Merge branch 'dev1.0.0' into develop

msb_beta
ch 3 years ago
commit b64f6ff30a

@ -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.e59dbb6b.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.5a23b417.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-03-20 14:14:53 * @Date: 2022-03-20 14:14:53
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-04-20 14:22:52 * @LastEditTime: 2022-04-20 14:35:32
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -132,6 +132,10 @@ export default {
*/ */
async submit(){ async submit(){
const {query} = this.$Route; const {query} = this.$Route;
if(!this.address.id){
uni.$u.toast('请选择收货地址');
return false;
}
const {error, result} = await ApiPostSubmitOrder({ const {error, result} = await ApiPostSubmitOrder({
orderSource : 2, orderSource : 2,
recipientAddressId : this.address.id, recipientAddressId : this.address.id,
@ -144,7 +148,7 @@ export default {
userMessage : this.userMessage userMessage : this.userMessage
}); });
if(error){ if(error){
uni.$u.totas(error.message); uni.$u.toast(error.message);
return false; return false;
} }
// this.wxpay(result.orderId); // this.wxpay(result.orderId);

Loading…
Cancel
Save