五常h5

src/components/inputNumber.vue

@@ -62,8 +62,8 @@ export default {
     jia() {
       this.leix();
       this.num++;
-      this.num = parseInt(this.num);
 
+      this.num = parseInt(this.num);
       if (this.num < this.max) {
         this.num++;
         this.$emit("backNum", this.num);

src/views/address/component/addrList.vue

@@ -4,7 +4,7 @@
       class="addressList"
       v-for="(n, i) in cardData.length"
       :key="i"
-      @click="handleSelect(cardData[i])"
+      @click.stop="handleSelect(cardData[i])"
     >
       <div class="addressDetai">
         <div class="addrTitle">
@@ -28,7 +28,7 @@
             />
             <span>删除</span>
           </div>
-          <div class="edit" @click="selected">
+          <div class="edit" @click.stop="handleEdit(cardData[i])">
             <img src="@/assets/images/delete/select.png" />
 
             <span>编辑</span>
@@ -85,6 +85,9 @@ export default {
     });
   },
   methods: {
+    handleEdit(e) {
+      this.$emit("edit", e);
+    },
     handleSelect(e) {
       this.$emit("select", e);
     },

src/views/address/view.vue

@@ -12,6 +12,7 @@
       :area-list="areaList"
       :show-postal="false"
       :show-delete="false"
+      :tel-validator="validator"
       :address-info="addressInfo"
       :show-set-default="false"
       :show-search-result="false"
@@ -31,6 +32,7 @@ export default {
   mixins: [resToken],
   data() {
     return {
+      // /^1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(s)
       id: "0",
       title: "",
       areaList: areaList,
@@ -56,6 +58,16 @@ export default {
     }
   },
   methods: {
+    validator(e) {
+      let myreg1 = /^[1][3,4,5,7,8][0-9]{9}$/;
+      let myreg2 = /^[2][3,4,5,7,8][0-9]{6}$/;
+      if (!myreg1.test(e) && !myreg2.test(e)) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+
     onClickLeft() {
       window.history.back(-1);
     },

src/views/live/index.vue

@@ -140,7 +140,7 @@ export default {
   .videoList {
     padding: 0 16px 60px 16px;
     box-sizing: border-box;
-    background: transparent;
+    background: #e6e6dc;
     position: relative;
     height: auto;
     width: 100%;

src/views/login/index.vue

@@ -452,6 +452,7 @@ export default {
   }
   .footer {
     width: 325.5px;
+    transform: scale(1.2);
     img {
       width: 100%;
       // border-radius: 10px;
@@ -463,15 +464,25 @@ export default {
     }
     .footer {
       width: 270.5px;
+      transform: scale(1);
     }
     .footerP {
       bottom: 20px;
     }
   }
+  @media screen and (min-width: 320px) {
+    .footer {
+      width: 270.5px;
+      transform: scale(1.2);
+    }
+  }
   @media screen and (min-width: 414px) {
     .login-main .login-form.van-form ul {
       top: -10px;
     }
+    .footer {
+      transform: scale(1.3);
+    }
   }
   @media screen and (min-height: 812px) {
     .login-main .login-form.van-form ul {

src/views/my/index.vue

@@ -221,6 +221,7 @@ export default {
     position: relative;
     box-sizing: border-box;
     width: 100%;
+    height: 100vh;
     background: #e6e6dc;
 
     .mine-resume-main {

src/views/paddy/index.vue

@@ -82,7 +82,7 @@
         <van-col
           span="12"
           style="padding: 2px 0px 0px 0"
-          @click="goto('/referMenu', '实时监控')"
+          @click="goto('/live', '实时监控')"
         >
           <div class="card">
             <img
@@ -93,7 +93,7 @@
             <p class="first">实时监控</p>
             <p class="second">全程溯源信赖保证</p>
             <div class="lastP">
-              <span>查看更多</span>
+              <p>查看更多</p>
             </div>
           </div>
           <div class="camera">
@@ -356,16 +356,20 @@ export default {
         position: absolute;
         left: 8px;
         top: 25px;
-
+        display: flex;
+        justify-content: center;
+        align-items: center;
         .riceBag-title {
+          margin: 0;
           // width: 26.5px;
+          transform: scale(0.8);
           width: 36.5px;
-          height: 8.5px;
+          height: 17.5px;
           font-size: 0.5rem;
           font-family: Source Han Sans CN;
           font-weight: 150;
           color: #f1cda9;
-          line-height: 13px;
+          line-height: 16.5px;
         }
       }
       .riceBox {
@@ -377,17 +381,19 @@ export default {
         position: absolute;
         right: 120px;
         top: 25px;
-
+        display: flex;
+        justify-content: center;
+        align-items: center;
         .riceBox-title {
+          margin: 0;
           // width: 26.5px;
+          transform: scale(0.8);
           width: 36.5px;
-          height: 8.5px;
+          height: 17.5px;
           font-size: 0.75rem;
-
           font-family: Source Han Sans CN;
           font-weight: 150;
           color: #f1cda9;
-          line-height: 13px;
         }
       }
     }
@@ -449,10 +455,16 @@ export default {
         position: absolute;
         top: 15vh;
         left: 4vw;
-        span {
-          width: 28px;
-          height: 6.5px;
-          font-size: 0.6rem;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        p {
+          margin: 0;
+          transform: scale(0.8);
+          width: 48px;
+          height: 12px;
+          line-height: 12px;
+          font-size: 0.5rem;
           font-family: Source Han Sans CN;
           font-weight: 300;
           color: #c5a06b;
@@ -631,113 +643,98 @@ export default {
     }
   }
 
-  @media screen and (max-width: 320px) {
-    .productPack .box {
-      p {
-        margin: 7.5px 0 7px 4px;
-      }
-      span {
-        margin: 12.5px 0 0px 8px;
-      }
-    }
+  @media screen and (max-width: 414px) {
     .middle .card {
       .first {
-        font-size: 0.9rem;
-        left: 3vw;
-        top: 9vh;
+        // margin-top: 27px;
+        font-size: 18px;
+        left: 4vw;
+        top: 7vh;
       }
       .second {
-        top: 12vh;
-        left: 3vw;
-        font-size: 0.7rem;
+        font-size: 11px;
       }
       .lastP {
-        top: 18vh;
-        left: 4vw;
-        span {
-          font-size: 0.6rem;
-        }
+        left: 18px;
       }
     }
 
-    .middle .camera {
-      left: 22vw;
-      top: 8vh;
-    }
-
     .middle .cardTwo {
       .first {
-        left: 45vw;
-        top: 16vh;
-        font-size: 14px;
+        left: 44vw;
+        top: 15vh;
       }
       .second {
-        left: 45vw;
-        top: 9vh;
+        left: 44vw;
+        top: 8vh;
+      }
+      .keepAlive {
+        width: 11.5vw;
+        left: 70vw;
+        top: 5vh;
       }
     }
 
-    .middle .keepAlive {
-      width: 11.5vw;
+    //
+    .middle .freshRice {
+      top: 16vh;
       left: 70vw;
-      top: 6vh;
     }
-    .middle .cardFour {
+    .middle .cardThree {
       .first {
-        font-size: 0.9rem;
-
-        left: 4vw;
-        top: 32vh;
+        left: 48vw;
+        top: 18vh;
       }
       .second {
-        font-size: 0.5rem;
-        top: 34vh;
-        left: 4vw;
+        left: 48vw;
+        top: 20vh;
       }
     }
-
-    //
-    .middle .freshRice {
-      top: 18vh;
-      left: 70vw;
-    }
-    .middle .cardThree .first {
-      left: 48vw;
-      top: 19vh;
-    }
-    .middle .cardThree .second {
-      left: 48vw;
-      top: 21vh;
-    }
-    .middle .cardFive .first {
-      top: 41vh;
-      font-size: 0.9rem;
+    .middle .cardFour {
+      .first {
+        left: 16px;
+        top: 230px;
+      }
+      .second {
+        left: 16px;
+        top: 242px;
+      }
+      .normalGrow {
+        left: 25vw;
+        top: 30vh;
+      }
     }
-    .middle .cardFive .second {
-      top: 34vh;
+    .middle .cardFive {
+      .first,
+      .second {
+        left: 44vw;
+      }
     }
     .detail li .riceBox {
-      right: 94px;
+      right: 137px;
     }
   }
-  @media screen and (min-width: 375px) {
-    .middle .card .first {
-      // margin-top: 27px;
-      font-size: 16px;
-      left: 4vw;
-      top: 9vh;
-    }
-    .middle .card .second {
-      top: 12vh;
-      left: 4vw;
-    }
-    .middle .card .lastP {
-      top: 17vh;
-      left: 5vw;
-      span {
-        font-size: 0.6rem;
+  @media screen and (max-width: 375px) {
+    .middle .card {
+      .first {
+        // margin-top: 27px;
+        font-size: 16px;
+        left: 4vw;
+        top: 9vh;
+      }
+      .second {
+        top: 12vh;
+        left: 4vw;
+      }
+      .lastP {
+        top: 17vh;
+        left: 5vw;
+        span {
+          font-size: 0.6rem;
+        }
       }
     }
+
     .middle .cardTwo {
       .first {
         left: 44vw;
@@ -792,65 +789,211 @@ export default {
         top: 33vh;
       }
     }
+    .detail li .riceBox {
+      right: 120px;
+    }
   }
-  @media screen and (min-width: 414px) {
-    .middle .card .second {
-      font-size: 11px;
+  @media screen and (max-width: 360px) {
+    .detail li .riceBox {
+      right: 113px;
     }
-    .middle .card .first {
-      // margin-top: 27px;
-      font-size: 18px;
-      left: 4vw;
-      top: 9vh;
+    .middle .card {
+      .first {
+        // margin-top: 27px;
+        font-size: 16px;
+        left: 4vw;
+        top: 9vh;
+      }
+      .second {
+        top: 12vh;
+        left: 4vw;
+      }
+      .lastP {
+        top: 17vh;
+        left: 5vw;
+        span {
+          font-size: 0.6rem;
+        }
+      }
     }
     .middle .cardTwo {
       .first {
-        left: 44vw;
-        top: 15vh;
+        left: 157px;
+        top: 99px;
       }
       .second {
-        left: 44vw;
-        top: 8vh;
+        left: 157px;
+        top: 55px;
+      }
+      .keepAlive {
+        width: 13vw;
+        left: 243px;
+        top: 32px;
+      }
+    }
+    .middle .cardThree {
+      .first {
+        left: 170px;
+        top: 119px;
+      }
+      .second {
+        left: 170px;
+        top: 133px;
+      }
+    }
+    .middle .freshRice {
+      top: 17vh;
+      left: 70vw;
+    }
+    .middle .cardFour {
+      .first {
+        left: 17px;
+        top: 200px;
+      }
+      .second {
+        top: 212px;
+        left: 17px;
+      }
+      .normalGrow {
+        left: 26vw;
+        top: 30vh;
+      }
+    }
+    .middle .cardFive {
+      .first {
+        left: 158px;
+        top: 255px;
+      }
+      .second {
+        left: 158px;
+        top: 213px;
+      }
+    }
+  }
+  @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: 0.9rem;
+        left: 12px;
+        top: 9vh;
+      }
+      .second {
+        top: 64px;
+        left: 7px;
+        font-size: 0.7rem;
+        transform: scale(0.8);
+      }
+      .lastP {
+        top: 18vh;
+        left: 4vw;
+        span {
+          font-size: 0.6rem;
+        }
+      }
+    }
+
+    .middle .camera {
+      left: 22vw;
+      top: 8vh;
+    }
+
+    .middle .cardTwo {
+      .first {
+        left: 138px;
+        top: 90px;
+        font-size: 14px;
+      }
+      .second {
+        transform: scale(0.8);
+
+        left: 134px;
+        top: 51px;
+        font-size: 0.7rem;
+      }
+      .keepAlive {
+        width: 13vw;
+        left: 223px;
+        top: 32px;
       }
     }
 
     .middle .keepAlive {
       width: 11.5vw;
       left: 70vw;
-      top: 5vh;
+      top: 6vh;
+    }
+    .middle .cardFour {
+      .first {
+        font-size: 14px;
+
+        left: 11px;
+        top: 184px;
+      }
+      .second {
+        transform: scale(0.8);
+
+        font-size: 0.7rem;
+        left: 7px;
+        top: 194px;
+      }
+      .normalGrow {
+        left: 81px;
+        top: 178px;
+      }
     }
 
     //
     .middle .freshRice {
-      top: 16vh;
+      top: 18vh;
       left: 70vw;
     }
     .middle .cardThree {
       .first {
-        left: 50vw;
-        top: 18vh;
-      }
-      .second {
-        left: 50vw;
-        top: 20vh;
+        font-size: 14px;
+        left: 148px;
+        top: 107px;
       }
-    }
-    .middle .cardThree {
-      .first,
       .second {
-        left: 48vw;
+        left: 143px;
+        top: 118px;
+        transform: scale(0.8);
       }
     }
+
     .middle .cardFive {
-      .first,
+      .first {
+        top: 233px;
+        left: 137px;
+
+        font-size: 14px;
+      }
       .second {
-        left: 44vw;
+        transform: scale(0.8);
+
+        top: 194px;
+        left: 132px;
+
+        font-size: 0.7rem;
+      }
+      .organic {
+        left: 221px;
+        top: 178px;
       }
     }
+
     .detail li .riceBox {
-      right: 137px;
+      right: 94px;
     }
   }
+
   @media screen and (min-height: 812px) {
     .middle .card .first {
       // margin-top: 27px;

src/views/product/index.vue

@@ -174,8 +174,8 @@ export default {
           if (!(limit && limit.length > 0)) {
             limit = [];
           }
-          this.canStockBag = res.data.limit[0].weight;
-          this.canStockBox = res.data.limit[1].weight;
+          this.canStockBag = res.data.stock;
+          this.canStockBox = res.data.stock;
 
           this.distributeGoods(limit);
           // await this.getUnitist(limit);
@@ -231,7 +231,7 @@ export default {
       }
     },
     backNum(e) {
-      this.num = e;
+      this.num = e - 1;
     },
     async placeOrder() {
       if (!this.loading) {