From fad1ca2b30fbd7960c2d18d327dca4ecf47f6bd2 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 31 Jan 2024 17:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/login/login_copy.vue    | 54 ++++++++++++++++-------------
 pages/users/order_confirm/index.vue | 39 ++++++++++++++++++++-
 2 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index bbf2f6a..5b26705 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -883,31 +883,35 @@
 			checkOpenId(user) {
 				if (user.wechat_user_id === 0) {
 					let that = this
-					wx.getUserInfo({
-						success: function(res) {
-							const encryptedData = res.encryptedData
-							const iv = res.iv
-							wx.login({
-								success(res) {
-									if (res.code) {
-										bindMp({
-											code: res.code,
-											iv: iv,
-											encryptedData: encryptedData,
-											phone: that.account
-										}).then(res => {
-											// console.log(res);
-										})
-									} else {
-										// console.log('登录失败！' + res.errMsg)
-									}
-								}
-							})
-						},
-						fail(e) {
-							// console.log('登录失败！' + res.errMsg)
-						}
-					})
+					try{
+					  wx.getUserInfo({
+					  	success: function(res) {
+					  		const encryptedData = res.encryptedData
+					  		const iv = res.iv
+					  		wx.login({
+					  			success(res) {
+					  				if (res.code) {
+					  					bindMp({
+					  						code: res.code,
+					  						iv: iv,
+					  						encryptedData: encryptedData,
+					  						phone: that.account
+					  					}).then(res => {
+					  						// console.log(res);
+					  					})
+					  				} else {
+					  					// console.log('登录失败！' + res.errMsg)
+					  				}
+					  			}
+					  		})
+					  	},
+					  	fail(e) {
+					  		// console.log('登录失败！' + res.errMsg)
+					  	}
+					  })
+					}catch(e){
+					  console.log(e);
+					}
 				}
 				// #ifdef APP-PLUS
 				jpushModule.initJPushService()
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 6ea3512..0ad2cc8 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -434,6 +434,20 @@
 		<!--优惠明细弹窗-->
 		<discountDetails :isShowDiscount="isShowDiscount" @close="closeDiscount" :couponData="couponData">
 		</discountDetails>
+    <uni-popup ref="tipsRef">
+      <view class="tips_popup">
+        <image class="r_c_gb" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/9b08120240131172018671.png"></image>
+        <view class="ref_content">
+          <view class="r_c_title">优惠提示</view>
+          <view class="r_c_text">当前订单金额已大于100元</view>
+          <view class="r_c_text">建议参与惠农供销活动进行购买，下单满100元即可获得红包</view>
+          <view class="r_c_btn">
+            <button class="r_c_btn1">继续支付</button>
+            <button class="r_c_btn2">前往活动</button>
+          </view>
+        </view>
+      </view>
+    </uni-popup>
 	</view>
 </template>
 <script>
@@ -700,8 +714,11 @@
 		onLoad: function(options) {
 			this.type_id = options.type_id
 			this.product_type = options.product_type
-      this.source = options.source
 			this.seckillId = options.seckillId
+      if(options.source) this.source = options.source;
+      else this.$nextTick(()=>{
+        this.$refs.tipsRef.open();
+      })
 			// #ifdef H5
 			this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
 			// #endif
@@ -2626,4 +2643,24 @@
     padding-left: 20rpx;
     font-size: 25rpx;
   }
+  .tips_popup{
+    width: 600rpx;
+    height: 450rpx;
+    position: relative;
+    .r_c_gb{
+      width: 100%;
+      height: 420rpx;
+      margin-top: 30rpx;
+    }
+    .ref_content{
+      position: absolute;
+      left: 0;
+      top: 0;
+      height: 100%;
+      width: 100%;
+      .r_c_title{
+        font-weight: blod;
+      }
+    }
+  }
 </style>
\ No newline at end of file