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

src/apps/AppGuardianship/component/makeCalls.vue

@@ -4,7 +4,7 @@
       <slot/>
     </div>
     <div v-else flex class="column" @tap="calls=true">
-      <img :src="`${$cdn}guardianship/dh.png`"/>
+      <img :src="`${$cdn}AppGuardianship/dh.png`"/>
       <span v-html="label"/>
     </div>
     <u-popup v-model="calls" mode="bottom">

src/apps/AppGuardianship/component/openMap.vue

@@ -1,7 +1,7 @@
 <template>
   <section class="openMap">
     <div flex class="column" shrink @tap="handleOpenMap">
-      <img :src="`${$cdn}guardianship/seat.png`"/>
+      <img :src="`${$cdn}AppGuardianship/seat.png`"/>
       <span v-text="'地图/导航'"/>
     </div>
   </section>

src/apps/AppGuardianship/gsLocation.vue

@@ -17,7 +17,7 @@
         <div class="headerIcon" flex @touchstart="handleTouchStart" @touchmove="handleTouchmoveClose"/>
         <div class="selectedInfo">
           <div class="header" flex>
-            <img :src="`${$cdn}guardianship/tx.png`" @tap="handleShowDetail(selected)"/>
+            <img :src="`${$cdn}AppGuardianship/tx.png`" @tap="handleShowDetail(selected)"/>
             <b v-text="selected.name" @tap="handleShowDetail(selected)"/>
             <div v-if="selected.abnormalStatus==1" class="abnormal" @tap="handleShowDetail(selected)">异常</div>
             <u-icon name="arrow-right" color="#ddd" class="fill" @tap="handleShowDetail(selected)"/>
@@ -133,7 +133,7 @@ export default {
   },
   methods: {
     cdn(icon) {
-      return `${this.$cdn}guardianship/${icon}.png`
+      return `${this.$cdn}AppGuardianship/${icon}.png`
     },
     getMapArea() {
       if (this.mapLib) {

src/apps/AppGuardianship/userDetail.vue

@@ -2,7 +2,7 @@
   <section class="userDetail">
     <div class="selectedInfo">
       <div class="header" flex>
-        <img :src="`${$cdn}guardianship/tx.png`"/>
+        <img :src="`${$cdn}AppGuardianship/tx.png`"/>
         <b v-text="detail.name"/>
         <div v-if="detail.abnormalStatus==1" class="abnormal">异常</div>
         <div class="fill"/>
@@ -97,7 +97,7 @@ export default {
   },
   methods: {
     cdn(icon) {
-      return `${this.$cdn}guardianship/${icon}.png`
+      return `${this.$cdn}AppGuardianship/${icon}.png`
     },
     getDetail(deviceId) {
       this.$http.post("/app/appintelligentguardianshipdevice/queryMonitorList", null, {

src/components/AiDate.vue

@@ -36,7 +36,6 @@ export default {
   },
   methods: {
     handleSelect(v) {
-      console.log(v)
       if (this.mode == 'date') {
         this.selected = v.result
         this.$emit('change', v.result)