From 9e7b16a79b89174638873c0280e325c55c666fd2 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 26 Mar 2024 16:55:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/payment/index.vue         |  2 ++
 pages/order_details/index.vue        | 10 +++++++---
 pages/payment/settlement.vue         |  8 ++++----
 uni_modules/guyue-updater/index.js   |  5 ++---
 uni_modules/guyue-updater/updater.js |  1 -
 utils/request.js                     |  1 +
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/components/payment/index.vue b/components/payment/index.vue
index 3772cd8..a680c5b 100644
--- a/components/payment/index.vue
+++ b/components/payment/index.vue
@@ -126,6 +126,8 @@
 					// #endif
 				} else if (paytype == 'public') {
 					type = 'public';
+				} else if (paytype == 'merBalance') {
+					type = 'merBalance';
 				}
 				if (!that.order_id) return that.$util.Tips({
 					title: '请选择要支付的订单'
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index afff32a..1085504 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -281,19 +281,23 @@
 				</view>
 				<view class='item acea-row row-between' v-if='orderInfo.coupon_price > 0'>
 					<view>优惠券抵扣：</view>
-					<view class='conter'>-￥{{orderInfo.coupon_price}}</view>
+					<view class='conter' style="color: #F55726;">-￥{{orderInfo.coupon_price}}</view>
 				</view>
+        <view class='item acea-row row-between' v-if='orderInfo.platform_coupon_price > 0'>
+        	<view>平台优惠抵扣：</view>
+        	<view class='conter' style="width: auto;color: #F55726;">-￥{{orderInfo.platform_coupon_price}}</view>
+        </view>
 				<view class='item acea-row row-between' v-if='orderInfo.integral'>
 					<view>积分抵扣：</view>
 					<view class='conter'>-￥{{orderInfo.integral_price}}</view>
 				</view>
 				<view class='item acea-row row-between' v-if="orderInfo.activity_type == 2">
 					<view>实付款：</view>
-					<view class='conter'>￥{{orderInfo.presell_price}}</view>
+					<view class='conter' style="color: #F55726;">￥{{orderInfo.presell_price}}</view>
 				</view>
 				<view class='item acea-row row-between' v-else>
 					<view>实付款：</view>
-					<view class='conter'>￥{{orderInfo.pay_price}}</view>
+					<view class='conter' style="color: #F55726;">￥{{orderInfo.pay_price}}</view>
 				</view>
 				<view class='item acea-row row-between'
 					v-if="orderInfo.order_extend && orderInfo.order_extend.corporate_voucher && orderInfo.pay_type == 10">
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
index 06ec57c..5022476 100644
--- a/pages/payment/settlement.vue
+++ b/pages/payment/settlement.vue
@@ -384,7 +384,7 @@
 						"icon": "icon-yinhangqia",
 						value: 'public',
 						title: '对公转账',
-						payStatus: 1,
+						payStatus: 2,
 					}
 				],
 				tagStyle: {
@@ -663,9 +663,9 @@
 					if (this.userInfo.service && this.userInfo.service.mer_id) getAdminApplyAPI(this.userInfo
 						.service.mer_id).then(res => {
 						this.moneyInfo = res.data;
-						this.cartArr.forEach(item => {
-							if (item.value == 'merBalance') item.payStatus = 1;
-						})
+						// this.cartArr.forEach(item => {
+						// 	if (item.value == 'merBalance') item.payStatus = 1;
+						// })
 					})
 				})
 			},
diff --git a/uni_modules/guyue-updater/index.js b/uni_modules/guyue-updater/index.js
index 4359740..554cff3 100644
--- a/uni_modules/guyue-updater/index.js
+++ b/uni_modules/guyue-updater/index.js
@@ -2,15 +2,14 @@
 import { download, install } from "./updater";
 
 export default class Updater {
-   static async update(options ) {
+   static async update(options) {
     // #ifdef APP-PLUS
     // 静默更新
-            console.log('更新');
     if (options.quiet) {
       download({
         url: options.downUrl,
         onSuccess(filePath) {
-          install(filePath, false, options.versionName);
+          install(filePath, options.quiet&&options.force, options.versionName);
         },
       });
     } else if (options.downUrl) {
diff --git a/uni_modules/guyue-updater/updater.js b/uni_modules/guyue-updater/updater.js
index fbdf8b6..f46437c 100644
--- a/uni_modules/guyue-updater/updater.js
+++ b/uni_modules/guyue-updater/updater.js
@@ -22,7 +22,6 @@ export const install = (filePath, restart = false, version='') => {
   }, () => {
     console.log('install success...');
     if (restart) {
-      uni.setStorageSync('wgt_version', version);
       plus.runtime.restart();
     }
   }, (e) => {
diff --git a/utils/request.js b/utils/request.js
index ec1cd8f..4239f95 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -88,6 +88,7 @@ function baseRequest(url, method, data, {
       http.abort();
     }
   }
+  HTTP_list.delete(URL);
 	if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token;
 	if(store.state.app.uuid) header['uuid'] = store.state.app.uuid
 	return new Promise((reslove, reject) => {