Merge branch 'main' of https://gitlab.com/tea28/client

src/components/swiperBanner.vue

@@ -130,7 +130,7 @@
 }
 .ad_swiper-container1 .swiper_box,
 .ad_swiper-container1 .swiper_box .imgsBar{
-    height: 750rpx;
+    height: 92.59vw;
 }
 
 /* 广告图3:1 */

src/pages/account/consignment.vue

@@ -304,7 +304,7 @@ page{background: #F4F4F4;}
 .goods_status{font-size: 30rpx;font-family: "SourceHanSansCN-Medium";}
 .goods_time{font-size: 22rpx;color: #808080;line-height: 1;margin-top: 20rpx;}
 .con{width: 100%;overflow: hidden;padding:30rpx 30rpx 0;box-sizing: border-box;}
-.goods_img{width: 218rpx;height: 152rpx;margin-right: 36rpx;border-radius: 8rpx;}
+.goods_img{width: 150rpx;height: 138.8rpx;margin-right: 36rpx;border-radius: 8rpx;}
 .goods_name{width: 100%;overflow: hidden;font-size: 32rpx;color: #373636;font-family: "SourceHanSansCN-Medium";}
 .goods{width: 100%;overflow: hidden;padding:24rpx 20rpx;box-sizing: border-box;background: #fff;border-radius: 12rpx;margin-bottom: 30rpx;}
 // 寄售列表-end

src/pages/agreement/privacy.vue

@@ -2,7 +2,7 @@
     <div class="box">
         <!-- <div class="tit">隐私协议</div> -->
         <div class="msg">
-            <span class="time">2022年10月24日</span>
+            <span class="time">2022年11月20日</span>
         </div>
         <p>本应用非常重视用户隐私政策并严格遵守相关的法律规定。请您仔细阅读《隐私政策》后再继续使用。如果您继续使用我们的服务，表示您已经充分阅读和理解我们协议的全部内容。</p>
         <p>本小程序尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更优质的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。 您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。</p>

src/pages/autonym-submit/index.vue

@@ -14,6 +14,10 @@
 				<view class="list_name">身份证号:</view>
 				<input class="list_input flex_grow" type="text" v-model="code" placeholder="请输入您的身份证号" />
 			</view>
+			<view class="privacy">
+				<navigator url="/pages/agreement/privacy" hover-class="li_hover"><text>查看《隐私协议》</text></navigator>
+			</view>
+			
 			<view class="btn flex_r flex_ac flex_jc" @tap="submit">提交审核</view>
 		</view>
 		<!-- 提交内容-end -->
@@ -97,6 +101,14 @@
 		background: #f4f4f4;
 	}
 
+	.privacy{
+		margin-top:20rpx;
+		text-align: right;
+		text{
+			color: #17bb87;
+		}
+	}
+
 	// 提示信息-end
 
 	// 提交内容

src/pages/index/index.vue

@@ -396,7 +396,7 @@ export default {
   .product-image {
     border-radius: 10rpx 10rpx 0 0;
     width: 100%;
-    height: 260rpx;
+    height:42.3vw;
     object-fit: cover;
   }
 

src/pages/product/p_details.vue

@@ -2,7 +2,7 @@
   <view class="container">
     <!-- 轮播图 -->
     <swiper-banner
-      imgScale="25:17"
+      imgScale="1:1"
       :imgArr="detail.goods_img"
       :duration="1000"
       :interval="5000"
@@ -519,7 +519,7 @@ page {
 }
 .goods_img {
   width: 202rpx;
-  height: 140rpx;
+  height: 187rpx;
   margin-right: 30rpx;
   border-radius: 12rpx;
 }

src/pages/product/productRetail.vue

@@ -146,7 +146,7 @@ page {
 
 .goods_img {
     width: 100%;
-    height: 232rpx;
+    height: 41vw;
     display: block;
 }
 
@@ -183,7 +183,7 @@ page {
 }
 
 .goods {
-    width: calc((100% - 22rpx) / 2);
+    width: 48%;
     overflow: hidden;
     margin-right: 22rpx;
     margin-bottom: 22rpx;
@@ -247,7 +247,7 @@ page {
 
 .goods_imgs {
     width: 202rpx;
-    height: 183rpx;
+    height: 187rpx;
     margin-right: 30rpx;
     border-radius: 12rpx;
 }

src/pages/product/productTeaBaby.vue

@@ -126,13 +126,13 @@ page {
 }
 
 .list_info {
-  width: calc(100% - 326rpx - 36rpx);
+  width: calc(100% - 200rpx);
   overflow: hidden;
 }
 
 .list_img {
-  width: 300rpx;
-  height: 200rpx;
+  width: 200rpx;
+  height:180rpx;
   margin-right: 35rpx;
   border-radius: 12rpx;
 }

src/pages/product/productWholesale.vue

@@ -117,13 +117,13 @@ page {
 }
 
 .list_info {
-    width: calc(100% - 326rpx - 36rpx);
+    width: calc(100% - 200rpx);
     overflow: hidden;
 }
 
 .list_img {
-    width: 300rpx;
-    height: 200rpx;
+    width: 200rpx;
+    height:180rpx;
     margin-right: 35rpx;
     border-radius: 12rpx;
 }

src/pages/sign/index.vue

@@ -495,7 +495,7 @@ page {
   .product-image {
     border-radius: 10rpx 10rpx 0 0;
     width: 100%;
-    height: 260rpx;
+    height:41vw;
     object-fit: cover;
   }
 

src/pages/szw-order-details/index.vue

@@ -511,7 +511,7 @@ page {
 
 .goods-img-container .img-box {
     width: 170rpx;
-    height: 118.56rpx;
+    height: 183.6rpx;
     background-color: #f7f7f7;
     overflow: hidden;
     float: left;
@@ -526,7 +526,7 @@ page {
     width: calc(100% - 194rpx);
     line-height: 1.5;
     position: relative;
-    height: 118rpx;
+    height:190rpx;
 }
 
 .goodsDetail_info .goods_name {

src/pages/szw-order-list/index.vue

@@ -20,7 +20,7 @@
                         <view class="goods-info flex_r flex_ac flex_jb" :data-type="li.type" @tap="toDetails(li)">
                             <view class="goods-info-bar overflow flex_r flex_ac">
                                 <view class="imgs_bar img-box">
-                                    <image :src="li.original_img" mode="" class="goods-img"></image>
+                                    <image :src="li.original_img" mode="cover" class="goods-img"></image>
                                 </view>
                                 <view class="goods_name ellipsis2">{{ li.goods_name || "" }}</view>
                             </view>
@@ -425,8 +425,8 @@ page {
 }
 
 .goods-info .img-box {
-    width: 172rpx;
-    height: 120rpx;
+    width: 150rpx;
+    height: 138.8rpx;
     overflow: hidden;
     background-color: #fff;
     border-radius: 12rpx;

src/pages/to-pay-list/index.vue

@@ -398,7 +398,7 @@ page {
 
 .goods_img {
   width: 202rpx;
-  height: 140rpx;
+  height: 187rpx;
   margin-right: 36rpx;
   border-radius: 12rpx;
 }