Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

package.json

@@ -64,7 +64,6 @@
     "miniprogram-api-typings": "^3.3.2",
     "node-sass": "npm:dart-sass@^1.25.0",
     "postcss-comment": "^2.0.0",
-    "sass-loader": "^7.1.0",
     "uview-ui": "^1.8.4",
     "vue-template-compiler": "^2.6.11"
   },

src/apps/AppAskForm/AppForm.vue

@@ -3,7 +3,7 @@
     <template v-if="showDetail">
       <form-detail/>
     </template>
-    <ai-result v-else :tips="errMsg" status="error"/>
+    <ai-result v-else :tips="errMsg" :status="errStatus"/>
   </section>
 </template>
 
@@ -29,7 +29,11 @@ export default {
       return !!this.$route.query?.id && this.access
     },
     errMsg() {
-      return this.err || (this.access ? "表单不存在" : "无法获取用户信息")
+      this.access && (this.err = "表单不存在")
+      return this.err || "数据读取中..."
+    },
+    errStatus() {
+      return !!this.err ? "error" : "loading"
     },
     isPreview() {
       return !!this.$route.query?.preview
@@ -64,7 +68,7 @@ export default {
   },
   created() {
     this.checkAccess()
-    document.title = "调查问卷"
+    document.title = "问卷调查"
   }
 }
 </script>

src/apps/AppWalkask/AppWalkask.vue

@@ -0,0 +1,51 @@
+<template>
+  <div class="AppWalkask">
+    <u-navbar title="走访慰问" back-icon-color="#fff" title-color="#fff" title-width="300" title-size="36" :background="backgroundNavbar"> </u-navbar>
+
+    <div class="header-top">
+      <u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+    </div>
+
+    <div>
+      <div v-if="current == 0">0</div>
+      <div v-if="current == 1">1</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AppWalkask',
+  appName: '走访慰问',
+  computed: {},
+  components: {},
+  data() {
+    return {
+      backgroundNavbar: {
+        backgroundColor: '#3975C6',
+      },
+      list: [
+        {
+          name: '全部',
+        },
+        {
+          name: '我的走访',
+        },
+      ],
+      current: 0,
+    }
+  },
+  onLoad() {},
+  onShow() {},
+  methods: {
+    change(index) {
+      this.current = index
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.AppWalkask {
+}
+</style>

src/components/AiResult.vue

@@ -30,6 +30,9 @@ export default {
       if (this.status == "error") {
         obj.image = this.$cdn + "result/fail.png"
         obj.tips = this.tips || "提交失败!"
+      } else if (this.status == "loading") {
+        obj.image = "https://cdn.cunwuyun.cn/wxAdmin/img/message.png"
+        obj.tips = this.tips || "数据读取中..."
       }
       return obj
     }

src/components/AiTopFixed.vue

@@ -39,10 +39,8 @@ export default {
   }
 
   .fixed {
-    display: flex;
-    align-items: center;
     width: 100%;
-    height: 100rpx;
+    min-height: 100px;
     top: 0;
     position: fixed;
     z-index: 9;
@@ -54,11 +52,8 @@ export default {
   }
 
   .content {
-    display: flex;
+    min-height: 100px;
-    align-items: center;
+    padding: 20px 32px;
-    width: 100%;
-    height: 100rpx;
-    padding: 0 32px;
     box-sizing: border-box;
   }