guhongwei пре 4 година
родитељ
комит
095d71b155
2 измењених фајлова са 22 додато и 8 уклоњено
  1. 11 2
      src/views/adminCenter/basicInfo/index.vue
  2. 11 6
      src/views/hall/direct.vue

+ 11 - 2
src/views/adminCenter/basicInfo/index.vue

@@ -12,6 +12,7 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 import QRCode from 'qrcode';
+const { mapActions: dock } = createNamespacedHelpers('dock');
 export default {
   name: 'index',
   props: {},
@@ -19,12 +20,20 @@ export default {
   data: function() {
     return {
       qc: '',
+      dockid: '',
     };
   },
-  created() {},
+  created() {
+    this.search();
+  },
   methods: {
+    ...dock(['fetch', 'query', 'delete', 'update', 'fetch']),
+    async search() {
+      let res = await this.fetch(this.user.uid);
+      this.$set(this, `dockid`, res.data.id);
+    },
     async creatQrCode() {
-      let url = `http://free.liaoningdoupo.com/api/auth/wxchat?redirect_uri=http://free.liaoningdoupo.com/platmobile/bind/&type=1&uid=${this.user.uid}`; // 需要转换为二维码的内容
+      let url = `http://free.liaoningdoupo.com/api/auth/wxchat?redirect_uri=http://free.liaoningdoupo.com/platmobile/followbind/&type=2&qrcode=${this.dockid}`; // 需要转换为二维码的内容
       let el = document.getElementById('qrCodeUrl');
       this.qc = await QRCode.toDataURL(url, { height: 200, width: 200 });
     },

+ 11 - 6
src/views/hall/direct.vue

@@ -48,9 +48,10 @@
                   <span>直播</span>
                 </el-col>
                 <el-col :span="24" class="video">
-                  <video :src="dockInfo.file_path" controls="controls" style="height: 395px; width: 100%;">
+                  轮播
+                  <!-- <video :src="dockInfo.file_path" controls="controls" style="height: 395px; width: 100%;">
                     您的浏览器不支持 video 标签。
-                  </video>
+                  </video> -->
                   <!-- <videoPlayer ref="videoPlayer" :options="videoOptions" class="vjs-custom-skin videoPlayer" :playsinline="true" /> -->
                 </el-col>
               </el-col>
@@ -664,10 +665,14 @@ export default {
       }
       this.$set(this, `directlist`, newjysk);
       // 展会动态
-      let dongtai = await this.dockdongtai(this.dock_id);
-      console.log(dongtai);
-      let opera = await this.operaFetch(this.dock_id);
-      console.log(opera);
+      // 交易情况
+      let jioayi = await this.dockdongtai(this.dock_id);
+      let jioayiData = jioayi.apply.map(item => item.transdata);
+      jioayiData = _.flattenDeep(jioayiData);
+      console.log(jioayiData);
+      // 登录情况
+      let login = await this.operaFetch(this.dock_id);
+      console.log(login);
     },
     // 交易实况
     handleClicks(tab, event) {