更新

manifest.json

@@ -2,8 +2,8 @@
     "name" : "惠农商户平台",
     "appid" : "__UNI__1EE148C",
     "description" : "",
-    "versionName" : "1.3.7",
+    "versionName" : "1.3.9",
-    "versionCode" : 137,
+    "versionCode" : 139,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/activeCode/subsidy.vue

@@ -63,7 +63,24 @@
       </view>
       <view class="b-card">
         <view class="b-top">
-          <view>采购目标金额{{info.purchase_target}}元</view>
+          <view>里海云仓采购目标金额{{info.official_purchase_target}}元</view>
+          <view>当前进度{{info.official_purchase_amount}}元</view>
+        </view>
+        <view class="b-bottom">
+          <view class="pro">
+            <view class="loss" :style="{left: `-${100-info.official_purchase_finish_rate}%`}">
+              <image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f805f20240229155704834.webp"></image>
+              <view class="text">{{info.official_purchase_finish_rate}}%</view>
+            </view>
+            
+          </view>
+          <view v-if="info.official_purchase_finish_rate>=100" style="color: #FF5E0C;">已完成</view>
+          <view v-else style="color: #ADADAD;">未完成</view>
+        </view>
+      </view>
+      <view class="b-card">
+        <view class="b-top">
+          <view>其他采购目标金额{{info.purchase_target}}元</view>
           <view>当前进度{{info.purchase_amount}}元</view>
         </view>
         <view class="b-bottom">
@@ -93,7 +110,8 @@
           <view class="list-b-text" v-for="(item,index) in list" :key="index">
             <view class="item1">￥{{ item.extra.purchase_amount }}</view>
             <view class="item2">￥{{ item.extra.sale_amount }}</view>
-            <view class="item3">￥{{ item.coupon_price }}</view>
+            <view class="item3" v-if="item.status!=1">￥{{ cPrice(item.coupon_price)  }}</view>
+            <view class="item3" v-else>￥{{ item.coupon_price }}</view>
             <view class="item4">
               <text v-if="item.status!=1">未激活</text>
               <text v-else style="color: #FF5E0C;">已到账</text>
@@ -158,6 +176,12 @@
         getSubsidyRecord(this.mer_id, this.where).then(res=>{
           this.list = res.data.record;
         })
+      },
+      cPrice(n){ //计算未激活的补贴达成了多少
+        let t = Number(this.info.official_purchase_finish_rate) + Number(this.info.purchase_finish_rate) + Number(this.info.sale_finish_rate);
+        t/=3*100;
+        t==0?t=1:null;
+        return (+n*t).toFixed(2);
       }
     },
     onPullDownRefresh() {
@@ -271,6 +295,7 @@
       .b-top{
         display: flex;
         justify-content: space-between;
+        font-size: 26rpx;
       }
       .b-bottom{
         display: flex;

pages/index/index.vue

@@ -48,7 +48,7 @@
 					{{item.value}}
 				</view>
 				<view class="content-middlea-one" style="font-size: 22rpx;color: #7f7f7f;">
-					<text v-if="index==1">(次日18点后可提现)</text>
+					<text v-if="index==1">(次日24点后可提现)</text>
 					<text v-if="index == 3">(点击查看进度详情)</text>
 				</view>
 			</view>

pages/users/embody/embody.vue

@@ -74,8 +74,8 @@
 							当前押金: ￥{{ot_margin}}
 						</view>
 						<view class='tip' style="line-height: 20px;">
-							说明: 用户下单后该订单金额存放在暂存金额中，用户确认收货后次日18:00才可提现该笔订单金额<br />
+							说明: 用户下单后该订单金额存放在暂存金额中，用户确认收货后次日24:00才可提现该笔订单金额<br />
-							提货付款订单在完成后次日18:00才可提现
+							提货付款订单在完成后次日24:00才可提现
 						</view>
 						<view class="btn-submit">
 							<button formType="submit" class='bnt b-color'>提现</button>