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

src/apps/AppIntegralAudit/AppIntegralAudit.vue

@@ -6,10 +6,10 @@
         <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{item}}<span></span></div>
       </div>
       <div class="search-box">
-        <div class="integral-types" @click="showType = true">
+        <!-- <div class="integral-types" @click="showType = true">
           <span>{{ type? type : '积分类型' }}</span>
           <u-icon name="arrow-down"></u-icon>
-        </div>
+        </div> -->
         <u-search placeholder="请输入关键字" v-model="keyword" :show-action="false" @search="search" @clear="getList()"/>
       </div>
     </div>
@@ -18,7 +18,7 @@
       <div class="card-item" @click="toDetail(item)" v-for="(item,index) in integralList" :key="index">
         <div class="card-title">{{ item.description }}</div>
         <div class="card-name">
-          <div class="name">{{ $dict.getLabel('atWillReportType',item.applyIntegralType) }}</div>
+          <!-- <div class="name">{{ $dict.getLabel('atWillReportType',item.applyIntegralType) }}</div> -->
           <div class="time">{{ item.createTime }}</div>
         </div>
         <div class="card-type">

src/apps/AppIntegralAudit/detail.vue

@@ -8,7 +8,7 @@
       <div class="detail-area">
         <div class="time">{{ form.createTime }}</div>
         <div class="address" v-if="form.areaId">
-          <img src="./img/address.png" alt="">
+          <img src="img/address.png" alt="">
           <span>{{ form.areaName }}</span>
         </div>
       </div>
@@ -32,7 +32,7 @@
 
       <!-- 通过 -->
       <div class="integral-select" v-if="opts === 1">
-        <div class="integral-item" @click="isShowType = true">
+        <!-- <div class="integral-item" @click="isShowType = true">
           <div class="label"><span>*</span>积分类别</div>
           <div class="value" >
             <span :style="{color:data.auditIntegralType ? '' : '#999'}">{{ $dict.getLabel('atWillReportType',data.auditIntegralType) || '请选择' }}</span>
@@ -45,16 +45,18 @@
             <span :style="{color:data.ruleName ? '' : '#999'}">{{ data.ruleName || '请选择' }}</span>
             <u-icon name="arrow-right" color="#E1E2E3"/>
           </div>
-        </div>
+        </div> -->
         <div class="integral-item">
-          <div class="label"><span style="margin-right: 8px;"></span>积分调整</div>
-          <div style="color: #E6736E;margin-right: 8px; font-weight: 600;" class="value">{{ data.integral }}</div>
+          <div class="label"><span>*</span><span style="margin-right: 8px;"></span>积分调整</div>
+          <div style="margin-right: 8px;" class="value">
+            <u-input v-model="data.integral" type="number" input-align="right" placeholder="请输入积分" />
+          </div>
         </div>
       </div>
       <!-- 不通过 -->
       <div class="reject" v-else>
         <div><span style="color:#FF4466;">*</span>不通过理由</div>
-        <textarea class="reasons" placeholder="请输入不通过理由" :maxlength="500" 
+        <textarea class="reasons" placeholder="请输入不通过理由" :maxlength="500"
                     v-model="data.auditOpinion"></textarea>
         <div class="tips">{{ data.auditOpinion.length }}/500</div>
       </div>
@@ -70,19 +72,19 @@
     <!-- 已审核 -->
     <div class="readOnly" v-else>
       <!-- 通过 -->
-      <div v-if="form.auditStatus==1">  
+      <div v-if="form.auditStatus==1">
         <div class="item">
           <div>积分审核</div>
           <div>通过</div>
         </div>
-        <div class="item">
+        <!-- <div class="item">
           <div>积分类别</div>
           <div>{{ $dict.getLabel('atWillReportType', form.auditIntegralType) }}</div>
         </div>
         <div class="item">
           <div>积分事项</div>
           <div>{{ form.auditRuleName }}</div>
-        </div>
+        </div> -->
         <div class="item">
           <div>积分调整</div>
           <div style="color: #E6736E;">{{ form.auditIntegral }}</div>
@@ -194,11 +196,14 @@ export default {
     },
     submit() {
       if(this.opts==1){
-        if(!this.data.auditIntegralType) {
-        return this.$u.toast('请选择积分类别')
-        }
-        if(!this.data.ruleName) {
-          return this.$u.toast('请选择积分事项')
+        // if(!this.data.auditIntegralType) {
+        // return this.$u.toast('请选择积分类别')
+        // }
+        // if(!this.data.ruleName) {
+        //   return this.$u.toast('请选择积分事项')
+        // }
+        if(!this.data.integral) {
+          return this.$u.toast('请输入积分调整')
         }
       }
       if(this.opts==0){
@@ -228,7 +233,7 @@ export default {
   onShow() {
     document.title = '积分审核详情'
   },
-  
+
 
 }
 </script>
@@ -289,7 +294,7 @@ export default {
     }
 
     .detail-img {
-      
+
       img {
       width: 220px;
       height: 220px;
@@ -303,7 +308,7 @@ export default {
 
   .integral {
     font-size: 32px;
-    
+
     .result {
       padding: 20px 30px;
       box-sizing: border-box;
@@ -313,7 +318,7 @@ export default {
       .options {
         display: flex;
         justify-content: space-between;
-        
+
         .opts-item {
           width: 45%;
           height: 112px;
@@ -418,7 +423,7 @@ export default {
       border-bottom: none;
     }
   }
-  
+
   .saveBtn {
     position: fixed;
     bottom: 0;
@@ -430,6 +435,6 @@ export default {
     color: #FFFFFF;
     text-align: center;
   }
-  
+
 }
-</style>
+</style>

src/project/shandong10086/AppVillagersCircle/commentDetail.vue

@@ -3,7 +3,7 @@
     <div class="avatar-info">
       <div class="avatar-img">
         <img :src="data.villagerCircleInfo.avatarUrl" alt="" v-if="data.villagerCircleInfo && data.villagerCircleInfo.avatarUrl" >
-        <img src="./img/tx@2x.png" alt="" v-else>
+        <img src="img/tx@2x.png" alt="" v-else>
       </div>
       <div class="avatar-title">
         <div class="name" v-if="data.villagerCircleInfo && data.villagerCircleInfo.createUserName">
@@ -22,7 +22,7 @@
     </div>
     <div class="address" v-if="data.villagerCircleInfo && data.villagerCircleInfo.gpsDesc">
       <span class="addr-bg">
-        <img src="./img/address.png" alt="">
+        <img src="img/address.png" alt="">
         <span v-if="data.villagerCircleInfo && data.villagerCircleInfo.gpsDesc">{{ data.villagerCircleInfo.gpsDesc }}</span>
       </span>
     </div>
@@ -77,7 +77,7 @@
       <div class="reject" @click="toReject">驳回发布</div>
       <div class="agree" @click="agree">同意发布</div>
     </div>
-    
+
   </div>
 </template>
 
@@ -190,7 +190,7 @@ export default {
       border-radius: 28px;
       padding: 6px 20px;
       background: #EFF1F3;
-      
+
       img {
         padding-top: 5px;
         width: 32px;
@@ -278,4 +278,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/project/shandong10086/AppVillagersCircle/infoDetail.vue

@@ -3,7 +3,7 @@
     <div class="avatar-info">
       <div class="avatar-img">
         <img :src="data.avatarUrl" alt="" v-if="data.avatarUrl">
-        <img src="./img/tx@2x.png" alt="" v-else>
+        <img src="img/tx@2x.png" alt="" v-else>
       </div>
       <div class="avatar-title">
         <div class="name">
@@ -22,7 +22,7 @@
     </div>
     <div class="address" v-if="data.gpsDesc">
       <span class="addr-bg">
-        <img src="./img/address.png" alt="">
+        <img src="img/address.png" alt="">
         <span>{{ data.gpsDesc }}</span>
       </span>
     </div>
@@ -41,7 +41,7 @@
         <div>{{ data.auditTime }}</div>
       </div>
     </div>
-    
+
     <div class="readOnly" v-if="data.status ==2">
       <div class="item">
         <div>审核结果</div>
@@ -67,7 +67,7 @@
       <div class="reject" @click="toReject">驳回发布</div>
       <div class="agree" @click="agree">同意发布</div>
     </div>
-    
+
   </div>
 </template>
 
@@ -181,7 +181,7 @@ export default {
       border-radius: 28px;
       padding: 6px 20px;
       background: #EFF1F3;
-      
+
       img {
         padding-top: 5px;
         width: 32px;
@@ -192,9 +192,9 @@ export default {
         vertical-align: top;
       }
     }
-    
-    
-    
+
+
+
   }
   .comment {
     padding: 0 32px 30px 32px;
@@ -271,4 +271,4 @@ export default {
     }
   }
 }
-</style>
+</style>