mkm/new_shop_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2024-03-26 16:55:50 +08:00
parent 49bc703f7a
commit 9e7b16a79b
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/payment/index.vue
View File

@ -126,6 +126,8 @@
// #endif // #endif
} else if (paytype == 'public') { } else if (paytype == 'public') {
type = 'public'; type = 'public';
} else if (paytype == 'merBalance') {
type = 'merBalance';
} }
if (!that.order_id) return that.$util.Tips({ if (!that.order_id) return that.$util.Tips({
title: '请选择要支付的订单' title: '请选择要支付的订单'

10
pages/order_details/index.vue
View File

@ -281,7 +281,11 @@
</view> </view>
<view class='item acea-row row-between' v-if='orderInfo.coupon_price > 0'> <view class='item acea-row row-between' v-if='orderInfo.coupon_price > 0'>
<view>优惠券抵扣：</view> <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>
<view class='item acea-row row-between' v-if='orderInfo.integral'> <view class='item acea-row row-between' v-if='orderInfo.integral'>
<view>积分抵扣：</view> <view>积分抵扣：</view>
@ -289,11 +293,11 @@
</view> </view>
<view class='item acea-row row-between' v-if="orderInfo.activity_type == 2"> <view class='item acea-row row-between' v-if="orderInfo.activity_type == 2">
<view>实付款：</view> <view>实付款：</view>
<view class='conter'>￥{{orderInfo.presell_price}}</view> <view class='conter' style="color: #F55726;">￥{{orderInfo.presell_price}}</view>
</view> </view>
<view class='item acea-row row-between' v-else> <view class='item acea-row row-between' v-else>
<view>实付款：</view> <view>实付款：</view>
<view class='conter'>￥{{orderInfo.pay_price}}</view> <view class='conter' style="color: #F55726;">￥{{orderInfo.pay_price}}</view>
</view> </view>
<view class='item acea-row row-between' <view class='item acea-row row-between'
v-if="orderInfo.order_extend && orderInfo.order_extend.corporate_voucher && orderInfo.pay_type == 10"> v-if="orderInfo.order_extend && orderInfo.order_extend.corporate_voucher && orderInfo.pay_type == 10">

8
pages/payment/settlement.vue
View File

@ -384,7 +384,7 @@
"icon": "icon-yinhangqia", "icon": "icon-yinhangqia",
value: 'public', value: 'public',
title: '对公转账', title: '对公转账',
payStatus: 1, payStatus: 2,
} }
], ],
tagStyle: { tagStyle: {
@ -663,9 +663,9 @@
if (this.userInfo.service && this.userInfo.service.mer_id) getAdminApplyAPI(this.userInfo if (this.userInfo.service && this.userInfo.service.mer_id) getAdminApplyAPI(this.userInfo
.service.mer_id).then(res => { .service.mer_id).then(res => {
this.moneyInfo = res.data; this.moneyInfo = res.data;
this.cartArr.forEach(item => { // this.cartArr.forEach(item => {
if (item.value == 'merBalance') item.payStatus = 1; // if (item.value == 'merBalance') item.payStatus = 1;
}) // })
}) })
}) })
}, },

3
uni_modules/guyue-updater/index.js
View File

@ -5,12 +5,11 @@ export default class Updater {
static async update(options) { static async update(options) {
// #ifdef APP-PLUS // #ifdef APP-PLUS
// 静默更新 // 静默更新
console.log('更新');
if (options.quiet) { if (options.quiet) {
download({ download({
url: options.downUrl, url: options.downUrl,
onSuccess(filePath) { onSuccess(filePath) {
install(filePath, false, options.versionName); install(filePath, options.quiet&&options.force, options.versionName);
}, },
}); });
} else if (options.downUrl) { } else if (options.downUrl) {

1
uni_modules/guyue-updater/updater.js
View File

@ -22,7 +22,6 @@ export const install = (filePath, restart = false, version='') => {
}, () => { }, () => {
console.log('install success...'); console.log('install success...');
if (restart) { if (restart) {
uni.setStorageSync('wgt_version', version);
plus.runtime.restart(); plus.runtime.restart();
} }
}, (e) => { }, (e) => {

1
utils/request.js
View File

@ -88,6 +88,7 @@ function baseRequest(url, method, data, {
http.abort(); http.abort();
} }
} }
HTTP_list.delete(URL);
if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token; if (store.state.app.token) header[TOKENNAME] = 'Bearer ' + store.state.app.token;
if(store.state.app.uuid) header['uuid'] = store.state.app.uuid if(store.state.app.uuid) header['uuid'] = store.state.app.uuid
return new Promise((reslove, reject) => { return new Promise((reslove, reject) => {