theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdpao

Browse Source
This commit is contained in:
Gdpao 2020-08-11 10:04:25 +08:00
commit e1c908152a
6 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pageB/sdetails/index.vue
View File

@ -353,7 +353,12 @@ export default {
}).then(res => { }).then(res => {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
type: res.errCode == 0 ? 'success' : 'warning', duration: 1000,
callback: () => {
if(res.errCode == 0) {
this.showSpec = false;
}
}
}) })
}) })
}, },
@ -501,6 +506,7 @@ export default {
} }
this.$u.api.settlementOrder(params).then(res => { this.$u.api.settlementOrder(params).then(res => {
if(res.errCode == 0) { if(res.errCode == 0) {
// console.log('type' + this.type);
this.$store.commit('setOrderType', this.type); this.$store.commit('setOrderType', this.type);
this.$store.commit('updateOrderInfo', res.data) this.$store.commit('updateOrderInfo', res.data)
this.$u.route({ this.$u.route({

4
pageC/cart/ConfirmOrder.vue
View File

@ -148,7 +148,7 @@ export default {
onLoad(option) { onLoad(option) {
this.orderType = this.$store.state.orderType; this.orderType = this.$store.state.orderType;
this.orderInfo = this.$store.state.orderInfo; this.orderInfo = this.$store.state.orderInfo;
// console.log(this.orderType); console.log('orderType' + this.orderType);
// console.log(this.orderInfo); // console.log(this.orderInfo);
this.getGoodsClass(); this.getGoodsClass();
this.setTotalPrice(); this.setTotalPrice();
@ -204,6 +204,8 @@ export default {
this.withImmediate(); this.withImmediate();
} else if(this.orderType == 1) { } else if(this.orderType == 1) {
this.sendOrder(0); this.sendOrder(0);
} else if(this.orderType == 3) {
this.sendOrder(0);
} else { } else {
this.sendOrder(1); this.sendOrder(1);
} }

2
pageC/merchant/goods.vue
View File

@ -109,7 +109,7 @@ export default {
}) })
}, },
switchCurrent(current) { switchCurrent(current) {
if(current == 1 && this.current == 1) this.priceOrderAsc = !this.priceOrderAsc; if(current == 3 && this.current == 3) this.priceOrderAsc = !this.priceOrderAsc;
this.current = current; this.current = current;
}, },
setViewHeight() { setViewHeight() {

2
pageE/mine/EditUserInfo.vue
View File

@ -98,7 +98,7 @@ export default {
}, },
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if( e.index == 0 ) uni.navigateBack(); if( e.index == 0 ) uni.navigateBack();
if( e.index == 1 ) this.customers(); // if( e.index == 1 ) this.customers();
}, },
methods: { methods: {
customers(){ customers(){

2
pageE/mine/Integral.vue
View File

@ -46,7 +46,7 @@ export default {
this.$u.api.getMemberPointsStat().then((res)=>{ this.$u.api.getMemberPointsStat().then((res)=>{
if (res.errCode == 0) { if (res.errCode == 0) {
this.memberInfo = res.data; this.memberInfo = res.data;
this.nodes = common.unescapeHTML(this.memberInfo.points_rule); this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
} }
}) })
}, },

14
pages.json
View File

@ -881,14 +881,14 @@
"text":"取消", "text":"取消",
"float":"left", "float":"left",
"fontSize":"14" "fontSize":"14"
},
{
"type":"none",
"text":"\ue62d",
"float":"right",
"fontSrc": "/static/fonts/customer.ttf",
"fontSize":"20"
} }
// {
// "type":"none",
// "text":"\ue62d",
// "float":"right",
// "fontSrc": "/static/fonts/customer.ttf",
// "fontSize":"20"
// }
] ]
} }
} }