From 587dd3f899309c420ade15c4f739defe5a6d4ca9 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Dec 2021 22:45:52 +0800
Subject: [PATCH 1/5] BUG 26029

---
 .../AppAskForm/{components => }/AddForm.vue   | 315 ++++++++----------
 src/apps/AppAskForm/AppAskForm.vue            |   9 +-
 .../{components => }/FiledConfig.vue          |  30 +-
 .../{components => }/PreviewForm.vue          |  14 +-
 .../AppAskForm/{components => }/Result.vue    |  15 +-
 src/apps/AppAskForm/components/AddList.vue    |  24 +-
 src/apps/AppAskForm/components/Tabbar.vue     |   8 +
 7 files changed, 174 insertions(+), 241 deletions(-)
 rename src/apps/AppAskForm/{components => }/AddForm.vue (66%)
 rename src/apps/AppAskForm/{components => }/FiledConfig.vue (97%)
 rename src/apps/AppAskForm/{components => }/PreviewForm.vue (98%)
 rename src/apps/AppAskForm/{components => }/Result.vue (97%)

diff --git a/src/apps/AppAskForm/components/AddForm.vue b/src/apps/AppAskForm/AddForm.vue
similarity index 66%
rename from src/apps/AppAskForm/components/AddForm.vue
rename to src/apps/AppAskForm/AddForm.vue
index 8e4c09d8..61aac02a 100644
--- a/src/apps/AppAskForm/components/AddForm.vue
+++ b/src/apps/AppAskForm/AddForm.vue
@@ -1,156 +1,134 @@
 <template>
   <div class="add-form" v-if="pageShow">
-    <div v-show="!isShowConfig">
-      <div class="header-pic">
-        <image v-if="form.headPicture" :src="form.headPicture"/>
-        <span @click="upload">更换图片</span>
-      </div>
-      <div class="form-info">
-        <h2>文本选项</h2>
-        <div class="form-info__wrapper">
+    <div class="header-pic">
+      <image v-if="form.headPicture" :src="form.headPicture"/>
+      <span @click="upload">更换图片</span>
+    </div>
+    <div class="form-info">
+      <h2>文本选项</h2>
+      <div class="form-info__wrapper">
           <textarea class="title" placeholder="请输入标题 (必填）" :maxlength="30" :auto-height="true"
                     v-model="form.title"></textarea>
-          <textarea
-              class="content"
-              border="none"
-              :clearable="false"
-              type="textarea"
-              v-model="form.tableExplain"
-              placeholder="请输入表单描述 (选填）"
-              :maxlength="255">
+        <textarea
+            class="content"
+            border="none"
+            :clearable="false"
+            type="textarea"
+            v-model="form.tableExplain"
+            placeholder="请输入表单描述 (选填）"
+            :maxlength="255">
           </textarea>
-        </div>
       </div>
-      <draggable
-          class="components-list"
-          v-model="targetList"
-          :animation="340"
-          scroll
-          element="div"
-          :options="{
+    </div>
+    <draggable
+        class="components-list"
+        v-model="targetList"
+        :animation="340"
+        scroll
+        element="div"
+        :options="{
           animation: 340,
           handle: '.components-item__title'
         }"
-          draggable=".components-item"
-          :sort="true">
-        <div class="components-item" v-for="(item, index) in targetList" :key="index"
-             @click="toFiledSetting(item, index)">
-          <div class="components-item__title">
-            <div class="components-item__title--left">
-              <em :style="{opacity: item.required ? 1 : 0}">*</em>
-              <i>{{ index + 1 }}.</i>
-              <h2>{{ item.label }}</h2>
+        draggable=".components-item"
+        :sort="true">
+      <div class="components-item" v-for="(item, index) in targetList" :key="index"
+           @click="toFiledSetting(item, index)">
+        <div class="components-item__title">
+          <div class="components-item__title--left">
+            <em :style="{opacity: item.required ? 1 : 0}">*</em>
+            <i>{{ index + 1 }}.</i>
+            <h2>{{ item.label }}</h2>
+          </div>
+          <image :src="`${$cdn}askform/sc1.png`" @click.stop="removeComponent(index)"
+                 @touchstart.stop="removeComponent(index)"/>
+        </div>
+        <div class="components-item__filed">
+          <template v-if="(item.type === 'radio')">
+            <u-radio-group v-model="item.value" wrap>
+              <u-radio class="u-radio" disabled style="display: block;" v-for="(field, i) in item.options" :key="i">
+                <image :src="field.img[0].url" v-if="field.img.length"/>
+                <span>{{ field.label }}</span>
+              </u-radio>
+            </u-radio-group>
+          </template>
+          <template v-if="(item.type === 'checkbox')">
+            <u-checkbox-group v-model="item.value" wrap>
+              <u-checkbox class="u-checkbox" disabled :name="field.label" v-for="(field, i) in item.options" :key="i">
+                <image :src="field.img[0].url" v-if="field.img.length"/>
+                <span>{{ field.label }}</span>
+              </u-checkbox>
+            </u-checkbox-group>
+          </template>
+          <template v-if="(item.type === 'select')">
+            <div class="components-item__select">
+              <span>{{ item.placeholder }}</span>
+              <u-icon name="arrow-down" color="#DEDFDF"/>
             </div>
-            <image :src="`${$cdn}askform/sc1.png`" @click.stop="removeComponent(index)"
-                   @touchstart.stop="removeComponent(index)"/>
-          </div>
-          <div class="components-item__filed">
-            <template v-if="(item.type === 'radio')">
-              <u-radio-group v-model="item.value" wrap>
-                <u-radio class="u-radio" disabled style="display: block;" v-for="(field, i) in item.options" :key="i">
-                  <image :src="field.img[0].url" v-if="field.img.length"/>
-                  <span>{{ field.label }}</span>
-                </u-radio>
-              </u-radio-group>
-            </template>
-            <template v-if="(item.type === 'checkbox')">
-              <u-checkbox-group v-model="item.value" wrap>
-                <u-checkbox class="u-checkbox" disabled :name="field.label" v-for="(field, i) in item.options" :key="i">
-                  <image :src="field.img[0].url" v-if="field.img.length"/>
-                  <span>{{ field.label }}</span>
-                </u-checkbox>
-              </u-checkbox-group>
-            </template>
-            <template v-if="(item.type === 'select')">
-              <div class="components-item__select">
-                <span>{{ item.placeholder }}</span>
-                <u-icon name="arrow-down" color="#DEDFDF"/>
-              </div>
-            </template>
-            <template v-if="(item.type === 'upload')">
-              <div class="components-item__select components-item__textarea components-item__upload">
-                <image :src="`${$cdn}askform/upload.png`"/>
-                <span>选择图片（10M以内）</span>
-              </div>
-            </template>
-            <template v-if="(item.type === 'input')">
-              <div class="components-item__select">
-                <span>{{ item.placeholder }}</span>
-              </div>
-            </template>
-            <template v-if="(item.type === 'textarea')">
-              <div class="components-item__select components-item__textarea">
-                <span>{{ item.placeholder }}</span>
-              </div>
-            </template>
-          </div>
+          </template>
+          <template v-if="(item.type === 'upload')">
+            <div class="components-item__select components-item__textarea components-item__upload">
+              <image :src="`${$cdn}askform/upload.png`"/>
+              <span>选择图片（10M以内）</span>
+            </div>
+          </template>
+          <template v-if="(item.type === 'input')">
+            <div class="components-item__select">
+              <span>{{ item.placeholder }}</span>
+            </div>
+          </template>
+          <template v-if="(item.type === 'textarea')">
+            <div class="components-item__select components-item__textarea">
+              <span>{{ item.placeholder }}</span>
+            </div>
+          </template>
         </div>
-      </draggable>
-      <div class="add-form__btn" @click="isShow = true">
-        <image :src="`${$cdn}askform/add.png`"/>
-        <span>添加问题</span>
       </div>
-      <div class="add-form__footer">
-        <div class="add-form__footer--item-wrapper">
-          <div class="add-form__footer--item" @click="toPreview">
-            <image :src="`${$cdn}sass/preview.png`"/>
-            <span>预览</span>
-          </div>
-          <div class="add-form__footer--item" @click="toSetting">
-            <image :src="`${$cdn}sass/setting.png`"/>
-            <span>设置</span>
-          </div>
+    </draggable>
+    <div class="add-form__btn" @click="isShow = true">
+      <image :src="`${$cdn}askform/add.png`"/>
+      <span>添加问题</span>
+    </div>
+    <div class="add-form__footer">
+      <div class="add-form__footer--item-wrapper">
+        <div class="add-form__footer--item" @click="toPreview">
+          <image :src="`${$cdn}sass/preview.png`"/>
+          <span>预览</span>
+        </div>
+        <div class="add-form__footer--item" @click="toSetting">
+          <image :src="`${$cdn}sass/setting.png`"/>
+          <span>设置</span>
         </div>
-        <div @click="onConfirm">立即发布</div>
       </div>
-      <u-popup v-model="isShow" :closeable="false" mode="bottom" @close="isShow = false">
-        <div class="add-popup">
-          <div class="add-popup__title">
-            <h2>添加问题</h2>
-            <image :src="`${$cdn}askform/zk.png`" mode="aspectFit" @click="isShow = false"/>
-          </div>
-          <div class="add-popup__list">
-            <span @click="toFiledSetting('radio')">单选题</span>
-            <span @click="toFiledSetting('checkbox')">多选题</span>
-            <span @click="toFiledSetting('select')">单下拉框</span>
-            <span @click="toFiledSetting('input')">单行填空</span>
-            <span @click="toFiledSetting('textarea')">多行填空</span>
-            <span @click="toFiledSetting('upload')">上传图片</span>
-          </div>
+      <div @click="onConfirm">立即发布</div>
+    </div>
+    <u-popup v-model="isShow" :closeable="false" mode="bottom" @close="isShow = false">
+      <div class="add-popup">
+        <div class="add-popup__title">
+          <h2>添加问题</h2>
+          <image :src="`${$cdn}askform/zk.png`" mode="aspectFit" @click="isShow = false"/>
         </div>
-      </u-popup>
-
-    </div>
-    <div class="detail" v-if="isShowConfig">
-      <component
-          :is="component"
-          :index="filedIndex"
-          :filed="filed"
-          @change="onChange"
-          :targetListData="targetList"
-          :formData="form"
-          :filedType="filedType"
-          @back="isShowConfig = false"
-          :id="id"
-          :formConfig="formConfig">
-      </component>
-    </div>
+        <div class="add-popup__list">
+          <span @click="toFiledSetting('radio')">单选题</span>
+          <span @click="toFiledSetting('checkbox')">多选题</span>
+          <span @click="toFiledSetting('select')">单下拉框</span>
+          <span @click="toFiledSetting('input')">单行填空</span>
+          <span @click="toFiledSetting('textarea')">多行填空</span>
+          <span @click="toFiledSetting('upload')">上传图片</span>
+        </div>
+      </div>
+    </u-popup>
   </div>
 </template>
 
 <script>
 import draggable from 'vuedraggable'
-import FiledConfig from './FiledConfig'
-import FormSetting from '../FormSetting'
-import PreviewForm from './PreviewForm'
+import qs from "query-string"
 
 export default {
-  props: ['params'],
-
   data() {
     return {
       pageShow: false,
-      isShowConfig: false,
       form: {
         tableExplain: '详细描述',
         title: '问卷调查',
@@ -180,34 +158,23 @@ export default {
       filedIndex: '',
       isQuote: false,
       touchStart: 0,
-      component: '',
       formConfig: {}
     }
   },
-
   components: {
     draggable,
-    PreviewForm,
-    FormSetting,
-    FiledConfig
   },
-
-  mounted() {
-    this.type = Number(this.params.type)
-
-    if (this.params.isQuote) {
-      this.isQuote = true
-    }
-
-    if (this.params.id) {
-      this.id = this.params.id
-      this.getInfo(this.params.id)
+  created() {
+    let {type, isQuote, id} = this.$route.query
+    this.type = type
+    this.isQuote = !!isQuote
+    if (id) {
+      this.id = id
+      this.getInfo(id)
     } else {
       this.pageShow = true
     }
-
     this.init()
-
     uni.$on('setting', res => {
       this.form = {
         ...this.form,
@@ -224,21 +191,15 @@ export default {
       }
     })
   },
-
   methods: {
     toSetting() {
-      this.component = 'FormSetting'
-      this.isShowConfig = true
+      let {formConfig} = this
+      uni.navigateTo({url: `./FormSetting?${qs.stringify({formConfig})}`})
     },
-
     back() {
-      this.$emit('change', {
-        type: 'Tabbar'
-      })
+      uni.navigateBack({})
     },
-
     onChange(e) {
-
     },
 
     removeComponent(index) {
@@ -246,8 +207,9 @@ export default {
     },
 
     toPreview() {
-      this.component = 'PreviewForm'
-      this.isShowConfig = true
+      let {form, targetList} = this
+      localStorage.setItem("toPreviewForm", JSON.stringify({form, targetList}))
+      uni.navigateTo({url: `./PreviewForm`})
     },
 
     upload() {
@@ -340,18 +302,15 @@ export default {
         type: this.type,
         templateType: 0
       }).then(res => {
-        if (res.code == 0) {
-          setTimeout(() => {
-            this.$emit('change', {
-              type: 'Result',
-              params: {
-                linkUrl: res.data.linkUrl,
-                title: this.form.title,
-                tableExplain: this.form.tableExplain,
-                headPicture: this.form.headPicture
-              }
-            })
-          }, 600)
+        if (res?.code == 0) {
+          uni.navigateTo({
+            url: `./Result?${qs.stringify({
+              linkUrl: res.data.linkUrl,
+              title: this.form.title,
+              tableExplain: this.form.tableExplain,
+              headPicture: this.form.headPicture
+            })}`
+          })
         }
       }).catch(e => {
         this.$u.toast(e)
@@ -377,7 +336,6 @@ export default {
         } else {
           this.$u.toast(res.msg)
         }
-
         uni.hideLoading()
       }).catch(() => {
         uni.hideLoading()
@@ -389,16 +347,15 @@ export default {
       if (index > -1) {
         this.filed = type
         this.filedIndex = index
-        this.component = 'FiledConfig'
-        this.isShowConfig = true
-
-        return false
+        let {filed, filedType} = this
+        localStorage.setItem("toFiledConfig", JSON.stringify({index, filed, filedType}))
+      } else {
+        this.filedIndex = ''
+        this.filedType = type
+        let {filed, filedType} = this
+        localStorage.setItem("toFiledConfig", JSON.stringify({filed, filedType}))
       }
-
-      this.filedIndex = ''
-      this.filedType = type
-      this.component = 'FiledConfig'
-      this.isShowConfig = true
+      uni.navigateTo({url: `./FiledConfig`})
     },
 
     init() {
diff --git a/src/apps/AppAskForm/AppAskForm.vue b/src/apps/AppAskForm/AppAskForm.vue
index f835c37a..9e62e786 100644
--- a/src/apps/AppAskForm/AppAskForm.vue
+++ b/src/apps/AppAskForm/AppAskForm.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="form">
-    <component v-if="refresh" :is="component" @change="onChange" :params="params"/>
+    <component ref="TabPage" :is="component" @change="onChange" :params="params"/>
   </div>
 </template>
 
 <script>
 import Tabbar from './components/Tabbar.vue'
-import AddForm from './components/AddForm.vue'
-import Result from './components/Result.vue'
+import AddForm from './AddForm.vue'
+import Result from './Result.vue'
 import {mapActions} from "vuex";
 
 export default {
@@ -37,9 +37,8 @@ export default {
   },
   onShow() {
     document.title = "问卷表单"
-    this.refresh = false
+    this.$refs.TabPage?.show()
     this.$nextTick(() => {
-      this.refresh = true
       this.injectJWeixin(['sendChatMessage', 'selectEnterpriseContact', 'shareAppMessage', 'shareWechatMessage']).then(() => {
         this.$dict.load(['questionnaireStatus', 'questionnaireType', 'questionnaireFieldType'])
       })
diff --git a/src/apps/AppAskForm/components/FiledConfig.vue b/src/apps/AppAskForm/FiledConfig.vue
similarity index 97%
rename from src/apps/AppAskForm/components/FiledConfig.vue
rename to src/apps/AppAskForm/FiledConfig.vue
index be9dd3a0..03a963ad 100644
--- a/src/apps/AppAskForm/components/FiledConfig.vue
+++ b/src/apps/AppAskForm/FiledConfig.vue
@@ -142,45 +142,35 @@
 </template>
 
 <script>
-import {components} from './config'
+import {components} from './components/config'
 
 export default {
-  props: ['filed', 'index', 'filedType'],
-
   data() {
+    let params = localStorage.getItem("toFiledConfig")
+    params && (params = JSON.parse(params))
+    localStorage.removeItem("toFiledConfig")
     return {
+      ...params,
       isShowType: false,
       isShowAnswer: false,
-      config: {}
     }
   },
-
-  mounted() {
-    if (this.index !== '') {
-      this.config = this.filed
-      return false
-    }
-
-    console.log(components)
-    this.config = JSON.parse(JSON.stringify(components.filter(v => v.type === this.filedType)[0]))
-  },
-
   computed: {
+    config() {
+      return !!this.index ? this.filed : JSON.parse(JSON.stringify(components.filter(v => v.type === this.filedType)[0]))
+    },
     pointTypeName() {
       if (!this.config.pointDict) return ''
 
       return this.config.pointDict.filter(v => v.dictValue === this.config.pointType)[0].dictName
     },
-
     defaultType() {
       if (!this.config.pointType) return [0]
 
       return [Number(this.config.pointType)]
     },
-
     defaultAnswer() {
       if (!this.config.answer) return [0]
-
       let index = 0
       if (this.config.answer) {
         this.config.options?.forEach((v, i) => {
@@ -193,7 +183,6 @@ export default {
       return [index]
     }
   },
-
   methods: {
     answerChange(e) {
       this.config.answer = e[0].label
@@ -266,7 +255,7 @@ export default {
     },
 
     back() {
-      this.$emit('back')
+      uni.navigateBack({})
     },
 
     confirm() {
@@ -274,7 +263,6 @@ export default {
         config: this.config,
         index: this.index === '' ? '-1' : this.index
       })
-
       this.back()
     },
 
diff --git a/src/apps/AppAskForm/components/PreviewForm.vue b/src/apps/AppAskForm/PreviewForm.vue
similarity index 98%
rename from src/apps/AppAskForm/components/PreviewForm.vue
rename to src/apps/AppAskForm/PreviewForm.vue
index 8817d415..0c00c30c 100644
--- a/src/apps/AppAskForm/components/PreviewForm.vue
+++ b/src/apps/AppAskForm/PreviewForm.vue
@@ -61,15 +61,16 @@
         </div>
       </div>
     </div>
-
   </div>
 </template>
 
 <script>
 
 export default {
-  props: ['formData', 'targetListData'],
   data() {
+    let params = localStorage.getItem("toPreviewForm")
+    params && (params = JSON.parse(params))
+    localStorage.removeItem("toPreviewForm")
     return {
       form: {
         tableExplain: '详细描述',
@@ -95,15 +96,10 @@ export default {
       isShow: false,
       type: 0,
       id: '',
-      touchStart: 0
+      touchStart: 0,
+      ...params
     }
   },
-
-  mounted() {
-    this.form = this.formData
-    this.targetList = this.targetListData
-  },
-
   methods: {
     getInfo(id) {
       uni.showLoading()
diff --git a/src/apps/AppAskForm/components/Result.vue b/src/apps/AppAskForm/Result.vue
similarity index 97%
rename from src/apps/AppAskForm/components/Result.vue
rename to src/apps/AppAskForm/Result.vue
index 80a530c0..185536cf 100644
--- a/src/apps/AppAskForm/components/Result.vue
+++ b/src/apps/AppAskForm/Result.vue
@@ -33,14 +33,16 @@ import {mapActions} from 'vuex'
 export default {
   name: 'Result',
 
-  props: ['params'],
-
+  computed: {
+    params() {
+      return this.$route.query || {}
+    }
+  },
   mounted() {
     this.injectJWeixin(['sendChatMessage', 'selectEnterpriseContact'])
   },
   methods: {
     ...mapActions(['injectJWeixin', 'wxInvoke']),
-
     copy() {
       let oInput = document.createElement('input')
       oInput.value = this.params.linkUrl
@@ -50,7 +52,6 @@ export default {
       this.$u.toast('已复制')
       oInput.remove()
     },
-
     share() {
       this.injectJWeixin(['shareAppMessage', 'shareWechatMessage']).then(() => {
         this.wxInvoke(['shareAppMessage', {
@@ -61,7 +62,6 @@ export default {
         }])
       })
     },
-
     shareWechat() {
       this.injectJWeixin(['shareAppMessage', 'shareWechatMessage']).then(() => {
         this.wxInvoke(['shareWechatMessage', {
@@ -72,11 +72,8 @@ export default {
         }])
       })
     },
-
     confirm() {
-      this.$emit('change', {
-        type: 'Tabbar'
-      })
+      uni.navigateBack({})
     }
   },
   onShow() {
diff --git a/src/apps/AppAskForm/components/AddList.vue b/src/apps/AppAskForm/components/AddList.vue
index f041f906..b0beb10e 100644
--- a/src/apps/AppAskForm/components/AddList.vue
+++ b/src/apps/AppAskForm/components/AddList.vue
@@ -26,6 +26,8 @@
 </template>
 
 <script>
+import qs from "query-string"
+
 export default {
   name: 'addList',
   label: '新建项目',
@@ -47,30 +49,16 @@ export default {
     }
   },
 
-  mounted() {
+  created() {
     this.getList()
   },
-
   methods: {
     toAdd(type) {
-      this.$emit('change', {
-        type: 'AddForm',
-        params: {
-          type
-        }
-      })
+      uni.navigateTo({url: `./AddForm?${qs.stringify({type})}`})
     },
-
     quote(id) {
-      this.$emit('change', {
-        type: 'AddForm',
-        params: {
-          id,
-          isQuote: 1
-        }
-      })
+      uni.navigateTo({url: `./AddForm?${qs.stringify({id, isQuote: 1})}`})
     },
-
     getList() {
       this.$http.post(`/app/appquestionnairetemplate/list`, null, {
         params: {
@@ -79,7 +67,7 @@ export default {
           size: 10000
         }
       }).then(res => {
-        if (res.code == 0) {
+        if (res?.code == 0) {
           this.list = res.data.records
         }
       })
diff --git a/src/apps/AppAskForm/components/Tabbar.vue b/src/apps/AppAskForm/components/Tabbar.vue
index 5e6a1f0f..b6a6d435 100644
--- a/src/apps/AppAskForm/components/Tabbar.vue
+++ b/src/apps/AppAskForm/components/Tabbar.vue
@@ -42,6 +42,14 @@ export default {
   methods: {
     onChange(e) {
       this.$emit('change', e)
+    },
+    show() {
+      if (this.currIndex == 0) {
+        this.currIndex = -1
+        this.$nextTick(() => {
+          this.currIndex = 0
+        })
+      }
     }
   },
   onReachBottom() {

From b0b1baef97d0df79be96715fd8fe5343e939766c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Fri, 24 Dec 2021 22:50:09 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppResidentDocument/AppResidentDocument.vue | 2 +-
 src/apps/AppResidentDocument/DetailCard.vue          | 2 +-
 src/apps/AppResidentDocument/DetailPeople.vue        | 2 +-
 src/apps/AppWorkonline/AppWorkonline.vue             | 6 +++---
 src/apps/AppWorkonline/Detail.vue                    | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue
index 7a599a2e..a34d0033 100644
--- a/src/apps/AppResidentDocument/AppResidentDocument.vue
+++ b/src/apps/AppResidentDocument/AppResidentDocument.vue
@@ -17,7 +17,7 @@
       <div class="datass" v-for="(item, iindex) in datas" :key="iindex" @click="toDetailCard(item)">
         <div class="left">
           <img :src="item.photo" alt="" v-if="item.photo" />
-          <img src="components/img/4.png" alt="" v-else />
+          <img src="./components/img/4.png" alt="" v-else />
         </div>
 
         <div class="right">
diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue
index 3e5a7f03..ccf77dcb 100644
--- a/src/apps/AppResidentDocument/DetailCard.vue
+++ b/src/apps/AppResidentDocument/DetailCard.vue
@@ -19,7 +19,7 @@
         <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">
           <div class="photos">
             <img :src="item.photo" alt="" v-if="item.photo" />
-            <img src="components/img/44.png" alt="" v-else />
+            <img src="./components/img/44.png" alt="" v-else />
           </div>
 
           <div class="right">
diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue
index 508bdea1..9a95965e 100644
--- a/src/apps/AppResidentDocument/DetailPeople.vue
+++ b/src/apps/AppResidentDocument/DetailPeople.vue
@@ -3,7 +3,7 @@
     <div class="top">
       <div class="photos">
         <img :src="data.resident.photo" alt="" v-if="data.resident && data.resident.photo" />
-        <img src="components/img/44.png" alt="" v-else />
+        <img src="./components/img/44.png" alt="" v-else />
       </div>
 
       <div class="right">
diff --git a/src/apps/AppWorkonline/AppWorkonline.vue b/src/apps/AppWorkonline/AppWorkonline.vue
index 8d70da3b..54f83030 100644
--- a/src/apps/AppWorkonline/AppWorkonline.vue
+++ b/src/apps/AppWorkonline/AppWorkonline.vue
@@ -44,11 +44,11 @@
 
           <span class="icon">
             <!-- ing -->
-            <img src="components/ing.png" alt="" v-if="item.approvalStatus == 0" />
+            <img src="./components/ing.png" alt="" v-if="item.approvalStatus == 0" />
             <!-- end -->
-            <img src="components/end.png" alt="" v-if="item.approvalStatus == 1" />
+            <img src="./components/end.png" alt="" v-if="item.approvalStatus == 1" />
             <!-- false -->
-            <img src="components/reject.png" alt="" v-if="item.approvalStatus == 2" />
+            <img src="./components/reject.png" alt="" v-if="item.approvalStatus == 2" />
           </span>
         </view>
       </u-card>
diff --git a/src/apps/AppWorkonline/Detail.vue b/src/apps/AppWorkonline/Detail.vue
index c73a1886..471796b7 100644
--- a/src/apps/AppWorkonline/Detail.vue
+++ b/src/apps/AppWorkonline/Detail.vue
@@ -40,7 +40,7 @@
 
           <!-- 已通过 -->
           <div class="people_status_agree" v-if="list.approvalStatus == 1">
-            <img src="components/people_status_agree.png" alt="" />
+            <img src="./components/people_status_agree.png" alt="" />
           </div>
 
           <!-- 被驳回 -->
@@ -120,7 +120,7 @@
                 </div>
 
                 <div class="avatar" v-else-if="item.title == '抄送'">
-                  <img src="components/Profile_Picture.png" alt="" />
+                  <img src="./components/Profile_Picture.png" alt="" />
                 </div>
 
                 <div class="avatar" v-else>
@@ -128,13 +128,13 @@
                 </div>
 
                 <div class="icon-yes" v-if="item.stepType == 1 || item.stepType == 0 || item.stepType == 3">
-                  <img src="components/agree.png" alt="" />
+                  <img src="./components/agree.png" alt="" />
                 </div>
 
                 <div class="" v-else-if="item.stepType == 2"></div>
 
                 <div class="icon-no" v-else>
-                  <img src="components/clearn.png" />
+                  <img src="./components/clearn.png" />
                 </div>
               </div>
 

From 70032934caf7f01dfcee608fb07c038e09d05c89 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Dec 2021 22:55:27 +0800
Subject: [PATCH 3/5] BUG 25965

---
 src/apps/AppBuilding/components/searchMap.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppBuilding/components/searchMap.vue b/src/apps/AppBuilding/components/searchMap.vue
index 1c7dc1de..da7ef2a8 100644
--- a/src/apps/AppBuilding/components/searchMap.vue
+++ b/src/apps/AppBuilding/components/searchMap.vue
@@ -26,7 +26,7 @@
       <img src="./img/build-icon.png" alt=""> 楼栋<br/>列表
     </div>
     <div class="map-content">
-      <AiTMap v-if="areaId" :areaId="areaId" :map.sync="map" :lib.sync="lib" :ops="ops"
+      <AiTMap v-if="user.areaId" :areaId="user.areaId" :map.sync="map" :lib.sync="lib" :ops="ops"
               :libraries="['service', 'tools']"/>
     </div>
     <u-popup v-model="showPop" mode="bottom" border-radius="14">
@@ -48,11 +48,11 @@
         </div>
         <div class="info-flex">
           <span class="label">所属网格</span>
-          <span class="value">{{ detailInfo.community.girdName || '' }}</span>
+          <span class="value">{{ detailInfo.gird.girdName || '' }}</span>
         </div>
         <div class="info-flex">
           <span class="label">网格管理员</span>
-          <span class="value">{{ detailInfo.build.girdMemberNames || '' }}</span>
+          <span class="value">{{ detailInfo.gird.girdMemberNames || '' }}</span>
         </div>
         <div class="info-flex">
           <span class="label">楼栋长</span>
@@ -112,7 +112,6 @@ export default {
   data() {
     return {
       latLngCenter: {},
-      areaId: '',
       ops: {},
       lib: null,
       map: null,
@@ -135,7 +134,6 @@ export default {
   },
   computed: {...mapState(['user'])},
   mounted() {
-    this.areaId = this.user.areaId
     this.getCenterLatLng().then(points => {
       this.getMarkerCluster(points)
     })

From b2fd1b57a672ef0ec273228b8881286ae114ed9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E4=BB=95=E4=BC=9F?= <499672082@qq.com>
Date: Sat, 25 Dec 2021 08:12:04 +0000
Subject: [PATCH 4/5] Update AppBroadcast.vue

---
 src/apps/AppBroadcast/AppBroadcast.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppBroadcast/AppBroadcast.vue b/src/apps/AppBroadcast/AppBroadcast.vue
index c2e73752..56172a5d 100644
--- a/src/apps/AppBroadcast/AppBroadcast.vue
+++ b/src/apps/AppBroadcast/AppBroadcast.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="AppBroadcast">
     <div class="header">
-      <img src="img/bigHorn-bg.png" alt="">
+      <img src="./img/bigHorn-bg.png" alt="">
       <div class="content">
         <div class="item" @click="linkTo('./onlineList')">
-          <img src="img/bigHorn-icon1@2x.png" alt="">
+          <img src="./img/bigHorn-icon1@2x.png" alt="">
           <div>在线设备</div>
           <!-- <h2>1</h2> -->
         </div>
         <div class="item" @click="linkTo('./playList')">
-          <img src="img/bigHorn-icon2@2x.png" alt="">
+          <img src="./img/bigHorn-icon2@2x.png" alt="">
           <div>播放记录</div>
         </div>
         <!-- <div class="item" @click="linkTo('./onlinePlayList')">

From e1e535c7e9a8def5e4614d21056dff1c69a85901 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 27 Dec 2021 08:48:11 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E5=9C=B0=E5=9B=BE=E6=9C=AA=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppBuilding/components/searchMap.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/apps/AppBuilding/components/searchMap.vue b/src/apps/AppBuilding/components/searchMap.vue
index da7ef2a8..2a801e3a 100644
--- a/src/apps/AppBuilding/components/searchMap.vue
+++ b/src/apps/AppBuilding/components/searchMap.vue
@@ -124,7 +124,8 @@ export default {
       detailInfo: {
         house: {},
         build: {},
-        community: {}
+        community: {},
+        gird: {}
       },
       showPop: false,
       retryMapCount: 0,
@@ -349,7 +350,7 @@ export default {
     },
     toDetail(id) {
       uni.navigateTo({url: `./detail?id=${id}`})
-    },
+    }
   }
 }
 </script>