From 97ba913d7d3e359ecb6f3c155a87241fdbb66b16 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 31 Jan 2024 18:06:30 +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/order_confirm/index.vue | 74 +++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 8 deletions(-)

diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index b056900..d4faff9 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -413,7 +413,7 @@
 					</view>
 				</view>
 				<view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100'
-					@tap="SubOrder">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view>
+					@tap="openTipsRef">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view>
 			</view>
 		</view>
 		<block v-if="coupon.status">
@@ -442,10 +442,11 @@
           <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>
+            <button class="r_c_btn1" @click="closeAndSubOrder">继续支付</button>
+            <button class="r_c_btn2" @click="gotoCloud">前往活动</button>
           </view>
         </view>
+        <image class="r_c_close" @click.stop="closeTipsRef" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d39b4202401311747186525.png"></image>
       </view>
     </uni-popup>
 	</view>
@@ -716,9 +717,6 @@
 			this.product_type = options.product_type
 			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
@@ -1551,7 +1549,7 @@
 			getTime(index) {
 				this.virtualIndex = index;
 			},
-			SubOrder: function(e) {
+			SubOrder: function() {
 
 				let that = this,
 					data = {};
@@ -1781,7 +1779,30 @@
 					// #ifdef H5
 				}
 				//#endif
-			}
+			},
+      // 关闭弹窗
+      closeTipsRef(){
+        this.$refs.tipsRef.close();
+      },
+      // 打开弹窗
+      openTipsRef(){
+        if(this.source!=103&&this.source!=105) this.$refs.tipsRef.open();
+        else this.SubOrder();
+      },
+      // 继续支付
+      closeAndSubOrder(){
+        this.closeTipsRef();
+        this.$nextTick(()=>{
+          this.SubOrder();
+        })
+      },
+      // 前往活动
+      gotoCloud(){
+        this.closeTipsRef();
+        uni.navigateTo({
+          url: '/pages/nongKe/cloud_entrepot/indexh'
+        })
+      }
 		}
 	}
 </script>
@@ -2658,9 +2679,46 @@
       top: 0;
       height: 100%;
       width: 100%;
+      box-sizing: border-box;
+      padding: 120rpx 30rpx 30rpx 30rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      color: #2E2E2E;
+      font-size: 28rpx;
       .r_c_title{
         font-weight: blod;
       }
+      .r_c_text{
+        font-size: 26rpx;
+      }
+      .r_c_btn{
+        display: flex;
+        justify-content: space-around;
+        .r_c_btn1{
+          background-color: transparent;
+          border: 5rpx solid #FF874C;
+          color: #FF874C;
+          font-size: 28rpx;
+          padding: 5rpx 28rpx;
+          border-radius: 60rpx;
+        }
+        .r_c_btn2{
+          background-color: #FF874C;
+          border: 5rpx solid #FF874C;
+          color: #fff;
+          font-size: 28rpx;
+          padding: 5rpx 28rpx;
+          border-radius: 60rpx;
+        }
+      }
+    }
+    .r_c_close{
+      position: absolute;
+      top: 0;
+      right: 0;
+      height: 60rpx;
+      width: 60rpx;
     }
   }
 </style>
\ No newline at end of file