update

miniprogram/app.json

@@ -11,7 +11,7 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "首页",
+    "navigationBarTitleText": "四维带看",
     "navigationBarTextStyle": "black"
   },
   "sitemapLocation": "sitemap.json",

miniprogram/components/card/card.wxml

@@ -1,6 +1,6 @@
 <!--components/card/card.wxml-->
 <view class="card-container">
-  <t-image src="{{cover}}" shape="round" loading="slot" mode="aspectFill" width="100%" height="240px" class="card-image">
+  <t-image src="{{cover}}"  bindtap="gotoRoom"  data-id='{{cardId}}' data-status="{{status}}" shape="round" loading="slot" mode="aspectFill" width="100%" height="240px" class="card-image">
     <t-loading slot="loading" theme="circular" size="40rpx" loading />
   </t-image>
   <view class="card-info">

miniprogram/pages/index/index.ts

@@ -48,8 +48,8 @@ Page({
   },
   handleToRoom(event: WechatMiniprogram.TouchEvent) {
     const { roomId, status } = event.detail
-    console.log('roomId', roomId, status)
-    const isTour = Number(status) === 0 ? 1 : 0
+    const isTour = Number(status) === 1 ? 0 : 1
+    console.log('handleToRoom', roomId, status, isTour)
     wx.navigateTo({
       url: `/pages/room/room?roomId=${roomId}&isTour=${isTour}`
     })
@@ -57,4 +57,8 @@ Page({
   onToTop(e: WechatMiniprogram.TouchEvent) {
     console.log('backToTop', e);
   },
+  onPullDownRefresh () {
+    this.fetchRoomList();
+    wx.stopPullDownRefresh()
+  }
 })

miniprogram/pages/my/my.ts

@@ -42,7 +42,10 @@ Page({
       isLogin: data
     })
     if (data) {
-      await getUserInfo();
+      const userInfo = await getUserInfo();
+      this.setData({
+        userInfo: userInfo
+      })
     }
   },
   /**
@@ -56,7 +59,6 @@ Page({
     this.updateUserInfo();
   },
   login() {
-
     const app = getApp<IAppOption>();
     app.login();
   },

miniprogram/pages/myScene/myScene.ts

@@ -45,11 +45,11 @@ Page({
   },
   handleToRoom(event: WechatMiniprogram.TouchEvent) {
     const { roomId, status, role } = event.detail
-    console.log('roomId', roomId, status)
-    let isTour = Number(status) === 0 ? 1 : 0
+    let isTour = Number(status) === 1 ? 0 : 1
     if (role === 'leader') {
       isTour = 0
     }
+    console.log('handleToRoom', roomId, status, isTour)
     wx.navigateTo({
       url: `/pages/room/room?roomId=${roomId}&isTour=${isTour}&role=${role}`
     })

miniprogram/pages/personal/personal.ts

@@ -89,11 +89,18 @@ Page({
     })
     wx.setStorageSync('isLogin', false)
     wx.setStorageSync('token', '')
-    wx.showToast({
-      title: '登出成功！'
-    });
     app.setLogin(false)
     app.resetUserInfo();
+    wx.showToast({
+      title: '登出成功！',
+  
+    });
+    setTimeout(()=>{
+      wx.redirectTo({
+        url:"/pages/my/my"
+      })
+    },1000)
+ 
   },
   async checkSession(): Promise<boolean> {
     let isExist = false

miniprogram/pages/room/room.ts

@@ -37,16 +37,17 @@ Page({
     console.log('auth', auth)
     let roomInfo: RoomDetailType
 
-
     if (options.role) {
       this.setData({ role: options.role })
     }
     if (options.roomId) {
       roomInfo = await fetchRoom(options.roomId);
-      console.log('data', roomInfo)
+
       this.setData({ roomDetail: roomInfo, roomId: options.roomId, m: roomInfo.sceneData[0].num })
       if (roomInfo && roomInfo.isHost === 1) {
         this.setData({ role: 'leader' })
+      }else{
+        this.setData({ role: 'cusomter' })
       }
     }
 
@@ -225,12 +226,12 @@ Page({
       })
       return {
         ...base,
-        title: '【好友邀请】一起来逛店吧！',
+        title: '【好友邀请】一起来带看吧！',
       }
     } else {
       return {
         ...base,
-        title: '【好友邀请】一起来逛店吧！',
+        title: '【好友邀请】一起来带看吧！',
       }
     }
   },