Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/common/axios.js

@@ -15,9 +15,9 @@ instance.interceptors.request.use(config => {
   } else if (/AppCountryAlbum/.test(location.pathname) || config.module == 'AppCountryAlbum') {
     config.baseURL = '/aca'
     config.url = config.url.replace(/(app|auth|admin)\//, "api/")
-  } else if (/\/grid\//.test(location.pathname)) {
+  } else if (/\/project\/beta\//.test(location.pathname)) {
     config.baseURL = '/wangge'
-  } else if (/\/project\/police\//.test(location.pathname)||config.module=='hnjc') {
+  } else if (/\/project\/police\//.test(location.pathname) || config.module == 'hnjc') {
     config.baseURL = '/hnjc'
     config.url = config.url.replace(/(app|auth|admin)\//, "api/")
   } else if (sessionStorage.getItem("prj") == "saas") {

src/pages/loading.vue

@@ -30,7 +30,7 @@ export default {
       let {search, currentLib} = this
       return this.apps.filter(e => {
         return (currentLib == "apps" && e.libPath.indexOf("project") > -1) || e.libPath.indexOf(currentLib) > -1
-      }).filter(e => !!search ? e.label.indexOf(search) > -1 : true) || []
+      }).filter(e => !!search ? e.label?.indexOf(search) > -1 : true) || []
     },
     currentApp() {
       return this.apps.find(e => e.key == this.$route.query.app) || {}

src/project/beta/AppEquipment/AppEquipment.vue

@@ -40,6 +40,7 @@
 import { mapState } from 'vuex'
 export default {
   name: "AppEquipment",
+  appName: '设备管理',
   data() {
     return {
       areaId: '',

src/project/beta/AppGridManagement/Map.vue

@@ -29,7 +29,7 @@
           </div>
           <div v-if="form.girdMemberList && form.girdMemberList.length">
             <div class="info-flex" v-for="(item, index) in  form.girdMemberList" :key="index">
-              <span class="label">网格管理员</span>
+              <span class="label">网格长</span>
               <span class="value">{{ item.name }}&nbsp;&nbsp;{{ item.phone }}
                 <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
                     v-if="item.phone">

src/project/beta/AppGridManagement/SelectGird.vue

@@ -2,7 +2,6 @@
   <div class="SelectGird">
     <div class="header-middle">
       <div class="hint">
-        <AiGap/>
         <span v-for="(item, index) in slectList" :key="index">
           <span v-if="index" style="margin:0 4px;" v-text="`/`"/>
           <span style="color:#3F8DF5" @click="girdNameClick(item, index)" v-text="item.girdName"/>
@@ -22,7 +21,7 @@
             </div>
           </div>
         </div>
-        <AiEmpty :description="isGridMember?`暂无数据`:`当前人员不是网格员或网格管理员`" class="emptyWrap" v-else/>
+        <AiEmpty :description="isGridMember?`暂无数据`:`当前人员不是网格员或网格长`" class="emptyWrap" v-else/>
       </div>
     </div>
     <!-- <div style="padding-bottom: 70px;"></div> -->
@@ -43,7 +42,6 @@ export default {
       allData: null,
       treeList: [],
       slectList: [],
-      userList: [],
       parentGirdId: '',
       isFormMap: 0, //1为网格地图 一级不允许选中
     }
@@ -61,7 +59,7 @@ export default {
     if (option.isFormMap) {
       this.isFormMap = option.isFormMap
     }
-    this.isGridMember ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格管理员')
+    this.isGridMember ? this.getAllGrids() : this.$u.toast('当前人员不是网格员或网格长')
   },
   methods: {
     getAllGrids() {
@@ -81,9 +79,9 @@ export default {
         }
       })
     },
-    treeInit() {
+    treeInit(isClick) {
       let last = uni.getStorageSync("lastSelectedGrid")
-      if (last) {
+      if (!isClick && last) {
         this.$http.post("/app/appgirdinfo/listFatherGirdInfo", null, {
           params: {girdId: last}
         }).then(res => {
@@ -114,18 +112,11 @@ export default {
       this.treeList = this.allData.filter(e => e.parentGirdId == parentGirdId)
     },
     girdNameClick(row, index) {
-      this.userList = []
       if (!index) { //第一级别
         this.slectList = []
-        this.treeInit()
+        this.treeInit(true)
       } else {
-        var list = []
+        this.slectList.splice(index, 8)
-        this.slectList.map((item, i) => {
-          if (i <= index) {
-            list.push(item)
-          }
-        })
-        this.slectList = list
         this.getGridsByGridMemberAndParent(row)
       }
     },

src/project/beta/AppResourcesManage/AppResourcesManage.vue

@@ -39,6 +39,7 @@
 
 export default {
   name: "AppResourcesManage",
+  appName: '媒资管理',
   data() {
     return {
       tab: [{name: '音频素材'}, {name: '文本素材'}],

src/project/police/AppMessageNotification/AppMessageNotification.vue

@@ -196,8 +196,18 @@ export default {
       if(!this.form.content) {
         return this.$u.toast('请输入文本内容')
       }
+      if(this.form.contentType == 'image' && !this.formData.imgList.length) {
+        return this.$u.toast('请上传图片')
+      }
+      if(this.form.contentType == 'video' && !this.formData.fileList.length) {
+        return this.$u.toast('请上传视频')
+      }
+      if(this.form.contentType == 'file' && !this.formData.fileList.length) {
+        return this.$u.toast('请上传文件')
+      }
       if(this.formData.fileList.length) {
         this.formData.file = this.formData.fileList[0]
+        this.formData.accessUrl = this.formData.fileList[0].url
       }
       if(this.formData.imgList.length) {
         this.formData.accessUrl = this.formData.imgList[0].url
@@ -220,7 +230,11 @@ export default {
           this.areaIdList = []
           this.tagIdList = []
           this.formDataInit()
+        }else {
+          this.$u.toast(res.msg)
         }
+      }).catch((err) => {
+        this.$u.toast(err)
       })
     },
     formDataInit() {