From 0f6fdff8fe6a50e68ad34bd1824a6c41ac32cb5e Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Mon, 29 Apr 2024 17:17:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9=20=20?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E8=8A=82=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                          |  2 --
 manifest.json                    |  4 ++--
 pages/goods_details/index.vue    | 16 ++--------------
 pages/users/order_list/index.vue |  9 ++++-----
 pages/users/refund/confirm.vue   |  2 +-
 5 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/App.vue b/App.vue
index 3705ce8..eb29ee3 100644
--- a/App.vue
+++ b/App.vue
@@ -537,7 +537,6 @@
 	/*#endif*/
 	// 圆形指示点
 	.circular {
-
 		/deep/.uni-swiper-dot,
 		/deep/.wx-swiper-dot {
 			width: 10rpx;
@@ -553,7 +552,6 @@
 
 	// 方形指示点
 	.square {
-
 		/deep/.uni-swiper-dot,
 		/deep/.wx-swiper-dot {
 			width: 20rpx;
diff --git a/manifest.json b/manifest.json
index 8f5f632..c059140 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "2.0.39",
-    "versionCode" : 2039,
+    "versionName" : "2.0.41",
+    "versionCode" : 2041,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 0d553ff..d5b93c1 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -87,7 +87,6 @@
 								</view>
 							</view>
 
-
 							<view v-if="!storeInfo.atmosphere_pic" class='integral_count skeleton-rect' style="">
 								<text v-if="storeInfo.max_integral > 0" class='integral'
 									style="margin-top: 0;">积分最高可抵扣{{storeInfo.max_integral}}元</text>
@@ -158,12 +157,7 @@
 								{{storeInfo.store_info}}
 							</view>
 						</view>
-						<!-- <view class='attribute acea-row row-between-wrapper skeleton-rect'>
-              <view class="acea-row row-between-wrapper">{{attrTxt}}：
-                <text class='atterTxt'>{{attrValue}}</text>
-              </view>
-              <view class='iconfont icon-jiantou'></view>
-            </view> -->
+						
 						<view v-if="specsInfo.params && specsInfo.params.length>0"
 							class="attribute acea-row row-between-wrapper" @click="seeSpecs">
 							<view class="acea-row row-middle">
@@ -269,17 +263,11 @@
 									:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
 									hover-class="none" class="info">
 									<view class="name line1">
-										<text>{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}</text>
+										<text class="line1" style="max-width:450rpx;">{{storeInfo.merchant.mer_name ? storeInfo.merchant.mer_name : ''}}</text>
 										<image
 											v-if="margin_ico_switch==1 && margin_ico && storeInfo.merchant.is_margin == 10"
 											:src="margin_ico" class="store-margin"></image>
-										<!-- <text v-if="storeInfo.merchant.type_name" class="font-bg-red ml8 bt-color">{{storeInfo.merchant.type_name}}</text>
-										<text v-else-if="storeInfo.merchant.is_trader" class="font-bg-red ml8 bt-color">自营</text> -->
 									</view>
-									<!-- <view v-if="storeInfo.merchant.care_count" class="txt">
-                    {{storeInfo.merchant.care_count < 10000 ? storeInfo.merchant.care_count : (storeInfo.merchant.care_count/10000).toFixed(2)+'万'}}人关注
-                  </view>
-                  <view v-else class="txt">0人关注</view> -->
 								</navigator>
 								<navigator v-if="hide_mer_status != 1"
 									:url="`/pages/store/home/index?id=${storeInfo.mer_id}&sale_type=${sale_type||1}`"
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 2fba218..d009704 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -106,9 +106,7 @@
 								<view class='title acea-row row-between-wrapper'>
 									<view class="acea-row row-middle left-wrapper">
 										<text class="iconfont icon-shangjiadingdan"></text>
-										<view class="store-name">
-											<view>{{item.orderList[0].merchant.mer_name}}</view>
-										</view>
+										<view class="store-name line1">{{item.orderList[0].merchant.mer_name}}</view>
 										<text class="iconfont icon-xiangyou"></text>
 									</view>
 									<view class='t-color'>
@@ -215,8 +213,8 @@
 								<view class='title acea-row row-between-wrapper'>
 									<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
 										<text class="iconfont icon-shangjiadingdan"></text>
-										<view class="store-name">
-											<view>{{item.merchant.mer_name}}</view>
+										<view class="store-name line1">
+											{{item.merchant.mer_name}}
 										</view>
 										<text class="iconfont icon-xiangyou"></text>
 									</view>
@@ -1106,6 +1104,7 @@
 			}
 
 			.store-name {
+				max-width: 400rpx;
 				margin: 0 10rpx;
 			}
 
diff --git a/pages/users/refund/confirm.vue b/pages/users/refund/confirm.vue
index 49080c8..71772cf 100644
--- a/pages/users/refund/confirm.vue
+++ b/pages/users/refund/confirm.vue
@@ -61,7 +61,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="btn-box" @click="bindComfirm">申请退款</view>
+		<view class="btn-box" @click="$u.throttle(bindComfirm, 1000)">申请退款</view>
 		<alertBox :msg="msg" v-if="isShowBox" @bindClose="bindClose"></alertBox>
 	</view>
 </template>