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

src/apps/AppBuilding/components/searchMap.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="searchMap">
     <div class="grid-input">
-      <!-- <img src="./img/search-icon.png" alt="" class="search-icon"> -->
-      <img src="./img/back-icon.png" alt="" class="back-icon">
-      <input type="text" class="input" placeholder="请输入姓名、房屋信息" v-model="name"/>
+      <img src="./img/search-icon.png" alt="" class="search-icon">
+      <!-- <img src="./img/back-icon.png" alt="" class="back-icon"> -->
+      <input type="text" class="input" placeholder="请输入姓名、房屋信息" v-model="name" maxlength="10" />
       <div class="clear-btn">
         <img src="./img/del-icon.png" alt="" class="del-icon" v-if="name" @click="clear">
       </div>
@@ -336,7 +336,7 @@ export default {
       padding: 8px 0;
       height: 32px;
       line-height: 32px;
-      width: 480px;
+      width: 460px;
       font-size: 28px;
       font-family: MicrosoftYaHei;
       color: #666;

src/apps/AppCountryAlbum/components/detail.vue

@@ -6,19 +6,19 @@
     </div>
     <div class="num-row">
       <div class="item">
-        <h3>13</h3>
+        <h3>{{numInfo.total}}</h3>
         <p>照片</p>
       </div>
       <div class="item">
-        <h3>13</h3>
+        <h3>{{numInfo.lastMonth}}</h3>
         <p>本月</p>
       </div>
       <div class="item">
-        <h3>13</h3>
+        <h3>{{numInfo.thisMonth}}</h3>
         <p>上月</p>
       </div>
       <div class="item">
-        <h3>13</h3>
+        <h3>{{numInfo.thisYear}}</h3>
         <p>今年</p>
       </div>
     </div>
@@ -50,7 +50,8 @@ export default {
       list: [],
       limit: 9,
       size: 10 * 1024 * 1024,
-      fileList: []
+      fileList: [],
+      numInfo: {}
     }
   },
   computed: { ...mapState(['user']) },
@@ -86,7 +87,7 @@ export default {
         }
       }).then(res => {
         if (res.code == 0) {
-           
+          this.numInfo = res.data
         }
       })
     },