Merge remote-tracking branch 'origin/test_dev' into test

LiangZhiYUMao/pages/message/index.vue

@@ -1029,6 +1029,9 @@ export default {
         return;
       }
       
+      // 先保存引用，避免被 closeActionMenu 清空
+      const conversation = this.selectedConversation;
+      
       uni.showModal({
         title: '确认删除',
         content: '确定要删除该会话吗？',
@@ -1036,10 +1039,10 @@ export default {
           if (res.confirm) {
             try {
               // 调用 TIM SDK 删除会话
-              await timManager.tim.deleteConversation(this.selectedConversation.id);
+              await timManager.tim.deleteConversation(conversation.id);
               
               // 从列表中移除
-              const index = this.conversations.findIndex(c => c.id === this.selectedConversation.id);
+              const index = this.conversations.findIndex(c => c.id === conversation.id);
               if (index > -1) {
                 this.conversations.splice(index, 1);
               }
@@ -1063,10 +1066,10 @@ export default {
               });
             }
           }
+          // 在回调结束后关闭菜单
+          this.closeActionMenu();
         }
       });
-      
-      this.closeActionMenu();
     },
     
     /**

LiangZhiYUMao/pages/page3/page3.vue

@@ -1,13 +1,13 @@
 <template>
   <view class="content">
     <!-- 背景图片 -->
-    <image class="bg-image" src="/static/login-bg.png" mode="aspectFill"></image>
+    <image class="bg-image" src="http://115.190.125.125:9000/static-images/login-bg.png" mode="aspectFill"></image>
 
 
     <!-- 顶部标题区域 -->
     <view class="header-section">
       <!-- <view class="app-logo">🪶🪶</view> -->
-      <image class="app-logo" src="/static/logo.png" mode="widthFix"></image>
+      <image class="app-logo" src="http://115.190.125.125:9000/static-images/logo.png" mode="widthFix"></image>
       <!-- <view class="app-name">青鸾之恋</view> -->
       <view class="app-slogan">真诚相遇 · 携手一生</view>
     </view>
@@ -16,7 +16,7 @@
     <view class="login-box">
       <!-- 微信一键登录 -->
       <button class="wechat-login-btn" @click="login_zheshow">
-        <image class="wechat-icon" src="/static/wechat-icon.png" mode="aspectFit"></image>
+        <image class="wechat-icon" src="http://115.190.125.125:9000/static-images/wechat-icon.png" mode="aspectFit"></image>
         <text>微信一键登录</text>
       </button>