msb-mca
/
shop-app
2.1k
2
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev1.0.0' into develop

Browse Source
msb_beta
ch 3 years ago
parent 6606270adf 31b6c81484
commit b3c81c9c4c
12 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
common/api/order.js
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-03-29 17:38:17 * @Date: 2022-03-29 17:38:17
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-19 15:00:05 * @LastEditTime: 2022-04-22 22:22:51
* @Description: file content * @Description: file content
*/ */
import {ToAsyncAwait, MsbRequestTk} from '@/common/utils'; import {ToAsyncAwait, MsbRequestTk} from '@/common/utils';
@ -67,7 +67,7 @@ export const ApiPostSubmitOrder = (data) =>
* @param {*} data * @param {*} data
*/ */
export const ApiPutCancelOrder = (data) => export const ApiPutCancelOrder = (data) =>
ToAsyncAwait(MsbRequestTk.post(`${BASE_URL}/app/tradeOrder/cancel`, data)); ToAsyncAwait(MsbRequestTk.put(`${BASE_URL}/app/tradeOrder/cancel`, data));
/** /**
* 获取支付参数 * 获取支付参数

2
h5/index.html
Unescape View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>马士兵严选</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.f944be4f.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.0d8f94da.js></script></body></html>

2
h5/static/js/index.f944be4f.js → h5/static/js/index.0d8f94da.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-account-index.f43a827d.js → h5/static/js/pages-account-index.85950ed1.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-detail-index.4b664f9b.js
View File

File diff suppressed because one or more lines are too long

1
h5/static/js/pages-order-detail-index.6ae55774.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-detail-index~pages-order-list~pages-order-logisitcsInfo~pages-order-saleAfter-saleAfterD~6e8da75e.fd794a15.js → h5/static/js/pages-order-detail-index~pages-order-list~pages-order-logisitcsInfo~pages-order-saleAfter-saleAfterD~6e8da75e.aa0b24e6.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterApply.761bf650.js → h5/static/js/pages-order-saleAfter-saleAfterApply.0234f754.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterEdit.f12f22f1.js → h5/static/js/pages-order-saleAfter-saleAfterEdit.e965d9e5.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-saleAfter-saleAfterList.24aa378d.js → h5/static/js/pages-order-saleAfter-saleAfterList.1bb65df7.js
View File

File diff suppressed because one or more lines are too long

2
h5/static/js/pages-order-submit.58188011.js → h5/static/js/pages-order-submit.b409769b.js
View File

File diff suppressed because one or more lines are too long

10
pages/order/detail/components/Operation.vue
Unescape View File

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-04-15 17:46:10 * @Date: 2022-04-15 17:46:10
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-21 18:49:52 * @LastEditTime: 2022-04-22 22:23:35
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -39,7 +39,7 @@
</radio-group> </radio-group>
<view class="cancel--footer"> <view class="cancel--footer">
<UiButton @click="closeCancel">暂不取消</UiButton> <UiButton @click="closeCancel">暂不取消</UiButton>
<UiButton type="gradual" :disabed="cancelValue == 0">确认取消</UiButton> <UiButton type="gradual" :disabed="cancelValue == 0" @click="cancelOrder">确认取消</UiButton>
</view> </view>
</u-popup> </u-popup>
<BsPay class="modal" :show.sync="payShow" :order="orderInfo"></BsPay> <BsPay class="modal" :show.sync="payShow" :order="orderInfo"></BsPay>
@ -77,14 +77,16 @@ export default {
this.cancelValue = val; this.cancelValue = val;
}, },
async cancelOrder(){ async cancelOrder(){
const ooderId = this.$Route.query.id;
const {error, result} = await ApiPutCancelOrder({ const {error, result} = await ApiPutCancelOrder({
cancelReasonType : this.cancelValue, cancelReasonType : this.cancelValue,
orderId : this.$Route.query.id orderId : ooderId
}); });
if(error){ if(error){
uni.$u.toast(error.message); uni.$u.toast(error.message);
return false; return false;
} }
this.$Router.replace(`/orderDetail?id=${ooderId}`);
// 取消成功，跳到订单关闭页 // 取消成功，跳到订单关闭页
}, },
/** /**
@ -101,7 +103,7 @@ export default {
uni.$toast(error.message); uni.$toast(error.message);
return false; return false;
} }
this.$Router.push('/orderSuccess') this.$Router.push('/orderSuccess');
} }
}) })

Write Preview
Loading…
Cancel
Save