订单，视频通话需要开发

pages/anchor/index.nvue

@@ -213,6 +213,7 @@
 			<LiveMoreActionsPanel
 				v-if="liveID"
 				v-model="isShowLiveMoreActionsPanel"
+				:currentLive="currentLive"
 			></LiveMoreActionsPanel>
 			<UserInfoPanel
 				v-if="liveID"

pages/audience/index.nvue

@@ -66,7 +66,7 @@
 							</text>
 						</view>
 					</view>
-					<view class="control-icons" @click.stop="navigateBack()">
+					<view class="control-icons" @click.stop="topBack()">
 						<!-- <image class="control-icon" src="/static/images/live-share.png" /> -->
 						<image class="control-icon" src="/static/images/close.png" />
 					</view>
@@ -211,7 +211,7 @@
 </template>
 
 <script setup lang="ts">
-	import { navigateTo } from '@/utils/router'
+	import { navigateBack, navigateTo } from '@/utils/router'
 	import {
 		imDataEndLive,
 		getLiveActivityDetail,
@@ -586,29 +586,14 @@
 				'onLocalMicrophoneClosedByAdmin',
 				handleLocalMicrophoneClosedByAdmin
 			)
+			uni.$liveID = ''
+			isShowExitSheet.value = true
 			uni.showModal({
 				title: `提示`,
 				content: `直播已结束`,
-				showCancel: false,
-				success: c => {
-					if (c.confirm) {
-						uni.$liveID = ''
-						uni.navigateBack({
-							delta: 1
-						});
-						// uni.redirectTo({
-						// 	url: `/pages/livelist/index`,
-						// 	delta: 1,
-						// 	success: () => {
-						// 		console.log('返回成功')
-						// 	},
-						// 	fail: err => {
-						// 		console.error('返回失败', err)
-						// 	}
-						// })
-					}
-				}
+				showCancel: false
 			})
+			navigateBack()
 		}
 	}
 	const handleKickedOutOfLive = {
@@ -712,7 +697,7 @@
 		uni.hideKeyboard()
 	}
 
-	const navigateBack = () => {
+	const topBack = () => {
 		if (uni.$localGuestStatus === 'CONNECTED') {
 			exitSheetItems.value = ['断开连麦', '退出直播间']
 			exitSheetTitle.value =

pages/discover/discover.vue

@@ -18,6 +18,10 @@
   ]
 
   const onGo = item => {
+    if (item === 'shopping') {
+      navigateTo('/pages/discover/order/index')
+      return
+    }
     if (item === 'project') {
       showDialog('提示', '外部链接暂未提供', false)
       return

pages/discover/dynamic/dynamic.vue

@@ -58,7 +58,8 @@
       const res = await getUserMomentsList({
         pageNum,
         pageSize,
-        targetUserId: isType.value == 1 ? userInfo.value.userId : targetUserId.value
+        targetUserId:
+          isType.value == 1 ? userInfo.value.userId : targetUserId.value
       })
       const list = res.rows.map(item => {
         return {
@@ -93,8 +94,8 @@
 
   /** 关闭评论框 */
   const closeComment = () => {
-    contentData.value = ''
-    inputId.value = ''
+    // contentData.value = ''
+    // inputId.value = ''
   }
 
   /** 发布评论 */
@@ -108,6 +109,8 @@
     const res = await addUserMomentsComment(data)
     item.commentList.push(res.data)
     closeComment()
+    contentData.value = ''
+    inputId.value = ''
   }
 
   /** 删除动态 */
@@ -191,7 +194,7 @@
 
     <!-- 动态列表 -->
     <view v-if="!listLoading" class="dynamic-list" @click="closeComment">
-      <view v-for="item in dataList" :key="item.id" class="list">
+      <view v-for="(item, i) in dataList" :key="i" class="list">
         <image
           v-if="item.avatar"
           :src="item.avatar"
@@ -258,15 +261,30 @@
             ></uni-icons>
           </view>
           <view v-if="inputId === item.id" class="input-box">
-            <input
+            <uni-easyinput
               v-model="contentData"
+              trim
+              :inputBorder="false"
+              :clearable="false"
+              :placeholder-style="placeholderStyle"
+              confirmType="done"
+              placeholder="评论"
+              @confirm.stop="onComment(item)"
+            >
+              <template #right>
+                <button @click.stop="onComment(item)">发布</button>
+              </template>
+            </uni-easyinput>
+            <!-- <input
+              v-model="contentData"
+              :key="i"
               focus
               confirm-type="done"
               placeholder="评论"
               :placeholder-style="placeholderStyle"
               @confirm.stop="onComment(item)"
             />
-            <button @click.stop="onComment(item)">发布</button>
+            <button @click.stop="onComment(item)">发布</button> -->
           </view>
           <!-- 评论内容 -->
           <view v-if="item.commentList.length > 0" class="comment">

pages/discover/order/index.vue

@@ -0,0 +1,11 @@
+<script setup></script>
+
+<template>
+  <view>购买记录pages\discover\order\index.vue</view>
+</template>
+
+<style lang="scss" scoped>
+  page {
+    background: #f9f9f9;
+  }
+</style>