From d9e5fefdfa01687c4fe8784f93f8ad65ddb80520 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 26 Sep 2024 19:07:08 +0800
Subject: [PATCH 1/7] =?UTF-8?q?Fix=EF=BC=9A2415=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=8E=BF=E5=9F=8E?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E8=B5=84=E8=AE=AF=E5=92=8C?=
 =?UTF-8?q?=E4=BA=A7=E4=B8=9A=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/famousQianxianShop.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 01a506a..c4177ce 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -143,7 +143,7 @@
       <view>
         <!-- 资讯 -->
         <view
-          v-if="activeIndex === 0"
+          v-if="activeIndex === 3"
           class="info-section"
         >
           <view v-if="isLoadInfoListSuccess">
@@ -303,7 +303,7 @@
         </view>
         <!-- 产业 -->
         <view
-          v-if="activeIndex === 3"
+          v-if="activeIndex === 0"
           class="industry-section"
         >
           <view v-if="industryTabIndex === 0">
@@ -628,10 +628,10 @@ export default {
         height: '500rpx'
       },
       tabList: [
-        { text: '资讯', value: 0, isShow: true },
+        { text: '产业', value: 0, isShow: true },
         { text: '文化', value: 1, isShow: true },
         { text: '攻略', value: 2, isShow: true },
-        { text: '产业', value: 3, isShow: true },
+        { text: '资讯', value: 3, isShow: true },
         { text: '产品', value: 4, isShow: true }
       ],
       // 资讯
@@ -856,7 +856,7 @@ export default {
       this.loading = false
       // 刷新数据
       switch (this.activeIndex) {
-        case 0:
+        case 3:
           this.getInfoReq()
           break
         case 2:

From ab5e5659febd36eab15b2adb9b92c615fd24fbbd Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 26 Sep 2024 19:10:14 +0800
Subject: [PATCH 2/7] =?UTF-8?q?Fix=EF=BC=9A2414=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=AF=BB=E8=B6=A3?=
 =?UTF-8?q?=E5=91=B3=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index f6e623e..759ad0e 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -270,7 +270,7 @@ export default {
   //padding-top: 120rpx;
 
   .top-box {
-    padding: 32rpx 0 20rpx;
+    padding: 32rpx 0 0rpx;
     background: #f5f5f5;
 
     .search-box {
@@ -371,7 +371,7 @@ export default {
   padding: 0 20rpx;
   background-color: #f5f5f5;
   .title {
-    padding: 20rpx 0;
+    padding: 0 0 20rpx;
     .img {
       display: block;
       height: 48rpx;

From e81aa3a490d0fd053a83cf58f593fdf0f13c326a Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 26 Sep 2024 20:52:51 +0800
Subject: [PATCH 3/7] =?UTF-8?q?Fix=EF=BC=9A2412=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E7=AA=97=E5=8F=A3=EF=BC=8C=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E5=86=85=E5=AE=B9=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=B3=95=E5=8C=BA=E5=9F=9F=E6=80=BB=E4=BC=9A?=
 =?UTF-8?q?=E6=8C=A1=E4=BD=8F=E8=BE=93=E5=85=A5=E6=A1=86=E7=9A=84=E4=B8=80?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=EF=BC=8C=E5=AE=89=E5=8D=93=E5=92=8C=E8=8B=B9?=
 =?UTF-8?q?=E6=9E=9C=E9=83=BD=E4=BC=9A=E6=9C=89=E8=BF=99=E4=B8=AA=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BC=98=E5=8C=96=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_common/views/room.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg_common/views/room.vue b/pkg_common/views/room.vue
index e622553..60f5586 100644
--- a/pkg_common/views/room.vue
+++ b/pkg_common/views/room.vue
@@ -79,6 +79,8 @@
           confirm-type="send"
           @input="userInput"
           @confirm="userSend"
+          cursor-spacing="15" 
+          :adjust-position="true"
         />
       </view>
       <button @click="userSend" class="v12-primary">发送</button>

From 27d4727f89d8eb51def933e810bd1f0b478f781a Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 26 Sep 2024 21:13:18 +0800
Subject: [PATCH 4/7] =?UTF-8?q?Fix=EF=BC=9A2416=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=AF=BB=E8=B6=A3?=
 =?UTF-8?q?=E5=91=B3=E8=BF=9B=E5=85=A5=E5=BA=97=E9=93=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=90=8E=E8=BF=94=E5=9B=9E=EF=BC=8C=E5=BA=94=E5=81=9C=E7=95=99?=
 =?UTF-8?q?=E5=9C=A8=E5=BD=93=E5=89=8D=E5=88=B7=E5=88=B0=E7=9A=84=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E7=8E=B0=E5=9C=A8=E6=AF=8F=E6=AC=A1=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=83=BD=E4=BC=9A=E5=88=B7=E6=96=B0=E5=88=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 759ad0e..d2e856c 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -162,6 +162,7 @@ export default {
     
   },
   onShow() {
+    const memCityName = uni.getStorageSync('cityName')
     this.page = 1
     this.currType = {}
     this.typeIndex = 0
@@ -171,13 +172,23 @@ export default {
       this.currType = data[this.typeIndex]
       this.getMapData()
     })
-    const memCityName = uni.getStorageSync('cityName')
     if (memCityName.length) {
       this.cityName = memCityName
       uni.removeStorageSync('cityName')
       this.name = ''
     }
   },
+  watch: {
+    cityName: {
+      handler(value) {
+        if(value) {
+          this.search()
+        }
+      },
+      immediate: true,
+      deep: true
+    }
+  },
   methods: {
     goCity() {
       uni.navigateTo({
@@ -197,7 +208,7 @@ export default {
         if(!this.cityName) {
           this.cityName = address[1].data.result.ad_info.city
         }
-        this.search()
+        // this.search()
       }
     },
     tapType(index) {

From 714f5c33406cadfd36ec60f187a45614bfde6374 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 26 Sep 2024 21:32:42 +0800
Subject: [PATCH 5/7] =?UTF-8?q?Fix=EF=BC=9A2413=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=82=B9=E5=87=BB=E6=9B=B4=E5=A4=9A=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E5=86=85=E5=AE=B9=EF=BC=8C=E7=82=B9=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=9C=B0=E6=96=B9=E6=97=A0=E6=B3=95=E6=94=B6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue      | 10 ++++++++--
 pages/order/OrderDetails/index.vue |  8 ++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index d2704df..fbdfcc8 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="my-order v12-mx-2" ref="container">
+  <view class="my-order v12-mx-2" ref="container" @click="handleBody">
     <view class="m-search-wrap v12-mb-2 v12-mt-3">
       <u-search placeholder="请输入商品名/订单号" shape="round" :inputStyle="inputStyle" :showAction="false" bgColor="#FFF" v-model="keyword" @search="changeType"></u-search>
     </view>
@@ -107,7 +107,7 @@
           <view class="group-btn"
                 v-if="(Number(order._status._type) === 2 || Number(order._status._type) === 3) &&
                     order.isTickets === 0">
-            <text class="btn-more v12-font-24" @click="tapShowMore(order,orderListIndex)">更多</text>
+            <text class="btn-more v12-font-24" @click.stop="tapShowMore(order,orderListIndex)">更多</text>
             <view class="group-float" v-show="order.showMore">
               <view class="btn btn-service flex jc-center ai-center v12-font-24" @click="goRoom(order)"
                     v-if="order.merName">联系商家
@@ -309,6 +309,12 @@ export default {
     }
   },
   methods: {
+    handleBody() {
+      this.orderList.forEach((e) => {
+        e.showMore = false
+      })
+      this.$forceUpdate()
+    },
     delOrder(order) {
       delOrderHandle(order.orderId).then(() => {
         // this.goBack()
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 3fd2dcb..2a0d495 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="order-details" style="padding: 30rpx;">
+  <view class="order-details" style="padding: 30rpx;" @click="handleBody">
     <!-- 给header上与data上加on为退款订单-->
     <view class=" v12-pa-3 v12-white" :class="refundOrder ? 'on' : ''" style="border-radius: 20rpx;">
       <!-- <view class="status-img-box">
@@ -344,7 +344,7 @@
           <view class="bnt v12-dark-text v12-dark-border cancel" @click="goRoom(orderInfo)">联系商家</view>
           <view class="v12-justify-between">
             <view class="" style="position: relative">
-              <text class="btn-more v12-font-24 v12-mr-2" @click="showMore = !showMore">更多</text>
+              <text class="btn-more v12-font-24 v12-mr-2" @click.stop="showMore = !showMore">更多</text>
               <view class="group-float" v-show="showMore" :style="{top: orderInfo.isExtendedDelivery==0 ? '-60px' : '-32px'}">
                 <view v-if="orderInfo.isExtendedDelivery==0" class="btn flex jc-center ai-center v12-font-24" @click="toDelay(orderInfo.orderId)">延长收货</view>
                 <view class="btn flex jc-center ai-center v12-font-24" @click="goGoodsReturn(orderInfo)">申请退款</view>
@@ -544,6 +544,10 @@ export default {
   },
   methods: {
     copyClipboard,
+    handleBody() {
+      this.showMore = false
+      this.$forceUpdate()
+    },
     getExpressInfo() {
       let params = {
         orderCode: this.orderInfo.id,

From 1439e1206d9bd6b83bb1527abefab29037905de8 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 26 Sep 2024 21:33:09 +0800
Subject: [PATCH 6/7] =?UTF-8?q?Style=EF=BC=9A=E6=88=91=E7=9A=84=E8=B6=B3?=
 =?UTF-8?q?=E8=BF=B9=E4=BC=98=E6=83=A0=E5=88=B8=E5=AD=97=E4=BD=93=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/History/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/user/History/index.vue b/pages/user/History/index.vue
index ebf63ef..003fcdd 100644
--- a/pages/user/History/index.vue
+++ b/pages/user/History/index.vue
@@ -39,8 +39,8 @@
                   }"
                   class="v12-align-center  v12-mt-2"
                 >
-                  <view class="v12-primary-text v12-primary-border v12-radius-6 v12-font-22 v12-px-1">券</view>
-                  <view class="v12-primary-text v12-primary-border v12-radius-6 v12-font-22 v12-px-1">{{ historyItem.couponName }}</view>
+                  <view class="v12-primary-text v12-primary-border v12-radius-6 v12-font-18 v12-px-1">券</view>
+                  <view class="v12-primary-text v12-primary-border v12-radius-6 v12-font-18 v12-px-1">{{ historyItem.couponName }}</view>
                 </view>
                 <view class="v12-justify-between v12-mt-2 price">
                   <view class="v12-font-bold v12-primary-text v12-align-center">

From c51f177c7c232ebaae6b05bc97364acfe06f0ab5 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Fri, 27 Sep 2024 09:31:31 +0800
Subject: [PATCH 7/7] =?UTF-8?q?Style=EF=BC=9A=E8=AE=A2=E5=8D=95=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E6=8C=89=E9=92=AE=E5=AD=97=E4=BD=93=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index fbdfcc8..b825034 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -107,7 +107,7 @@
           <view class="group-btn"
                 v-if="(Number(order._status._type) === 2 || Number(order._status._type) === 3) &&
                     order.isTickets === 0">
-            <text class="btn-more v12-font-24" @click.stop="tapShowMore(order,orderListIndex)">更多</text>
+            <text class="btn-more v12-font-28 v12-font-bold" @click.stop="tapShowMore(order,orderListIndex)">更多</text>
             <view class="group-float" v-show="order.showMore">
               <view class="btn btn-service flex jc-center ai-center v12-font-24" @click="goRoom(order)"
                     v-if="order.merName">联系商家