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

.hbuilderx/launch.json

@@ -6,8 +6,8 @@
             "type" : "uni-app:app-ios"
         },
         {
-            "customPlaygroundType" : "device",
-            "playground" : "standard",
+            "customPlaygroundType" : "local",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]

common/main.css

@@ -256,6 +256,10 @@
 	display: flex;
 }
 
+.shrink-0 {
+	flex-shrink: 0;
+}
+
 .flex-column {
 	flex-direction: column;
 }
@@ -282,6 +286,11 @@
 	align-items: center;
 }
 
+.flex-align-start {
+	display: flex;
+	align-items: flex-start;
+}
+
 .flex-justify-center {
 	display: flex;
 	justify-content: center;

components/message/list.vue

@@ -0,0 +1,145 @@
+<template>
+    <view :style="`${phone}-style`">
+        <uni-swipe-action class="swipe-action">
+            <!-- 使用插槽 （请自行给定插槽内容宽度）-->
+            <uni-swipe-action-item>
+                <view>
+                    <view class="item flex-align-center">
+                        <view class="dot"></view>
+                        <image class="img shrink-0" :src="`/static/image/phone-message/${phone}/default.png`"></image>
+                        <view class="border-box  m-l-24 flex-1 flex flex-align-start">
+                            <view class="main-box flex-1">
+                                <view class="title-box flex-between">
+                                    <text class="title">title</text>
+                                    <text class="time">昨天</text>
+                                </view>
+                                <view class="content">市燃管办温馨提示：依法安全文明燃放烟花爆竹，共护平安幸福家园呵呵哈哈哈还好...</view>
+                            </view>
+                            <view class="box-right h100 flex-column flex-align-center">
+                                <uni-icons type="right" size="14" color="#C1C1C1"></uni-icons>
+                                <image class="img" src="/static/image/phone-message/iphone/notice.png"></image>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <template v-slot:right>
+                    <view><text>删除</text></view>
+                </template>
+            </uni-swipe-action-item>
+        </uni-swipe-action>
+    </view>
+</template>
+<script setup>
+import {
+    ref,
+    reactive,
+    computed
+} from 'vue'
+import {
+    util
+} from '@/utils/common.js';
+
+const props = defineProps({
+    // 手机品牌
+    phone: {
+        type: String,
+        default: 'iphone'
+    }
+})
+</script>
+<style>
+@import '@/common/main.css';
+</style>
+<style lang="less" scoped>
+.m-t-4 {
+    margin-top: 4rpx;
+}
+
+.m-l-24 {
+    margin-left: 24rpx;
+}
+
+.iphone-style {
+
+    .swipe-action {
+        margin-top: 24rpx;
+    }
+
+    .item:first-child {
+        .border-box {
+            position: relative;
+        }
+
+        .border-box::before {
+            position: absolute;
+            content: '';
+            width: 100%;
+            height: 1px;
+            top: -1px;
+            left: 0;
+            right: 0;
+            box-shadow: 0 0.3px 0 0 #C2C2C2;
+        }
+    }
+
+    .item {
+        padding: 0 0 0 14rpx;
+        height: 146rpx;
+
+        .dot {
+            width: 20rpx;
+            height: 20rpx;
+            background-color: #007BFD;
+            border-radius: 50%;
+        }
+
+        .img {
+            width: 84rpx;
+            height: 84rpx;
+            margin-left: 16rpx;
+        }
+
+        .border-box {
+            padding: 18rpx 14rpx 14rpx 0;
+            height: 100%;
+            box-shadow: inset 0 -0.3px 0 0 #C2C2C2;
+        }
+
+        .main-box {
+            .title-box {
+                margin-bottom: 6rpx;
+
+                .title {
+                    color: #1A1A1A;
+                    font-size: 32rpx;
+                    line-height: 32rpx;
+                }
+
+                .time {
+                    color: #838383;
+                    font-size: 28rpx;
+                    line-height: 28rpx;
+                }
+            }
+
+            .content {
+                font-size: 28rpx;
+                line-height: 38rpx;
+                color: #838383;
+                display: -webkit-box;
+                -webkit-box-orient: vertical;
+                -webkit-line-clamp: 2;
+                overflow: hidden;
+            }
+        }
+
+        .box-right {
+            .img {
+                width: 28rpx;
+                height: 28rpx;
+                margin: 0;
+            }
+        }
+    }
+}
+</style>

components/message/message-nav-bar.vue

@@ -0,0 +1,512 @@
+<template>
+    <view :class="`${phone}-style`">
+        <!-- 导航样式 -->
+        <NavBar :isBack="false">
+            <!-- 左侧文字图标 -->
+            <template v-slot:left>
+                <view v-if="phone == 'iphone'" class="flex flex-align-center">
+                    <image @click="util.goBack" class="left-icon" src="/static/image/phone-message/iphone/back.png"
+                        mode=""></image>
+                    <text class="left-text">过滤条件</text>
+                </view>
+                <view v-if="(phone == 'huawei' && isScroll) || phone == 'vivo'" class="flex flex-align-center">
+                    <text class="left-text">信息</text>
+                </view>
+            </template>
+            <!-- 中间标题 -->
+            <template v-slot:center>
+                <view v-if="phone == 'iphone' && isScroll" class="center-text">
+                    信息
+                </view>
+            </template>
+            <!-- 右侧图标 -->
+            <template v-slot:right>
+                <!-- iphone -->
+                <view v-if="phone == 'iphone'">
+                    <image class="right-icon mg-r-30" src="/static/image/phone-message/iphone/more.png" mode=""></image>
+                    <image class="right-icon mg-r-5" src="/static/image/phone-message/iphone/edit.png" mode=""></image>
+                </view>
+                <!-- mi -->
+                <view v-if="phone == 'mi'">
+                    <image class="right-icon" src="/static/image/phone-message/mi/setting.png" mode=""></image>
+                </view>
+                <!-- oppo -->
+                <view v-if="phone == 'oppo'">
+                    <image class="right-icon mg-r-52" src="/static/image/phone-message/oppo/search.png" mode=""></image>
+                    <image class="right-icon mg-r-14" src="/static/image/phone-message/oppo/more.png" mode=""></image>
+                </view>
+                <!-- huawei -->
+                <view v-if="phone == 'huawei'">
+                    <image v-if="isScroll" class="right-icon" src="/static/image/phone-message/huawei/nav-search.png"
+                        mode="">
+                    </image>
+                    <image class="right-icon" src="/static/image/phone-message/huawei/add.png" mode=""></image>
+                    <image class="right-icon" src="/static/image/phone-message/huawei/more.png" mode=""></image>
+                </view>
+                <!-- vivo -->
+                <view v-if="phone == 'vivo'">
+                    <image class="right-icon" src="/static/image/phone-message/vivo/select.png" mode="">
+                    </image>
+                    <image class="right-icon" src="/static/image/phone-message/vivo/add.png" mode=""></image>
+                    <image class="right-icon m-r-34" src="/static/image/phone-message/vivo/more.png" mode=""></image>
+                </view>
+            </template>
+        </NavBar>
+        <!-- 主体内容 -->
+        <view class="main-container">
+            <!-- 顶部搜索栏样式 -->
+            <view class="top-box">
+                <view v-if="showInfo.text" class="text">{{ showInfo.text }}</view>
+                <view v-if="showInfo.secondText" class="second-text">{{ showInfo.secondText }}</view>
+                <view v-if="showInfo.placeholder" class="search-box flex flex-align-center">
+                    <image class="icon" :src="`/static/image/phone-message/${props.phone}/search.png`">
+                    </image>
+                    <input class="input flex-1" :placeholder="showInfo.placeholder" type="text">
+                    <image class="icon" :src="`/static/image/phone-message/${props.phone}/mic.png`"></image>
+                </view>
+            </view>
+            <slot>
+            </slot>
+        </view>
+        <!-- 底部样式 -->
+        <template v-if="phone == 'mi' || phone == 'oppo'">
+            <image class="add-message" :src="`/static/image/phone-message/${props.phone}/add-message.png`"></image>
+            <view class="bottom-box flex">
+                <view class="item flex-1 h100">
+                    <image class="icon" :src="`/static/image/phone-message/${props.phone}/bottom-left.png`"></image>
+                    <text>{{ showInfo.bottomLtext }}</text>
+                </view>
+                <view class="item flex-1 h100">
+                    <image class="icon" :src="`/static/image/phone-message/${props.phone}/bottom-right.png`"></image>
+                    <text class="grey">{{ showInfo.bottomRtext }}</text>
+                </view>
+            </view>
+        </template>
+
+    </view>
+</template>
+
+<script setup>
+import NavBar from '@/components/nav-bar/nav-bar.vue'
+import {
+    ref,
+    reactive,
+    computed
+} from 'vue'
+import {
+    util
+} from '@/utils/common.js';
+
+const props = defineProps({
+    // 手机品牌
+    phone: {
+        type: String,
+        default: 'iphone'
+    },
+    // 是否向下滚动
+    isScroll: {
+        type: Boolean,
+        default: false
+    }
+})
+
+// 展示文字信息
+const showInfo = computed(() => {
+    let text, placeholder, secondText, bottomLtext, bottomRtext
+    switch (props.phone) {
+        case "iphone":
+            text = "信息"
+            placeholder = '搜索'
+            break;
+        case "mi":
+            text = "主要"
+            placeholder = '搜索短信'
+            bottomLtext = "主要"
+            bottomRtext = "推广"
+            break;
+        case "oppo":
+            text = "消息"
+            placeholder = ''
+            bottomLtext = "消息"
+            bottomRtext = "通知"
+            break;
+        case "huawei":
+            text = "信息"
+            placeholder = '搜索信息'
+            secondText = "388 条未读"
+            break;
+        case "vivo":
+            placeholder = '搜索信息'
+            break;
+        default:
+            break;
+    }
+    return { text, placeholder, secondText, bottomLtext, bottomRtext }
+})
+
+const data = reactive({
+    navBar: {
+        title: '信息',
+        bgColor: '#FFFFFF',
+    }
+})
+</script>
+
+<style>
+@import '@/common/main.css';
+
+page {
+    background-color: #FFFFFF;
+}
+</style>
+<style lang="less">
+::v-deep .uni-navbar__header-btns {
+    width: 100px !important;
+    flex: 1;
+}
+
+::v-deep .uni-navbar__header {
+    align-items: center !important;
+}
+
+.bottom-box {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 120rpx;
+    border-top: 1rpx solid #E7E7E7;
+    background-color: #ffffff;
+
+    .item {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+
+        .icon {
+            width: 44rpx;
+            height: 44rpx;
+        }
+
+        text {
+            font-size: 20rpx;
+            color: #333;
+        }
+
+        .grey {
+            color: #999999;
+        }
+    }
+}
+
+// 苹果机型样式
+.iphone-style {
+    .mg-r-30 {
+        margin-right: 60rpx;
+    }
+
+    .mg-r-5 {
+        margin-right: 10rpx;
+    }
+
+    .left-icon {
+        width: 40rpx;
+        height: 40rpx;
+    }
+
+    .right-icon {
+        width: 48rpx;
+        height: 48rpx;
+    }
+
+    .left-text {
+        font-size: 32rpx;
+        color: #0278E2;
+        margin-left: 10rpx;
+    }
+
+    .center-text {
+        font-size: 32rpx;
+        color: #1a1a1a;
+    }
+
+    .main-container {
+        .top-box {
+            padding: 20rpx 32rpx 0;
+
+            .text {
+                color: #1A1A1A;
+                font-size: 64rpx;
+                font-weight: 700;
+            }
+
+            .search-box {
+                margin-top: 20rpx;
+                background-color: #EEEEF0;
+                height: 68rpx;
+                border-radius: 24rpx;
+                padding: 0 16rpx;
+
+                .icon {
+                    width: 32rpx;
+                    height: 32rpx;
+                }
+
+                .input {
+                    margin: 0 14rpx;
+
+                    ::v-deep .input-placeholder {
+                        color: #838383;
+                        font-size: 32rpx;
+                    }
+                }
+            }
+        }
+    }
+
+}
+
+// 小米机型样式
+.mi-style {
+    .right-icon {
+        width: 40rpx;
+        height: 40rpx;
+        margin-right: 30rpx;
+    }
+
+    .main-container {
+
+        .top-box {
+            padding: 0 22rpx 0;
+
+            .text {
+                color: #1A1A1A;
+                font-size: 60rpx;
+                font-weight: 500;
+            }
+
+            .search-box {
+                margin-top: 32rpx;
+                background-color: #F0F0F0;
+                height: 84rpx;
+                border-radius: 42rpx;
+                padding: 0 34rpx;
+
+                .icon {
+                    width: 32rpx;
+                    height: 32rpx;
+                }
+
+                .input {
+                    margin: 0 18rpx;
+
+                    ::v-deep .input-placeholder {
+                        color: #A9A9A9;
+                        font-size: 32rpx;
+                    }
+                }
+            }
+        }
+    }
+
+    .add-message {
+        position: fixed;
+        bottom: 168rpx;
+        right: 44rpx;
+        width: 120rpx;
+        height: 120rpx;
+    }
+
+
+}
+
+// oppo机型
+.oppo-style {
+    .mg-r-52 {
+        margin-right: 52rpx;
+    }
+
+    .mg-r-14 {
+        margin-right: 14rpx;
+    }
+
+    .right-icon {
+        width: 48rpx;
+        height: 48rpx;
+    }
+
+    .main-container {
+
+
+        .top-box {
+            padding: 16rpx 34rpx 0;
+            margin-bottom: 50rpx;
+
+            .text {
+                color: #1A1A1A;
+                font-size: 64rpx;
+                font-weight: 900;
+            }
+        }
+    }
+
+    .add-message {
+        width: 116rpx;
+        height: 116rpx;
+        position: fixed;
+        bottom: 200rpx;
+        right: 46rpx;
+    }
+
+    .bottom-box {
+        height: 148rpx;
+        background-color: #FAFAFA;
+        border-top: 1rpx solid #DCDCDC;
+
+        .item {
+            .icon {
+                width: 48rpx;
+                height: 48rpx;
+                margin-bottom: 12rpx;
+            }
+
+            text {
+                color: #191919;
+            }
+
+            .grey {
+                color: #717171;
+            }
+        }
+    }
+
+}
+
+// 华为机型
+.huawei-style {
+
+    ::v-deep .uni-navbar__header-container {
+        flex: 0;
+    }
+
+    .left-text {
+        color: #1a1a1a;
+        font-size: 50rpx;
+        font-weight: 700;
+        margin-left: 10rpx;
+    }
+
+    .right-icon {
+        width: 76rpx;
+        height: 76rpx;
+        margin: 0 8rpx;
+    }
+
+    .main-container {
+
+
+        .top-box {
+            padding: 40rpx 34rpx 0;
+
+            .text {
+                color: #1A1A1A;
+                font-size: 60rpx;
+                font-weight: 700;
+                line-height: 60rpx;
+            }
+
+            .second-text {
+                color: #646464;
+                font-size: 28rpx;
+                margin-top: 10rpx;
+            }
+
+            .search-box {
+                margin-top: 40rpx;
+                background-color: #F4F4F4;
+                height: 76rpx;
+                border-radius: 38rpx;
+                padding: 0 24rpx;
+
+                .icon {
+                    width: 32rpx;
+                    height: 32rpx;
+                }
+
+                .input {
+                    margin: 0 14rpx;
+
+                    ::v-deep .input-placeholder {
+                        color: #646464;
+                        font-size: 32rpx;
+                    }
+                }
+            }
+        }
+    }
+}
+
+// vivo机型
+.vivo-style {
+    ::v-deep .uni-navbar__header-container {
+        flex: 0;
+    }
+
+    .m-r-34 {
+        margin-right: 34rpx !important;
+    }
+
+    .right-icon {
+        width: 44rpx;
+        height: 44rpx;
+        margin-right: 52rpx;
+    }
+
+    .left-text {
+        font-size: 54rpx;
+        color: #1A1A1A;
+        font-weight: 700;
+        margin-left: 30rpx;
+    }
+
+    .main-container {
+        .top-box {
+            padding: 0 46rpx;
+
+            .search-box {
+                position: relative;
+                margin-top: 70rpx;
+                background-color: #ffffff;
+                height: 76rpx;
+                border-radius: 38rpx;
+                padding: 0 10rpx;
+
+                .icon {
+                    width: 32rpx;
+                    height: 32rpx;
+                }
+
+                .input {
+                    margin: 0 20rpx;
+
+                    ::v-deep .input-placeholder {
+                        color: #646464;
+                        font-size: 32rpx;
+                    }
+                }
+            }
+
+            .search-box::after {
+                position: absolute;
+                content: '';
+                width: 100%;
+                height: 12rpx;
+                background-color: #F0F0F0;
+                bottom: 0;
+                left: 0;
+            }
+        }
+    }
+}
+</style>

components/nav-bar/nav-bar.vue

@@ -13,7 +13,7 @@
 					<template v-slot:left>
 						<view class="nav-bar-left">
 							<slot name="left">
-								<view class="left-icon" @click.stop="onBack">
+								<view v-if="isBack" class="left-icon" @click.stop="onBack">
 									<image class="nav-icon-back"
 										:src="`/static/image/nav-bar/back-${textColor == '#fff' || textColor == '#fffffff' ? 'white' : 'black'}.png`"
 										mode="">
@@ -130,6 +130,10 @@ const props = defineProps({
 		type: Boolean,
 		default: false
 	},
+	isBack: {
+		type: Boolean,
+		default: true
+	},
 	tipLayerText: {
 		type: String,
 		default: ''

main.js

@@ -27,7 +27,7 @@ export function createApp() {
 	const systemInfo = uni.getStorageSync('systemInfo') || {}
 	app.config.globalProperties.$system = systemInfo.platform == 'ios' ? 'iOS' : 'Android'
 	app.config.globalProperties.$systemInfo = systemInfo
-	uni.setStorageSync('version', '1.0.3')
+	uni.setStorageSync('version', '1.0.3.sp1')
 	app.config.globalProperties.$version = uni.getStorageSync('version')
 
 	app.use(globalMethods);

pages.json

@@ -10,17 +10,25 @@
 		}
 	],
 
-	"subPackages": [
-		{
+	"subPackages": [{
 			"root": "pages/call-log",
 			"pages": [{
-							"path": "call",
-							"style": {
-								"navigationBarTitleText": "通话记录页面",
-								"navigationStyle": "custom"
-							}
-						}
-					]
+				"path": "call",
+				"style": {
+					"navigationBarTitleText": "通话记录页面",
+					"navigationStyle": "custom"
+				}
+			}]
+		},
+		{
+			"root": "pages/message",
+			"pages": [{
+				"path": "list-index",
+				"style": {
+					"navigationBarTitleText": "短信列表首页",
+					"navigationStyle": "custom"
+				}
+			}]
 		},
 		{
 			"root": "pages/balance",
@@ -237,6 +245,13 @@
 						"navigationBarTitleText": "充值页",
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path": "call-and-message-entry/call-and-message-entry",
+					"style": {
+						"navigationBarTitleText": "呼叫和短信入口",
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		}
@@ -250,7 +265,9 @@
 				"pages/common",
 				"pages/finance-management",
 				"pages/ant-credit-pay",
-				"pages/other"
+				"pages/other",
+				"pages/message",
+				"pages/call-log"
 			]
 		}
 	},

pages/common/call-and-message-entry/call-and-message-entry.vue

@@ -0,0 +1,164 @@
+<template>
+	<view>
+		<NavBar :title="data.navBar.title" :bgColor="data.navBar.bgColor" />
+		<view class="list-container">
+			<view class="item" v-for="item in source" :key="item.id"
+				:style="{ background: `linear-gradient( -270deg, ${item.color.bgColor} 0%, #FFFFFF 70%), #FFFFFF` }">
+				<view class="content flex flex-align-center">
+					<image class="logo" :src="`/static/image/common/phone/${item.icon}.png`" mode=""></image>
+					<view class="name flex-1">{{ item.name }}机型</view>
+					<view class="right-button" :style="{ background: item.color.buttonColor }"
+						@click="goPage(data.type == 'message' ? item.messageUrl : item.callUrl)">立即进入</view>
+				</view>
+				<view class="line" :style="{ background: item.color.lineColor }"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import NavBar from '@/components/nav-bar/nav-bar.vue'
+import {
+	ref,
+	reactive
+} from 'vue'
+import {
+	onLoad
+} from "@dcloudio/uni-app";
+import {
+	util
+} from '@/utils/common.js';
+
+// 列表
+const source = ref([{
+	name: '苹果',
+	color: {
+		bgColor: '#F3EAFF',
+		lineColor: '#B78EF5',
+		buttonColor: '#BA8DFF',
+	},
+	icon: 'iphone',
+	messageUrl: "/pages/message/list-index?phone=iphone",
+	callUrl: ""
+},
+{
+	name: '华为',
+	color: {
+		bgColor: '#FFE9E9',
+		lineColor: '#FF6969',
+		buttonColor: '#FB6767',
+	},
+	icon: 'huawei',
+	messageUrl: "/pages/message/list-index?phone=huawei",
+	callUrl: ""
+},
+{
+	name: '小米',
+	color: {
+		bgColor: '#FFF0DD',
+		lineColor: '#FFA143',
+		buttonColor: '#FFA64D',
+	},
+	icon: 'mi',
+	messageUrl: "/pages/message/list-index?phone=mi",
+	callUrl: ""
+},
+{
+	name: 'oppo',
+	color: {
+		bgColor: '#E0FFD9',
+		lineColor: '#56B745',
+		buttonColor: '#5DCD49',
+	},
+	icon: 'oppo',
+	messageUrl: "/pages/message/list-index?phone=oppo",
+	callUrl: ""
+}, {
+	name: 'vivo',
+	color: {
+		bgColor: '#D4F4FF',
+		lineColor: '#52C2FF',
+		buttonColor: '#50C1FE',
+	},
+	icon: 'vivo',
+	messageUrl: "/pages/message/list-index?phone=vivo",
+	callUrl: ""
+},
+])
+
+const data = reactive({
+	navBar: {
+		title: '选择机型',
+		bgColor: '#F0F4F9',
+	},
+	type: "message"
+})
+
+onLoad((options) => {
+	if (options.type) {
+		data.type = options.type
+	}
+})
+
+function goPage(url) {
+	if (url) {
+		util.goPage(url)
+	} else {
+		uni.showToast({
+			title: '开发中',
+			icon: 'none'
+		})
+	}
+}
+</script>
+
+<style>
+@import '@/common/main.css';
+</style>
+<style lang="less">
+.list-container {
+	background-color: #F0F4F9;
+	padding: 24rpx 32rpx;
+}
+
+.item {
+	width: 100%;
+	height: 188rpx;
+	border-radius: 24rpx;
+	margin-bottom: 24rpx;
+	padding: 40rpx 36rpx 24rpx 28rpx;
+
+	.content {
+		.logo {
+			width: 96rpx;
+			height: 96rpx;
+			flex-shrink: 0;
+		}
+
+		.name {
+			margin-left: 32rpx;
+			color: #1A1A1A;
+			font-size: 36rpx;
+			font-weight: 500;
+		}
+
+		.right-button {
+			width: 140rpx;
+			height: 64rpx;
+			border-radius: 16rpx;
+			color: #ffffff;
+			font-size: 28rpx;
+			line-height: 64rpx;
+			text-align: center;
+		}
+	}
+
+	.line {
+		width: 100rpx;
+		height: 8rpx;
+		filter: blur(5px);
+		opacity: 0.5;
+		margin-top: 4rpx;
+	}
+}
+</style>

pages/index/index.nvue

@@ -79,7 +79,7 @@
 					<view class="group-box">
 						<image class="title-img" src="/static/image/index/shipingjiaocheng.png"></image>
 						<view class="video-help-box">
-							<view class="video-help-item" :style="{ width: (windowWidth - 50) / 4 + 'px' }"
+							<view class="video-help-item" :style="{ width: (windowWidth - 32) / 4 + 'px' }"
 								v-for="item in videoHelpList" :key="item.id" @click="clickVideoHelp(item)">
 								<image class="video-help-img" :src="item.icon"></image>
 								<text class="video-help-title">{{ item.text }}</text>
@@ -114,7 +114,7 @@
 					<view class="group-box">
 						<image class="title-img" src="/static/image/index/qita.png"></image>
 						<view class="video-help-box">
-							<view class="video-help-item" :style="{ width: (windowWidth - 50) / 4 + 'px' }"
+							<view class="video-help-item" :style="{ width: (windowWidth - 32) / 4 + 'px' }"
 								v-for="item in otherList" :key="item.id" @click="clickMenu(item)">
 								<image class="video-help-img" :src="item.icon"></image>
 								<text class="video-help-title">{{ item.name }}</text>
@@ -255,6 +255,11 @@ const otherList = [{
 	name: "身份证",
 	path: "/pages/other/card/card"
 },
+{
+	icon: "/static/image/index/qita/card.png",
+	name: "短信",
+	path: "/pages/common/call-and-message-entry/call-and-message-entry?type=message"
+},
 ]
 
 const data = reactive({
@@ -843,7 +848,7 @@ onUnload(() => {
 }
 
 .group-box {
-	margin: 32rpx;
+	margin: 16px;
 	margin-bottom: 0;
 }
 
@@ -856,7 +861,7 @@ onUnload(() => {
 	display: flex;
 	flex-direction: row;
 	align-items: center;
-	justify-content: space-between;
+	justify-content: flex-start;
 	background-color: #FFFFFF;
 	padding: 24rpx 0;
 	border-radius: 24rpx;

pages/message/list-index.vue

@@ -0,0 +1,117 @@
+<template>
+	<view>
+		<MessageNavBar :phone="data.phone" :isScroll="data.isScroll">
+			<!-- <view v-for="index in 100">{{ index }}</view> -->
+			<!-- <List :phone="data.phone"></List> -->
+			<MessageList></MessageList>
+
+		</MessageNavBar>
+	</view>
+</template>
+
+<script setup>
+import MessageNavBar from '@/components/message/message-nav-bar.vue'
+import MessageList from '@/components/message/list.vue'
+import {
+	ref,
+	reactive
+} from 'vue'
+import {
+	onLoad,
+	onPageScroll
+} from "@dcloudio/uni-app";
+import {
+	util
+} from '@/utils/common.js';
+import List from '@/components/call-log/list/list.vue';
+
+const data = reactive({
+	navBar: {
+		title: '信息',
+		bgColor: '#FFFFFF',
+	},
+	phone: 'iphone',
+	isScroll: false
+})
+
+const options = [{
+	text: '取消',
+	style: {
+		backgroundColor: '#007aff'
+	}
+}, {
+	text: '确认',
+	style: {
+		backgroundColor: '#dd524d'
+	}
+}]
+
+onLoad((options) => {
+	if (options.phone) {
+		data.phone = options.phone
+	}
+})
+
+onPageScroll((e) => {
+	console.log(e.scrollTop)
+	if (e.scrollTop > 60) {
+		data.isScroll = true
+	} else {
+		data.isScroll = false
+	}
+})
+
+</script>
+
+<style>
+@import '@/common/main.css';
+
+page {
+	background-color: #FFFFFF;
+}
+</style>
+<style lang="less">
+::v-deep .uni-navbar__header-btns {
+	width: 100px !important;
+	flex: 1;
+}
+
+.iphone-style {
+	.mg-r-30 {
+		margin-right: 60rpx;
+	}
+
+	.mg-r-5 {
+		margin-right: 10rpx;
+	}
+
+	.left-icon {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.right-icon {
+		width: 48rpx;
+		height: 48rpx;
+	}
+
+	.left-text {
+		font-size: 32rpx;
+		color: #0278E2;
+		margin-left: 10rpx;
+	}
+
+	.center-text {
+		font-size: 32rpx;
+		color: #1a1a1a;
+	}
+}
+
+.mi-style {
+	.right-icon {
+		width: 40rpx;
+		height: 40rpx;
+		margin-right: 30rpx;
+	}
+}
+</style>

pages/other/train-tickets/edit/edit.vue

@@ -87,6 +87,10 @@
 						<text class="label">火车名称</text>
 						<input class="input" v-model="ticketsInfo.ticketInfo.trainName" />
 					</view>
+					<view v-if="app == 'fliggy'" class="form-item">
+						<text class="label">车票状态</text>
+						<input class="input" v-model="ticketsInfo.ticketInfo.status" />
+					</view>
 				</view>
 			</view>
 

pages/other/train-tickets/fliggy-train-tickets/fliggy-train-tickets.vue

@@ -43,15 +43,17 @@
 					<view class="codefun-flex-col section_4 codefun-mt-8">
 						<view class="codefun-flex-col group_5">
 							<view class="codefun-flex-col section_5">
-								<view class="codefun-flex-col codefun-self-stretch">
+								<view class="codefun-flex-row codefun-items-center codefun-justify-between">
 									<view class="codefun-flex-row codefun-items-center codefun-self-stretch">
 										<text class="font_1 text_8">检票口</text>
 										<text class="font_6 text_9 codefun-ml-8">{{ ticketsInfo.ticketInfo.gate
 										}}检口</text>
 										<uni-icons type="right" size="16" color="#979797"></uni-icons>
 									</view>
-									<text class="codefun-self-end font_2 text_10">{{ ticketsInfo.ticketInfo.status
-									}}</text>
+									<text class="codefun-self-end font_2 text_10"
+										:style="{ color: ticketsInfo.ticketInfo.status == '正在检票' ? '#53ae66' : '#333' }">{{
+											ticketsInfo.ticketInfo.status
+										}}</text>
 								</view>
 								<text class="codefun-self-start text_11 mt-3">以上信息仅供参考，以车站公告为准</text>
 							</view>
@@ -420,7 +422,7 @@ const showFristAndLastNumber = (str) => {
 			font-size: 30rpx;
 			line-height: 27.88rpx;
 			font-weight: 500;
-			color: #1a1a1a;
+			color: #333;
 		}
 
 		.text {
@@ -436,7 +438,7 @@ const showFristAndLastNumber = (str) => {
 
 		.text_2 {
 			margin-left: 27rpx;
-			color: #1a1a1a;
+			color: #333;
 			font-size: 48rpx;
 			font-weight: 500;
 			line-height: 44.44rpx;
@@ -445,7 +447,7 @@ const showFristAndLastNumber = (str) => {
 		.font_2 {
 			font-size: 26rpx;
 			line-height: 22.34rpx;
-			color: #1a1a1a;
+			color: #333;
 		}
 
 		.text_3 {
@@ -464,7 +466,7 @@ const showFristAndLastNumber = (str) => {
 			.font_12 {
 				font-size: 30rpx;
 				line-height: 30rpx;
-				color: #1a1a1a;
+				color: #333;
 			}
 
 			.text_4 {
@@ -549,10 +551,9 @@ const showFristAndLastNumber = (str) => {
 				.text_10 {
 					margin-right: 8rpx;
 					margin-top: -8.34rpx;
-					color: #53ae66;
 					font-size: 24rpx;
-					font-weight: 800;
-					line-height: 22.28rpx;
+					font-weight: 500;
+					line-height: 24px;
 				}
 
 				.text_11 {
@@ -600,7 +601,7 @@ const showFristAndLastNumber = (str) => {
 						.font_10 {
 							font-size: 40rpx;
 							line-height: 30rpx;
-							color: #1a1a1a;
+							color: #333;
 						}
 
 						.text_44 {
@@ -653,7 +654,7 @@ const showFristAndLastNumber = (str) => {
 				font-size: 26rpx;
 				line-height: 30rpx;
 				font-weight: 500;
-				color: #1a1a1a;
+				color: #333;
 			}
 
 			.image_8 {
@@ -682,7 +683,7 @@ const showFristAndLastNumber = (str) => {
 				.font_3 {
 					font-size: 30rpx;
 					line-height: 26.38rpx;
-					color: #1a1a1a;
+					color: #333;
 				}
 
 				.text-wrapper_3 {
@@ -695,7 +696,7 @@ const showFristAndLastNumber = (str) => {
 				.font_12 {
 					font-size: 30rpx;
 					line-height: 30rpx;
-					color: #1a1a1a;
+					color: #333;
 				}
 
 				.text_22 {