diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index 1a75780..bbb6937 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -817,7 +817,8 @@
}],
"payGold": this.priceValue[1],
"promoteCode": this.identificationCode,
- "payPwd": this.PaymentPassword,
+ "payPwd": this.PaymentPassword,
+ "companyId": app.globalData.companyId,
"memDiscountId": this.memDiscountId
}
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 9c7b2c3..40fb27d 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -110,6 +110,27 @@
+
+
+
+
+
+ 下单返积分
+
+
+ 返{{rebateIntegral}}积分
+
+
+ {{rebateIntegral}}
+
+
+
+
+ 积分抵扣与优惠券抵扣不同享
+
+
@@ -567,7 +588,8 @@
}],
"payGold": this.priceValue[1],
"promoteCode": this.identificationCode,
- memDiscountId: this.memDiscountId,
+ memDiscountId: this.memDiscountId,
+ "companyId": app.globalData.companyId,
"storeId": this.storeId,
"postData": {
"address": this.contactAddress,
@@ -736,7 +758,8 @@
}],
"payGold": this.priceValue[1],
"promoteCode": this.identificationCode,
- "payPwd": this.PaymentPassword,
+ "payPwd": this.PaymentPassword,
+ "companyId": app.globalData.companyId,
memDiscountId: this.memDiscountId
}
create(goods).then(res => {
diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index 8f662fc..5450264 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -280,7 +280,7 @@
},
//拨打客服电话
playPhone() {
- let cont = "本服务由惠兑礼品提供\n400-678-738";
+ let cont = "本服务由惠兑礼品提供\n400-678-0738";
let content = cont.replace(/
/g,"\n");
uni.showModal({
title: '客服',
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 941e8a9..95922b1 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -204,7 +204,6 @@
// 分类菜单
homeCateList: [],
//切换状态
- cpStuats: 1,
jumpType: '',
locationRef: null, // 用于接收定位对象
isdisplay: true //是否展示
@@ -305,7 +304,7 @@
})
that.city = '重庆市';
app.globalData.cityName = '重庆市';
- app.globalData.cityId = '500000';
+ app.globalData.cityId = '500000';
that.getCmsContentcmsContent();
that.getCmsAactibity();
}
@@ -616,7 +615,7 @@
})
},
//商品跳转
- toGoods(e, id) {
+ toGoods(e, id) {
uni.navigateTo({
url: e + id
});
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index 5149ac5..ac6a175 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -451,7 +451,7 @@
lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime /
(1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
24), //计算小时数
- leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? + Math.floor(lefttime / (1000 * 60) % 60) :
+ leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? +Math.floor(lefttime / (1000 * 60) % 60) :
Math.floor(lefttime / (1000 * 60) % 60), //计算分钟数
lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
lefttime / 1000 % 60); //计算秒数
@@ -498,7 +498,7 @@
})
}
// #ifdef H5
- let cont = "本服务由惠兑礼品提供\n400-678-738";
+ let cont = "本服务由惠兑礼品提供\n400-678-0738";
let content = cont.replace(/
/g, "\n");
if (item == '客服') {
uni.showModal({
diff --git a/pages/user/deposit/deposit.vue b/pages/user/deposit/deposit.vue
index 8ba2d3f..50efec3 100644
--- a/pages/user/deposit/deposit.vue
+++ b/pages/user/deposit/deposit.vue
@@ -146,7 +146,8 @@
"goodsType": 2,
"saleCount": 1,
}],
- "promoteCode": app.globalData.identificationCode
+ "promoteCode": app.globalData.identificationCode,
+ "companyId": app.globalData.companyId
}
create(goods).then(res => {
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index 7324a18..05cbff1 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -109,7 +109,7 @@
联系地址
¥{{materialData.address}}
-
+
@@ -138,16 +138,18 @@
-
-
+
+
-
+
加油实付 ￥{{recinfo.payRealPrice}}
-
-
- 实付 ￥{{recinfo.payRealPrice}}
+
+
+ 实付 ￥{{recinfo.payRealPrice}}
@@ -526,7 +528,6 @@
6: '退款中',
7: '退款失败'
},
- preByOrderInfo: '',
materialData: '' //实物参数
};
diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue
index 8f86477..fe28c21 100644
--- a/qianzhu-KFC/order-details/order-details.vue
+++ b/qianzhu-KFC/order-details/order-details.vue
@@ -187,9 +187,9 @@
-
-
-
+
+
+ 取消订单
@@ -533,7 +533,7 @@
line-height: 30px;
text-align: center;
margin-right: 20px;
- background-color: #009dff;
+ background-color: #999999;
border-radius: 25px;
}
diff --git a/subPages/coupon-comfirmation/coupon-comfirmation.vue b/subPages/coupon-comfirmation/coupon-comfirmation.vue
index 391513b..99fb355 100644
--- a/subPages/coupon-comfirmation/coupon-comfirmation.vue
+++ b/subPages/coupon-comfirmation/coupon-comfirmation.vue
@@ -74,11 +74,7 @@