From 3bae60abf90e5240e9811995d20bb21e58936a4b Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 2 Feb 2023 16:14:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8A=E7=BA=BF2.0=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 high-unionPay/Utils/Api.js                    | 11 ++++++--
 high-unionPay/member-Recharge/home/home.vue   |  2 +-
 .../rec-confirmation/rec-confirmation.vue     |  7 +++---
 .../goods/refuel-confirm/refuel-confirm.vue   |  5 ++--
 .../goods/refuel-details/refuel-details.vue   |  6 -----
 high-unionPay/pages/login/register.vue        | 17 +++++++------
 high-unionPay/pages/order/confirmation.vue    | 25 ++++++++++---------
 high-unionPay/pages/tabBar/home/home.vue      |  7 +++---
 high-unionPay/pages/tabBar/user/user.vue      |  7 ++++--
 .../unionComfirmation/unionComfirmation.vue   |  3 +--
 high-unionPay/pages/user/coupon/coupon.vue    |  7 +++---
 .../user/order_details/order_details.vue      |  2 +-
 .../qianzhu-KFC/confirmOrder/confirmOrder.vue |  5 ++--
 .../order-details/order-details.vue           |  2 +-
 high-unionPay/uni.scss                        |  8 ++++++
 15 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/high-unionPay/Utils/Api.js b/high-unionPay/Utils/Api.js
index 320b882..449a204 100644
--- a/high-unionPay/Utils/Api.js
+++ b/high-unionPay/Utils/Api.js
@@ -539,10 +539,17 @@ export const getOrderByOrderNo = params => {
 }
 
 //----------------我的页面接口
-
-// 手机号登录
+// 获取登录验证码
+export const getLoginSMSCode = params => {
+	return POST('POST', `${userbase}/sms/getLoginSMSCode`, params).then(res => res.data);
+}
+// 银联授权登录
 export const unionPhoneLogin = params => {
 	return POST('POST', `${userbase}/login/union`, params).then(res => res.data);
+}
+// 手机号登录
+export const phone = params => {
+	return POST('POST', `${userbase}/login/phone`, params).then(res => res.data);
 }
 
 //  获取用户信息
diff --git a/high-unionPay/member-Recharge/home/home.vue b/high-unionPay/member-Recharge/home/home.vue
index 12c171a..49821c7 100644
--- a/high-unionPay/member-Recharge/home/home.vue
+++ b/high-unionPay/member-Recharge/home/home.vue
@@ -12,7 +12,7 @@
 					:currentSwiperLineActiveWidth="currentSwiperLineActiveWidth"
 					:currentSwiperLineActiveHeight="currentSwiperLineActiveHeight"
 					:currentSwiperLineActiveBg="currentSwiperLineActiveBg"
-					:currentSwiperLineAnimatie="currentSwiperLineAnimatie" v-if=" swiperTabList.length > 1 "
+					:currentSwiperLineAnimatie="currentSwiperLineAnimatie" v-if=" swiperTabList.length > 0 "
 					@change="CurrentTab">
 				</swiperNavBar>
 				<!--组件-->
diff --git a/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue b/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue
index 74807b6..0a7eb3c 100644
--- a/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue
+++ b/high-unionPay/member-Recharge/rec-confirmation/rec-confirmation.vue
@@ -277,8 +277,7 @@
 				let datas = {
 					"companyId": app.globalData.companyId,
 					"price": this.payPrice,
-					"productId": 3,
-					"type": 4,
+					"type": 3,
 				}
 				getRebateIntegral(datas).then(res => {
 					if (res.return_code == '000000') {
@@ -697,7 +696,9 @@
 
 <style lang="scss">
 	page {
-		background-color: #f0f0f0;
+		background-color: #f0f0f0;
+		overflow: hidden;
+		overflow-y: auto;
 	}
 
 	.headsbg {
diff --git a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
index 66d5359..ae49f9b 100644
--- a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -195,7 +195,7 @@
 			<view class="width50 flleft fcoreb5 padleft15 font15">
 				合计: ￥<text class="font24">{{payPrice}}</text>
 			</view>
-			<button class="reBtn flright" @click="addOrder">去支付</button>
+			<button class="reBtn flright" @click="create">去支付</button>
 		</view>
 
 
@@ -348,8 +348,7 @@
 				let datas = {
 					"companyId": app.globalData.companyId,
 					"price": this.payPrice,
-					"productId": 1,
-					"type": 3,
+					"type": 6,
 				}
 				getRebateIntegral(datas).then(res => {
 					if (res.return_code == '000000') {
diff --git a/high-unionPay/pages/goods/refuel-details/refuel-details.vue b/high-unionPay/pages/goods/refuel-details/refuel-details.vue
index b079c79..72a7933 100644
--- a/high-unionPay/pages/goods/refuel-details/refuel-details.vue
+++ b/high-unionPay/pages/goods/refuel-details/refuel-details.vue
@@ -112,14 +112,8 @@
 					v-if="priceVip != priceOfficial">优惠约:￥{{discountPrice}}</text>
 			</view>
 
-			<!-- #ifdef MP -->
-			<button class="reBtn flright" v-if="user.phone == null" @click="jumpPhone">去支付</button>
-			<button class="reBtn flright" v-else @click="postionIng">去支付</button>
-			<!-- #endif -->
-			<!-- #ifdef H5 -->
 			<button class="reBtn flright" v-if="user.phone == null" @click="jumpH5Bding">去支付</button>
 			<button class="reBtn flright" v-else @click="postionIng">去支付</button>
-			<!-- #endif -->
 
 		</view>
 		<!-- 底部弹窗 -->
diff --git a/high-unionPay/pages/login/register.vue b/high-unionPay/pages/login/register.vue
index 75d2623..454ed2d 100644
--- a/high-unionPay/pages/login/register.vue
+++ b/high-unionPay/pages/login/register.vue
@@ -33,9 +33,9 @@
 <script>
 	import md5 from "@/common/SDK/md5.min.js";
 	import {
-		sendSmsCodeByHw,
+		getLoginSMSCode,
 		bindUserPhone,
-		H5login
+		phone
 	} from "../../Utils/Api.js";
 	let app = getApp();
 	export default {
@@ -73,10 +73,9 @@
 					title: '发送中...'
 				})
 				let params = {
-					phone: this.phoneNumber,
-					HWMSG:3
+					phone: this.phoneNumber
 				}
-				sendSmsCodeByHw(params).then(res => {
+				getLoginSMSCode(params).then(res => {
 					if (res.return_code == '000000') {
 						this.getCodeisWaiting = true;
 						this.getCodeBtnColor = "rgba(255,255,255,0.5)"
@@ -128,10 +127,12 @@
 				})
 				let params = {
 					phone: this.phoneNumber,
-					code: this.code
+					type: "SMS",
+					platform: "UNIONPAY",
+					smsCode: this.code
 				}
 				if (this.Typeid == 1) {
-					H5login(params).then(res => {
+					phone(params).then(res => {
 						uni.hideLoading()
 						if (res.return_code == '000000') {
 							app.globalData.userInfo = res.return_data
@@ -159,7 +160,7 @@
 						}
 					})
 				} else {
-					bindUserPhone(params).then(res => {
+					phone(params).then(res => {
 						uni.hideLoading()
 						if (res.return_code == '000000') {
 							app.globalData.userInfo = res.return_data
diff --git a/high-unionPay/pages/order/confirmation.vue b/high-unionPay/pages/order/confirmation.vue
index 9b370d6..cc18c7d 100644
--- a/high-unionPay/pages/order/confirmation.vue
+++ b/high-unionPay/pages/order/confirmation.vue
@@ -350,8 +350,7 @@
 				let datas = {
 					"companyId": app.globalData.companyId,
 					"price": this.paytheprice,
-					"productId": 1,
-					"type": 1,
+					"type": 5,
 				}
 				getRebateIntegral(datas).then(res => {
 					if (res.return_code == '000000') {
@@ -398,34 +397,34 @@
 				} else { // 否则进行选中赋值
 					this.isDiscont = true;
 					this.memDiscountId = item.id;
-					if (item.highDiscount.discountType == 1) {
+					if (item.discountType == 1) {
 						//满减价格
-						if (this.orderPrice > item.highDiscount.discountCondition) {
+						if (this.orderPrice > item.discountCondition) {
 							this.memDiscountId = item.id;
 							//满减价格
-							this.deductionPrice = item.highDiscount.discountPrice;
+							this.deductionPrice = item.discountPrice;
 							let oldprice = this.orderPrice - this.deductionPrice;
 							this.priceCaluc(oldprice);
 						} else {
 							uni.showToast({
-								title: '请满' + item.highDiscount.discountCondition + '使用此券',
+								title: '请满' + item.discountCondition + '使用此券',
 								icon: 'none',
 								duration: 2000
 							})
 						}
 					}
-					if (item.highDiscount.discountType == 2) {
+					if (item.discountType == 2) {
 						//抵扣价格
-						this.deductionPrice = item.highDiscount.discountPrice;
+						this.deductionPrice = item.discountPrice;
 						let oldprice = this.orderPrice - this.deductionPrice;
 						this.priceCaluc(oldprice);
 					}
-					if (item.highDiscount.discountType == 3) {
+					if (item.discountType == 3) {
 						// 打折
-						this.deductionPrice = parseFloat(this.orderPrice - (this.orderPrice * item.highDiscount
+						this.deductionPrice = parseFloat(this.orderPrice - (this.orderPrice * item
 								.discountPrice))
 							.toFixed(2);
-						let oldprice = parseFloat(this.orderPrice * item.highDiscount.discountPrice).toFixed(2);
+						let oldprice = parseFloat(this.orderPrice * item.discountPrice).toFixed(2);
 						this.priceCaluc(oldprice);
 					}
 				}
@@ -780,7 +779,9 @@
 
 <style lang="scss">
 	page {
-		background-color: #f7f7f7;
+		background-color: #f7f7f7;
+		overflow: hidden;
+		overflow-y: auto;
 	}
 
 	.comorder {
diff --git a/high-unionPay/pages/tabBar/home/home.vue b/high-unionPay/pages/tabBar/home/home.vue
index 47defd0..4602c9d 100644
--- a/high-unionPay/pages/tabBar/home/home.vue
+++ b/high-unionPay/pages/tabBar/home/home.vue
@@ -184,7 +184,6 @@
 		},
 		onShow() {
 			let that = this;
-			that.hqaddress();
 			uni.getStorage({
 				key: "user",
 				success(e) {
@@ -199,7 +198,9 @@
 				}
 			})
 		},
-		onLoad() {},
+		onLoad() {
+			this.hqaddress();
+		},
 		methods: {
 			//等待加载
 			handleAnimation: function(anim) {
@@ -302,7 +303,7 @@
 				let params = {
 					companyId: app.globalData.companyId,
 					platform: 3,
-					categoryCode: 'CMS_HOME_POPOVER'
+					categoryCode: 'CMS_HOME'
 				}
 				getCmsContent(params).then(res => {
 					this.isdisplay = false;
diff --git a/high-unionPay/pages/tabBar/user/user.vue b/high-unionPay/pages/tabBar/user/user.vue
index 9d0e1e4..0b8a83b 100644
--- a/high-unionPay/pages/tabBar/user/user.vue
+++ b/high-unionPay/pages/tabBar/user/user.vue
@@ -296,7 +296,8 @@
 						this.whetherCheckNum = res.return_data.whetherCheckNum;
 						this.orderPayNum = res.return_data.orderPayNum;
 						this.rechargeOrderNum = res.return_data.rechargeOrderNum;
-						this.geTel(this.user.phone);
+						this.geTel(this.user.phone);
+						this.getUserOrderList();
 						uni.setStorage({
 							key: "user",
 							data: res.return_data
@@ -532,7 +533,9 @@
 </script>
 <style lang="scss">
 	page {
-		background-color: #f5f5f5;
+		background-color: #f5f5f5;
+		overflow: hidden;
+		overflow-y: auto;
 	}
 
 	.status {
diff --git a/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue b/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue
index a4988e8..2f7c047 100644
--- a/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue
+++ b/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue
@@ -303,8 +303,7 @@
 				let datas = {
 					"companyId": app.globalData.companyId,
 					"price": this.payPrice,
-					"productId": this.rechargeModel,
-					"type": 3,
+					"type": 9,
 				}
 				getRebateIntegral(datas).then(res => {
 					if (res.return_code == '000000') {
diff --git a/high-unionPay/pages/user/coupon/coupon.vue b/high-unionPay/pages/user/coupon/coupon.vue
index 3efbc78..7d67386 100644
--- a/high-unionPay/pages/user/coupon/coupon.vue
+++ b/high-unionPay/pages/user/coupon/coupon.vue
@@ -469,7 +469,6 @@
 
 	.srollview {
 		position: fixed;
-		z-index: 9999;
 		height: 60px;
 		background-color: #ffffff;
 		display: flex;
@@ -728,7 +727,7 @@
 				.left {
 					background-color: #fff;
 					width: 72%;
-					background-image: radial-gradient(6px at top right, #f5f5f5 50px, #ffffff);
+					background-image: radial-gradient(6px at top right, #ffffff 50px, #ffffff);
 
 					.title {
 						width: 90%;
@@ -738,7 +737,7 @@
 
 					.term {
 						width: 95%;
-						background-image: radial-gradient(6px at bottom right, #f5f5f5 50px, #ffffff);
+						background-image: radial-gradient(6px at bottom right, #ffffff 50px, #ffffff);
 						margin-left: 5%;
 						font-size: 26upx;
 						color: #999;
@@ -778,7 +777,7 @@
 					width: 28%;
 					color: #fff;
 					background: linear-gradient(to right, #66c4ff, #009DFF);
-					background-image: radial-gradient(6px at bottom left, #f5f5f5 50px, #009DFF);
+					background-image: radial-gradient(6px at bottom left, #009DFF 50px, #009DFF);
 
 					&.invalid {
 						background: linear-gradient(to right, #aaa, #999);
diff --git a/high-unionPay/pages/user/order_details/order_details.vue b/high-unionPay/pages/user/order_details/order_details.vue
index fbe58e4..3433eca 100644
--- a/high-unionPay/pages/user/order_details/order_details.vue
+++ b/high-unionPay/pages/user/order_details/order_details.vue
@@ -600,7 +600,7 @@
 						if (res.return_data.orderStatus == 1) {
 							this.timers = setInterval(() => {
 								this.showtime()
-							})
+							}, 1000)
 						}
 					}
 				})
diff --git a/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue b/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue
index f133857..3502cd8 100644
--- a/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -383,8 +383,7 @@
 				let datas = {
 					"companyId": app.globalData.companyId,
 					"price": this.payPrice,
-					"productId": this.productType,
-					"type": 4,
+					"type": this.productType
 				}
 				getRebateIntegral(datas).then(res => {
 					if (res.return_code == '000000') {
@@ -942,6 +941,8 @@
 <style lang="scss">
 	page {
 		background-color: #f0f0f0;
+		overflow: hidden;
+		overflow-y: auto;
 	}
 
 	.headsbg {
diff --git a/high-unionPay/qianzhu-KFC/order-details/order-details.vue b/high-unionPay/qianzhu-KFC/order-details/order-details.vue
index 8f86477..4db0998 100644
--- a/high-unionPay/qianzhu-KFC/order-details/order-details.vue
+++ b/high-unionPay/qianzhu-KFC/order-details/order-details.vue
@@ -269,7 +269,7 @@
 						if (this.orderList.orderStatus == 1) {
 							this.timer = setInterval(() => {
 								this.showtime()
-							})
+							}, 1000)
 						}
 						if (this.orderList.orderStatus == 2) {
 							this.setTimer();
diff --git a/high-unionPay/uni.scss b/high-unionPay/uni.scss
index ca960ce..cfcf448 100644
--- a/high-unionPay/uni.scss
+++ b/high-unionPay/uni.scss
@@ -393,6 +393,11 @@ $uni-font-size-paragraph:30upx;
   width: 30%;
   margin-left: 3%;
 }
+
+.widthw30 {
+  width: 30%;
+  margin-left: 35%;
+}
 .width31{
 	width: 31%;
 	margin-right: auto;
@@ -562,6 +567,9 @@ $uni-font-size-paragraph:30upx;
 .mart90 {
   margin-top: 90px;
 }
+.mart110 {
+  margin-top: 110px;
+}
 
 .mart80{
 	margin-top: 80px;