zhangjinxing 3 years ago
parent
commit
53e4278445
4 changed files with 224 additions and 185 deletions
  1. 2 0
      src/components/inputNumber.vue
  2. 104 82
      src/views/login/index.vue
  3. 117 103
      src/views/paddy/index.vue
  4. 1 0
      src/views/product/index.vue

+ 2 - 0
src/components/inputNumber.vue

@@ -22,6 +22,7 @@ export default {
   mounted() {},
   watch: {
     numb: function (val) {
+      console.log(val);
       this.num = val ? parseInt(val) : 0;
     },
   },
@@ -56,6 +57,7 @@ export default {
       this.leix();
       if (this.num > 0) {
         this.num--;
+        console.log(this.num);
         this.$emit("backNum", this.num);
       }
     },

+ 104 - 82
src/views/login/index.vue

@@ -10,87 +10,86 @@
         </div>
         <p class="logo-header-title">Hello</p>
         <p class="logo-header-tips">欢迎登录藏金·1745平台</p>
-      </div>
-      <van-form validate-first class="login-form">
-        <div class="loginBox">
-          <img src="@/assets/img/loginBox.png" alt="" />
-        </div>
-        <ul class="clear oUl" style="width: 83vw">
-          <!-- <li class="label">
+        <van-form validate-first class="login-form">
+          <div class="loginBox">
+            <img src="@/assets/img/loginBox.png" alt="" />
+          </div>
+          <ul class="clear oUl" style="width: 83vw">
+            <!-- <li class="label">
             卡号:
            
           </li> -->
-          <li class="van-field-input">
-            <van-row style="width: 83vw">
-              <van-col span="3" style="width: 14px">
-                <div class="cardNo">
-                  <img src="@/assets/img/cardNo.png" alt="" />
-                </div>
-              </van-col>
-              <van-col span="5" style="width: 42px">
-                <div class="myCard">CJ1745</div>
-              </van-col>
-              <van-col span="16" style="width: calc(100% - 86px)">
-                <van-field
-                  style="margin: 0 0 0 30px; background: transParent"
-                  size="large"
-                  v-model="form.mobile"
-                  name="mobile"
-                  placeholder="XXXXXX"
-                  type="text"
-                  maxlength="6"
-                  :rules="[{ validator: asyncmobileValidator }]"
-                >
-                </van-field>
-              </van-col>
-            </van-row>
-          </li>
-        </ul>
-        <ul class="clear" style="width: 83vw; border-radius: 10px">
-          <!-- <li class="label">
+            <li class="van-field-input">
+              <van-row style="width: 83vw">
+                <van-col span="3" style="width: 14px">
+                  <div class="cardNo">
+                    <img src="@/assets/img/cardNo.png" alt="" />
+                  </div>
+                </van-col>
+                <van-col span="5" style="width: 42px">
+                  <div class="myCard">CJ1745</div>
+                </van-col>
+                <van-col span="16" style="width: calc(100% - 86px)">
+                  <van-field
+                    style="margin: 0 0 0 30px; background: transParent"
+                    size="large"
+                    v-model="form.mobile"
+                    name="mobile"
+                    placeholder="XXXXXX"
+                    type="text"
+                    maxlength="6"
+                    :rules="[{ validator: asyncmobileValidator }]"
+                  >
+                  </van-field>
+                </van-col>
+              </van-row>
+            </li>
+          </ul>
+          <ul class="clear" style="width: 83vw; border-radius: 10px">
+            <!-- <li class="label">
             密码:
             <img src="@/assets/img/password.png" alt="" />
           </li> -->
-          <van-row style="width: 84vw">
-            <van-col span="3" style="width: 14px">
-              <div class="cardPwd">
-                <img src="@/assets/img/password.png" alt="" />
-              </div>
-            </van-col>
-            <van-col :span="21" style="width: calc(100% - 50px)">
-              <li class="van-field-input">
-                <van-field
-                  style="background: transparent; margin: 0 0 0 28px"
-                  size="large"
-                  v-model="form.code"
-                  name="code"
-                  maxlength="6"
-                  placeholder="请输入密码"
-                  :rules="[{ validator: asyncpwodValidator }]"
-                  :type="!passwordStatus ? 'password' : 'text'"
-                  @click-right-icon="showPassword"
-                >
-                  <!--  :right-icon="!passwordStatus ? 'eye-o' : 'closed-eye'" -->
-                </van-field>
-              </li>
-            </van-col></van-row
-          >
-        </ul>
-
-        <van-button
-          style="font-size: 16px; font-weight: 400"
-          class="login-form-button"
-          block
-          type="info"
-          :disabled="loadding"
-          :loadding="loadding"
-          loadding-text="加载中..."
-          native-type="submit"
-          @click="onSubmit()"
-        >
-          登&nbsp;录
-        </van-button>
-      </van-form>
+            <van-row style="width: 84vw">
+              <van-col span="3" style="width: 14px">
+                <div class="cardPwd">
+                  <img src="@/assets/img/password.png" alt="" />
+                </div>
+              </van-col>
+              <van-col :span="21" style="width: calc(100% - 50px)">
+                <li class="van-field-input">
+                  <van-field
+                    style="background: transparent; margin: 0 0 0 28px"
+                    size="large"
+                    v-model="form.code"
+                    name="code"
+                    maxlength="6"
+                    placeholder="请输入密码"
+                    :rules="[{ validator: asyncpwodValidator }]"
+                    :type="!passwordStatus ? 'password' : 'text'"
+                    @click-right-icon="showPassword"
+                  >
+                    <!--  :right-icon="!passwordStatus ? 'eye-o' : 'closed-eye'" -->
+                  </van-field>
+                </li>
+              </van-col></van-row
+            >
+          </ul>
+        </van-form>
+      </div>
+      <van-button
+        style="font-size: 16px; font-weight: 400"
+        class="login-form-button"
+        block
+        type="info"
+        :disabled="loadding"
+        :loadding="loadding"
+        loadding-text="加载中..."
+        native-type="submit"
+        @click="onSubmit()"
+      >
+        登&nbsp;录
+      </van-button>
       <div class="footerP">
         <div class="footer">
           <img src="@/assets/img/footer.png" alt="" />
@@ -262,6 +261,7 @@ export default {
       .login-img {
         width: 100%;
         position: absolute;
+
         left: 0;
         top: 0;
         img {
@@ -318,11 +318,14 @@ export default {
     }
     .loginBox {
       width: 84vw;
+      margin: 0 auto 0;
       background: rgba(0, 0, 0, 0);
       // border: 1px solid red;
       border-radius: 10px;
       position: absolute;
-      margin: 0 30.5px 0 28.5px;
+      left: 8vw;
+      top: 8vw;
+      // margin: 0 30.5px 0 28.5px;
 
       top: -59px;
       // z-index: 99999;
@@ -341,16 +344,16 @@ export default {
       // border-top-right-radius: 20px;
       position: relative;
       // top: -145px;
-      top: -135.5px; //新版
+      top: 232.5px; //新版
       left: 0;
       // border: 1px solid green;
       ul {
         position: relative;
-        left: 0;
+        left: 9vw;
         top: 0;
         // border-radius: 20px;
         overflow: hidden;
-        margin: 0 0 11.5px 30px;
+        // margin: 0 0 11.5px 30px;
         // border-bottom: 1px solid #f0f0f0;
         z-index: 9999;
         li {
@@ -393,7 +396,10 @@ export default {
     .login-form-button.van-button,
     .login-form-button.van-button--disabled {
       border: 0;
-      margin: 98px auto 10px auto;
+      // margin: 98px auto 10px auto;
+      position: absolute;
+      left: 5vw;
+      bottom: 30vh;
       color: #333;
       // background: #f4d022;
       background: linear-gradient(0deg, #f2c482, #a07947);
@@ -481,12 +487,28 @@ export default {
       top: -10px;
     }
     .footer {
-      transform: scale(1.3);
+      transform: scale(1);
     }
   }
   @media screen and (min-height: 812px) {
     .login-main .login-form.van-form ul {
-      top: -18px;
+      top: -1vh;
+    }
+  }
+
+  @media screen and (max-width: 375px) {
+    .login-main .login-form.van-form ul {
+      top: -3vh;
+    }
+  }
+  @media screen and (max-width: 360px) {
+    .login-main .login-form.van-form ul {
+      top: -3vh;
+    }
+  }
+  @media screen and (max-width: 320px) {
+    .login-main .login-form.van-form ul {
+      top: -4vh;
     }
   }
 }

+ 117 - 103
src/views/paddy/index.vue

@@ -235,7 +235,6 @@ export default {
   }
   .top {
     width: 90vw;
-    height: 26.5vh;
     margin: 34.5px auto 0 auto;
     img {
       width: 90vw;
@@ -261,7 +260,7 @@ export default {
     // top: 23vh;
     // left: 48vw;\
     padding: 0 0 0 0;
-    margin: -2vh 0 0 48vw;
+    margin: -2vh 0 0 44vw;
   }
   .custom-indicator {
     right: 155px;
@@ -323,7 +322,7 @@ export default {
   }
   .detail {
     width: 90vw;
-    height: 150px;
+    height: 20vh;
     margin: 3vh auto 0;
     position: relative;
     // display: flex;
@@ -528,10 +527,11 @@ export default {
       width: 40vw;
       display: flex;
       justify-content: center;
+      position: relative;
       .first {
         position: absolute;
-        left: 50vw;
-        top: 14vh;
+        left: 3vw;
+        top: 3vh;
         width: 60px;
         height: 14.5px;
         font-size: 15px;
@@ -542,8 +542,8 @@ export default {
       }
       .second {
         position: absolute;
-        left: 50vw;
-        top: 16vh;
+        left: 3vw;
+        top: 5vh;
 
         width: 48px;
         height: 24px;
@@ -557,11 +557,12 @@ export default {
     .freshRice {
       width: 14vw;
       position: absolute;
-      top: 13vh;
-      left: 71vw;
+      top: 1vh;
+      left: 24vw;
     }
     .cardFour {
       width: 45vw;
+      position: relative;
       // position: absolute;
       display: flex;
       justify-content: center;
@@ -603,13 +604,12 @@ export default {
     .cardFive {
       width: 40vw;
       display: flex;
+      position: relative;
       justify-content: center;
-      // align-items: center;
       .first {
         position: absolute;
-        left: 45vw;
-        top: 40vh;
-        margin: -9vh 0 0 5vw;
+        left: 2vw;
+        top: 16px;
         width: 60px;
         height: 14.5px;
         font-size: 15px;
@@ -677,37 +677,45 @@ export default {
 
     //
     .middle .freshRice {
-      top: 16vh;
-      left: 70vw;
+      top: 1vh;
+      left: 24vw;
     }
     .middle .cardThree {
       .first {
-        left: 48vw;
-        top: 18vh;
+        left: 3vw;
+        top: 3vh;
       }
       .second {
-        left: 48vw;
-        top: 20vh;
+        left: 3vw;
+        top: 5vh;
       }
     }
     .middle .cardFour {
       .first {
-        left: 16px;
-        top: 230px;
+        left: 4vw;
+        top: 3vh;
       }
       .second {
-        left: 16px;
-        top: 242px;
+        left: 4vw;
+        top: 5vh;
       }
       .normalGrow {
-        left: 25vw;
-        top: 30vh;
+        left: 24vw;
+        top: 2vh;
       }
     }
     .middle .cardFive {
-      .first,
+      .first {
+        left: 2vw;
+        top: 19px;
+      }
       .second {
-        left: 44vw;
+        left: -2vw;
+        top: 34px;
+      }
+      .organic {
+        left: 22vw;
+        top: 13px;
       }
     }
     .detail li .riceBox {
@@ -752,41 +760,45 @@ export default {
     }
     //
     .middle .freshRice {
-      top: 17vh;
-      left: 70vw;
+      top: 1vh;
+      left: 24vw;
     }
     .middle .cardThree {
       .first {
-        left: 48vw;
-        top: 19vh;
+        left: 3vw;
+        top: 3vh;
       }
       .second {
-        left: 48vw;
-        top: 21vh;
+        left: 3vw;
+        top: 5vh;
       }
     }
     .middle .cardFour {
       .first {
         left: 4vw;
-        top: 31vh;
+        top: 3vh;
       }
       .second {
-        top: 33vh;
         left: 4vw;
+        top: 5vh;
       }
       .normalGrow {
-        left: 26vw;
-        top: 30vh;
+        left: 24vw;
+        top: 2vh;
       }
     }
     .middle .cardFive {
       .first {
-        left: 44vw;
-        top: 40vh;
+        left: 2vw;
+        top: 19px;
       }
       .second {
-        left: 44vw;
-        top: 33vh;
+        left: -2vw;
+        top: 34px;
+      }
+      .organic {
+        left: 22vw;
+        top: 13px;
       }
     }
     .detail li .riceBox {
@@ -833,40 +845,44 @@ export default {
     }
     .middle .cardThree {
       .first {
-        left: 170px;
-        top: 119px;
+        left: 3vw;
+        top: 3vh;
       }
       .second {
-        left: 170px;
-        top: 133px;
+        left: 3vw;
+        top: 5vh;
       }
     }
     .middle .freshRice {
-      top: 17vh;
-      left: 70vw;
+      top: 1vh;
+      left: 23vw;
     }
     .middle .cardFour {
       .first {
-        left: 17px;
-        top: 200px;
+        left: 4vw;
+        top: 3vh;
       }
       .second {
-        top: 212px;
-        left: 17px;
+        left: 4vw;
+        top: 5vh;
       }
       .normalGrow {
-        left: 26vw;
-        top: 30vh;
+        left: 24vw;
+        top: 2vh;
       }
     }
     .middle .cardFive {
       .first {
-        left: 158px;
-        top: 255px;
+        left: 2vw;
+        top: 16px;
       }
       .second {
-        left: 158px;
-        top: 213px;
+        left: -2vw;
+        top: 30px;
+      }
+      .organic {
+        left: 22vw;
+        top: 13px;
       }
     }
   }
@@ -932,60 +948,52 @@ export default {
     }
     .middle .cardFour {
       .first {
-        font-size: 14px;
-
-        left: 11px;
-        top: 184px;
+        left: 4vw;
+        top: 3vh;
       }
       .second {
         transform: scale(0.8);
-
-        font-size: 0.7rem;
-        left: 7px;
-        top: 194px;
+        left: 3vw;
+        top: 5vh;
       }
       .normalGrow {
-        left: 81px;
-        top: 178px;
+        left: 26vw;
+        top: 2vh;
       }
     }
 
     //
     .middle .freshRice {
-      top: 18vh;
-      left: 70vw;
+      top: 1vh;
+      left: 24vw;
     }
     .middle .cardThree {
       .first {
         font-size: 14px;
-        left: 148px;
-        top: 107px;
+        left: 3vw;
+        top: 3vh;
       }
       .second {
-        left: 143px;
-        top: 118px;
+        left: 2vw;
+        top: 5vh;
         transform: scale(0.8);
       }
     }
 
     .middle .cardFive {
       .first {
-        top: 233px;
-        left: 137px;
-
-        font-size: 14px;
+        left: 2vw;
+        top: 17px;
       }
       .second {
         transform: scale(0.8);
 
-        top: 194px;
-        left: 132px;
-
-        font-size: 0.7rem;
+        left: -3vw;
+        top: 30px;
       }
       .organic {
-        left: 221px;
-        top: 178px;
+        left: 25vw;
+        top: 13px;
       }
     }
 
@@ -998,6 +1006,7 @@ export default {
     .middle .card .first {
       // margin-top: 27px;
       font-size: 16px;
+
       left: 4vw;
       top: 7vh;
     }
@@ -1031,39 +1040,44 @@ export default {
     }
     //
     .middle .freshRice {
-      top: 14vh;
-      left: 70vw;
+      top: 2vh;
+      left: 25vw;
     }
     .middle .cardThree .first {
-      left: 47vw;
-      top: 15vh;
+      left: 3vw;
+      top: 2vh;
     }
     .middle .cardThree .second {
-      left: 47vw;
-      top: 17vh;
-    }
-    .middle .cardFour .first {
-      left: 4vw;
-      top: 26vh;
-    }
-    .middle .cardFour .second {
-      top: 28vh;
-      left: 4vw;
+      left: 3vw;
+      top: 4vh;
     }
-    .middle .cardFour .normalGrow {
-      left: 26vw;
-      top: 25vh;
+    .middle .cardFour {
+      .first {
+        left: 4vw;
+        top: 3vh;
+      }
+      .second {
+        left: 4vw;
+        top: 5vh;
+      }
+      .normalGrow {
+        left: 24vw;
+        top: 2vh;
+      }
     }
 
     .middle .cardFive {
       .first {
-        top: 35vh;
+        left: 2vw;
+        top: 19px;
       }
       .second {
-        top: 28vh;
+        left: -2vw;
+        top: 34px;
       }
       .organic {
-        top: 25vh;
+        left: 24vw;
+        top: 21px;
       }
     }
   }

+ 1 - 0
src/views/product/index.vue

@@ -232,6 +232,7 @@ export default {
     },
     backNum(e) {
       this.num = e - 1;
+      console.log(this.num);
     },
     async placeOrder() {
       if (!this.loading) {