Merge branch 'edit' into sit

dist/static/vant@2.12.23.min.css

@@ -4189,7 +4189,7 @@ ul {
 
 .van-button--normal {
     padding: 0 15px;
-    font-size: 14px
+    font-size: 16px
 }
 
 .van-button--small {

public/static/vant@2.12.23.min.css

@@ -4189,7 +4189,7 @@ ul {
 
 .van-button--normal {
     padding: 0 15px;
-    font-size: 14px
+    font-size: 16px
 }
 
 .van-button--small {

src/views/address/component/addrList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="addrList" >
+  <div class="addrList">
     <div
       class="addressList"
       v-for="(n, i) in cardData.length"
@@ -126,6 +126,13 @@ export default {
         })
         .catch(() => {
           // on cancel
+          this.cardData.map((ele) => {
+            if (ele.id === e) {
+              ele.isShow = false;
+            } else {
+              ele.isShow = true;
+            }
+          });
         });
     },
     async searchList() {

src/views/login/index.vue

@@ -68,15 +68,17 @@
                   placeholder="请输入密码"
                   :rules="[{ validator: asyncpwodValidator }]"
                   :type="!passwordStatus ? 'password' : 'text'"
-                  :right-icon="!passwordStatus ? 'eye-o' : 'closed-eye'"
                   @click-right-icon="showPassword"
                 >
+                  <!--  :right-icon="!passwordStatus ? 'eye-o' : 'closed-eye'" -->
                 </van-field>
-              </li> </van-col
-          ></van-row>
+              </li>
+            </van-col></van-row
+          >
         </ul>
 
         <van-button
+          style="font-size: 16px; font-weight: 400"
           class="login-form-button"
           block
           type="info"
@@ -274,7 +276,7 @@ export default {
         //登陆字体的盒子
         // margin: 0px 0 0 0;
         // font-weight: bold;
-        padding: 0px 211px 0px 55px;
+        padding: 0px 211px 0px 28.5px;
         // width: 81px;
         // height: 37px;
         // font-size: 20px;
@@ -297,7 +299,7 @@ export default {
         // left: 0;
         // top: 0;
         // padding-top: 0;
-        padding: 40px 211px 0px 55px;
+        padding: 40px 211px 0px 28.5px;
         // width: 97px;
         // height: 12px;
         // font-size: 12px;
@@ -446,16 +448,12 @@ export default {
     justify-content: center;
     position: absolute;
     left: 0;
-    bottom: 20px;
+    bottom: 40px;
   }
   .footer {
-    width: 90vw;
-    height: 57.5px;
-
+    width: 325.5px;
     img {
       width: 100%;
-      height: 57.5px;
-
       // border-radius: 10px;
     }
   }
@@ -463,6 +461,12 @@ export default {
     .login-main .login-form.van-form ul {
       top: -25px;
     }
+    .footer {
+      width: 270.5px;
+    }
+    .footerP {
+      bottom: 20px;
+    }
   }
   @media screen and (min-width: 414px) {
     .login-main .login-form.van-form ul {

src/views/paddy/index.vue

@@ -12,7 +12,7 @@
         indicator-color="#DAAD71"
         @change="onChange"
       >
-        <van-swipe-item style="width: 100vw">
+        <van-swipe-item style="width: 90vw">
           <img
             src="@/assets/images/home/swipper/swipper1.png"
             alt=""
@@ -59,10 +59,17 @@
     <div class="detail">
       <p>产品展示</p>
 
-      <li>
+      <li @click="goto('/referMenu', '五常大米-实惠装')">
+        <div class="riceBag">
+          <p class="riceBag-title">实惠装</p>
+        </div>
+
         <img src="@/assets/images/home/detail/bag.png" alt="" />
       </li>
-      <li>
+      <li @click="goto('/referMenu', '五常大米-礼盒装')">
+        <div class="riceBox">
+          <p class="riceBox-title">礼盒装</p>
+        </div>
         <img src="@/assets/images/home/detail/box.png" alt="" />
       </li>
       <!-- <img src="@/assets/images/home/paddy-title.png" alt="" /> -->
@@ -125,7 +132,7 @@
             </div>
           </van-col>
         </van-col>
-        <van-col span="12" style="padding: 5px 0px 0px 0">
+        <van-col span="12" style="padding: 8px 0px 0px 0">
           <div class="cardFour" @click="goto('/referMenu', '自然耕种')">
             <img
               src="@/assets/images/home/middle/cardTwo.png"
@@ -139,7 +146,7 @@
             </div>
           </div>
         </van-col>
-        <van-col span="12" style="padding: 5px 0 0px 0px">
+        <van-col span="12" style="padding: 8px 0 0px 0px">
           <div class="cardFive" @click="goto('/referMenu', '生态有机')">
             <img
               src="@/assets/images/home/middle/cardTwo.png"
@@ -227,11 +234,11 @@ export default {
     }
   }
   .top {
-    width: 100vw;
+    width: 90vw;
     height: 26.5vh;
     margin: 34.5px auto 0 auto;
     img {
-      width: 100%;
+      width: 90vw;
     }
   }
   .bottom {
@@ -340,6 +347,49 @@ export default {
       img {
         width: 100%;
       }
+      .riceBag {
+        width: 43px;
+        height: 14px;
+        background: #613c0c;
+        border-radius: 10px 0;
+        text-align: center;
+        position: absolute;
+        left: 8px;
+        top: 25px;
+
+        .riceBag-title {
+          // width: 26.5px;
+          width: 36.5px;
+          height: 8.5px;
+          font-size: 0.5rem;
+          font-family: Source Han Sans CN;
+          font-weight: 150;
+          color: #f1cda9;
+          line-height: 13px;
+        }
+      }
+      .riceBox {
+        width: 43px;
+        height: 14px;
+        background: #613c0c;
+        border-radius: 10px 0;
+        text-align: center;
+        position: absolute;
+        right: 120px;
+        top: 25px;
+
+        .riceBox-title {
+          // width: 26.5px;
+          width: 36.5px;
+          height: 8.5px;
+          font-size: 0.75rem;
+
+          font-family: Source Han Sans CN;
+          font-weight: 150;
+          color: #f1cda9;
+          line-height: 13px;
+        }
+      }
     }
   }
   .middle {
@@ -383,7 +433,7 @@ export default {
         top: 9vh;
         left: 4vw;
         // margin: 1vh 0 0 6vw;
-        width: 59px;
+        width: 48px;
         height: 24px;
         font-size: 11px;
         font-family: Source Han Sans CN;
@@ -402,11 +452,11 @@ export default {
         span {
           width: 28px;
           height: 6.5px;
-          font-size: 7px;
+          font-size: 0.6rem;
           font-family: Source Han Sans CN;
           font-weight: 300;
           color: #c5a06b;
-          line-height: 16px;
+          line-height: 11.5px;
           background: linear-gradient(0deg, #a57d50 0%, #e3d097 100%);
           -webkit-background-clip: text;
           -webkit-text-fill-color: transparent;
@@ -427,7 +477,7 @@ export default {
       // align-items: center;
       .first {
         position: absolute;
-        left: 47vw;
+        left: 44vw;
         top: 16vh;
         margin: -9vh 0 0 5vw;
         width: 60px;
@@ -436,14 +486,14 @@ export default {
         font-family: Source Han Sans CN;
         font-weight: 500;
         color: #613c0c;
-        line-height: 3px;
+        line-height: 6px;
       }
       .second {
         position: absolute;
         left: 47vw;
         top: 9vh;
         margin: 0 0 0 5vw;
-        width: 59px;
+        width: 48px;
         height: 24px;
         font-size: 11px;
         font-family: Source Han Sans CN;
@@ -476,14 +526,14 @@ export default {
         font-family: Source Han Sans CN;
         font-weight: 500;
         color: #613c0c;
-        line-height: 3px;
+        line-height: 6px;
       }
       .second {
         position: absolute;
         left: 50vw;
         top: 16vh;
 
-        width: 59px;
+        width: 48px;
         height: 24px;
         font-size: 11px;
         font-family: Source Han Sans CN;
@@ -522,9 +572,9 @@ export default {
         top: 9vh;
         left: 4vw;
         // margin: 1vh 0 0 6vw;
-        width: 59px;
+        width: 48px;
         height: 24px;
-        font-size: 11px;
+        font-size: 0.5rem;
         font-family: Source Han Sans CN;
         font-weight: 300;
         color: #613c0c;
@@ -545,10 +595,8 @@ export default {
       // align-items: center;
       .first {
         position: absolute;
-
         left: 45vw;
         top: 40vh;
-
         margin: -9vh 0 0 5vw;
         width: 60px;
         height: 14.5px;
@@ -556,20 +604,20 @@ export default {
         font-family: Source Han Sans CN;
         font-weight: 500;
         color: #613c0c;
-        line-height: 3px;
+        line-height: 6px;
       }
       .second {
         position: absolute;
         left: 45vw;
         top: 33vh;
         margin: 0 0 0 5vw;
-        width: 59px;
+        width: 48px;
         height: 24px;
         font-size: 11px;
         font-family: Source Han Sans CN;
         font-weight: 300;
         color: #613c0c;
-        line-height: 15px;
+        line-height: 12px;
       }
       img {
         width: 100%;
@@ -578,60 +626,74 @@ export default {
         width: 14vw;
         position: absolute;
         left: 70vw;
-        top: 31vh;
+        top: 30vh;
       }
     }
   }
 
-  @media screen and (min-width: 320px) {
-    .productPack .box p {
-      margin: 7.5px 0 7px 4px;
-    }
-    .productPack .box span {
-      margin: 12.5px 0 0px 8px;
+  @media screen and (max-width: 320px) {
+    .productPack .box {
+      p {
+        margin: 7.5px 0 7px 4px;
+      }
+      span {
+        margin: 12.5px 0 0px 8px;
+      }
     }
-    .middle .card .first {
-      font-size: 14px;
-      left: 3vw;
-      top: 9vh;
+    .middle .card {
+      .first {
+        font-size: 0.9rem;
+        left: 3vw;
+        top: 9vh;
+      }
+      .second {
+        top: 12vh;
+        left: 3vw;
+        font-size: 0.7rem;
+      }
+      .lastP {
+        top: 18vh;
+        left: 4vw;
+        span {
+          font-size: 0.6rem;
+        }
+      }
     }
+
     .middle .camera {
       left: 22vw;
       top: 8vh;
     }
-    .middle .card .second {
-      top: 12vh;
-      left: 3vw;
-      font-size: 12px;
-    }
-    .middle .card .lastP {
-      top: 18vh;
-      left: 4vw;
-      span {
-        font-size: 12px;
+
+    .middle .cardTwo {
+      .first {
+        left: 45vw;
+        top: 16vh;
+        font-size: 14px;
+      }
+      .second {
+        left: 45vw;
+        top: 9vh;
       }
     }
-    .middle .cardTwo .first {
-      left: 45vw;
-      top: 16vh;
-      font-size: 14px;
-    }
+
     .middle .keepAlive {
       width: 11.5vw;
       left: 70vw;
       top: 6vh;
     }
-    .middle .cardTwo .second {
-      left: 45vw;
-      top: 9vh;
-    }
-    .middle .cardFour .first {
-      left: 4vw;
-      top: 32vh;
-    }
-    .middle .cardFour .second {
-      top: 34vh;
-      left: 4vw;
+    .middle .cardFour {
+      .first {
+        font-size: 0.9rem;
+
+        left: 4vw;
+        top: 32vh;
+      }
+      .second {
+        font-size: 0.5rem;
+        top: 34vh;
+        left: 4vw;
+      }
     }
 
     //
@@ -649,10 +711,14 @@ export default {
     }
     .middle .cardFive .first {
       top: 41vh;
+      font-size: 0.9rem;
     }
     .middle .cardFive .second {
       top: 34vh;
     }
+    .detail li .riceBox {
+      right: 94px;
+    }
   }
   @media screen and (min-width: 375px) {
     .middle .card .first {
@@ -669,16 +735,16 @@ export default {
       top: 17vh;
       left: 5vw;
       span {
-        font-size: 12px;
+        font-size: 0.6rem;
       }
     }
     .middle .cardTwo {
       .first {
-        left: 47vw;
+        left: 44vw;
         top: 16vh;
       }
       .second {
-        left: 47vw;
+        left: 44vw;
         top: 9vh;
       }
       .keepAlive {
@@ -694,11 +760,11 @@ export default {
     }
     .middle .cardThree {
       .first {
-        left: 50vw;
+        left: 48vw;
         top: 19vh;
       }
       .second {
-        left: 50vw;
+        left: 48vw;
         top: 21vh;
       }
     }
@@ -718,45 +784,71 @@ export default {
     }
     .middle .cardFive {
       .first {
+        left: 44vw;
         top: 40vh;
       }
       .second {
+        left: 44vw;
         top: 33vh;
       }
     }
   }
   @media screen and (min-width: 414px) {
+    .middle .card .second {
+      font-size: 11px;
+    }
     .middle .card .first {
       // margin-top: 27px;
       font-size: 18px;
       left: 4vw;
       top: 9vh;
     }
-    .middle .cardTwo .first {
-      left: 47vw;
-      top: 15vh;
+    .middle .cardTwo {
+      .first {
+        left: 44vw;
+        top: 15vh;
+      }
+      .second {
+        left: 44vw;
+        top: 8vh;
+      }
     }
+
     .middle .keepAlive {
       width: 11.5vw;
       left: 70vw;
       top: 5vh;
     }
-    .middle .cardTwo .second {
-      left: 47vw;
-      top: 8vh;
-    }
+
     //
     .middle .freshRice {
       top: 16vh;
       left: 70vw;
     }
-    .middle .cardThree .first {
-      left: 50vw;
-      top: 18vh;
+    .middle .cardThree {
+      .first {
+        left: 50vw;
+        top: 18vh;
+      }
+      .second {
+        left: 50vw;
+        top: 20vh;
+      }
     }
-    .middle .cardThree .second {
-      left: 50vw;
-      top: 20vh;
+    .middle .cardThree {
+      .first,
+      .second {
+        left: 48vw;
+      }
+    }
+    .middle .cardFive {
+      .first,
+      .second {
+        left: 44vw;
+      }
+    }
+    .detail li .riceBox {
+      right: 137px;
     }
   }
   @media screen and (min-height: 812px) {
@@ -782,7 +874,7 @@ export default {
       }
     }
     .middle .cardTwo .first {
-      left: 47vw;
+      left: 44vw;
       top: 14vh;
     }
     .middle .cardTwo .keepAlive {
@@ -791,7 +883,7 @@ export default {
       top: 4vh;
     }
     .middle .cardTwo .second {
-      left: 47vw;
+      left: 44vw;
       top: 7vh;
     }
     //
@@ -800,11 +892,11 @@ export default {
       left: 70vw;
     }
     .middle .cardThree .first {
-      left: 50vw;
+      left: 47vw;
       top: 15vh;
     }
     .middle .cardThree .second {
-      left: 50vw;
+      left: 47vw;
       top: 17vh;
     }
     .middle .cardFour .first {
@@ -819,14 +911,17 @@ export default {
       left: 26vw;
       top: 25vh;
     }
-    .middle .cardFive .first {
-      top: 35vh;
-    }
-    .middle .cardFive .second {
-      top: 28vh;
-    }
-    .middle .cardFive .organic {
-      top: 25vh;
+
+    .middle .cardFive {
+      .first {
+        top: 35vh;
+      }
+      .second {
+        top: 28vh;
+      }
+      .organic {
+        top: 25vh;
+      }
     }
   }
 }