Merge branch 'dev_v3_lqw' into dev_v3

pages/index/index.vue

@@ -1190,7 +1190,7 @@ page {
       }
 
       .text-info {
-        padding: 10rpx 20rpx 15rpx;
+        padding: 10rpx 20rpx 20rpx;
 
         .title {
           color: #222222;
@@ -1426,7 +1426,7 @@ page {
   .classify-txt {
     font-size: 24rpx;
     color: #666;
-    margin-top: 8rpx;
+    margin-top: 10rpx;
     text-align: center;
     white-space: nowrap;
     overflow: hidden;

pages/users/my_merchant/index.vue

@@ -4,7 +4,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"></image>
         </view>
         <view class="center">
           <view class="name">{{merchantInfo.merchantName}}</view>
@@ -136,7 +136,7 @@ const makePhoneCall = () => {
 
 <style scoped lang="scss">
 .container {
-  padding: 30rpx;
+  padding: 20rpx;
   background-color: #f5f5f5;
   min-height: 100vh;
   box-sizing: border-box;
@@ -234,7 +234,7 @@ const makePhoneCall = () => {
 }
 /* 联系商家部分 */
 .contact-section {
-  margin-top: 30rpx;
+  margin-top: 20rpx;
   padding: 40rpx;
   background-color: #fff;
   border-radius: 24rpx;