Merge branch 'sit' of daiyanrong/live-telecast-ui-h5 into master

dist/static/css/chunk-47178012.d20c5dcc.css

@@ -1 +0,0 @@
-.paddy .paddy-title[data-v-9d6f86ec]{position:fixed;padding:0;width:100%;margin:0;top:0;left:0;z-index:3;border:0;height:44px}.paddy .paddy-main[data-v-9d6f86ec]{display:block;padding:16px}.paddy .paddy-main img[data-v-9d6f86ec]{width:100%;height:auto;min-height:30vh;display:block;border:1px solid #b0b0b0}

dist/static/css/chunk-c09430c8.4960f43a.css → dist/static/css/chunk-5c991410.f8d4cb8b.css

@@ -1 +1 @@
-.van-tabbar-item{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-flex:1;-webkit-flex:1;flex:1;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;color:#646566;font-size:12px;line-height:1;cursor:pointer}.van-tabbar-item__icon{position:relative;margin-bottom:4px;font-size:22px}.van-tabbar-item__icon .van-icon{display:block}.van-tabbar-item__icon img{display:block;height:20px}.van-tabbar-item--active{color:#1989fa;background-color:#fff}.van-tabbar-item .van-info{margin-top:4px}.van-tabbar{z-index:1;display:-webkit-box;display:-webkit-flex;display:flex;box-sizing:content-box;width:100%;height:50px;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom);background-color:#fff}.van-tabbar--fixed{position:fixed;bottom:0;left:0}.van-tabbar--unfit{padding-bottom:0}.layout[data-v-c04af8e2]{position:fixed;height:100%;width:100%;padding:0;margin:0;-webkit-box-sizing:border-box;box-sizing:border-box}.van-hairline--top-bottom.van-tabbar.van-tabbar--fixed[data-v-c04af8e2] .van-tabbar-item.van-tabbar-item--active{color:#f4d022}
+.van-tabbar-item{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-flex:1;-webkit-flex:1;flex:1;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;color:#646566;font-size:12px;line-height:1;cursor:pointer}.van-tabbar-item__icon{position:relative;margin-bottom:4px;font-size:22px}.van-tabbar-item__icon .van-icon{display:block}.van-tabbar-item__icon img{display:block;height:20px}.van-tabbar-item--active{color:#1989fa;background-color:#fff}.van-tabbar-item .van-info{margin-top:4px}.van-tabbar{z-index:1;display:-webkit-box;display:-webkit-flex;display:flex;box-sizing:content-box;width:100%;height:50px;padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom);background-color:#fff}.van-tabbar--fixed{position:fixed;bottom:0;left:0}.van-tabbar--unfit{padding-bottom:0}.layout[data-v-7c325792]{position:fixed;height:100%;width:100%;padding:0;margin:0;-webkit-box-sizing:border-box;box-sizing:border-box}.van-hairline--top-bottom.van-tabbar.van-tabbar--fixed[data-v-7c325792] .van-tabbar-item.van-tabbar-item--active{color:#f4d022}

dist/static/css/chunk-8f29371c.991b06a2.css

@@ -0,0 +1 @@
+.paddy[data-v-28beca2c]{overflow:scroll}.paddy .top[data-v-28beca2c]{width:100%;height:30%;margin:0 auto}.paddy .top img[data-v-28beca2c]{width:100%;height:100%}.paddy .detail[data-v-28beca2c]{width:90%;height:40%;margin:0 auto;position:relative;padding-bottom:30px;top:-2%}.paddy .detail img[data-v-28beca2c]{width:100%;height:100%}.paddy .middle[data-v-28beca2c]{width:90%;height:50%;margin:0 auto;padding-bottom:30px}.paddy .middle img[data-v-28beca2c]{width:100%;height:100%}.paddy .bottom[data-v-28beca2c]{width:100%;height:50%;overflow:hidden;margin:0 auto}.paddy .bottom img[data-v-28beca2c]{width:100%;height:100%}

dist/static/js/chunk-47178012.c2d4b1c3.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-47178012"],{1324:function(t,a,n){},"4aa2":function(t,a,n){"use strict";n.r(a);var c,i=n("5908"),e=n.n(i);for(c in i)["default"].indexOf(c)<0&&function(t){n.d(a,t,(function(){return i[t]}))}(c);a.default=e.a},5908:function(t,a){},"7c01":function(t,a,n){"use strict";n.d(a,"a",(function(){return c})),n.d(a,"b",(function(){return i}));var c=function(){var t=this,a=t.$createElement;a=t._self._c||a;return a("div",{staticClass:"paddy",staticStyle:{"padding-top":"44px"}},[a("div",{staticClass:"paddy-title"},[a("van-nav-bar",{staticClass:"van-nav-bar-my-fixed",attrs:{title:"我的稻田"}})],1),t._m(0)])},i=[function(){var t=this.$createElement;t=this._self._c||t;return t("div",{staticClass:"paddy-main"},[t("img",{attrs:{src:"https://retailcloud-oss-bucket.oss-cn-hangzhou.aliyuncs.com/20210302/824b52ce-ba5a-4418-b299-c3d91b010a5c.jpg?Expires=1615516693&OSSAccessKeyId=LTAIT3bnC94ivUGf&Signature=RNwkapvSZfdzxdaGb21vl3BIP1c%3D",alt:""}})])}]},a0a4:function(t,a,n){"use strict";n("1324")},f01a:function(t,a,n){"use strict";n.r(a);var c,i=n("7c01"),e=n("4aa2");for(c in e)["default"].indexOf(c)<0&&function(t){n.d(a,t,(function(){return e[t]}))}(c);n("a0a4");var s=n("2877");i=Object(s.a)(e.default,i.a,i.b,!1,null,"9d6f86ec",null);a.default=i.exports}}]);

dist/static/js/chunk-8f29371c.761f5067.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-8f29371c"],{"48d5":function(t,a,n){t.exports=n.p+"static/img/paddy-middle.4673b03b.png"},"4aa2":function(t,a,n){"use strict";n.r(a);var i,c=n("5908"),s=n.n(c);for(i in c)["default"].indexOf(i)<0&&function(t){n.d(a,t,(function(){return c[t]}))}(i);a.default=s.a},"4ba2":function(t,a,n){"use strict";n.d(a,"a",(function(){return i})),n.d(a,"b",(function(){return c}));var i=function(){var t=this;t.$createElement;return t._self._c,t._m(0)},c=[function(){var t=this.$createElement;t=this._self._c||t;return t("div",{staticClass:"paddy"},[t("div",{staticClass:"top"},[t("img",{attrs:{src:n("caed"),alt:""}})]),t("div",{staticClass:"detail"},[t("img",{attrs:{src:n("caa7"),alt:""}})]),t("div",{staticClass:"middle"},[t("img",{attrs:{src:n("48d5"),alt:""}})]),t("div",{staticClass:"bottom"},[t("img",{attrs:{src:n("827b"),alt:""}})])])}]},5908:function(t,a){},"59dc":function(t,a,n){},"827b":function(t,a,n){t.exports=n.p+"static/img/paddy-bottom.8121bb17.png"},b054:function(t,a,n){"use strict";n("59dc")},caa7:function(t,a,n){t.exports=n.p+"static/img/paddy-detail.534b235c.png"},caed:function(t,a,n){t.exports=n.p+"static/img/paddy.62f9c076.png"},f01a:function(t,a,n){"use strict";n.r(a);var i,c=n("4ba2"),s=n("4aa2");for(i in s)["default"].indexOf(i)<0&&function(t){n.d(a,t,(function(){return s[t]}))}(i);n("b054");var e=n("2877");c=Object(e.a)(s.default,c.a,c.b,!1,null,"28beca2c",null);a.default=c.exports}}]);

src/config/env.development.js

@@ -1,8 +1,8 @@
 // 本地
 module.exports = {
   title: '五常稻田',
-  // baseApi: 'http://www.fivechang.com/',
-  baseApi: 'http://fc.test241.wanyuhengtong.com/',
+  baseApi: 'http://www.fivechang.com/',
+  // baseApi: 'http://fc.test241.wanyuhengtong.com/',
   fileURL: `https://api2.edusit.zretchome.com`,
   appId: 'wx5ac3a2c2d72b6f26',
   ding: {

src/layout/index.vue

@@ -49,8 +49,8 @@ export default {
           to: "/home/paddy",
           title: "稻田",
           icon: {
-            // active: require("@/assets/images/home/live-active.png"),
-            // inactive: require("@/assets/images/home/live.png"),
+            active: require("@/assets/images/home/rice-active.png"),
+            inactive: require("@/assets/images/home/rice.png"),
           },
         },
         {

src/store/modules/user.js

@@ -5,11 +5,13 @@ import {
   removeToken,
   getAd,
   setAd,
+  removeAd,
   getGoodsNum,
   setGoodsNum,
+  removeGoodsNum,
   getGoodsUnit,
-  setGoodsUnit
-
+  setGoodsUnit,
+  removeGoodsUnit,
 } from '@/utils/auth'
 
 const state = {
@@ -63,9 +65,14 @@ const actions = {
 
           if (response.code === 0) {
             const { data } = response
-            console.log(data);
             commit('SET_TOKEN', data.token)
             setToken(data.token)
+            removeAd();
+            commit('SET_AD', {})
+            removeGoodsNum(),
+            commit('SET_GOODSNUM', "")
+            removeGoodsUnit(),
+            commit('SET_GOODSUNIT', "")
           }
           resolve(response)
         })
@@ -83,7 +90,12 @@ const actions = {
       commit('SET_ROLES', [])
       removeToken()
       commit('SET_HAS', '')
-
+      removeAd();
+      commit('SET_AD', {})
+      removeGoodsNum(),
+      commit('SET_GOODSNUM', "")
+      removeGoodsUnit(),
+      commit('SET_GOODSUNIT', "")
       // reset visited views and cached views
       // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485
       dispatch('tagsView/delAllViews', null, { root: true })
@@ -101,7 +113,6 @@ const actions = {
     })
   },
   set_ad({ commit }, item) {
-    // const { username, password } = userInfo
     return new Promise((resolve, reject) => {
       let key = JSON.parse(JSON.stringify(item))
       setAd(key)
@@ -110,7 +121,6 @@ const actions = {
     })
   },
   set_goodsNum({ commit }, item) {
-    console.log(item);
     return new Promise((resolve, reject) => {
       let key = item
       setGoodsNum(key)
@@ -119,7 +129,6 @@ const actions = {
     })
   },
   set_goodsUnit({ commit }, item) {
-    // console.log(item);
     return new Promise((resolve, reject) => {
       let key = item
       setGoodsUnit(key)

src/views/login/index.vue

@@ -6,7 +6,7 @@
     <div class="login-main">
       <div class="logo-header">
         <div class="login-img">
-          <img src="@/assets/img/login.png" alt="">
+          <img src="@/assets/img/login.png" alt="" />
         </div>
         <p class="logo-header-title">登录</p>
         <p class="logo-header-tips">登录享受更多精彩</p>
@@ -14,20 +14,27 @@
       <van-form validate-first class="login-form">
         <ul class="clear">
           <li class="label">
-            账号:
+            卡号:
             <!-- <img :src="user" alt="" /> -->
           </li>
           <li class="van-field-input">
-            <van-field
-              size="large"
-              
-              v-model="form.mobile"
-              name="mobile"
-              placeholder="请输入账号"
-              type="text"
-              :rules="[{ validator: asyncmobileValidator }]"
-            >
-            </van-field>
+            <van-row>
+              <van-col span="5" style="width: 42px">
+                <div class="myCard">CJ1745</div>
+              </van-col>
+              <van-col span="19">
+                <van-field
+                  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">
@@ -40,6 +47,7 @@
               size="large"
               v-model="form.code"
               name="code"
+              maxlength="6"
               placeholder="请输入密码"
               :rules="[{ validator: asyncpwodValidator }]"
               :type="!passwordStatus ? 'password' : 'text'"
@@ -74,14 +82,11 @@ export default {
   mixins: [resToken],
   data() {
     return {
-      passwordStatus:false,//默认隐藏密码
+      passwordStatus: false, //默认隐藏密码
       loginBG: require("@/assets/images/login/bg.png"),
       user: require("@/assets/images/login/user.png"),
       pwod: require("@/assets/images/login/pwod.png"),
       loadding: false,
-      // show: false,
-      // codeTitle: "发送密码",
-      // num: 60,
       form: {
         mobile: "",
         code: "",
@@ -94,14 +99,18 @@ export default {
     async onSubmit() {
       if (!this.loadding) {
         this.loadding = true;
-        await this.asyncmobileValidator(this.form.mobile)//校验表单手机号
+        await this.asyncmobileValidator(this.form.mobile) //校验表单卡号
           .then(async (res) => {
             if (res === "ok") {
+              let parmValue = {
+                code: this.form.code,
+                mobile: "CJ1745" + this.form.mobile,
+              };
               await this.asyncpwodValidator(this.form.code)
                 .then(async (res) => {
                   if (res === "ok") {
                     this.$store
-                      .dispatch("user/login", this.form)
+                      .dispatch("user/login", parmValue)
                       .then((res) => {
                         this.loadding = false;
                         if (res.code === 0) {
@@ -141,21 +150,15 @@ export default {
       return new Promise((resolve) => {
         let type = true;
         if (val === "") {
-          this.show_title("请输入账号！");
+          this.show_title("请输入卡号！");
           type = false;
         } else {
-          if (val.length !== 10) {
-            this.show_title("账号不正确！");
-            type = false;
-          }
-          let o = val.substr(0, 4);
-          if (o !== "1745") {
-            this.show_title("账号不正确！");
+          if (val.length !== 6) {
+            this.show_title("卡号不正确！");
             type = false;
           }
-          let t = val.substr(val.length - 6);
-          if (!isnumber(t)) {
-            this.show_title("账号不正确！");
+          if (!isnumber(val)) {
+            this.show_title("卡号不正确！");
             type = false;
           }
         }
@@ -188,54 +191,61 @@ export default {
         resolve(type ? "ok" : "error");
       });
     },
-    showPassword(){//展示/隐藏密码
-      console.log("显示/隐藏密码");
+
+    showPassword() {
+      //展示/隐藏密码
       console.log(this.passwordStatus);
       this.passwordStatus = !this.passwordStatus;
-    }
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.login {//最外层的登陆盒子
+.login {
+  //最外层的登陆盒子
   position: relative;
   width: 100%;
   height: 100%;
-  .bg {//背景图的盒子
+  .bg {
+    //背景图的盒子
     position: relative;
     width: 100%;
     height: 100%;
-    img {//背景图
+    img {
+      //背景图
       display: inline-block;
       width: 100%;
       height: 100%;
     }
   }
-  .login-main {//详情登陆页面
+  .login-main {
+    //详情登陆页面
     position: absolute;
     top: 0;
     left: 0;
-    width: 100%;//继承最外层login的宽高
+    width: 100%; //继承最外层login的宽高
     height: 100%;
     background-color: #fff;
-    .logo-header {//上半部分登陆盒子，用来展示一张图片
+    .logo-header {
+      //上半部分登陆盒子，用来展示一张图片
       // padding: 50% 0 10% 0;
       width: 100%;
       height: 309px;
-      .login-img{
+      .login-img {
         width: 100%;
         position: absolute;
         left: 0;
         top: 0;
-        img{
+        img {
           width: 100%;
           height: 209px;
         }
       }
       position: relative;
       top: -12px;
-      .logo-header-title {//登陆字体的盒子
+      .logo-header-title {
+        //登陆字体的盒子
         margin: 0px;
         font-weight: bold;
         padding: 91px 256px 99px 37px;
@@ -243,11 +253,12 @@ export default {
         height: 37px;
         font-size: 20px;
         font-weight: bold;
-        color: #FFFFFF;
+        color: #ffffff;
         line-height: 20px;
         position: absolute;
       }
-      .logo-header-tips{//登陆文字下提示内容
+      .logo-header-tips {
+        //登陆文字下提示内容
         position: absolute;
         left: 0;
         top: 0;
@@ -257,11 +268,12 @@ export default {
         height: 12px;
         font-size: 12px;
         font-weight: 150;
-        color: #FFFFFF;
+        color: #ffffff;
         line-height: 3px;
       }
     }
-    .login-form.van-form {//登陆框
+    .login-form.van-form {
+      //登陆框
       padding: 10% 18%;
       background-color: #fff;
       border-top-left-radius: 20px;
@@ -274,13 +286,13 @@ export default {
         overflow: hidden;
         background: #ffffff;
         margin: 0 0 28px 0;
-        border-bottom: 1px solid #F0F0F0;
+        border-bottom: 1px solid #f0f0f0;
         li {
           float: left;
           &.label {
             width: 100%;
             color: #333333;
-            font-size: 16px;;
+            font-size: 16px;
             font-weight: bolder;
             // width: 54px;
             // text-align: center;
@@ -329,10 +341,14 @@ export default {
       border: 0;
       margin: 9vh 0 0 0;
       color: #333;
-      
-      background: #F4D022;
+
+      background: #f4d022;
       border-radius: 34px;
     }
   }
 }
+.myCard {
+  height: 42px;
+  line-height: 42px;
+}
 </style>

src/views/order/orderRes.vue

@@ -27,7 +27,7 @@
         </svg>
       </div>
       <div class="tc" style="margin: -10px 0 30px 0">
-        <p style="color:#959595">恭喜您，下单成功！</p>
+        <p style="color: #959595">恭喜您，下单成功！</p>
       </div>
       <div class="yingdao clear" v-if="ok">
         <van-button
@@ -38,7 +38,7 @@
           @click="goto('/oDetail')"
           >订单详情</van-button
         >
-        <van-button round class="fr" size="small" @click="goto('/home/live')"
+        <van-button round class="fr" size="small" @click="goto('/home/paddy')"
           >返回首页</van-button
         >
       </div>
@@ -173,7 +173,7 @@ export default {
         margin: 0 6.5% 0 13%;
         color: #333;
         background: #f2f2f2;
-        border:0px;
+        border: 0px;
         // border-color: rgb(255, 131, 39);
         // color: rgb(255, 131, 39);
       }
@@ -492,5 +492,4 @@ input[type="search"]::-webkit-search-cancel-button {
     }
   }
 }
-
 </style>

src/views/paddy/index.vue

@@ -1,6 +1,18 @@
 <template>
-  <div class="paddy" style="padding-top:44px">
-  <div class="paddy-title">
+  <div class="paddy">
+    <div class="top">
+      <img src="@/assets/images/home/paddy.png" alt="" />
+    </div>
+    <div class="detail">
+      <img src="@/assets/images/home/paddy-detail.png" alt="" />
+    </div>
+    <div class="middle">
+      <img src="@/assets/images/home/paddy-middle.png" alt="" />
+    </div>
+    <div class="bottom">
+      <img src="@/assets/images/home/paddy-bottom.png" alt="" />
+    </div>
+    <!-- <div class="paddy-title">
       <van-nav-bar
         title="我的稻田"
         class="van-nav-bar-my-fixed"
@@ -11,8 +23,7 @@
       src="https://retailcloud-oss-bucket.oss-cn-hangzhou.aliyuncs.com/20210302/824b52ce-ba5a-4418-b299-c3d91b010a5c.jpg?Expires=1615516693&OSSAccessKeyId=LTAIT3bnC94ivUGf&Signature=RNwkapvSZfdzxdaGb21vl3BIP1c%3D"
       alt=""
     />
-    </div>
-   
+    </div> -->
   </div>
 </template>
 
@@ -21,27 +32,75 @@
 
 <style lang="scss" scoped>
 .paddy {
-    .paddy-title {
-    position: fixed;
-    padding: 0;
+  overflow: scroll;
+  .top {
     width: 100%;
-    margin: 0;
-    top: 0;
-    left: 0;
-    z-index: 3;
-    border: 0;
-    height: 44px;
+    height: 30%;
+    margin: 0 auto;
+    img {
+      width: 100%;
+      height: 100%;
+      // background-size: 50% 50%;
+    }
+  }
+  .detail {
+    width: 90%;
+    height: 40%;
+    margin: 0 auto;
+    position: relative;
+    padding-bottom: 30px;
+
+    top: -2%;
+    img {
+      width: 100%;
+      height: 100%;
+      // background-size: 50% 50%;
+    }
+  }
+  .middle {
+    width: 90%;
+    height: 50%;
+    margin: 0 auto;
+    padding-bottom: 30px;
+
+    img {
+      width: 100%;
+      height: 100%;
+      // background-size: 50% 50%;
+    }
   }
-  .paddy-main{
-    display: block;
-    padding:16px;
-    img{
+  .bottom {
+    width: 100%;
+    height: 50%;
+    overflow: hidden;
+    margin: 0 auto;
+    img {
       width: 100%;
-      height: auto;
-      min-height: 30vh;
-      display: block;
-      border: 1px solid #b0b0b0;
+      height: 100%;
+      // background-size: 50% 50%;
     }
   }
+  // .paddy-title {
+  //   position: fixed;
+  //   padding: 0;
+  //   width: 100%;
+  //   margin: 0;
+  //   top: 0;
+  //   left: 0;
+  //   z-index: 3;
+  //   border: 0;
+  //   height: 44px;
+  // }
+  // .paddy-main {
+  //   display: block;
+  //   padding: 16px;
+  //   img {
+  //     width: 100%;
+  //     height: auto;
+  //     min-height: 30vh;
+  //     display: block;
+  //     border: 1px solid #b0b0b0;
+  //   }
+  // }
 }
 </style>

src/views/product/index.vue

@@ -76,9 +76,10 @@ export default {
     this.num = isNaN(getGoodsNum()) ? 0 : parseInt(getGoodsNum());
     if (this.ad && this.ad.id) {
       this.initData(this.ad.id);
+    } else {
+      this.address = [];
     }
     this.getStock();
-  
   },
 
   methods: {
@@ -92,7 +93,6 @@ export default {
     },
     async getaddress() {
       let numRes = await this.set_user_goodsNum(this.num);
-      console.log("保存时单位：" + this.radioV);
       let unitRes = await this.set_user_goodsUnit(this.radioV);
       if (numRes && numRes.code === 0 && unitRes && unitRes.code === 0) {
         window.vm.$router.push({
@@ -108,7 +108,7 @@ export default {
         let res = await asyncRequest.get_stock({});
         if (res && res.code == 0) {
           this.total = parseInt(res.data.stock);
-            await this.getUnitist();
+          await this.getUnitist();
         } else if (res && res.code >= 100 && res.code <= 104) {
           await this.logout();
         } else {