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

src/apps/AppPageBasic/AppPageBasic.vue

@@ -21,6 +21,11 @@ export default {
           name: '三务公开',
           icon: require('./img/shgk.png'),
           url: '../AppServicePublic/AppServicePublic?moduleId=b03d1ea68c8449ecb00685644e3f0192&listName=三务公开'
+        },
+        {
+          name: '问卷表单',
+          icon: require('./img/wjbd.png'),
+          url: '../AppAskForm/AppAskForm'
         }
       ],
       headerBg: require('./img/header-bg.png'),

src/apps/AppPageInteraction/AppPageInteraction.vue

@@ -21,11 +21,6 @@ export default {
           name: '小程序公告',
           icon: require('./img/xcxgg.png'),
           url: '../AppUniMsg/AppUniMsg'
-        },
-        {
-          name: '问卷表单',
-          icon: require('./img/wjbd.png'),
-          url: '../AppAskForm/AppAskForm'
         }
       ],
       headerBg: require('./img/header-bg.png'),

src/apps/AppWalkask/AppWalkask.vue

@@ -9,11 +9,11 @@
         <div class="currentLeft">
           <div class="currentLeft-top">
             <div class="left">
-              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color:#fff;">
+              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #fff">
-                <img :src="$cdn+'location.svg'" alt="" style="width:18px;height:18px;margin-right:4px;vertical-align: middle;">
+                <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;" />
+                <u-icon name="arrow-down" color="#fff" size="28" style="margin-left: 4px" />
               </AiAreaPicker>
             </div>
 
@@ -25,8 +25,8 @@
               <template #custom>
                 <div class="cards-left">
                   <span class="walkName">走访对象：{{ item.name }}</span>
-                  <span class="tags">{{ item.menuLevel3Name }}</span>
+                  <span class="tags" v-if="item.menuLevel3Name">{{ item.menuLevel3Name }}</span>
-                  <span class="tags">{{ $dict.getLabel('realityStatus', item.reality) }}</span>
+                  <span class="tags" v-if="item.reality">{{ $dict.getLabel('realityStatus', item.reality) }}</span>
                 </div>
 
                 <div class="cards-hint">{{ item.title }}</div>

src/apps/AppWalkask/add.vue

@@ -75,6 +75,7 @@ export default {
         reality: '',
         realityValue: '',
         menuLevel3Name: '',
+        applicationId: '',
         title: '',
         description: '',
         images: [],
@@ -106,6 +107,7 @@ export default {
     uni.$on('goBack', (data) => {
       console.log(data)
       this.forms.menuLevel3Name = data.applicationName
+      this.forms.applicationId = data.applicationId
       this.forms.name = data.selectUser.name
       this.forms.optionId = data.selectUser.id
     })
@@ -165,7 +167,8 @@ export default {
               applicationId: this.forms.applicationId,
               name: this.forms.name,
               optionId: this.forms.optionId,
-              menuLevel3Name: this.forms.menuLevel3Name,
+              // menuLevel3Name: this.forms.menuLevel3Name,
+              applicationId: this.forms.applicationId,
 
               reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality,
               title: this.forms.title,

src/apps/AppWalkask/selectType.vue

@@ -71,6 +71,7 @@ export default {
       current: 1,
       showType: true,
       applicationName: '',
+      applicationId: '',
       selectUser: {},
     }
   },
@@ -105,6 +106,7 @@ export default {
     },
 
     getUser(data) {
+      this.applicationId = data.id
       this.$http.post(`/app/appapplicationinfo/list?appId=${data.id}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
         if (res.code == 0) {
           res.data.records.map((item) => {
@@ -116,7 +118,7 @@ export default {
     },
 
     submit() {
-      uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName })
+      uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId })
       uni.navigateBack()
       // uni.navigateTo({ url: `./add` })
     },