修改BUG

pages/my-index/customer-service/index.vue

@@ -1,4 +1,18 @@
-<script setup></script>
+<script setup>
+  import { navigateTo } from '@/utils/router'
+  // import { onLoad } from '@dcloudio/uni-app'
+  // import { ref } from 'vue'
+  // import { getUserServiceList } from '@/api/my-index'
+
+  // const list = ref([])
+  // const getList = async () => {
+  //   const res = await getUserServiceList()
+  //   list.value = res.data
+  // }
+  // onLoad(() => {
+  //   getList()
+  // })
+</script>
 
 <template>
   <view class="customer-service-index">
@@ -9,8 +23,12 @@
         class="avatar"
       ></image>
       <text class="tisp">Hi~有什么可以帮到你？</text>
-      <button>第三方客服</button>
-      <button>APP客服</button>
+      <button
+        @tap="navigateTo('/pages/my-index/customer-service/third-party')"
+      >
+        第三方客服
+      </button>
+      <!-- <button>APP客服</button> -->
     </view>
   </view>
 </template>
@@ -52,7 +70,7 @@
         background: linear-gradient(0deg, #00d993 0%, #00d9c5 100%);
         border-radius: 16rpx;
         box-sizing: border-box;
-        &:last-child {
+        &:nth-child(2) {
           background: #ffffff;
           color: #00d993;
           border: 2rpx solid #00d993;

pages/my-index/customer-service/third-party.vue

@@ -0,0 +1,35 @@
+<script setup>
+  import { onLoad } from '@dcloudio/uni-app'
+  import { ref } from 'vue'
+  import { useAuthUser } from '@/composables/useAuthUser'
+
+  const { userInfo } = useAuthUser()
+
+  const windowHeight = ref(0)
+  const url = ref('')
+  onLoad(() => {
+    const info = uni.getSystemInfoSync()
+    windowHeight.value = info.windowHeight - 4
+    url.value = `https://www.axd01wf.cfd/chat/index?channelId=${
+      import.meta.env.VITE_CHANNEL_ID
+    }&groupId=${import.meta.env.VITE_GROUP_ID}&userName=${
+      userInfo.value.userName
+    }&phone=${userInfo.value.mobile}&email=${userInfo.value.email}`
+  })
+</script>
+
+<template>
+  <view :style="{ height: windowHeight + 'px' }" class="webview-box">
+    <web-view
+      :fullscreen="false"
+      :src="url"
+      style="width: 100%; height: 100%"
+    ></web-view>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+  .webview-box {
+    width: 100%;
+  }
+</style>

pages/my-index/meeting-record/details.vue

@@ -1,22 +1,40 @@
 <script setup>
   import { onLoad } from '@dcloudio/uni-app'
+  import { getLiveRecordDetail } from '@/api/tui-kit'
+  import { ref } from 'vue'
 
+  const viewData = ref({})
+  const loading = ref(true)
+  const getData = async id => {
+    loading.value = true
+    const res = await getLiveRecordDetail(id)
+    viewData.value = res.data
+    loading.value = false
+  }
   onLoad(e => {
-    console.log(e, '==')
+    getData(e.id)
   })
 </script>
 
 <template>
-  <view class="details-index">
+  <view v-if="!loading" class="details-index">
     <view class="top-name">
-      <text class="title">Admin的视频的会议</text>
+      <text class="title">{{ viewData.roomName }}</text>
       <view class="date-box">
         <image
           src="/static/images/my-index/date-icon.png"
           mode="heightFix"
           class="icon-img"
         ></image>
-        <text class="des">12月14日(周五) 13:45-16:09</text>
+        <text class="des">开始时间：{{ viewData.startTime }}</text>
+      </view>
+      <view class="date-box">
+        <image
+          src="/static/images/my-index/date-icon.png"
+          mode="heightFix"
+          class="icon-img"
+        ></image>
+        <text class="des">结束时间：{{ viewData.endTime }}</text>
       </view>
       <view class="id-box">
         <image
@@ -24,9 +42,9 @@
           mode="heightFix"
           class="icon-img"
         ></image>
-        <text class="des">会议ID：8755 8445</text>
+        <text class="des">会议ID：{{ viewData.roomId }}</text>
       </view>
-      <view class="user-box">
+      <!-- <view class="user-box">
         <view class="user-text">
           <image
             src="/static/images/my-index/user-icon.png"
@@ -45,18 +63,18 @@
             <text>名字</text>
           </view>
         </view>
-      </view>
+      </view> -->
     </view>
 
-    <view v-for="item in 3" class="public-meeting-card">
+    <view class="public-meeting-card">
       <image
-        src="https://q9.itc.cn/q_70/images01/20241011/856bff05ebe54098ad4af2cb59e02ae8.png"
+        :src="viewData.coverUrl"
         mode="aspectFill"
         class="left-img"
       ></image>
       <view class="right-box">
-        <text>Admin的视频的会议</text>
-        <text>12月27日13:27</text>
+        <text>{{ viewData.roomName }}</text>
+        <text>{{ viewData.startTime }}</text>
       </view>
     </view>
   </view>
@@ -93,13 +111,11 @@
       }
       .date-box,
       .id-box {
+        margin-top: 12rpx;
         display: flex;
         align-items: center;
       }
 
-      .date-box {
-        margin: 32rpx 0;
-      }
       .user-box {
         margin-top: 32rpx;
         display: flex;
@@ -137,8 +153,8 @@
   }
 
   .public-meeting-card {
-    margin-top: 47rpx;
-    padding-top: 47rpx;
+    margin-top: 27rpx;
+    padding-top: 27rpx;
     border-top: 2rpx solid #f9f9f9;
   }
 </style>

pages/my-index/meeting-record/index.vue

@@ -1,27 +1,57 @@
 <script setup>
   import { navigateTo } from '@/utils/router'
+  import { ref } from 'vue'
+  import { getLiveRecordList } from '@/api/tui-kit'
+
+  const dataList = ref([])
+  const paging = ref(null)
+  const getList = async (pageNum, pageSize) => {
+    console.log(pageSize, '====')
+    try {
+      const res = await getLiveRecordList({
+        pageNum,
+        pageSize
+      })
+      paging.value.complete(res.rows)
+    } catch (error) {
+      paging.value.complete(false)
+    }
+  }
 </script>
 
 <template>
-  <view class="meeting-record-index">
-    <view
-      v-for="item in 3"
-      class="public-meeting-card"
-      @click="
-        navigateTo('/pages/my-index/meeting-record/details', { id: item })
-      "
-    >
-      <image
-        src="https://q9.itc.cn/q_70/images01/20241011/856bff05ebe54098ad4af2cb59e02ae8.png"
-        mode="aspectFill"
-        class="left-img"
-      ></image>
-      <view class="right-box">
-        <text>Admin的视频的会议</text>
-        <text>12月27日13:27</text>
+  <z-paging
+    ref="paging"
+    v-model="dataList"
+    safe-area-inset-bottom
+    use-safe-area-placeholder
+    :default-page-size="15"
+    @query="getList"
+  >
+    <view class="meeting-record-index">
+      <view
+        v-for="item in dataList"
+        :key="item.id"
+        class="public-meeting-card"
+        @click="
+          navigateTo('/pages/my-index/meeting-record/details', {
+            id: item.id
+          })
+        "
+      >
+        <image
+          :src="item.coverUrl"
+          lazy-load
+          mode="aspectFill"
+          class="left-img"
+        ></image>
+        <view class="right-box">
+          <text>{{ item.roomName }}</text>
+          <text>{{ item.createTime }}</text>
+        </view>
       </view>
     </view>
-  </view>
+  </z-paging>
 </template>
 
 <style lang="scss" scoped>

pages/my-index/my-index.vue

@@ -13,7 +13,7 @@
     { name: '我的团队', icon: 'team', url: '/pages/my-index/my-team' },
     // { name: '群创建直播', icon: 'videocam', url: '' },
     {
-      name: '会议记录',
+      name: '直播记录',
       icon: 'meeting',
       url: '/pages/my-index/meeting-record/index'
     },
@@ -22,11 +22,11 @@
     //   icon: 'circle',
     //   url: '/pages/discover/dynamic/dynamic'
     // },
-    {
-      name: '我的收藏',
-      icon: 'collection',
-      url: '/pages/my-index/collection/index'
-    },
+    // {
+    //   name: '我的收藏',
+    //   icon: 'collection',
+    //   url: '/pages/my-index/collection/index'
+    // },
     {
       name: '在线客服',
       icon: 'customer',

pages/my-index/my-team.vue

@@ -1,4 +1,8 @@
-<script setup></script>
+<script setup>
+  import { useAuthUser } from '@/composables/useAuthUser'
+
+  const { userInfo } = useAuthUser()
+</script>
 
 <template>
   <view class="team-index">
@@ -6,7 +10,7 @@
     <view class="top-card">
       <view class="num-box">
         <text>我的团队(人)</text>
-        <text>2933</text>
+        <text>{{ userInfo.teamCount }}</text>
       </view>
       <image
         src="/static/images/my-index/team-bg.png"

pages/my-index/wallet/bank-card/card-details.vue

@@ -154,13 +154,7 @@
 
 <template>
   <view v-if="!stateData.loading">
-    <nav-bar isTopBg isPlaceholder :title="stateData.title">
-      <template #right>
-        <text class="public-navbar__right-btn" @click="onAdd">
-          {{ formData.id ? '修改' : '添加' }}
-        </text>
-      </template>
-    </nav-bar>
+    <nav-bar isTopBg isPlaceholder :title="stateData.title"></nav-bar>
 
     <view
       v-if="!['101', '102'].includes(stateData.state)"
@@ -208,6 +202,13 @@
         ></cb-file-picker>
       </CardInput>
     </view>
+
+    <!-- 底部按钮 -->
+    <bottom-view>
+      <cb-button @click="onAdd">
+        {{ formData.id ? '修改' : '添加' }}
+      </cb-button>
+    </bottom-view>
   </view>
 </template>
 

pages/my-index/wallet/edit-password.vue

@@ -94,9 +94,7 @@
 <template>
   <view class="edit-password">
     <nav-bar isTopBg isPlaceholder title="交易密码">
-      <template #right>
-        <text class="top-right-name" @click="onEdit">确认</text>
-      </template>
+
     </nav-bar>
 
     <view v-if="formData.state === '1'" class="input-box">
@@ -123,6 +121,13 @@
         type="password"
       ></CardInput>
     </view>
+
+    <!-- 底部按钮 -->
+    <bottom-view>
+      <cb-button @click="onEdit">
+        确认
+      </cb-button>
+    </bottom-view>
   </view>
 </template>
 

pages/my-index/wallet/record.vue

@@ -74,6 +74,7 @@
 
   const onTop = id => {
     formData.type = id
+    dataList.value = []
     getData(1, formData.pageSize)
   }