From 43ba05ab7c3d5052879936faff74bf211733acb9 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 25 Nov 2021 16:02:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppAskForm/AppAskForm.vue            |   2 +-
 .../AppAskForm/{askForm.vue => AppForm.vue}   |  15 +-
 src/apps/AppAskForm/formDetail.vue            |  17 +-
 src/apps/AppAskForm/formList.vue              | 162 ------------------
 src/pages/login.vue                           |   7 +-
 src/store/index.js                            |   6 +-
 6 files changed, 14 insertions(+), 195 deletions(-)
 rename src/apps/AppAskForm/{askForm.vue => AppForm.vue} (62%)
 delete mode 100644 src/apps/AppAskForm/formList.vue

diff --git a/src/apps/AppAskForm/AppAskForm.vue b/src/apps/AppAskForm/AppAskForm.vue
index 02a77d27..69879023 100644
--- a/src/apps/AppAskForm/AppAskForm.vue
+++ b/src/apps/AppAskForm/AppAskForm.vue
@@ -14,7 +14,7 @@
 
   export default {
     name: 'AppAskForm',
-    appName: '问卷表单',
+    appName: '问卷表单管理',
 
     data () {
       return {
diff --git a/src/apps/AppAskForm/askForm.vue b/src/apps/AppAskForm/AppForm.vue
similarity index 62%
rename from src/apps/AppAskForm/askForm.vue
rename to src/apps/AppAskForm/AppForm.vue
index 304ca182..05765c36 100644
--- a/src/apps/AppAskForm/askForm.vue
+++ b/src/apps/AppAskForm/AppForm.vue
@@ -1,11 +1,8 @@
 <template>
   <section class="askForm">
-    <template v-if="showDetail&&!isManager">
+    <template v-if="showDetail">
       <form-detail/>
     </template>
-    <template v-else-if="isManager">
-      <form-list ref="FormList"/>
-    </template>
     <ai-loading v-else :tips="errMsg"/>
   </section>
 </template>
@@ -14,22 +11,16 @@
 import AiLoading from "../../components/AiLoading";
 import {mapState} from "vuex";
 import FormDetail from "./formDetail";
-import FormList from "./formList";
 
 export default {
   name: "askForm",
-  components: {FormList, FormDetail, AiLoading},
+  appName: "问卷表单",
+  components: {FormDetail, AiLoading},
   computed: {
     ...mapState(['openUser', 'user']),
     showDetail() {
       return !!this.$route.query?.id
     },
-    isManager() {
-      let {hash, query: {preview}} = this.$route
-      if (preview) return false
-      else if (hash == "#dev") return true
-      else return hash != '#form' && !!this.user.id
-    }
   },
   data() {
     return {
diff --git a/src/apps/AppAskForm/formDetail.vue b/src/apps/AppAskForm/formDetail.vue
index 17d30fd3..d95fe105 100644
--- a/src/apps/AppAskForm/formDetail.vue
+++ b/src/apps/AppAskForm/formDetail.vue
@@ -65,14 +65,10 @@
 
 <script>
 
-import UForm from "../../uview/components/u-form/u-form";
-import UFormItem from "../../uview/components/u-form-item/u-form-item";
 import {mapActions, mapState} from "vuex";
-import UInput from "../../uview/components/u-input/u-input";
 import AiTextarea from "../../components/AiTextarea";
 import AiUploader from "../../components/AiUploader";
 import AiSelect from "../../components/AiSelect";
-import URadio from "../../uview/components/u-radio/u-radio";
 import AiLoading from "../../components/AiLoading";
 import AiResult from "../../components/AiResult";
 import AiImage from "../../components/AiImage";
@@ -85,13 +81,9 @@ export default {
     AiImage,
     AiResult,
     AiLoading,
-    URadio,
     AiSelect,
     AiUploader,
     AiTextarea,
-    UInput,
-    UFormItem,
-    UForm
   },
   computed: {
     ...mapState(['openUser', 'token']),
@@ -220,14 +212,9 @@ export default {
         this.checkUser = true
         return Promise.resolve()
       }
-      let {query: {id}, hash} = this.$route,
+      let {query: {id}} = this.$route,
           {openId} = this.openUser
-      if (hash != "#form") {
-        this.result = {
-          tips: "非法的调查问卷链接",
-          status: "error"
-        }
-      } else if (openId) {
+      if (openId) {
         return new Promise(resolve => {
           this.$http.post("/app/appquestionnairetemplate/commitCheck", null, {
             params: {id, openId}
diff --git a/src/apps/AppAskForm/formList.vue b/src/apps/AppAskForm/formList.vue
deleted file mode 100644
index 91344d2a..00000000
--- a/src/apps/AppAskForm/formList.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <section class="formList">
-    <ai-top-fixed>
-      <u-search placeholder="请输入标题" :show-action="false" search-icon-color="#ccc" v-model="search.title" @search="page.current=1,getList()"/>
-    </ai-top-fixed>
-    <div class="mainPane">
-      <div class="formBox column" flex v-for="op in list" :key="op.id">
-        <div flex>
-          <div class="fill column" flex>
-            <b class="title">{{ op.title }}</b>
-            <div class="info wrap" flex>
-              <span v-html="op.createUserName"/>
-              <span v-html="op.createUnitName"/>
-              <span v-html="op.createTime"/>
-              <span v-html="$dict.getLabel('questionnaireType',op.type)"/>
-            </div>
-          </div>
-          <div class="split"/>
-          <div flex class="column submitCount">
-            <b>{{ op.dataCount }}</b>
-            <div>答卷数量</div>
-          </div>
-        </div>
-        <div flex class="bottom">
-          <div class="dot" :style="{background:$dict.getColor('questionnaireStatus',op.status)}"/>
-          <div>{{ $dict.getLabel("questionnaireStatus", op.status) }}</div>
-        </div>
-      </div>
-    </div>
-  </section>
-</template>
-
-<script>
-import AiTopFixed from "../../components/AiTopFixed";
-
-export default {
-  name: "formList",
-  components: {AiTopFixed},
-  data() {
-    return {
-      page: {current: 1, size: 10, total: 0},
-      search: {title: ""},
-      list: []
-    }
-  },
-  methods: {
-    getList() {
-      this.$http.post("/app/appquestionnairetemplate/list", null, {
-        params: {...this.page, ...this.search}
-      }).then(res => {
-        if (res?.data) {
-          if (this.page.current > 1) {
-            this.list = [...this.list, ...res.data.records]
-          } else this.list = res.data.records
-          this.page.total = res.data.total
-        }
-      })
-    },
-    reachBottom() {
-      if (this.page.total > this.list.length) {
-        this.page.current++
-        this.getList()
-      }
-    }
-  },
-  created() {
-    this.$dict.load("questionnaireStatus", 'questionnaireType')
-    this.getList()
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.formList {
-  min-height: 100%;
-  background: #F3F6F9;
-
-  ::v-deep .mainPane {
-    padding: 24px 24px 126px;
-
-    .formBox {
-      width: 100%;
-      min-height: 220px;
-      background: #FFFFFF;
-      border-radius: 16px;
-      padding: 24px;
-      box-sizing: border-box;
-      text-align: center;
-      color: #999;
-      font-size: 20px;
-      margin-bottom: 24px;
-
-      & > div {
-        width: 100%;
-      }
-
-      b {
-        width: 100%;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        font-size: 32px;
-        color: #333;
-        margin-bottom: 16px;
-      }
-
-      .title {
-        text-align: start;
-      }
-
-      .info {
-        width: 100%;
-
-        span {
-          white-space: nowrap;
-          padding: 0 16px;
-          box-sizing: border-box;
-          border-left: 1px solid #D1D2D5;
-          margin-bottom: 4px;
-
-          &:first-of-type {
-            border-left: none;
-            padding-left: 0;
-          }
-        }
-      }
-
-      .bottom {
-        margin-top: 30px;
-        font-size: 26px;
-
-        .dot {
-          width: 11px;
-          height: 11px;
-          background: #3CB300;
-          border-radius: 50%;
-          margin-right: 8px;
-        }
-      }
-
-      .submitCount {
-        width: 118px;
-
-        b {
-          color: #1EA0FA;
-        }
-
-        & > div {
-          font-size: 22px;
-          white-space: nowrap;
-        }
-      }
-
-      .split {
-        width: 2px;
-        background: #f5f5f5;
-        margin: 0 24px;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/pages/login.vue b/src/pages/login.vue
index f33ed748..5bff50df 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -37,14 +37,17 @@ export default {
     ...mapActions(['getToken']),
     ...mapMutations(['login']),
     handleLogin() {
-      this.$refs.loginForm.validate().then(v => {
+      this.$refs.loginForm.validate(v => {
         if (v) {
           this.getToken(this.form).then(() => {
             uni.navigateBack({})
           }).catch(() => 0)
         }
       })
-    }
+    },
+  },
+  mounted() {
+    this.$refs.loginForm.setRules(this.rules)
   }
 }
 </script>
diff --git a/src/store/index.js b/src/store/index.js
index 56a0f2c0..d9799c35 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -14,7 +14,7 @@ const store = new Vuex.Store({
     openUser: {},
     dicts: [],
     user: {},
-    config:{}
+    config: {}
   },
   mutations: {
     login(state, token) {
@@ -162,7 +162,7 @@ const store = new Vuex.Store({
   actions: {
     getToken(state, params) {
       const encryptByDES = password => {
-        let isIos = wx.getSystemInfoSync().system.toUpperCase === 'ios'
+        let isIos = uni.getSystemInfoSync().system.toUpperCase == 'ios'
         let key = "thanks,villcloud"
         let iv = CryptoJS.enc.Latin1.parse(key)
         let encrypted = CryptoJS.AES.encrypt(password, iv, {
@@ -322,7 +322,7 @@ const store = new Vuex.Store({
         }, 500)
       })
     },
-    selectEnterpriseContact(state,params) {
+    selectEnterpriseContact(state, params) {
       return new Promise(resolve => {
         state.dispatch("injectJWeixin", "selectEnterpriseContact").then(() => {
           setTimeout(() => {