From 82c8d55ef3c38a9d24eca0e9866ff8bbc00089c7 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Tue, 7 Feb 2023 15:13:12 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B92.0=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E9=A2=86=E5=88=B8=202.=E4=BC=98=E5=8C=96=E8=82=AF=E5=BE=B7?=
 =?UTF-8?q?=E5=9F=BA=20=E6=98=9F=E5=B7=B4=E5=85=8B=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/externalCoupon/externalCoupon.vue |  2 +-
 pages/order/confirmation.vue                  | 19 ++++++++++++-------
 qianzhu-KFC/home/home.vue                     |  6 +++---
 qianzhu-KFC/menu-list/menu-list.vue           |  2 +-
 qianzhu-Starbucks/home/home.vue               |  4 ++--
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pages/goods/externalCoupon/externalCoupon.vue b/pages/goods/externalCoupon/externalCoupon.vue
index 75b9bbf..767cf38 100644
--- a/pages/goods/externalCoupon/externalCoupon.vue
+++ b/pages/goods/externalCoupon/externalCoupon.vue
@@ -368,7 +368,7 @@
 							})
 						} else {
 							uni.navigateTo({
-								url: '../../order/confirmation?id=' + e
+								url: '../../order/confirmation?id=' + e+'&postPayType=2,'
 							})
 						}
 
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 7bd44cd..43eeadc 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -259,11 +259,15 @@
 				Integrastu: 1, //返积分状态
 				contactPepole: '', //联系人
 				contactPhone: '', //联系电话
-				contactAddress: '' //联系地址
+				contactAddress: '', //联系地址
+				postPayType: '' //请求支付方式
 			};
 		},
 		onLoad(option) {
 			this.couponId = option.id;
+			if (option.postPayType != undefined && option.postPayType) {
+				this.postPayType = option.postPayType;
+			}
 			// #ifdef H5
 			this.identificationCode = app.globalData.staffCode;
 			// #endif
@@ -318,7 +322,8 @@
 					platformId: this.showType,
 					"companyId": this.couponList.companyId,
 					productType: 5,
-					productId: this.couponList.couponSource
+					productId: this.couponList.couponSource,
+					payType: this.postPayType
 				}
 				getThirdPartyByDetail(datas).then(res => {
 					if (res.return_code == '000000') {
@@ -356,12 +361,12 @@
 				});
 			},
 			//支付返利积分
-			getRebateIntegral() {
+			getRebateIntegral() {
 				let datas = {
 					"companyId": this.couponList.companyId,
 					"price": this.paytheprice,
 					"type": 5,
-				}
+				}
 				getRebateIntegral(datas).then(res => {
 					if (res.return_code == '000000') {
 						this.rebateIntegral = res.return_data;
@@ -386,7 +391,7 @@
 						this.couponList = res.return_data;
 						this.paytheprice = res.return_data.discountPrice;
 						this.saveprice = res.return_data.discountPrice;
-						this.orderPrice = res.return_data.salesPrice;
+						this.orderPrice = res.return_data.salesPrice;
 						this.getRebateIntegral();
 						this.getThirdPartyByDetail();
 					}
@@ -587,7 +592,7 @@
 					}],
 					"payGold": this.priceValue[1],
 					"promoteCode": this.identificationCode,
-					memDiscountId: this.memDiscountId,
+					memDiscountId: this.memDiscountId,
 					"companyId": app.globalData.companyId,
 					"storeId": this.storeId,
 					"postData": {
@@ -757,7 +762,7 @@
 						}],
 						"payGold": this.priceValue[1],
 						"promoteCode": this.identificationCode,
-						"payPwd": this.PaymentPassword,
+						"payPwd": this.PaymentPassword,
 						"companyId": app.globalData.companyId,
 						memDiscountId: this.memDiscountId
 					}
diff --git a/qianzhu-KFC/home/home.vue b/qianzhu-KFC/home/home.vue
index 17cbe47..3c4fd50 100644
--- a/qianzhu-KFC/home/home.vue
+++ b/qianzhu-KFC/home/home.vue
@@ -3,11 +3,11 @@
 		<image mode="widthFix" class="width100 imgs" src="../static/imgs/kfchome.png"></image>
 		<view class="width94 heads alijusstart">
 			<view class="width48 backcorfff height280 fotct paddtop15">
-				<view class="fcor666 font20"><text class="fcor333 fontwig6 ">KFC</text>在线点餐</view>
-				<view class="c62a1e font28 mart10 fontwig6">5折起</view>
+				<view class="fcor666 fontwig6 font20">平台特惠</view>
+				<view class="c62a1e font28 mart10 fontwig6">凭码取餐</view>
 				<image class="width80p mart20" mode="widthFix" src="../static/imgs/kfc1.png"></image>
 				<view class="mart20 width80 height30 border-15 fcorfff backcorf062 font13" @click="jumpbuffert()">
-					立即点餐(堂食/外带)
+					立即点餐
 				</view>
 			</view>
 			<!-- <view class="width48 backcorfff margitle height260 fotct paddtop15">
diff --git a/qianzhu-KFC/menu-list/menu-list.vue b/qianzhu-KFC/menu-list/menu-list.vue
index a285e7c..abb683d 100644
--- a/qianzhu-KFC/menu-list/menu-list.vue
+++ b/qianzhu-KFC/menu-list/menu-list.vue
@@ -211,7 +211,7 @@
 			}
 		},
 		onLoad(options) {
-			// this.storeCode = options.storeCode;
+			this.storeCode = options.storeCode;
 			this.starttime = options.sttime;
 			this.endtime = options.entime;
 			this.getStarbucksProducts();
diff --git a/qianzhu-Starbucks/home/home.vue b/qianzhu-Starbucks/home/home.vue
index ab17ac3..97e1b03 100644
--- a/qianzhu-Starbucks/home/home.vue
+++ b/qianzhu-Starbucks/home/home.vue
@@ -4,10 +4,10 @@
 		<view class="width94 heads alijusstart">
 			<view class="width48 backcorfff height280 fotct paddtop15">
 				<view class="fcor333 fontwig6  font20">星专享</view>
-				<view class="color2f6f43 font16 mart10">低至9折</view>
+				<view class="color2f6f43 font28 mart10 fontwig6">凭码取餐</view>
 				<image class="width80p mart20" mode="widthFix" src="../static/imgs/sk1.png"></image>
 				<view class="mart20 width80 height30 border-15 fcorfff backcorf2f6 font13" @click="jumpbuffert()">
-					立即点餐(堂食/外带)
+					立即点餐
 				</view>
 			</view>
 		</view>