diff --git a/Utils/Api.js b/Utils/Api.js
index c04cdab..4540afa 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -172,7 +172,7 @@ export const getDiscountByCode = params => {
//站内信列表
export const getMsgByList = params => {
- return POST('GET', `${base}//bsMsg/getMsgByList`, params).then(res => res.data);
+ return POST('GET', `${base}/bsMsg/getMsgByList`, params).then(res => res.data);
}
// 根据优惠券查卡券
export const getCouponByDiscount = params => {
diff --git a/pages.json b/pages.json
index 6a03fd5..8f1f639 100644
--- a/pages.json
+++ b/pages.json
@@ -874,14 +874,7 @@
"navigationBarTextStyle": "white"
}
- }, {
- "path": "kfc-details/kfc-details",
- "style": {
- "navigationBarTitleText": "详情",
- "enablePullDownRefresh": false
- }
-
- }, {
+ },{
"path": "kfc-menu-list/kfc-menu-list",
"style": {
"navigationBarTitleText": "菜单",
diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index c3e266b..1a75780 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -275,9 +275,7 @@
wechatPay,
getHuiLianTongCardBalance,
cardPay,
- orderToGoldPay,
findUser,
- oilCardPay,
getUserOrderPreList,
canUseDiscount,
create,
@@ -311,8 +309,6 @@
user: '',
paytype: 'weixin',
PaymentPassword: '',
- // timedeductionPrice: '0', //本次优惠金额
-
orderPrice: '', //原价
deductionPrice: '0.00', //优惠金额
OrderPreList: [], //优惠券数据
@@ -348,7 +344,6 @@
},
onShow() {
let that = this;
- // that.paytype = '';
that.findUser();
this.priceValue[1] = 0;
this.reload();
@@ -488,14 +483,6 @@
if (res.return_code == '000000') {
this.orderList = res.return_data;
this.payPrice = res.return_data.payPrice;
- // let payprice = parseFloat(this.payPrice * 100).toFixed(
- // 0);
- // if (payprice > this.user.gold) {
- // this.availIntegal = this.user.gold;
- // } else {
- // this.availIntegal = payprice;
- // }
-
this.getRebateIntegral();
this.getThirdPartyByDetail();
}
@@ -831,7 +818,7 @@
"payGold": this.priceValue[1],
"promoteCode": this.identificationCode,
"payPwd": this.PaymentPassword,
- memDiscountId: this.memDiscountId
+ "memDiscountId": this.memDiscountId
}
create(goods).then(res => {
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 96e6d8b..9c7b2c3 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -69,6 +69,22 @@
+
+
+
+ 联系人
+
+
+
+ 联系电话
+
+
+
+ 联系地址
+
+
+
+
@@ -102,28 +118,28 @@
v-if="couponList.payType == 1 || couponList.payType == 2 || couponList.payType==3">积分充值 -->
-
-
-
-
-
- 微信支付
-
-
-
-
-
-
-
-
- 汇联通工会卡可用余额: {{tongCardPrice}}元
-
-
-
-
-
+
+
+
+
+
+ 微信支付
+
+
+
+
+
+
+
+
+ 汇联通工会卡可用余额: {{tongCardPrice}}元
+
+
+
+
+
@@ -656,12 +672,12 @@
})
}
})
- } else if (that.paytype == '3') {
- if (!that.user.isSetPayPwd) {
- uni.navigateTo({
- url: '../login/updatePas/updatePas'
- })
- return;
+ } else if (that.paytype == '3') {
+ if (!that.user.isSetPayPwd) {
+ uni.navigateTo({
+ url: '../login/updatePas/updatePas'
+ })
+ return;
}
if (that.tongCardPrice < that.paytheprice) {
uni.showToast({
@@ -671,7 +687,7 @@
});
return;
}
-
+
if (!that.user.isSetHltCard) {
uni.showToast({
icon: 'none',
diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue
index 8e8f418..742dee2 100644
--- a/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -69,15 +69,15 @@
style="text-decoration: line-through;"> ¥{{orderPrice}}
-
-
-
-
- 邀请码
-
-
-
-
+
+
+
+
+ 邀请码
+
+
+
+
@@ -340,7 +340,7 @@
orderPrice: 0, //订单价格
rechargeDes: '', // 支付详情
rebateIntegral: '', //返回积分
- Integrastu: 1 ,//返积分状态
+ Integrastu: 1, //返积分状态
identificationCode: '', //渠道商
}
},
@@ -453,12 +453,12 @@
let resul2 = 0;
let result3 = 0;
this.orderList.forEach((good) => {
- resul2 += this.accMul(good.num, good.oldprice);
+ resul2 += this.accMul(good.num, good.oldprice);
result3 = resul2.toFixed(2);
this.disconutprice = (result3 - result).toFixed(2);
})
- this.orderPrice = result3;
+ this.orderPrice = result3;
this.totalprice = result;
this.payPrice = result;
},
@@ -597,8 +597,8 @@
datas = {
"childOrderList": [{
"goodsId": 9999,
- "customerMobile": this.customerMobile,
- "storeCode":this.storeCode,
+ "customerMobile": this.customerMobile,
+ "storeCode": this.storeCode,
"platformId": this.showType,
"productType": this.productType,
"orderItems": data2,
@@ -610,14 +610,14 @@
"companyId": app.globalData.companyId,
"promoteCode": this.identificationCode,
"memDiscountId": this.memDiscountId,
- }
+ }
}
if (this.typeid == 2) {
datas = {
"childOrderList": [{
"goodsId": 9999,
- "customerMobile": this.customerMobile,
- "storeCode":this.storeCode,
+ "customerMobile": this.customerMobile,
+ "storeCode": this.storeCode,
"platformId": this.showType,
"productType": this.productType,
"orderItems": this.orderList,
@@ -808,24 +808,7 @@
})
}
})
- } else if (that.paytype == '3') {
- if (!that.user.isSetPayPwd) {
- uni.navigateTo({
- url: '../../pages/login/updatePas/updatePas'
- })
- that.thirdCancelOrder();
- return;
- }
- if (that.tongCardPrice < that.payPrice) {
- uni.showToast({
- icon: 'none',
- title: '工会卡余额不足',
- duration: 2000,
- });
- that.thirdCancelOrder();
- return;
- }
-
+ } else if (that.paytype == '3') {
if (!that.user.isSetHltCard) {
uni.showToast({
icon: 'none',
@@ -842,6 +825,24 @@
that.thirdCancelOrder();
return;
}
+ if (!that.user.isSetPayPwd) {
+ uni.navigateTo({
+ url: '../../pages/login/updatePas/updatePas'
+ })
+ that.thirdCancelOrder();
+ return;
+ }
+ if (that.tongCardPrice < that.payPrice) {
+ uni.showToast({
+ icon: 'none',
+ title: '工会卡余额不足',
+ duration: 2000,
+ });
+ that.thirdCancelOrder();
+ return;
+ }
+
+
that.$refs.paymentPassword.modalFun('show');
} else {
uni.showToast({
@@ -878,8 +879,8 @@
datas = {
"childOrderList": [{
"goodsId": 9999,
- "customerMobile": this.customerMobile,
- "storeCode":this.storeCode,
+ "customerMobile": this.customerMobile,
+ "storeCode": this.storeCode,
"platformId": this.showType,
"productType": this.productType,
"orderItems": data2,
@@ -892,17 +893,17 @@
"promoteCode": this.identificationCode,
"memDiscountId": this.memDiscountId,
"payPwd": this.PaymentPassword
- }
+ }
}
if (this.typeid == 2) {
datas = {
"childOrderList": [{
"goodsId": 9999,
- "customerMobile": this.customerMobile,
- "storeCode":this.storeCode,
+ "customerMobile": this.customerMobile,
+ "storeCode": this.storeCode,
"platformId": this.showType,
"productType": this.productType,
- "orderItems": this.orderList,
+ "orderItems": this.orderList,
"goodsType": 9,
"saleCount": 1,
}],
@@ -911,8 +912,8 @@
"promoteCode": this.identificationCode,
"memDiscountId": this.memDiscountId,
"payPwd": this.PaymentPassword
- }
-
+ }
+
}
create(datas).then(res => {
diff --git a/qianzhu-KFC/kfc-details/kfc-details.vue b/qianzhu-KFC/kfc-details/kfc-details.vue
deleted file mode 100644
index 8183fd0..0000000
--- a/qianzhu-KFC/kfc-details/kfc-details.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue b/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
index b9c79fc..95bb044 100644
--- a/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
+++ b/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
@@ -65,14 +65,16 @@
-
-
-
-
- 选规格
-
-
- {{titem.count}}
+
+
+
+
+ 选规格
+
+
+ {{titem.count}}
+
@@ -82,8 +84,7 @@
-
+
@@ -185,7 +186,7 @@
this.tlist.push(items);
})
})
- this.currentId = res.return_data[0].name;
+ this.currentId = res.return_data[0].name;
}
})
},
@@ -425,16 +426,16 @@
"price": this.kfcprice,
"oldprice": this.kfcoldprice
}
- this.shoppingcart.push(datas);
- for (var i = 0; i < this.tlist.length; i++) {
- if (!this.tlist[i].productId) {
- for (var k = 0; k < this.tlist[i].specGroups.length; k++) {
- if (this.productId == this.tlist[i].specGroups[k].productId) {
- this.tlist[i].count = this.tlist[i].count + this.nums
- }
- }
-
- }
+ this.shoppingcart.push(datas);
+ for (var i = 0; i < this.tlist.length; i++) {
+ if (!this.tlist[i].productId) {
+ for (var k = 0; k < this.tlist[i].specGroups.length; k++) {
+ if (this.productId == this.tlist[i].specGroups[k].productId) {
+ this.tlist[i].count = this.tlist[i].count + this.nums
+ }
+ }
+
+ }
}
this.$refs.popup.hide();
return;
@@ -443,16 +444,16 @@
for (var i = 0; i < this.shoppingcart.length; i++) {
if (this.shoppingcart[i].name == this.kfcname) {
indexs = 0;
- this.shoppingcart[i].num = this.shoppingcart[i].num + this.nums;
- for (var i = 0; i < this.tlist.length; i++) {
- if (!this.tlist[i].productId) {
- for (var k = 0; k < this.tlist[i].specGroups.length; k++) {
- if (this.productId == this.tlist[i].specGroups[k].productId) {
- this.tlist[i].count = this.tlist[i].count + this.nums
- }
- }
-
- }
+ this.shoppingcart[i].num = this.shoppingcart[i].num + this.nums;
+ for (var i = 0; i < this.tlist.length; i++) {
+ if (!this.tlist[i].productId) {
+ for (var k = 0; k < this.tlist[i].specGroups.length; k++) {
+ if (this.productId == this.tlist[i].specGroups[k].productId) {
+ this.tlist[i].count = this.tlist[i].count + this.nums
+ }
+ }
+
+ }
}
}
}
@@ -466,16 +467,16 @@
"price": this.kfcprice,
"oldprice": this.kfcoldprice
}
- this.shoppingcart.push(datas);
- for (var i = 0; i < this.tlist.length; i++) {
- if (!this.tlist[i].productId) {
- for (var k = 0; k < this.tlist[i].specGroups.length; k++) {
- if (this.productId == this.tlist[i].specGroups[k].productId) {
- this.tlist[i].count = this.tlist[i].count + this.nums
- }
- }
-
- }
+ this.shoppingcart.push(datas);
+ for (var i = 0; i < this.tlist.length; i++) {
+ if (!this.tlist[i].productId) {
+ for (var k = 0; k < this.tlist[i].specGroups.length; k++) {
+ if (this.productId == this.tlist[i].specGroups[k].productId) {
+ this.tlist[i].count = this.tlist[i].count + this.nums
+ }
+ }
+
+ }
}
}
this.$refs.popup.hide();
@@ -499,12 +500,6 @@
return true;
- },
- //跳转详情
- navToList() {
- uni.navigateTo({
- url: '../kfc-details/kfc-details'
- })
}
}
}
@@ -666,19 +661,19 @@
.wybfot {
position: fixed;
bottom: 0px;
- }
-
- .unibadge {
- background: #000;
- width: 20px;
- height: 20px;
- border-radius: 50%;
- font-size: 9px;
- color: #fff;
- line-height: 20px;
- text-align: center;
- position: absolute;
- margin-top: -25px;
- margin-right: -5px;
+ }
+
+ .unibadge {
+ background: #000;
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ font-size: 9px;
+ color: #fff;
+ line-height: 20px;
+ text-align: center;
+ position: absolute;
+ margin-top: -25px;
+ margin-right: -5px;
}
diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue
index 6246753..8f86477 100644
--- a/qianzhu-KFC/order-details/order-details.vue
+++ b/qianzhu-KFC/order-details/order-details.vue
@@ -113,8 +113,8 @@
-
-
+
+
商品小计
diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue
index 9564758..c917f8f 100644
--- a/subPages/unionComfirmation/unionComfirmation.vue
+++ b/subPages/unionComfirmation/unionComfirmation.vue
@@ -353,9 +353,6 @@
//查询工会卡余额
//查询详情
getHuiLianTongCardBalance() {
- if (!this.user.hltCardNo) {
- return;
- }
let params = {
cardNo: this.user.hltCardNo.cardNo
}