Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppAskForm/AddForm.vue

@@ -184,6 +184,7 @@ export default {
     })
 
     uni.$on('filedConfig', res => {
+      console.log(res)
       if (res.index < 0) {
         this.targetList.push(res.config)
       } else {
@@ -191,6 +192,11 @@ export default {
       }
     })
   },
+
+  onShow () {
+    localStorage.removeItem("toFiledConfig")
+  },
+
   methods: {
     toSetting() {
       let {formConfig} = this
@@ -348,13 +354,10 @@ export default {
       if (index > -1) {
         this.filed = type
         this.filedIndex = index
-        let {filed, filedType} = this
+        localStorage.setItem("toFiledConfig", JSON.stringify({index, filed: type, filedType: type.type}))
-        localStorage.setItem("toFiledConfig", JSON.stringify({index, filed, filedType}))
       } else {
         this.filedIndex = ''
-        this.filedType = type
+        localStorage.setItem("toFiledConfig", JSON.stringify({filed: '', filedType: type, index: -1}))
-        let {filed, filedType} = this
-        localStorage.setItem("toFiledConfig", JSON.stringify({filed, filedType}))
       }
       uni.navigateTo({url: `./FiledConfig`})
     },

src/apps/AppAskForm/FiledConfig.vue

@@ -148,12 +148,11 @@ export default {
   data() {
     let params = localStorage.getItem("toFiledConfig")
     params && (params = JSON.parse(params))
-    localStorage.removeItem("toFiledConfig")
+    params.config = params.index > -1 ? params.filed : components.filter(v => v.type === params.filedType)[0]
-    params.config = params.index > -1 ? params.filed : components?.filter(v => v.type === params.filedType)?.[0] || {}
     return {
       ...params,
       isShowType: false,
-      isShowAnswer: false,
+      isShowAnswer: false
     }
   },
   computed: {
@@ -251,7 +250,7 @@ export default {
       this.config.options.splice(index, 1)
     },
 
-    back() {
+    back() {  
       uni.navigateBack({})
     },
 

src/apps/AppAskForm/Result.vue

@@ -74,7 +74,9 @@ export default {
       })
     },
     confirm() {
-      history.go(2 - history.length)
+      uni.navigateBack({
+        delta: 2
+      })
     }
   },
   onShow() {

src/apps/AppResidentActivitie/AppResidentActivities.vue

@@ -108,6 +108,8 @@ export default {
     },
 
     change(index) {
+      this.datas = []
+      this.current = 1
       this.currentTabs = index
       this.getList()
     },

src/apps/AppWalkask/AppWalkask.vue

@@ -9,7 +9,12 @@
         <div class="currentLeft">
           <div class="currentLeft-top">
             <div class="left">
-              <AiAreaPicker v-model="areaId" all :areaId="areaId" @select="areaSelect" style="color: #fff"></AiAreaPicker>
+              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" style="color:#fff;">
+                <img :src="$cdn+'location.svg'" alt="" style="width:18px;height:18px;margin-right:4px;vertical-align: middle;">
+                <span class="label" v-if="areaName">{{ areaName }}</span>
+                <span v-else>请选择</span>
+                <u-icon name="arrow-down" color="#fff" size="28" style="margin-left:4px;" />
+              </AiAreaPicker>
             </div>
 
             <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF" search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch" @clear="handerClear"></u-search>
@@ -44,7 +49,7 @@
           </template>
 
           <div v-else>
-            <AiEmpty description="您还未添加过入户调查走访" class="emptyWrap"></AiEmpty>
+            <AiEmpty description="您还未添加过入户走访慰问" class="emptyWrap"></AiEmpty>
 
             <div class="addBtns">
               <span> 点击</span>
@@ -92,6 +97,7 @@ export default {
       params: null,
       current: 1,
       areaId: '',
+      areaName: '',
       size: 10,
       deletId: '',
       pages: 0,
@@ -102,6 +108,7 @@ export default {
   },
   onLoad() {
     this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
     this.$dict.load('realityStatus').then(() => {
       this.getList()
     })
@@ -147,7 +154,9 @@ export default {
     },
 
     areaSelect(e) {
+      console.log(e)
       this.areaId = e.id
+      this.areaName = e.name
       this.getList()
     },