From 74fd2b3a51bfb4483b2148f30308b997a3d4ebe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Sat, 9 Oct 2021 17:30:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/lf-payPassword/lf-payPassword.vue |  3 +++
 pages/business/center/center.vue             |  6 +++---
 pages/business/order/list.vue                |  2 +-
 pages/index/activity/hot.vue                 |  2 +-
 pages/index/category/category.vue            |  2 +-
 pages/index/openScreenAd/openScreenAd.vue    | 11 +++++++----
 pages/order/cashier/cashier.vue              |  9 +++++++--
 pages/order/confirm/confirm.vue              |  1 +
 pages/order/newdetail/newdetail.vue          |  8 +++++++-
 pages/order/pointconfirm/confirm.vue         |  1 +
 10 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/components/lf-payPassword/lf-payPassword.vue b/components/lf-payPassword/lf-payPassword.vue
index 6d6ad24..bb98b97 100644
--- a/components/lf-payPassword/lf-payPassword.vue
+++ b/components/lf-payPassword/lf-payPassword.vue
@@ -62,6 +62,9 @@
 			},
 			inputVal(event){
 				this.code = event;
+				if(this.code.length >= 6){
+					this.comfirm();
+				}
 			},
 			comfirm(){
 				if(this.code.length < 6){
diff --git a/pages/business/center/center.vue b/pages/business/center/center.vue
index 15baf09..a7382a6 100644
--- a/pages/business/center/center.vue
+++ b/pages/business/center/center.vue
@@ -7,7 +7,7 @@
 				<view class="bg-right"></view>
 				<view class="head-content">
 					<view class="lf-flex">
-						<image class="head-img" mode="widthFix" :src="detail.brand.logo"></image>
+						<image class="head-img" :src="detail.brand.logo"></image>
 						<view class="head-title lf-line-3">{{ detail.brand.name }}</view>
 					</view>
 					<view class="lf-flex">
@@ -102,11 +102,11 @@
 				</view>
 				<view class="lf-flex lf-m-t-50">
 					<view class="item" :style="{width: 100 / 3 +'%'}" @click="$url('/pages/business/activity/add')">
-						<view class="lf-iconfont icon-bianji lf-font-60"></view>
+						<view class="lf-iconfont icon-a-Group21 lf-font-60 lf-color-333"></view>
 						<view>新增活动</view>
 					</view>
 					<view class="item" :style="{width: 100 / 3 +'%'}" @click="$url('/pages/business/activity/list')">
-						<view class="lf-iconfont icon-fabujilu lf-font-60"></view>
+						<view class="lf-iconfont icon-a-Group16 lf-font-60 lf-color-333"></view>
 						<view>活动列表</view>
 					</view>
 				</view>
diff --git a/pages/business/order/list.vue b/pages/business/order/list.vue
index 9bba3be..3f2f1af 100644
--- a/pages/business/order/list.vue
+++ b/pages/business/order/list.vue
@@ -189,7 +189,7 @@
 					let method_id = this.columns[this.select_index].id;
 					let express_no = this.expressNum;
 					let order_no = this.click_order_no;
-					this.$http.get({
+					this.$http.post({
 						api: 'api/supplier/order/send',
 						data: {
 							distribution_id: 0,
diff --git a/pages/index/activity/hot.vue b/pages/index/activity/hot.vue
index 32afc24..163d768 100644
--- a/pages/index/activity/hot.vue
+++ b/pages/index/activity/hot.vue
@@ -11,7 +11,7 @@
 					<view class="scroll-content">
 						<view class="card" v-for="(item, index) in tab.list" :key="index" @click="goDetails(item.id)">
 							<view class="cover">
-								<image class="img" :src="item.image" mode="widthFix"></image>
+								<image class="img" :src="item.image" mode="aspectFill"></image>
 							</view>
 							<view class="info">
 								<view class="title">{{item.name}}</view>
diff --git a/pages/index/category/category.vue b/pages/index/category/category.vue
index f302a68..88da584 100644
--- a/pages/index/category/category.vue
+++ b/pages/index/category/category.vue
@@ -366,7 +366,7 @@
 <style lang="scss" scoped>
 	.fixed-right{
 		position: fixed;
-		right: 32rpx;
+		right: 62rpx;
 		bottom: 400rpx;
 		width: max-content;
 		height: max-content;
diff --git a/pages/index/openScreenAd/openScreenAd.vue b/pages/index/openScreenAd/openScreenAd.vue
index 9e568d2..20ea8a0 100644
--- a/pages/index/openScreenAd/openScreenAd.vue
+++ b/pages/index/openScreenAd/openScreenAd.vue
@@ -1,8 +1,9 @@
 <template>
 	<view class="content">
+		<lf-nav bgColor="transparent" :spreadOut="false" @changeHeight="e => head_height = e"></lf-nav>
 		<block v-if="$isRight(full)">
-			<image class="img" :src="full.image" mode="widthFix" @click="clickAd"></image>
-			<view class="tips" @click="next">跳过 {{ num }}s</view>
+			<image class="img" :src="full.image" @click="clickAd"></image>
+			<view class="tips" @click="next" :style="{top: 'calc('+ head_height +'px + 10rpx)'}">跳过 {{ num }}s</view>
 		</block>
 	</view>
 </template>
@@ -13,7 +14,8 @@
 			return {
 				num: 5,
 				timer: null,
-				full: {}
+				full: {},
+				head_height: 0
 			}
 		},
 		onLoad(){
@@ -79,7 +81,8 @@
 		.tips{
 			position: absolute;
 			right: 32rpx;
-			top: 132rpx;
+			// top: 132rpx;
+			// top: 10vh;
 			width: 144rpx;
 			height: 55rpx;
 			background-color: rgba(0,0,0,0.5);
diff --git a/pages/order/cashier/cashier.vue b/pages/order/cashier/cashier.vue
index ab0a1c7..488c194 100644
--- a/pages/order/cashier/cashier.vue
+++ b/pages/order/cashier/cashier.vue
@@ -20,7 +20,7 @@
 								</view>
 							</template>
 						</countdown-timer> -->
-						<countdown-time minute="5" second="0" :showDay="false" :showHour="false" color="#FF9D9D" splitorColor="#FF9D9D">
+						<countdown-time :minute="last_pay_time[2]" :second="last_pay_time[3]" :showDay="false" :showHour="false" color="#FF9D9D" splitorColor="#FF9D9D">
 							
 						</countdown-time>
 					</view>
@@ -72,15 +72,20 @@
 				token: '',
 				balance_sum: 0,
 				show_pw: false,
-				user_pw: ''
+				user_pw: '',
+				last_pay_time: []
 			}
 		},
 		onLoad(options){
 			this.token = this.$cookieStorage.get('user_token');
+			this.last_pay_time = this.$cookieStorage.get('last_pay_time') || [0,0,29,58];
 			this.amount = options.amount;
 			this.order_no = options.order_no;
 			this.getBalanceSum();
 		},
+		onUnload(){
+			this.$cookieStorage.clear('last_pay_time');
+		},
 		methods: {
 			// 获取余额
 			getBalanceSum(){
diff --git a/pages/order/confirm/confirm.vue b/pages/order/confirm/confirm.vue
index 06173e9..097cd90 100644
--- a/pages/order/confirm/confirm.vue
+++ b/pages/order/confirm/confirm.vue
@@ -353,6 +353,7 @@
 						let url = '/pages/order/cashier/cashier';
 						url += '?amount='+ this.totalPrice;
 						url += '&order_no='+ order.order_no;
+						this.$cookieStorage.set('last_pay_time', order.last_pay_time);
 						this.$url(url, {type: 'redirect'});
 					}else{
 						this.$msg(res.data.message);
diff --git a/pages/order/newdetail/newdetail.vue b/pages/order/newdetail/newdetail.vue
index a984fc3..a9557de 100644
--- a/pages/order/newdetail/newdetail.vue
+++ b/pages/order/newdetail/newdetail.vue
@@ -183,7 +183,7 @@
 			</view>
 			<view class="lf-flex">
 				<view class="btn-gray lf-m-r-20" @click="cancelOrder">取消订单</view>
-				<view class="btn-red" @click="$url('/pages/order/cashier/cashier?amount='+ order_details.total_yuan+'&order_no='+order_details.order_no)">立即付款</view>
+				<view class="btn-red" @click="toPay">立即付款</view>
 			</view>
 			
 			
@@ -274,6 +274,12 @@
 			}
 		},
 		methods: {
+			// 去到付款页面
+			toPay(){
+				let order_details = this.order_details;
+				this.$cookieStorage.set('last_pay_time', order_details.last_pay_time);
+				this.$url('/pages/order/cashier/cashier?amount='+ order_details.total_yuan+'&order_no='+order_details.order_no)
+			},
 			// 确认收货
 			confirmReceiving(){
 				this.$http.post({
diff --git a/pages/order/pointconfirm/confirm.vue b/pages/order/pointconfirm/confirm.vue
index 4851d18..7cb405b 100644
--- a/pages/order/pointconfirm/confirm.vue
+++ b/pages/order/pointconfirm/confirm.vue
@@ -292,6 +292,7 @@
 							let url = '/pages/order/cashier/cashier';
 							url += '?amount='+ order.payable_freight_yuan;
 							url += '&order_no='+ order.order_no;
+							this.$cookieStorage.set('last_pay_time', order.last_pay_time);
 							this.$url(url, {type: 'redirect'});
 						}else {
 							this.$msg('兑换成功')