diff --git a/manifest.json b/manifest.json index b35f0ee..4d2ff1d 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农商户平台", "appid" : "__UNI__1EE148C", "description" : "", - "versionName" : "1.3.7", - "versionCode" : 137, + "versionName" : "1.3.9", + "versionCode" : 139, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/activeCode/subsidy.vue b/pages/activeCode/subsidy.vue index 462c697..534af99 100644 --- a/pages/activeCode/subsidy.vue +++ b/pages/activeCode/subsidy.vue @@ -63,7 +63,24 @@ - 采购目标金额{{info.purchase_target}}元 + 里海云仓采购目标金额{{info.official_purchase_target}}元 + 当前进度{{info.official_purchase_amount}}元 + + + + + + {{info.official_purchase_finish_rate}}% + + + + 已完成 + 未完成 + + + + + 其他采购目标金额{{info.purchase_target}}元 当前进度{{info.purchase_amount}}元 @@ -93,7 +110,8 @@ ¥{{ item.extra.purchase_amount }} ¥{{ item.extra.sale_amount }} - ¥{{ item.coupon_price }} + ¥{{ cPrice(item.coupon_price) }} + ¥{{ item.coupon_price }} 未激活 已到账 @@ -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;