|
@@ -31,13 +31,7 @@
|
|
|
>
|
|
|
进入房间
|
|
|
</van-col>
|
|
|
- <van-col
|
|
|
- :span="24"
|
|
|
- class="reserve"
|
|
|
- @click.native="$router.push({ path: '/live/roomMeet', query: { id: roomInfos.id, roomname: roomInfos.name } })"
|
|
|
- v-else
|
|
|
- >进入房间</van-col
|
|
|
- >
|
|
|
+ <van-col :span="24" class="reserve" @click.native="roomMeetBtn" v-else>进入房间</van-col>
|
|
|
</el-col>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -48,8 +42,8 @@
|
|
|
import { mapState, mapMutations, createNamespacedHelpers } from 'vuex';
|
|
|
import NavBar from '@/layout/common/topInfo.vue';
|
|
|
import footInfo from '@/layout/common/footInfo.vue';
|
|
|
-import wx from 'weixin-jsapi';
|
|
|
-var moment = require('moment');
|
|
|
+import wx from 'weixin-js-sdk';
|
|
|
+const moment = require('moment');
|
|
|
const { mapActions: room } = createNamespacedHelpers('room');
|
|
|
const jwt = require('jsonwebtoken');
|
|
|
export default {
|
|
@@ -99,6 +93,10 @@ export default {
|
|
|
this.$set(this, `endtime`, endtime - now);
|
|
|
}
|
|
|
},
|
|
|
+ roomMeetBtn() {
|
|
|
+ const url = '/pages/meeting/meeting?uid=' + this.user.uid + '&username=' + this.user.name + '&rid=' + this.id + '&roomname=' + this.roomname;
|
|
|
+ wx.miniProgram.navigateTo({ url });
|
|
|
+ },
|
|
|
},
|
|
|
computed: {
|
|
|
...mapState(['user']),
|