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

dist/static/css/chunk-4a316060.89c0e08b.css

@@ -1 +0,0 @@
-.introduce[data-v-d084891e]{background:#e6e6dc;position:relative;width:100%;height:100%;overflow-y:scroll}.introduce .list img[data-v-d084891e]{display:inline-block;width:100%}.introduce .header[data-v-d084891e]{position:absolute;height:46px;width:100%;top:0;left:0}.introduce .header img[data-v-d084891e]{width:9px;margin:18px 0 0 16px}

dist/static/css/chunk-6198b04f.95134792.css

@@ -0,0 +1 @@
+.goods[data-v-4c8cf3c8]{background:#e6e6dc;position:fixed;width:100%;height:100%}.goods .list[data-v-4c8cf3c8]{position:relative;width:100%;height:100%;overflow-y:scroll}.goods .list img[data-v-4c8cf3c8]{display:inline-block;width:100%;margin:-8px 0 0 0}.goods .header[data-v-4c8cf3c8]{position:absolute;z-index:2;height:46px;width:100%;top:0;left:0}.goods .header .van-icon[data-v-4c8cf3c8]{height:46px;width:46px;line-height:46px;text-align:center;font-size:18px;color:#fff}

dist/static/css/chunk-9951e086.f071dd40.css

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

dist/static/css/chunk-b5e917be.f3eb7336.css

@@ -1 +0,0 @@
-.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-c833cdfe.5390a16e.css

@@ -0,0 +1 @@
+.introduce[data-v-bd59b8d6]{background:#e6e6dc;position:fixed;width:100%;height:100%}.introduce .list[data-v-bd59b8d6]{position:relative;width:100%;height:100%;overflow-y:scroll}.introduce .list img[data-v-bd59b8d6]{display:inline-block;width:100%;margin:-5px 0 0 0}.introduce .header[data-v-bd59b8d6]{position:absolute;height:46px;width:100%;top:0;left:0;z-index:2}.introduce .header img[data-v-bd59b8d6]{width:8px;margin:17px 0 0 16px}

dist/static/js/chunk-9951e086.fedfb129.js

@@ -0,0 +1 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-9951e086"],{2232:function(t,e,n){"use strict";n("4339")},4339: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:"400-0001-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("2232"),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,"14988f38",null);e.default=r.exports}}]);

dist/static/js/chunk-b5e917be.feed3b29.js

@@ -1 +0,0 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-b5e917be"],{"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}}]);

src/router/index.js

@@ -90,6 +90,11 @@ const routes = [
         component: () => import('@/views/introduce/index'),
         hidden: true
     },
+    {
+        path: '/goods',
+        component: () => import('@/views/goods/index'),
+        hidden: true
+    },
 
     
 ];

src/views/aboutUs/index.vue

@@ -30,7 +30,7 @@ export default {
       list: [
         // { title: "公司名称：", value: "五常市藏金壹柒肆伍农业科技有限公司" },
         { title: "联系电话：", value: "" },
-        { title: "客服热线：", value: "4000-001-745" },
+        { title: "客服热线：", value: "400-0001-745" },
         { title: "企业邮箱：", value: "" },
         { title: "邮政编码：", value: "150200" },
         {

src/views/goods/index.vue

@@ -0,0 +1,84 @@
+<template>
+  <div class="goods">
+    <div class="header">
+      <van-icon name="arrow-left" @click="onClickLeft" />
+    </div>
+    <div class="list" v-if="showList && showList.length > 0">
+      <img
+        v-for="(img, index) in showList"
+        :key="img + index"
+        :src="img"
+        alt=""
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import resToken from "@/mixins/resToken";
+export default {
+  mixins: [resToken],
+  data() {
+    return {
+      title: null,
+      showList: [],
+
+      loading: false,
+    };
+  },
+  async created() {
+    this.showList = [];
+    this.getImgList();
+  },
+
+  methods: {
+    onClickLeft() {
+      window.history.back(-1);
+    },
+    getImgList() {
+      for (let i = 0; i < 23; i++) {
+        this.showList.push(
+          require(`@/assets/images/goods/image${i + 1}@2x.png`)
+        );
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.goods {
+  background: #e6e6dc;
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  .list {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    overflow-y: scroll;
+    img {
+      display: inline-block;
+      width: 100%;
+      margin: -8px 0 0 0;
+    }
+  }
+  .header {
+    position: absolute;
+    z-index: 2;
+    height: 46px;
+    width: 100%;
+    top: 0;
+    left: 0;
+    .van-icon {
+      height: 46px;
+      width: 46px;
+      line-height: 46px;
+      text-align: center;
+      font-size: 18px;
+      color: #fff;
+    }
+  }
+}
+</style>
+

src/views/introduce/index.vue

@@ -79,16 +79,19 @@ export default {
 <style lang="scss" scoped>
 .introduce {
  background: #e6e6dc;
- position: relative;
+ position:fixed;
+ 
  width: 100%;
  height: 100%;
- overflow-y: scroll;
  .list{
-
- 
+position: relative;
+ width: 100%;
+ height: 100%;
+ overflow-y:scroll;
  img{
    display: inline-block;
    width: 100%;
+   margin:-5px 0 0 0;
 
  }}
  .header{
@@ -97,9 +100,10 @@ export default {
    width: 100%;
    top:0;
    left:0;
+   z-index:2;
    img{
-     width: 9px;
-     margin: 18px 0 0 16px;
+     width: 8px;
+     margin: 17px 0 0 16px;
    }
  }
 }

src/views/paddy/index.vue

@@ -7,7 +7,7 @@
         indicator-color="#DAAD71"
         @change="onChange"
       >
-        <van-swipe-item>
+        <van-swipe-item >
           <img
             src="@/assets/images/home/swipper/swipper1.png"
             alt=""
@@ -21,6 +21,13 @@
             style="width: 100%"
           />
         </van-swipe-item>
+        <van-swipe-item>
+          <img
+            src="@/assets/images/home/swipper/swipper3.png"
+            alt=""
+            style="width: 100%"
+          />
+        </van-swipe-item>
         <template #indicator>
           <ul class="oUl">
             <li
@@ -37,6 +44,13 @@
                   : 'custom-indicator'
               "
             ></li>
+            <li
+              :class="
+                current == 2
+                  ? 'custom-indicator indicator-active'
+                  : 'custom-indicator'
+              "
+            ></li>
           </ul>
         </template>
       </van-swipe>
@@ -57,7 +71,7 @@
         <li
           v-for="(item, index) in baozhuangBoxList"
           :key="index + item.name"
-          @click="goto('/home/product', index)"
+          @click="goto('/goods', index)"
         >
           <div class="riceBag">
             <img :src="item.img" alt="" />