Merge branch 'master' of http://git.cc-lotus.info/service-platform/mobile-official

package.json

@@ -15,6 +15,7 @@
     "lodash": "^4.17.15",
     "moment": "^2.26.0",
     "naf-core": "^0.1.2",
+    "trtc-js-sdk": "^4.4.0",
     "vant": "^2.8.5",
     "vue": "^2.6.11",
     "vue-meta": "^2.3.4",

src/store/index.js

@@ -16,7 +16,7 @@ import exportuser from '@common/store/market/exportuser';
 import user from './user';
 import place from './place';
 import onliveUser from './onlive/user';
-import onliveUser from './onlive/gensign';
+import gensign from './onlive/gensign';
 import room from './onlive/room';
 import * as ustate from '@/store/common/state';
 import * as umutations from '@/store/common/mutations';
@@ -46,5 +46,6 @@ export default new Vuex.Store({
     place,
     onliveUser,
     room,
+    gensign,
   },
 });

src/store/onlive/room.js

@@ -22,6 +22,10 @@ const actions = {
     const res = await this.$axios.$post(`${api.roomInfo}`, payload);
     return res;
   },
+  async roomfetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.roomInfo}/roomname`, payload);
+    return res;
+  },
   async fetch({ commit }, payload) {
     const res = await this.$axios.$get(`${api.roomInfo}/${payload}`);
     return res;

src/views/live/parts/liveList.vue

@@ -13,9 +13,9 @@
             </p>
           </el-col>
           <el-col :span="6" class="right">
-            <p @click="$router.push({ path: '/live/roomDetail', query: { id: item.id,roomname:item.roomname } })" v-if="item.roomname">进入房间</p>
+            <p @click="$router.push({ path: '/live/roomDetail', query: { id: item.id, roomname: item.roomname } })" v-if="item.roomname">进入房间</p>
             <p @click="$router.push({ path: '/live/detail', query: { id: item.id } })" v-else>进入房间</p>
-            <p @click="$router.push({ path: '/onlive/roomInfo', query: { roomname: item.roomname } })">房间详情</p>
+            <p @click="$router.push({ path: '/onlive/roomInfo', query: { roomname: item.roomname } })" v-if="item.roomname">房间详情</p>
           </el-col>
         </el-col>
       </el-col>

src/views/live/parts/roomsDetail.vue

@@ -35,9 +35,7 @@ const { mapActions: gensign } = createNamespacedHelpers('gensign');
 export default {
   name: 'roomsDetail',
   props: {},
-  components: {
-    
-  },
+  components: {},
   data: function() {
     return {
       client_: null,

src/views/onlive/roomInfo.vue

@@ -32,14 +32,25 @@ export default {
       isleftarrow: '',
       // 返回
       navShow: true,
+      roomInfos: {},
     };
   },
-  created() {},
-  methods: {},
+  created() {
+    this.seachInfo();
+  },
+  methods: {
+    ...room(['roomfetch']),
+    async seachInfo() {
+      let res = await this.roomfetch({ roomname: this.roomname });
+      if (this.$checkRes(res)) {
+        this.$set(this, `roomInfos`, res.data);
+      }
+    },
+  },
   computed: {
     ...mapState(['user']),
-    token() {
-      return this.$route.query.token;
+    roomname() {
+      return this.$route.query.roomname;
     },
   },
   mounted() {