Merge branch 'dev' into live

dist/static/css/chunk-056e744a.fa6653bc.css

@@ -0,0 +1 @@
+.live[data-v-a4d332c4]{position:relative;width:100%;height:100%;padding:44px 0 0 0;-webkit-box-sizing:border-box;box-sizing:border-box;overflow-y:scroll;background:transparent}.live .live-title[data-v-a4d332c4]{position:fixed;padding:0;width:100%;margin:0;top:0;left:0;z-index:3;border:0;height:44px}.live .videoList[data-v-a4d332c4]{padding:0 16px 60px 16px;background:transparent;height:auto}.live .videoList .videoItem[data-v-a4d332c4],.live .videoList[data-v-a4d332c4]{-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;width:100%}.live .videoList .videoItem[data-v-a4d332c4]{font-size:14px;line-height:30px;padding:0;margin:0;cursor:pointer}.live .videoList .videoItem .img[data-v-a4d332c4]{width:100%;display:block;height:180px;padding:0;border-radius:20px;overflow:hidden;border:0}.live .videoList .videoItem .img img[data-v-a4d332c4]{width:100%;display:inline-block;height:100%;border:0}.live .videoList .videoItem .videoName[data-v-a4d332c4]{display:block;-webkit-box-sizing:border-box;box-sizing:border-box;font-size:16px;font-weight:bolder;padding:0 5px;margin:10px 0 5px 0;width:100%;line-height:20px;color:#1a1a1a}.live .videoList .videoItem .videoDesc[data-v-a4d332c4]{display:block;font-size:12px;color:#999;-webkit-box-sizing:border-box;box-sizing:border-box;margin:0 0 10px 0;line-height:25px;padding:0 5px}

dist/static/css/chunk-40a4599f.f3eb7336.css

@@ -0,0 +1 @@
+.aboutUs[data-v-6e0349ca]{position:relative;width:100%;height:100%;-webkit-box-sizing:border-box;box-sizing:border-box;background:#fff}.aboutUs .logo[data-v-6e0349ca]{-webkit-box-sizing:border-box;box-sizing:border-box;text-align:center;padding:30px 0 25px 0}.aboutUs .logo img[data-v-6e0349ca]{width:100px;background:#f9f9f9;border-radius:12px;overflow:hidden;display:inline-block}

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

@@ -0,0 +1 @@
+.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-73ab7664.97184df3.css

@@ -0,0 +1 @@
+.liveD[data-v-5955cec4]{position:relative;width:100%;height:100%;padding:44px 0 0 0;-webkit-box-sizing:border-box;box-sizing:border-box;overflow-y:scroll;background:transparent}

dist/static/css/chunk-7ebd2b4e.43716fc5.css

@@ -0,0 +1 @@
+.addressView[data-v-7979aa78]{position:relative;width:100%;height:100%;-webkit-box-sizing:border-box;box-sizing:border-box;background:#fff}.addressView .van-address-edit__buttons button[data-v-7979aa78]{float:right;width:42.5%}.addressView .van-address-edit__buttons button[data-v-7979aa78]:first-child{margin:0 5% 0 2.5%;background:-webkit-gradient(linear,left bottom,left top,from(#ff6680),to(#ffd490));background:linear-gradient(0deg,#ff6680,#ffd490);border:0}.addressView .van-address-edit__buttons button[data-v-7979aa78]:last-child{margin:0 2.5% 0 5%;border-color:#ff8327;color:#ff8327}.addressView .van-address-edit__buttons[data-v-7979aa78]:after,.addressView .van-address-edit__buttons[data-v-7979aa78]:before{content:"";display:block;clear:both}

dist/static/css/chunk-a1f95ea6.0cf8261c.css

@@ -0,0 +1 @@
+.oDetail .page-main[data-v-fc9bd18c],.oDetail[data-v-fc9bd18c]{background:transparent;overflow-y:scroll}.oDetail .page-main[data-v-fc9bd18c]{-webkit-box-sizing:border-box;box-sizing:border-box;width:100%;height:auto;padding:46px 0 50px 0;border:0!important}.oDetail .page-main .jiange[data-v-fc9bd18c]{height:5px;background:#f0f0f0!important;width:calc(100% - 32px);margin:3px 16px 0 16px}.oDetail .page-main .van-cell-group__title[data-v-fc9bd18c],.oDetail .page-main .van-cell[data-v-fc9bd18c]:after{-webkit-box-sizing:0!important;box-sizing:0!important;border:0!important}.oDetail .page-main .van-cell-group__title[data-v-fc9bd18c]{font-weight:bolder;color:#333}.oDetail .page-main .van-cell[data-v-fc9bd18c]{font-size:12px;background:transparent!important;color:#787878;padding:7px 16px 0 16px;-webkit-box-sizing:0!important;box-sizing:0!important;border:0!important}.oDetail .page-main .van-cell[data-v-fc9bd18c]:last-child{padding-bottom:7px!important;-webkit-box-sizing:0!important;box-sizing:0!important;border:0!important}.oDetail .page-main .van-cell-group[data-v-fc9bd18c]{background:transparent!important;-webkit-box-sizing:0!important;box-sizing:0!important;border:0!important}.oDetail .page-main .van-hairline--top-bottom[data-v-fc9bd18c]:after,.oDetail .page-main .van-hairline-unset--top-bottom[data-v-fc9bd18c]:after{border:0!important}

dist/static/css/chunk-c09430c8.4960f43a.css

@@ -0,0 +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}

dist/static/css/chunk-cf4ff352.838b150b.css

@@ -0,0 +1 @@
+.order[data-v-5f7c8845]{position:relative;width:100%;height:100%;padding-top:108px;-webkit-box-sizing:border-box;box-sizing:border-box;overflow-y:scroll;background:#fff}.order .order-title[data-v-5f7c8845]{position:fixed;padding:0;width:100%;margin:0;top:0;left:0;z-index:3;border:0;height:84px}.order .order-title .vant-tabs-main[data-v-5f7c8845]{padding:40px 0 0 0}.order .order-title .van-hairline--bottom[data-v-5f7c8845]:after{display:none}.order .list-ul-main[data-v-5f7c8845]{padding:12px 16px 0 16px}.order .list-ul-main .list-ul[data-v-5f7c8845]{background:#fff;border-radius:30px;width:100%;padding:8px 16px 8px 16px;margin:0 0 12px 0;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:10px}.order .list-ul-main .list-ul li[data-v-5f7c8845]{width:100%;float:left;font-size:14px;line-height:30px;color:#000;-webkit-box-sizing:border-box;box-sizing:border-box}.order .list-ul-main .list-ul[data-v-5f7c8845]:last-child{margin:0 0 2px 0}

dist/static/js/chunk-40a4599f.84560b8d.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-40a4599f"],{"0a68":function(t,e,n){"use strict";n("4452")},4452:function(t,e,n){},7583:function(t,e,n){t.exports=n.p+"static/img/logo.e7e39450.png"},"9f53":function(t,e,n){"use strict";n("433b");var a,i=n("d399");n("96cf"),n=n("1da1");e.a={methods:{logout:(a=Object(n.a)(regeneratorRuntime.mark((function t(){return regeneratorRuntime.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:if("/login"!==this.$route.path)return t.next=3,this.$store.dispatch("user/logout");t.next=4;break;case 3:this.$router.push("/login");case 4:case"end":return t.stop()}}),t,this)}))),function(){return a.apply(this,arguments)}),show_title:function(t){Object(i.a)({message:t})}}}},ffc5:function(t,e,n){"use strict";n.r(e),n("96cf");var a,i=n("1da1"),r={mixins:[n("9f53").a],data:function(){return{list:[{title:"联系电话：",value:""},{title:"客服热线：",value:"4000-001-745"},{title:"企业邮箱：",value:""},{title:"邮政编码：",value:"150200"},{title:"企业地址：",value:"黑龙江省哈尔滨市五常市小山子镇双利村一屯"}],loading:!1,header:n("7583")}},created:(a=Object(i.a)(regeneratorRuntime.mark((function t(){return regeneratorRuntime.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:case"end":return t.stop()}}),t)}))),function(){return a.apply(this,arguments)}),methods:{onClickLeft:function(){window.history.back(-1)}}};n("0a68"),i=n("2877"),r=Object(i.a)(r,(function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"aboutUs",staticStyle:{"padding-top":"46px"}},[n("van-nav-bar",{staticClass:"van-nav-bar-my-fixed",attrs:{title:"联系我们","left-arrow":"",fixed:""},on:{"click-left":t.onClickLeft}}),n("div",{staticClass:"logo"},[n("img",{attrs:{src:t.header,alt:""}})]),t._l(t.list,(function(t,e){return n("van-cell",{key:t.title+e,attrs:{center:"",title:t.title,value:t.value}})}))],2)}),[],!1,null,"6e0349ca",null);e.default=r.exports}}]);

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

@@ -0,0 +1 @@
+(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}}]);

src/App.vue

@@ -45,6 +45,7 @@ html {
       .aboutUs,
       .product,
       .live,
+      .paddy,
       .liveD,
       .login {
         @include layout-dev;

src/layout/index.vue

@@ -46,11 +46,11 @@ export default {
       bottomTabs: [
         //底部导航配置
         {
-          to: "/home/live",
-          title: "直播",
+          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/live-active.png"),
+            // inactive: require("@/assets/images/home/live.png"),
           },
         },
         {

src/router/index.js

@@ -14,14 +14,14 @@ const routes = [
     {
         path: '/home',
         component: () => import('@/layout/index'),
-        redirect: '/product',
+        redirect: '/paddy',
         children: [
             {
-                path: 'live',
-                component: () => import('@/views/live/index'),
-                name: 'live',
+                path: 'paddy',
+                component: () => import('@/views/paddy/index'),
+                name: 'paddy',
                 alwaysShow: true,
-                meta: { title: '直播', noCache: true, breadcrumb: true }
+                meta: { title: '稻田', noCache: true, breadcrumb: true }
             },
             {
                 path: 'product',
@@ -60,6 +60,11 @@ const routes = [
         component: () => import('@/views/address/view'),
         hidden: true
     },
+    {
+        path: '/live',
+        component: () => import('@/views/live/index'),
+        hidden: true
+    },
     {
         path: '/order',
         component: () => import('@/views/order/index'),

src/views/live/index.vue

@@ -2,7 +2,7 @@
   <div class="live" style="padding-top: 44px">
     <div class="live-title">
       <van-nav-bar
-        title="直播"
+        title="我的稻田"
         class="van-nav-bar-my-fixed"
         left-arrow
         @click-left="onClickLeft"
@@ -98,6 +98,9 @@ export default {
           this.parmValue.page--;
         }
       }
+    },
+     onClickLeft() {
+      window.history.back(-1);
     },
      goto(id) {
       window.vm.$router.push({

src/views/login/index.vue

@@ -133,7 +133,7 @@ export default {
     },
     async loginSuccess(data) {
       window.vm.$router.push({
-        path: "/home/live",
+        path: "/home/paddy",
       });
     },
 

src/views/my/index.vue

@@ -97,6 +97,7 @@ export default {
     return {
       header: require("@/assets/images/my/header.png"), //用户头像
       userData: null,
+      active: require("@/assets/images/home/live-active.png"),
       ad: require("@/assets/images/my/ad.png"), //地理定位
       order: require("@/assets/images/my/order.png"), //用户订单
       unshipped: require("@/assets/images/my/unshipped.png"), //待发货
@@ -112,6 +113,11 @@ export default {
   },
   async created() {
     this.cellList = [
+       {
+        anchor: "/live",
+        id: this.active,
+        name: "我的直播",
+      },
       {
         anchor: "/address",
         id: this.ad,

src/views/paddy/index.vue

@@ -0,0 +1,47 @@
+<template>
+  <div class="paddy" style="padding-top:44px">
+  <div class="paddy-title">
+      <van-nav-bar
+        title="我的稻田"
+        class="van-nav-bar-my-fixed"
+      />
+    </div>
+    <div class="paddy-main">
+ <img
+      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>
+</template>
+
+<script>
+</script>
+
+<style lang="scss" scoped>
+.paddy {
+    .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>