diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index d43c75c..e608e7a 100644
--- a/.hbuilderx/launch.json
+++ b/.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"
}
]
diff --git a/common/main.css b/common/main.css
index d2f9a80..a4d30ce 100644
--- a/common/main.css
+++ b/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;
diff --git a/components/message/list.vue b/components/message/list.vue
new file mode 100644
index 0000000..c3ed4c8
--- /dev/null
+++ b/components/message/list.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ title
+ 昨天
+
+ 市燃管办温馨提示:依法安全文明燃放烟花爆竹,共护平安幸福家园呵呵哈哈哈还好...
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/message/message-nav-bar.vue b/components/message/message-nav-bar.vue
new file mode 100644
index 0000000..de19cf2
--- /dev/null
+++ b/components/message/message-nav-bar.vue
@@ -0,0 +1,512 @@
+
+
+
+
+
+
+
+
+ 过滤条件
+
+
+ 信息
+
+
+
+
+
+ 信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ showInfo.text }}
+ {{ showInfo.secondText }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ showInfo.bottomLtext }}
+
+
+
+ {{ showInfo.bottomRtext }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/nav-bar/nav-bar.vue b/components/nav-bar/nav-bar.vue
index 1525ee8..d0b53b9 100644
--- a/components/nav-bar/nav-bar.vue
+++ b/components/nav-bar/nav-bar.vue
@@ -13,7 +13,7 @@
-
+
@@ -130,6 +130,10 @@ const props = defineProps({
type: Boolean,
default: false
},
+ isBack: {
+ type: Boolean,
+ default: true
+ },
tipLayerText: {
type: String,
default: ''
diff --git a/main.js b/main.js
index 264e37d..1b77748 100644
--- a/main.js
+++ b/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);
diff --git a/pages.json b/pages.json
index dccb99b..882f792 100644
--- a/pages.json
+++ b/pages.json
@@ -9,18 +9,26 @@
}
}
],
-
- "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"
]
}
},
diff --git a/pages/common/call-and-message-entry/call-and-message-entry.vue b/pages/common/call-and-message-entry/call-and-message-entry.vue
new file mode 100644
index 0000000..2d6b33d
--- /dev/null
+++ b/pages/common/call-and-message-entry/call-and-message-entry.vue
@@ -0,0 +1,164 @@
+
+
+
+
+
+
+
+ {{ item.name }}机型
+ 立即进入
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.nvue b/pages/index/index.nvue
index 3b2ed7f..fe0dce0 100644
--- a/pages/index/index.nvue
+++ b/pages/index/index.nvue
@@ -79,7 +79,7 @@
-
{{ item.text }}
@@ -114,7 +114,7 @@
-
{{ item.name }}
@@ -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;
diff --git a/pages/message/list-index.vue b/pages/message/list-index.vue
new file mode 100644
index 0000000..34745c5
--- /dev/null
+++ b/pages/message/list-index.vue
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/other/train-tickets/edit/edit.vue b/pages/other/train-tickets/edit/edit.vue
index aa1a043..28d7bb1 100644
--- a/pages/other/train-tickets/edit/edit.vue
+++ b/pages/other/train-tickets/edit/edit.vue
@@ -87,6 +87,10 @@
火车名称
+
+ 车票状态
+
+
diff --git a/pages/other/train-tickets/fliggy-air-tickets/fliggy-air-tickets.vue b/pages/other/train-tickets/fliggy-air-tickets/fliggy-air-tickets.vue
deleted file mode 100644
index 3ef91a3..0000000
--- a/pages/other/train-tickets/fliggy-air-tickets/fliggy-air-tickets.vue
+++ /dev/null
@@ -1,1024 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 出票成功
- 该票为电子票,可直接凭购票证件进站乘车
-
-
- 再订一张
-
-
- 车次{{ ticketsInfo.ticketInfo.trainNo }}为电子票,无需取票可刷身份证乘车。
-
-
-
-
-
-
-
-
-
-
-
- 品质出行
- ·保障更安心
-
-
-
-
-
-
-
-
-
- 检票口
- {{ ticketsInfo.ticketInfo.gate
- }}检口
-
-
- {{ ticketsInfo.ticketInfo.status
- }}
-
- 以上信息仅供参考,以车站公告为准
-
-
- 取票号:{{ ticketsInfo.orderInfo.orderNo }}
-
-
- {{
- formatDateTime(ticketsInfo.ticketInfo.departureTime,
- ticketsInfo.ticketInfo.date) }}
- {{
- formatDateTime(ticketsInfo.ticketInfo.arrivalTime,
- ticketsInfo.ticketInfo.date) }}
-
-
-
- {{ ticketsInfo.ticketInfo.departureTime.split(' ')[1] }}
-
- {{ ticketsInfo.ticketInfo.duration }}
-
-
-
- {{ ticketsInfo.ticketInfo.arrivalTime.split(' ')[1] }}
-
-
- {{ ticketsInfo.ticketInfo.trainNo }}
-
-
-
-
- {{
- ticketsInfo.ticketInfo.departureStation
- }}
-
-
-
-
- {{
- ticketsInfo.ticketInfo.arrivalStation
- }}
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
-
- 靠窗
-
- {{ item.carriage }}车厢
- {{ item.seatNo }}号
-
-
-
-
- {{ item.idType }}:
- {{ item.idType.includes('身份证') ?
- showFristAndLastNumber(item.idNumber) : (item.idType.includes('护照') ?
- stringUtil.maskPassport(item.idNumber) : item.idNumber) }}
-
-
- {{ item.seatType }}
- ¥{{ item.price }}
-
-
-
-
- 退票
-
-
- 改签
-
-
-
-
-
-
-
-
-
-
-
- 电子发票
-
-
-
- 车站大屏
-
-
-
- 退改说明
-
-
-
-
-
-
-
-
-
-
- 关注飞猪旅行公众号
- 第一时间接受出票、出行信息
-
-
-
- 去关注
-
-
-
-
- 已购服务
-
- {{ ticketsInfo.serviceText }}
-
-
-
-
- 您可能遇到的问题
-
- 更多
-
-
-
-
-
- 如何取火车票
-
-
- 如何改签火车票
-
-
- 取票常见问题
-
-
- 如何使用电子票
-
-
- 申请退票退费
-
-
- 如何申请退票
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/other/train-tickets/fliggy-train-tickets/fliggy-train-tickets.vue b/pages/other/train-tickets/fliggy-train-tickets/fliggy-train-tickets.vue
index 05fca18..047d9a8 100644
--- a/pages/other/train-tickets/fliggy-train-tickets/fliggy-train-tickets.vue
+++ b/pages/other/train-tickets/fliggy-train-tickets/fliggy-train-tickets.vue
@@ -43,15 +43,17 @@
-
+
检票口
{{ ticketsInfo.ticketInfo.gate
}}检口
- {{ ticketsInfo.ticketInfo.status
- }}
+ {{
+ ticketsInfo.ticketInfo.status
+ }}
以上信息仅供参考,以车站公告为准
@@ -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 {
diff --git a/static/image/common/phone/huawei.png b/static/image/common/phone/huawei.png
new file mode 100644
index 0000000..e139deb
Binary files /dev/null and b/static/image/common/phone/huawei.png differ
diff --git a/static/image/common/phone/iphone.png b/static/image/common/phone/iphone.png
new file mode 100644
index 0000000..8a8cbcf
Binary files /dev/null and b/static/image/common/phone/iphone.png differ
diff --git a/static/image/common/phone/mi.png b/static/image/common/phone/mi.png
new file mode 100644
index 0000000..d9d80b0
Binary files /dev/null and b/static/image/common/phone/mi.png differ
diff --git a/static/image/common/phone/oppo.png b/static/image/common/phone/oppo.png
new file mode 100644
index 0000000..a1b6dc9
Binary files /dev/null and b/static/image/common/phone/oppo.png differ
diff --git a/static/image/common/phone/vivo.png b/static/image/common/phone/vivo.png
new file mode 100644
index 0000000..a15f2a2
Binary files /dev/null and b/static/image/common/phone/vivo.png differ
diff --git a/static/image/other/air-tickets/fliggy-air/spring-festival-banner.png b/static/image/other/air-tickets/fliggy-air/spring-festival-banner.png
index 6ddf2b8..e99619a 100644
Binary files a/static/image/other/air-tickets/fliggy-air/spring-festival-banner.png and b/static/image/other/air-tickets/fliggy-air/spring-festival-banner.png differ
diff --git a/static/image/other/train-tickets/12306-tickets/bottom-bg.png b/static/image/other/train-tickets/12306-tickets/bottom-bg.png
index 3675a94..512e97a 100644
Binary files a/static/image/other/train-tickets/12306-tickets/bottom-bg.png and b/static/image/other/train-tickets/12306-tickets/bottom-bg.png differ
diff --git a/static/image/phone-message/huawei/add.png b/static/image/phone-message/huawei/add.png
new file mode 100644
index 0000000..f665aeb
Binary files /dev/null and b/static/image/phone-message/huawei/add.png differ
diff --git a/static/image/phone-message/huawei/more.png b/static/image/phone-message/huawei/more.png
new file mode 100644
index 0000000..2eb7681
Binary files /dev/null and b/static/image/phone-message/huawei/more.png differ
diff --git a/static/image/phone-message/huawei/nav-search.png b/static/image/phone-message/huawei/nav-search.png
new file mode 100644
index 0000000..f31eaf1
Binary files /dev/null and b/static/image/phone-message/huawei/nav-search.png differ
diff --git a/static/image/phone-message/huawei/search.png b/static/image/phone-message/huawei/search.png
new file mode 100644
index 0000000..31d6271
Binary files /dev/null and b/static/image/phone-message/huawei/search.png differ
diff --git a/static/image/phone-message/iphone/back.png b/static/image/phone-message/iphone/back.png
new file mode 100644
index 0000000..d8071e4
Binary files /dev/null and b/static/image/phone-message/iphone/back.png differ
diff --git a/static/image/phone-message/iphone/default.png b/static/image/phone-message/iphone/default.png
new file mode 100644
index 0000000..79e1117
Binary files /dev/null and b/static/image/phone-message/iphone/default.png differ
diff --git a/static/image/phone-message/iphone/delete.png b/static/image/phone-message/iphone/delete.png
new file mode 100644
index 0000000..cd23a83
Binary files /dev/null and b/static/image/phone-message/iphone/delete.png differ
diff --git a/static/image/phone-message/iphone/edit.png b/static/image/phone-message/iphone/edit.png
new file mode 100644
index 0000000..e9dada2
Binary files /dev/null and b/static/image/phone-message/iphone/edit.png differ
diff --git a/static/image/phone-message/iphone/mic.png b/static/image/phone-message/iphone/mic.png
new file mode 100644
index 0000000..f2c6acc
Binary files /dev/null and b/static/image/phone-message/iphone/mic.png differ
diff --git a/static/image/phone-message/iphone/more.png b/static/image/phone-message/iphone/more.png
new file mode 100644
index 0000000..cfdf25b
Binary files /dev/null and b/static/image/phone-message/iphone/more.png differ
diff --git a/static/image/phone-message/iphone/mute.png b/static/image/phone-message/iphone/mute.png
new file mode 100644
index 0000000..093bd7d
Binary files /dev/null and b/static/image/phone-message/iphone/mute.png differ
diff --git a/static/image/phone-message/iphone/notice.png b/static/image/phone-message/iphone/notice.png
new file mode 100644
index 0000000..7ba1472
Binary files /dev/null and b/static/image/phone-message/iphone/notice.png differ
diff --git a/static/image/phone-message/iphone/search.png b/static/image/phone-message/iphone/search.png
new file mode 100644
index 0000000..251eacf
Binary files /dev/null and b/static/image/phone-message/iphone/search.png differ
diff --git a/static/image/phone-message/mi/add-message.png b/static/image/phone-message/mi/add-message.png
new file mode 100644
index 0000000..559dfc9
Binary files /dev/null and b/static/image/phone-message/mi/add-message.png differ
diff --git a/static/image/phone-message/mi/bottom-left.png b/static/image/phone-message/mi/bottom-left.png
new file mode 100644
index 0000000..96aa164
Binary files /dev/null and b/static/image/phone-message/mi/bottom-left.png differ
diff --git a/static/image/phone-message/mi/bottom-right.png b/static/image/phone-message/mi/bottom-right.png
new file mode 100644
index 0000000..8eb7378
Binary files /dev/null and b/static/image/phone-message/mi/bottom-right.png differ
diff --git a/static/image/phone-message/mi/search.png b/static/image/phone-message/mi/search.png
new file mode 100644
index 0000000..c95f062
Binary files /dev/null and b/static/image/phone-message/mi/search.png differ
diff --git a/static/image/phone-message/mi/setting.png b/static/image/phone-message/mi/setting.png
new file mode 100644
index 0000000..4dfa20f
Binary files /dev/null and b/static/image/phone-message/mi/setting.png differ
diff --git a/static/image/phone-message/oppo/add-message.png b/static/image/phone-message/oppo/add-message.png
new file mode 100644
index 0000000..56ee98d
Binary files /dev/null and b/static/image/phone-message/oppo/add-message.png differ
diff --git a/static/image/phone-message/oppo/bottom-left.png b/static/image/phone-message/oppo/bottom-left.png
new file mode 100644
index 0000000..ceb01c4
Binary files /dev/null and b/static/image/phone-message/oppo/bottom-left.png differ
diff --git a/static/image/phone-message/oppo/bottom-right.png b/static/image/phone-message/oppo/bottom-right.png
new file mode 100644
index 0000000..abd5f14
Binary files /dev/null and b/static/image/phone-message/oppo/bottom-right.png differ
diff --git a/static/image/phone-message/oppo/more.png b/static/image/phone-message/oppo/more.png
new file mode 100644
index 0000000..f255c55
Binary files /dev/null and b/static/image/phone-message/oppo/more.png differ
diff --git a/static/image/phone-message/oppo/search.png b/static/image/phone-message/oppo/search.png
new file mode 100644
index 0000000..194d319
Binary files /dev/null and b/static/image/phone-message/oppo/search.png differ
diff --git a/static/image/phone-message/vivo/add.png b/static/image/phone-message/vivo/add.png
new file mode 100644
index 0000000..0ca70fc
Binary files /dev/null and b/static/image/phone-message/vivo/add.png differ
diff --git a/static/image/phone-message/vivo/more.png b/static/image/phone-message/vivo/more.png
new file mode 100644
index 0000000..5407298
Binary files /dev/null and b/static/image/phone-message/vivo/more.png differ
diff --git a/static/image/phone-message/vivo/search.png b/static/image/phone-message/vivo/search.png
new file mode 100644
index 0000000..ff922b8
Binary files /dev/null and b/static/image/phone-message/vivo/search.png differ
diff --git a/static/image/phone-message/vivo/select.png b/static/image/phone-message/vivo/select.png
new file mode 100644
index 0000000..90a9663
Binary files /dev/null and b/static/image/phone-message/vivo/select.png differ