Merge branch 'edit' into live

src/views/live/index.vue

@@ -30,7 +30,6 @@
 
 <script>
 import {
-  // Tab, Tabs,
   List,
   cell,
 } from "vant";
@@ -41,8 +40,6 @@ export default {
   components: {
     "van-cell": cell,
     "van-list": List,
-    // "van-tab": Tab,
-    // "van-tabs": Tabs,
   },
   async created() {
     //在组件被创建的时候就加载

src/views/live/liveD.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="liveD" v-loading="loading" >
+  <div class="liveD" v-loading="loading">
     <van-nav-bar
       title="订单详情"
       class="van-nav-bar-my-fixed"
@@ -7,10 +7,16 @@
       @click-left="onClickLeft"
       fixedfixed
     />
-    <div class="page-main" style="padding-top:44px">
+    <div class="page-main" style="padding-top: 44px">
       <!-- <div class="oDetail" > -->
 
-      <video-player ref="videoPlayer" :playsinline="true" :options="Options" />
+      <video-player
+        ref="videoPlayer"
+        id="videoPlayer"
+        style="width: 100%"
+        :playsinline="true"
+        :options="Options"
+      />
     </div>
   </div>
 </template>
@@ -28,11 +34,23 @@ export default {
     };
   },
   async created() {
+    window.onresize = () => {
+      this.getHeight();
+    };
     this.id = this.$route.query.id ? this.$route.query.id : "0";
     this.initOPtions();
     await this.initData();
   },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.getHeight();
+    });
+  },
   methods: {
+    getHeight() {
+      console.log(this.$refs.videoPlayer);
+    },
     onClickLeft() {
       window.history.back(-1);
     },
@@ -79,8 +97,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
-
 .liveD {
   position: relative;
   width: 100%;
@@ -89,6 +105,17 @@ export default {
   box-sizing: border-box;
   overflow-y: scroll;
   background: transparent;
+  // #videoPlayer {
+  //   width: 100% !important;
+  //   .video-js {
+  //     margin: 0 !important;
+  //     padding: 0 !important;
+  //     .vjs-big-play-button {
+  //       top: 20px!important;
+  //       left: 150px!important;
+  //     }
+  //   }
+  // }
   // .liveD-title {
   //   position: fixed;
   //   padding: 0;
@@ -100,7 +127,7 @@ export default {
   //   border: 0;
   //   height: 44px;
   // }
-  }
+}
 // .liveD {
 //   text-align: center;
 // }

src/views/my/index.vue

@@ -199,7 +199,7 @@ export default {
     box-sizing: border-box;
     width: 100%;
     .mine-resume-main {
-      padding: 0 0 10px 0;
+      padding: 0  0;
       ul {
         padding: 16px;
         background: transparent;
@@ -354,7 +354,7 @@ export default {
   position: relative;
   top: 0;
   left: 0;
-  padding: 8px 609px 18px 15px;
+  padding: 8px 609px 8px 15px;
 }
 .top {
   width: 100%;

src/views/product/index.vue

@@ -38,11 +38,7 @@
       <div v-else @click="getaddress" class="kong clear">添加地址</div>
       <div class="product-footer clear">
         <div class="fl">
-          <input-number
-            :numb="num || goodsNum"
-            :max="stock"
-            @backNum="backNum"
-          />
+          <input-number :numb="num" :max="stock" @backNum="backNum" />
         </div>
         <van-button
           type="info"
@@ -58,46 +54,46 @@
 
 <script>
 import { Dialog } from "vant";
-import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/product/index";
+import { getGoodsUnit, getGoodsNum, getAd } from "@/utils/auth";
 export default {
   mixins: [resToken],
-  computed: {
-    ...mapGetters(["ad", "goodsNum", "goodsUnit"]),
-  },
   data() {
     return {
-      num: this.goodsNum,
+      num: 0,
       total: 0,
-      radioV: "1",
+      radioV: "",
       address: [],
       unitist: [],
       productList: [],
       stock: 0,
+      ad: null,
     };
   },
   mounted() {
+    this.ad = getAd() ? JSON.parse(getAd()) : {};
+    this.num = isNaN(getGoodsNum()) ? 0 : parseInt(getGoodsNum());
     if (this.ad && this.ad.id) {
       this.initData(this.ad.id);
     }
-    this.getUnitist();
     this.getStock();
+  
   },
 
   methods: {
     changePitem(index) {
       this.radioV = this.productList[index].id;
       this.stock = this.productList[index].stock;
+
       if (this.num > this.stock) {
         this.num = this.stock;
       }
     },
     async getaddress() {
-      let numRes = await this.set_user_goodsNum(this.num || this.goodsNum);
-      let unitRes = await this.set_user_goodsUnit(
-        this.radioV || this.goodsUnit
-      );
+      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({
           path: "/address",
@@ -112,12 +108,11 @@ export default {
         let res = await asyncRequest.get_stock({});
         if (res && res.code == 0) {
           this.total = parseInt(res.data.stock);
-          this.distributeGoods();
+            await this.getUnitist();
         } else if (res && res.code >= 100 && res.code <= 104) {
           await this.logout();
         } else {
           this.total = 0;
-          // this.show_title("获取个人信息失败！");
         }
       }
     },
@@ -148,9 +143,10 @@ export default {
           };
           this.productList.push(item);
         });
-        let index = this.productList.findIndex(v1 => {
-        return  v1.id == this.goodsUnit+"";
+        let index = this.productList.findIndex((v1) => {
+          return v1.id == getGoodsUnit() + "";
         });
+
         this.changePitem(index === -1 ? 0 : index);
       }
     },
@@ -160,9 +156,9 @@ export default {
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
-        this.$store.dispatch("user/set_ad", {}).then((res) => {
-        });
+        this.$store.dispatch("user/set_ad", {}).then((res) => {});
       }
+      console.log(11);
     },
     backNum(e) {
       this.num = e;
@@ -170,7 +166,7 @@ export default {
     async placeOrder() {
       if (!this.loading) {
         if (this.ad && this.ad.id) {
-          this.num = this.num || this.goodsNum;
+          this.num = this.num;
           if (isNaN(this.num)) {
             this.num = 0;
           }
@@ -378,5 +374,4 @@ export default {
     }
   }
 }
-
 </style>