Merge branch 'Branch_1' of https://git.u8t.cn/tangxinyue/alipay-emulator into Branch_1

# Conflicts:
#	main.js

components/message/chat/chat-layout.vue

@@ -43,7 +43,7 @@
                 </view>
             </slot>
         </view>
-        <view class="center-box flex-1">
+        <view class="center-box flex-1" @click="handleBoxClick">
             <scroll-view :scroll-top="scrollTop" scroll-y="true" scroll-with-animation :show-scrollbar="false"
                 class="scroll-view h100">
                 <slot></slot>
@@ -142,12 +142,13 @@ const data = reactive({
     content: "",
     simIndex: 1,
     scrollTop: 0,
-    keyboardHeight: 0
+    keyboardHeight: 0,
+    lastClickTime: 0
 })
 
-let { isSend, content, simIndex, scrollTop } = toRefs(data)
+let { isSend, content, simIndex, scrollTop, lastClickTime } = toRefs(data)
 
-const emit = defineEmits(['send'])
+const emit = defineEmits(['send', 'dblclick-left', 'dblclick-right'])
 
 onMounted(() => {
     // 延迟极小时间确保 DOM 已更新循环并将滚动条拉到极限底端
@@ -220,6 +221,38 @@ const sendMessage = () => {
     }, 100);
 }
 
+/**
+ * 处理 center-box 点击事件，检测双击并区分左右
+ */
+const handleBoxClick = (e) => {
+    const now = Date.now();
+    const clickInterval = now - data.lastClickTime;
+
+    // 如果两次点击间隔在 300ms 以内，视为双击
+    if (clickInterval > 0 && clickInterval < 300) {
+        // 获取点击位置的 X 坐标
+        const clientX = e.detail.x || (e.touches && e.touches[0] ? e.touches[0].clientX : 0);
+
+        // 获取屏幕宽度来区分左右
+        const systemInfo = uni.getSystemInfoSync();
+        const halfWidth = systemInfo.screenWidth / 2;
+
+        if (clientX < halfWidth) {
+            console.log('双击左侧');
+            emit('dblclick-left');
+        } else {
+            console.log('双击右侧');
+            emit('dblclick-right');
+        }
+
+        // 成功触发双击后重置时间，防止连续三次点击触发两次双击
+        data.lastClickTime = 0;
+    } else {
+        data.lastClickTime = now;
+    }
+}
+
+
 // 展示文字信息
 const showInfo = computed(() => {
     let placeholder

components/message/chat/chat-list.vue

@@ -18,7 +18,8 @@
             </view>
 
             <view style="flex: 1; overflow: hidden;">
-                <view class="time m-t-44" v-if="shouldShowTime(index)">
+                <view class="time m-t-44" :id="'time-' + index" v-if="shouldShowTime(index)"
+                    @longpress="!sortMode && onMessageLongPress(index, message, 'time')">
                     <view class="top-text" v-if="phone == 'iphone' && index == 0">信息 · 短信</view>
                     <view class="top-text" v-if="phone == 'huawei' && index == 0">短信/彩信</view>
                     <text v-if="phone == 'huawei'">{{ formatHuaweiTopTime(message.time) }}</text>
@@ -345,8 +346,8 @@ const formatMessageContent = (content, isMe) => {
  * @param index 
  * @param message 
  */
-const onMessageLongPress = (index, message) => {
+const onMessageLongPress = (index, message, type = 'message') => {
-    emit('onLongPress', index, message)
+    emit('onLongPress', index, message, type)
 }
 
 // ===================== 拖拽排序逻辑 =====================

components/message/list/message-nav-bar.vue

@@ -111,19 +111,9 @@ import {
     util
 } from '@/utils/common.js';
 
-const emit = defineEmits(['add'])
+const emit = defineEmits(['add', 'setSim', 'setNoticeCount'])
+
 
-const buttonGroup = [{
-    name: "添加短信",
-    click: () => {
-        emit('add')
-    }
-}, {
-    name: "设置卡1卡2运营商",
-    click: () => {
-        emit('setSim')
-    }
-}]
 
 const props = defineProps({
     // 手机品牌
@@ -138,6 +128,31 @@ const props = defineProps({
     }
 })
 
+const buttonGroup = computed(() => {
+    const groups = [{
+        name: "添加短信",
+        click: () => {
+            emit('add')
+        }
+    }, {
+        name: "设置卡1卡2运营商",
+        click: () => {
+            emit('setSim')
+        }
+    }]
+
+    if (props.phone == 'huawei') {
+        groups.push({
+            name: "设置通知信息未读数",
+            click: () => {
+                emit('setNoticeCount')
+            }
+        })
+    }
+
+    return groups
+})
+
 
 const data = reactive({
     navBar: {
@@ -538,15 +553,17 @@ page {
                 padding: 0 10rpx;
 
                 .icon {
-                    width: 32rpx;
+                    width: 40rpx;
-                    height: 32rpx;
+                    height: 40rpx;
+                    flex-shrink: 0;
                 }
 
                 .input {
+                    flex: 1;
                     margin: 0 20rpx;
 
                     ::v-deep .input-placeholder {
-                        color: #646464;
+                        color: #9A9A9A;
                         font-size: 32rpx;
                     }
                 }

pages/message/chat-page/chat-page.vue

@@ -8,7 +8,7 @@
 	</view>
 	<view :class="`${data.phone}-style`">
 		<ChatLayout :phone="data.phone" :chatInfo="data.data" :sortMode="isSortMode" @send="handleSend"
-			:number="data.number">
+			:number="data.number" @dblclick-left="onDblclickLeft" @dblclick-right="onDblclickRight">
 			<!-- 弹出操作层及遮罩 -->
 			<view v-if="showActionPopup" class="action-mask" @tap="closeActionPopup">
 				<view class="action-popup" :style="{ top: popupTop + 'px', left: popupLeft + 'px' }">
@@ -194,10 +194,13 @@ const onEditorReady = () => {
 	}).exec()
 }
 
+let longpressType = ref('message')
 // 长按弹出弹出层
-const onMessageLongPress = (index, message) => {
+const onMessageLongPress = (index, message, type) => {
 	selectedMessage.value = message;
-	uni.createSelectorQuery().select('#msg-' + index).boundingClientRect(rect => {
+	longpressType.value = type
+	const selector = type === 'time' ? '#time-' + index : '#msg-' + index;
+	uni.createSelectorQuery().select(selector).boundingClientRect(rect => {
 		if (rect) {
 			// 将弹窗定位在元素正下方 (bottom边界 + 一点点边距)
 			popupTop.value = rect.bottom + 10;
@@ -443,6 +446,28 @@ const handleSend = (params) => {
 	messageList.value.push(params)
 	saveChatList()
 }
+
+/**
+ * 双击左侧
+ */
+const onDblclickLeft = () => {
+	isMe.value = false
+	uni.showToast({
+		title: "现在是对方发言",
+		icon: "none"
+	})
+}
+
+/**
+ * 双击右侧
+ */
+const onDblclickRight = () => {
+	isMe.value = true
+	uni.showToast({
+		title: "现在是自己发言",
+		icon: "none"
+	})
+}
 </script>
 
 <style lang="less" scoped>

pages/message/list-index.vue

@@ -7,7 +7,17 @@
 		</liu-drag-button>
 	</view>
 	<view>
-		<MessageNavBar :phone="data.phone" :isScroll="data.isScroll" @add="openAddPopup" @setSim="setSim">
+		<MessageNavBar :phone="data.phone" :isScroll="data.isScroll" @add="openAddPopup" @setSim="setSim"
+			@setNoticeCount="setNoticeCount">
+			<view v-if="data.phone == 'huawei'" class="huawei-notice">
+				<view class="img-box">
+					<image class="img" src="/static/image/phone-message/huawei/notice.png" mode="aspectFill"></image>
+					<view class="dot" v-if="data.noticeCount > 0">{{ data.noticeCount > 99 ? '99+' : data.noticeCount }}
+					</view>
+				</view>
+				<view class="text">通知信息</view>
+				<image class="right-img" src="/static/image/phone-message/huawei/right.png" mode="aspectFill"></image>
+			</view>
 			<MessageList :phone="data.phone" :list="defaultList" @item-click="itemClick" @delete-item="deleteItem"
 				@edit-item="editItem">
 			</MessageList>
@@ -94,6 +104,23 @@
 				</view>
 			</view>
 		</view>
+
+		<!-- 设置通知信息未读数弹窗 -->
+		<view v-if="showNoticePopup" class="add-mask" @tap="closeNoticePopup">
+			<view class="add-popup" @tap.stop>
+				<view class="add-header">设置通知信息</view>
+				<view class="add-body">
+					<view class="add-row">
+						<text class="add-label">未读数量</text>
+						<input class="add-input" type="number" v-model="noticeForm.count" placeholder="请输入通知信息数量" />
+					</view>
+				</view>
+				<view class="add-footer">
+					<view class="add-btn cancel" @tap="closeNoticePopup">取消</view>
+					<view class="add-btn confirm" @tap="confirmNotice">确定</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -123,7 +150,8 @@ const data = reactive({
 		bgColor: '#FFFFFF',
 	},
 	phone: 'iphone',
-	isScroll: false
+	isScroll: false,
+	noticeCount: 256
 })
 
 const shape = [{
@@ -136,6 +164,7 @@ const shape = [{
 
 const STORAGE_KEY = 'message_list'
 const SIM_STORAGE_KEY = 'sim_info'
+const NOTICE_COUNT_KEY = 'huawei_notice_count'
 
 onLoad((options) => {
 	if (options.phone) {
@@ -161,6 +190,11 @@ onShow(() => {
 		if (cached) {
 			defaultList.value = JSON.parse(cached)
 		}
+		// 加载通知数量
+		const cachedNotice = uni.getStorageSync(NOTICE_COUNT_KEY)
+		if (cachedNotice !== '') {
+			data.noticeCount = Number(cachedNotice)
+		}
 	} catch (e) { }
 })
 
@@ -425,6 +459,31 @@ const confirmSim = () => {
 	closeSimPopup()
 }
 
+// ===== 设置通知信息未读数弹窗 =====
+const showNoticePopup = ref(false)
+const noticeForm = reactive({
+	count: 256
+})
+
+const setNoticeCount = () => {
+	noticeForm.count = data.noticeCount
+	showNoticePopup.value = true
+}
+
+const closeNoticePopup = () => {
+	showNoticePopup.value = false
+}
+
+const confirmNotice = () => {
+	data.noticeCount = Number(noticeForm.count) || 0
+	try {
+		uni.setStorageSync(NOTICE_COUNT_KEY, data.noticeCount)
+		uni.showToast({ title: '保存成功', icon: 'success' })
+	} catch (e) { }
+	closeNoticePopup()
+}
+
+
 </script>
 
 <style>
@@ -613,4 +672,51 @@ page {
 	color: #333333;
 	text-align: center;
 }
+
+.huawei-notice {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 32rpx;
+	height: 124rpx;
+
+	.img-box {
+		position: relative;
+		width: 76rpx;
+		height: 76rpx;
+		flex-shrink: 0;
+
+		.img {
+			width: 100%;
+			height: 100%;
+		}
+
+		.dot {
+			position: absolute;
+			top: -12rpx;
+			right: -8rpx;
+			height: 28rpx;
+			line-height: 30rpx;
+			padding: 0 10rpx;
+			background-color: #EA0000;
+			border-radius: 16rpx;
+			font-size: 20rpx;
+			color: #fff;
+		}
+	}
+
+	.text {
+		flex: 1;
+		font-size: 30rpx;
+		color: #1A1A1A;
+		margin: 0 32rpx;
+		font-weight: 500;
+	}
+
+	.right-img {
+		width: 28rpx;
+		height: 28rpx;
+		flex-shrink: 0;
+	}
+}
 </style>