From 6b1c9700d631607c4d1ca75af9c5e07e74be3952 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 31 Jan 2024 18:35:35 +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

---
 components/activityCard.vue         | 2 +-
 pages/users/order_confirm/index.vue | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/components/activityCard.vue b/components/activityCard.vue
index 11bb28b..85eb503 100644
--- a/components/activityCard.vue
+++ b/components/activityCard.vue
@@ -49,7 +49,7 @@
 .a_c_home{
   width: 600rpx;
   /* #ifdef H5 */
-  height: 65vh;
+  height: 75vh;
   /* #endif */
   /* #ifndef H5 */
   height: 90vh;
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index d4faff9..bc5d10d 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -1786,7 +1786,7 @@
       },
       // 打开弹窗
       openTipsRef(){
-        if(this.source!=103&&this.source!=105) this.$refs.tipsRef.open();
+        if(this.source!=103&&this.source!=105&&this.totalPrice>=100) this.$refs.tipsRef.open();
         else this.SubOrder();
       },
       // 继续支付
@@ -1799,8 +1799,12 @@
       // 前往活动
       gotoCloud(){
         this.closeTipsRef();
+        let street_id = this.$store.state.storage.address.street_id;
+        let townName = this.$store.state.storage.address.townName;
+        let lat = this.$store.state.storage.location.lat;
+        let long = this.$store.state.storage.location.long;
         uni.navigateTo({
-          url: '/pages/nongKe/cloud_entrepot/indexh'
+          url: `/pages/nongKe/cloud_entrepot/indexh?street_id=${street_id}&townName=${townName}&source=103&location=${lat},${long}`
         })
       }
 		}