Merge branch 'dev_v3_lqw' into dev_v3

# Conflicts:
#	config/app.js

config/app.js

@@ -1,19 +1,14 @@
-let domain = "https://www.shuibeibyg.com/front-api"; // 正式环境IP
-// let domain = "https://test.shuibeibyg.com/front-api"; // 测试环境IP
-
-// let domain = "http://192.168.3.29:8081"; // 宏广IP
+// let domain = "https://www.shuibeibyg.com/front-api"; // 正式环境IP
+let domain = "https://test.shuibeibyg.com/front-api"; // 测试环境IP
 // let domain = 'http://192.168.100.199:8081' // 晋守桦IP
 // let domain = 'http://192.168.100.246:8081' // 韩朝龙IP
-
 let share = "https://www.shuibeibyg.com";
 
-let imgUrl =
-  "https://sb-admin.oss-cn-shenzhen.aliyuncs.com/shuibei-mini/new-mini/"; //服務器上图片地址
+let imgUrl = "https://sb-admin.oss-cn-shenzhen.aliyuncs.com/shuibei-mini/new-mini/" //服務器上图片地址
 
 // export const H5_BASE_URL = "http://192.168.3.10:5174"; // 本地测试
 // export const H5_BASE_URL = "http://192.168.100.35:5175"; // 本地测试
-export const H5_BASE_URL = "https://www.shuibeibyg.com/web-h5/"; // 正式环境H5地址
-// export const H5_BASE_URL = "https://test.shuibeibyg.com/web-h5/"; // 正式环境H5地址
+export const H5_BASE_URL = "https://test.shuibeibyg.com/web-h5/"; // 正式环境H5地址
 
 // PC 后台 API 地址（用于上传图片）
 export const HTTP_ADMIN_URL = domain;

pages/goods/goods_details/index.vue

@@ -197,7 +197,7 @@
 <!--            </view>-->
             <view class="store-card" @click="toStore" v-if="sbMerchantInfo?.id">
               <view class="left">
-                <image class="storeImg" :src="sbMerchantInfo.merchantLogo" mode="aspectFit"></image>
+                <image class="storeImg" :src="sbMerchantInfo.merchantLogo" mode="aspectFill"></image>
               </view>
               <view class="center">
                 <view class="name line1">{{sbMerchantInfo.merchantName}}</view>
@@ -2110,10 +2110,13 @@ action-sheet-item {
   align-items: center;
   margin-top: 30rpx;
   .left{
-    width: 140rpx;
+    width: 100rpx;
+	margin-right: 20rpx;
+	height: 100rpx;
     .storeImg{
       width: 100rpx;
       height: 100rpx;
+	  border-radius: 8rpx;
     }
   }
   .center{

pages/index/index.vue

@@ -45,14 +45,18 @@
               class="swiper-box"
               :list="list1"
               :height="160"
-              image-fit="cover"
+              imgMode="scaleFill"
               indicator
               :radius="10"
               indicatorMode="line"
               :circular="true"
               keyName="url"
               @click="clickSwiper"
-          ></up-swiper>
+		  >
+				<!-- <template v-slot:default="{item}">
+		          <image class="swiper-banner" :src="item.url" mode="heightFix"></image>
+		        </template> -->
+		  </up-swiper>
         </view>
 
       </view>
@@ -795,6 +799,10 @@ page {
   &::v-deep uni-image {
     width: 100%;
   }
+  .swiper-banner{
+	  width: 100%;
+	  height: 160px;
+  }
 }
 
 // 活动专区

pages/merchantCenters/merchant.vue

@@ -7,7 +7,7 @@
       <view class="store-card">
         <view class="info-top">
           <view class="left">
-            <image class="storeImg" :src="merchantInfo.merchantLogo" mode="aspectFit"></image>
+            <image class="storeImg" :src="merchantInfo.merchantLogo" mode="aspectFill"></image>
           </view>
           <view class="center">
             <view class="name">{{merchantInfo.merchantName}}</view>