From d2047af37f8d60f8c75126aacbdaa6d2deaae76d Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Tue, 10 Jan 2023 17:44:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98=202.=E6=96=B0=E5=A2=9E=E5=9B=BE?=
=?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../rec-confirmation/rec-confirmation.vue | 2 +-
pages/goods/goods-list/goods-list.vue | 10 +-
pages/goods/refuel-confirm/refuel-confirm.vue | 4 +-
pages/order/confirmation.vue | 4 +-
pages/tabBar/home/home.vue | 10 +-
pages/tabBar/user/user.vue | 82 ++++++++-----
pages/user/order_details/order_details.vue | 31 +++--
pages/user/order_list/order_list.vue | 36 ++++--
pages/userLogin/userLogin.vue | 2 +-
qianzhu-KFC/confirmOrder/confirmOrder.vue | 2 +-
qianzhu-KFC/order-details/order-details.vue | 114 +++++++++---------
qianzhu-KFC/payment-method/payment-method.vue | 2 +-
static/img/Vip.png | Bin 7349 -> 0 bytes
static/img/ghk.png | Bin 3297 -> 0 bytes
static/img/home/home3.png | Bin 158013 -> 0 bytes
static/img/home/home4.png | Bin 91509 -> 0 bytes
static/img/home/home5.png | Bin 8781 -> 0 bytes
static/img/home/home6.png | Bin 21381 -> 0 bytes
static/img/home/home7.png | Bin 44595 -> 0 bytes
static/img/order2.png | Bin 7000 -> 10714 bytes
static/img/order3.png | Bin 6781 -> 9035 bytes
static/img/order4.png | Bin 3674 -> 6585 bytes
static/img/order5.png | Bin 3016 -> 4040 bytes
static/img/order6.png | Bin 0 -> 10064 bytes
static/img/order7.png | Bin 0 -> 13862 bytes
static/img/order8.png | Bin 0 -> 7844 bytes
static/img/order9.png | Bin 7631 -> 21284 bytes
static/img/unioncard.png | Bin 0 -> 37138 bytes
static/img/xbk.png | Bin 1145 -> 0 bytes
subPages/coupon-package/coupon-package.vue | 4 +-
subPages/recharge/recharge.vue | 4 +-
31 files changed, 179 insertions(+), 128 deletions(-)
delete mode 100644 static/img/Vip.png
delete mode 100644 static/img/ghk.png
delete mode 100644 static/img/home/home3.png
delete mode 100644 static/img/home/home4.png
delete mode 100644 static/img/home/home5.png
delete mode 100644 static/img/home/home6.png
delete mode 100644 static/img/home/home7.png
create mode 100644 static/img/order6.png
create mode 100644 static/img/order7.png
create mode 100644 static/img/order8.png
create mode 100644 static/img/unioncard.png
delete mode 100644 static/img/xbk.png
diff --git a/member-Recharge/rec-confirmation/rec-confirmation.vue b/member-Recharge/rec-confirmation/rec-confirmation.vue
index c07bff1..cec130c 100644
--- a/member-Recharge/rec-confirmation/rec-confirmation.vue
+++ b/member-Recharge/rec-confirmation/rec-confirmation.vue
@@ -243,7 +243,7 @@
// #endif
let datas = {
platformId: this.showType,
- regionId: app.globalData.cityId,
+ "companyId": app.globalData.companyId,
productType: 3
}
getThirdPartyByDetail(datas).then(res => {
diff --git a/pages/goods/goods-list/goods-list.vue b/pages/goods/goods-list/goods-list.vue
index 453e332..8db45b8 100644
--- a/pages/goods/goods-list/goods-list.vue
+++ b/pages/goods/goods-list/goods-list.vue
@@ -108,7 +108,7 @@
title: '商品列表'
});
this.getCouponListArea();
- this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
+ this.getCmsContent('CMS_BANNER_COUPON');
}
if (option.id == 2) {
uni.setNavigationBarTitle({
@@ -119,7 +119,7 @@
} else {
this.getCouponListArea();
}
- this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
+ this.getCmsContent('CMS_BANNER_COUPON');
}
if (option.id == 5) {
uni.setNavigationBarTitle({
@@ -130,13 +130,13 @@
} else {
this.getCouponListArea();
}
- this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
+ this.getCmsContent('CMS_BANNER_COUPON');
}
if (option.id == 3) {
uni.setNavigationBarTitle({
title: '优选商品'
});
- this.getCmsContent('CMS_PRE_LIST');
+ this.getCmsContent('CMS_DISCOUNT_PACKAGE_BANNER');
this.getBrandCouponList();
}
},
@@ -200,7 +200,7 @@
}
getCmsContent(params).then(res => {
if (res.return_code == '000000') {
- this.swiperList = res.return_data;
+ this.swiperList = res.return_data.childCategory;
}
});
},
diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index 2f3e185..7d40672 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -368,8 +368,8 @@
// #endif
let datas = {
platformId: this.showType,
- regionId: app.globalData.cityId,
- productType: 5
+ "companyId": app.globalData.companyId,
+ productType: 6
}
getThirdPartyByDetail(datas).then(res => {
if (res.return_code == '000000') {
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index d184e17..8676325 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -344,8 +344,8 @@
// #endif
let datas = {
platformId: this.showType,
- regionId: app.globalData.cityId,
- productType: 4,
+ "companyId": app.globalData.companyId,
+ productType: 5,
productId: this.couponList.couponSource
}
getThirdPartyByDetail(datas).then(res => {
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 60d0dba..143e696 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -52,7 +52,7 @@
-
+
@@ -375,15 +375,15 @@
let params = {
companyId: app.globalData.companyId,
platform: code,
- categoryCode: ''
+ categoryCode: 'CMS_HOME_POPOVER'
}
getCmsContent(params).then(res => {
if (res.return_code == '000000' && res.return_data != '') {
//弹窗首页广告
this.showPopup();
- this.imgadres3 = res.return_data[0].imgData;
- this.webUrl = res.return_data[0].ext1;
- this.jumpType = res.return_data[0].jumpType;
+ this.imgadres3 = res.return_data.childCategory[0].imgData;
+ this.webUrl = res.return_data.childCategory[0].ext1;
+ this.jumpType = res.return_data.childCategory[0].jumpType;
}
});
},
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index e4414ad..deca1b6 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -53,9 +53,9 @@
:text="therrNum" type="error" size="normal">
-
-
+
+
@@ -65,9 +65,27 @@
-
+
-
+
+
+
+
+
+
+
+
+
等待付款
@@ -165,7 +183,7 @@
findUser,
loginOut,
getUserAccount,
- getUserOrderList,
+ getUserOrderList,
orderCheck
} from "../../../Utils/Api.js";
// import authorize from '../../../components/Authorize';
@@ -356,7 +374,7 @@
getUserOrderList(params).then(res => {
// uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list != '') {
- this.nopaylist = res.return_data.list;
+ this.nopaylist = res.return_data.list;
this.timesettime(res.return_data.list[0].createTime);
} else {
this.nopaylist = [];
@@ -401,28 +419,28 @@
//轮播滚动
swiperChange(e) {
this.timesettime(this.nopaylist[e.detail.current].createTime);
- },
- //跳转详情
- jumpDetails(e, item) {
- this.orderCheck(e);
- if (item == 1 || item == 2 || item == 3) {
- uni.navigateTo({
- url: '/qianzhu-KFC/order-details/order-details?id=' + e
- })
- return;
- }
- uni.navigateTo({
- url: '/pages/user/order_details/order_details?id=' + e
- })
- },
- //查看状态
- orderCheck(item) {
- let datas = {
- orderNo: item
- }
- orderCheck(datas).then(res => {
-
- });
+ },
+ //跳转详情
+ jumpDetails(e, item) {
+ this.orderCheck(e);
+ if (item == 1 || item == 2 || item == 3) {
+ uni.navigateTo({
+ url: '/qianzhu-KFC/order-details/order-details?id=' + e
+ })
+ return;
+ }
+ uni.navigateTo({
+ url: '/pages/user/order_details/order_details?id=' + e
+ })
+ },
+ //查看状态
+ orderCheck(item) {
+ let datas = {
+ orderNo: item
+ }
+ orderCheck(datas).then(res => {
+
+ });
},
//计算时间
timesettime(item) {
@@ -479,9 +497,9 @@
url: url
})
}
- // #ifdef H5
- let cont = "本服务由惠兑礼品提供\n400-678-738";
- let content = cont.replace(/
/g,"\n");
+ // #ifdef H5
+ let cont = "本服务由惠兑礼品提供\n400-678-738";
+ let content = cont.replace(/
/g, "\n");
if (item == '客服') {
uni.showModal({
title: '客服',
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index a8c5b46..3cddd1a 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -51,8 +51,10 @@
支付方式
支付宝
- 微信
+ 微信支付
+ 积分兑换
汇联通工会卡
+ 汇联通银联支付工会卡
地址
@@ -94,7 +96,20 @@
加油金额
¥{{oilList.gasRefuelPrice}}
-
+
+
+ 联系人
+ ¥{{materialData.user}}
+
+
+ 联系电话
+ ¥{{materialData.phone}}
+
+
+ 联系地址
+ ¥{{materialData.address}}
+
+
@@ -459,7 +474,7 @@
- 再来一单
+
@@ -725,7 +740,7 @@
// '&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
// })
uni.redirectTo({
- url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.id + '&amount=' + this.recinfo
+ url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.recinfo.orderNo + '&amount=' + this.recinfo
.payPrice + '&productType=' + this.recinfo.productType
})
},
@@ -1038,20 +1053,20 @@
.borderleft {
- background-image: radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff);
+ background-image: -webkit-radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff);
}
.bordertopleft {
- background-image: radial-gradient(10px at top left, #f0f0f0 10px, #ffffff);
+ background-image: -webkit-radial-gradient(10px at top left, #f0f0f0 10px, #ffffff);
}
.concont {
border-radius: 8px 8px 0 0;
- background-image: radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
+ background-image: -webkit-radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
}
.gooddes {
border-radius: 0 0 8px 8px;
- background-image: radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
+ background-image: -webkit-radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
}
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index a0f1684..f87e05f 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -46,8 +46,24 @@
-
+
+
+
+
+
+
+
+
+
{{row.title}}
@@ -106,12 +122,12 @@
headerswper: '120px',
typeText: {
1: '等待付款',
- 2: '订单已支付',
- 3: '订单已完成',
- 4: '订单已退款',
- 5: '订单已取消',
- 6: '订单退款中',
- 7: '订单退款失败'
+ 2: '已支付',
+ 3: '已完成',
+ 4: '已退款',
+ 5: '已取消',
+ 6: '退款中',
+ 7: '退款失败'
},
// 退换货
orderType: ['全部', '待支付', '已支付', '已完成', '已退款'],
@@ -344,7 +360,7 @@
payTypes = 2;
}
uni.redirectTo({
- url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + row.id + '&amount=' + row
+ url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + row.orderNo + '&amount=' + row
.payPrice + '&productType=' + row.productType
})
}
@@ -627,7 +643,7 @@
}
.orderlabel {
- width: 50px;
+ width: 60px;
border-radius: 5px;
height: 22px;
line-height: 22px;
diff --git a/pages/userLogin/userLogin.vue b/pages/userLogin/userLogin.vue
index d766db3..1cdb5b6 100644
--- a/pages/userLogin/userLogin.vue
+++ b/pages/userLogin/userLogin.vue
@@ -100,7 +100,7 @@
getCodeText: '获取验证码',
getCodeisWaiting: false,
type: 1, // 区分登录方式
- disabled: false,
+ disabled: true ,
}
},
onLoad() {
diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue
index 4051a2b..fc73f9f 100644
--- a/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -372,7 +372,7 @@
}
let datas = {
platformId: this.showType,
- regionId: app.globalData.cityId,
+ "companyId": app.globalData.companyId,
productType: this.productType
}
getThirdPartyByDetail(datas).then(res => {
diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue
index 3accc1e..353467b 100644
--- a/qianzhu-KFC/order-details/order-details.vue
+++ b/qianzhu-KFC/order-details/order-details.vue
@@ -38,9 +38,9 @@
- 订单已准备完毕，喜欢您再来
+ 订单已准备完毕，喜欢您再来
-
+
请至柜台凭取餐码取餐
如有询问手机尾号请点击右侧按钮查看
@@ -64,7 +64,8 @@
v-for="(item,index) in recinfo.object.orderItems" :key='index'>{{item.code}}
- {{recinfo.statusDesc}}
+
+ {{typeText[orderList.orderStatus]}}
{{recinfo.statusDesc}}
@@ -76,7 +77,8 @@
充值明细
- {{orderList.highChildOrderList[0].storeName}}
+
+ {{orderList.highChildOrderList[0].storeName}}
优惠券优惠 ¥ {{orderList.deductionCouponPrice}}
-
-
- 商品优惠 ¥ {{orderList.deductionProductPrice}}
+
+
+ 商品优惠 ¥ {{orderList.deductionProductPrice}}
积分抵扣 ¥ {{(orderList.payGold / 100).toFixed(2)}}
@@ -149,11 +151,11 @@
下单时间
{{orderList.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
-
-
- 支付时间
- {{orderList.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
-
+
+
+ 支付时间
+ {{orderList.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+
就餐方式
店内就餐
@@ -161,9 +163,9 @@
支付方式
- 微信
- 积分
- 工会卡
+ 微信支付
+ 积分兑换
+ 汇联通工会卡
银联支付
@@ -182,7 +184,7 @@
- 再来一单
+
@@ -191,7 +193,7 @@