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

src/apps/AppHandSnapshot/Detail.vue

@@ -68,7 +68,7 @@
             <div class="cardss-left">
               <span>
                 <!-- {{ item.systemExplain }} -->
-                {{ item.systemExplain && item.systemExplain.substring(item.systemExplain.length, item.systemExplain.length - 2) }}
+                {{ item.girdMemberName && item.girdMemberName.substring(item.girdMemberName.length, item.girdMemberName.length - 2) }}
               </span>
 
               <img src="./components/1.png" class="avatarIcon" alt="" />

src/apps/AppHandSnapshot/SelectUser.vue

@@ -1,21 +1,16 @@
 <template>
-  <div class="SelectUser">
+  <div class="SelectUser" v-if="showPage">
     <div class="header-middle">
       <div class="hint">
-        <span :style="{ color: applicationName ? '#3F8DF5' : '' }" @click="back">可选范围</span>
-        <span> {{ applicationName ? ' / ' + applicationName : '' }}</span>
+        <span style="color:#3F8DF5" v-for="(item, index) in slectList" :key="index">{{item.girdName}}</span>
       </div>
 
-      <div class="showTypes" v-if="showType">
-        <div class="empty-div"></div>
-
+      <div class="showTypes">
         <div v-if="treeList.length > 0">
-          <div class="cards" v-for="(item, i) in treeList" :key="i" @click="toUserSelect(item)">
+          <div class="cards" v-for="(item, i) in treeList" :key="i" @click="itemClick(item)">
             <img src="./components/img/tx@2x.png" alt="" />
-
             <div class="rightes">
-              <div class="applicationNames">{{ item.tagname }}</div>
-
+              <div class="applicationNames">{{ item.girdName }}</div>
               <img src="./components/img/right-icon.png" alt="" class="imgs" />
             </div>
           </div>
@@ -24,7 +19,7 @@
         <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
       </div>
 
-      <div class="showUsers" v-else>
+      <!-- <div class="showUsers" v-else>
         <div v-if="userList.length > 0">
           <div class="cards" v-for="(e, index) in userList" :key="index">
             <div class="imges">
@@ -42,7 +37,7 @@
         </div>
 
         <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
-      </div>
+      </div> -->
     </div>
 
     <div class="subBtn" @click="submit">
@@ -58,7 +53,7 @@ export default {
   name: 'SelectUser',
   data() {
     return {
-      treeList: [],
+      
       typeList: [],
       userList: [],
       keyword: '',
@@ -67,19 +62,52 @@ export default {
       applicationName: '',
       applicationId: '',
       selectUser: {},
+
+      allData: null,
+      showPage: false,
+      treeList: [],
+      slectList: []
     }
   },
-  computed: {},
-  watch: {},
   onLoad() {
     this.getTree()
   },
-  onShow() {},
   methods: {
     getTree() {
-      this.$http.post('/app/wxcp/wxtag/tree').then((res) => {
+      this.$http.post('/app/appgirdinfo/listAllByTop').then((res) => {
         if (res?.data) {
-          this.treeList = res.data
+          this.allData = res.data
+          if(this.allData[0].isLastLevel == 1) {
+            this.treeList = this.allData[0].girdMemberList
+          }else {
+            this.treeList = this.allData[0].girdList
+          }
+          var obj = {
+            girdName: this.allData[0].girdName,
+            girdId: this.allData[0].girdId
+          }
+          this.slectList.push(obj)
+          this.showPage = true
+        }
+      })
+    },
+
+    itemClick(row) {
+      console.log(row)
+      this.$http.post(`/app/appgirdinfo/listAll2?id=${row.id}`).then((res) => {
+        if (res?.data) {
+          // this.allData = res.data
+          // if(this.allData[0].isLastLevel == 1) {
+          //   this.treeList = this.allData[0].girdMemberList
+          // }else {
+          //   this.treeList = this.allData[0].girdList
+          // }
+          // var obj = {
+          //   girdName: this.allData[0].girdName,
+          //   girdId: this.allData[0].girdId
+          // }
+          // this.slectList.push(obj)
+          // this.showPage = true
         }
       })
     },

src/apps/AppUniMsg/Detail.vue

@@ -7,6 +7,11 @@
         <span>发布单位：</span>
         <span>{{ data.publishUnitName }}</span>
       </div>
+
+      <div class="titles-bottom">
+        <span>发布时间：</span>
+        <span>{{ data.createTime }}</span>
+      </div>
     </div>
 
     <div class="header-middle">