合并代码
tangxinyue
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<!-- 左侧文字图标 -->
|
||||
<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/ios/back.png"
|
||||
<image @click="util.goBack" class="left-icon" src="/static/image/phone-message/iphone/back.png"
|
||||
mode=""></image>
|
||||
<text class="left-text">过滤条件</text>
|
||||
</view>
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
<template v-slot:right>
|
||||
<!-- iphone -->
|
||||
<view v-if="phone == 'iphone'">
|
||||
<image class="right-icon mg-r-30" src="/static/image/phone-message/ios/more.png" mode=""></image>
|
||||
<image class="right-icon mg-r-5" src="/static/image/phone-message/ios/edit.png" mode=""></image>
|
||||
<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'">
|
||||
|
|
@ -232,9 +232,9 @@ page {
|
|||
}
|
||||
|
||||
.main-container {
|
||||
padding: 20rpx 32rpx;
|
||||
|
||||
.top-box {
|
||||
padding: 20rpx 32rpx 0;
|
||||
|
||||
.text {
|
||||
color: #1A1A1A;
|
||||
font-size: 64rpx;
|
||||
|
|
@ -276,9 +276,10 @@ page {
|
|||
}
|
||||
|
||||
.main-container {
|
||||
padding: 0 22rpx;
|
||||
|
||||
.top-box {
|
||||
padding: 0 22rpx 0;
|
||||
|
||||
.text {
|
||||
color: #1A1A1A;
|
||||
font-size: 60rpx;
|
||||
|
|
@ -336,9 +337,10 @@ page {
|
|||
}
|
||||
|
||||
.main-container {
|
||||
padding: 16rpx 34rpx;
|
||||
|
||||
|
||||
.top-box {
|
||||
padding: 16rpx 34rpx 0;
|
||||
margin-bottom: 50rpx;
|
||||
|
||||
.text {
|
||||
|
|
@ -402,9 +404,11 @@ page {
|
|||
}
|
||||
|
||||
.main-container {
|
||||
padding: 40rpx 34rpx;
|
||||
|
||||
|
||||
.top-box {
|
||||
padding: 40rpx 34rpx 0;
|
||||
|
||||
.text {
|
||||
color: #1A1A1A;
|
||||
font-size: 60rpx;
|
||||
|
|
@ -467,8 +471,6 @@ page {
|
|||
}
|
||||
|
||||
.main-container {
|
||||
|
||||
|
||||
.top-box {
|
||||
padding: 0 46rpx;
|
||||
|
||||
|
|
|
|||
2
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);
|
||||
|
|
|
|||
|
|
@ -1,13 +1,17 @@
|
|||
<template>
|
||||
<view>
|
||||
<MessageNavBar :phone="data.phone" :isScroll="data.isScroll">
|
||||
<view v-for="index in 100">{{ index }}</view>
|
||||
<!-- <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
|
||||
|
|
@ -19,6 +23,7 @@ import {
|
|||
import {
|
||||
util
|
||||
} from '@/utils/common.js';
|
||||
import List from '@/components/call-log/list/list.vue';
|
||||
|
||||
const data = reactive({
|
||||
navBar: {
|
||||
|
|
@ -29,6 +34,18 @@ const data = reactive({
|
|||
isScroll: false
|
||||
})
|
||||
|
||||
const options = [{
|
||||
text: '取消',
|
||||
style: {
|
||||
backgroundColor: '#007aff'
|
||||
}
|
||||
}, {
|
||||
text: '确认',
|
||||
style: {
|
||||
backgroundColor: '#dd524d'
|
||||
}
|
||||
}]
|
||||
|
||||
onLoad((options) => {
|
||||
if (options.phone) {
|
||||
data.phone = options.phone
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 398 KiB After Width: | Height: | Size: 842 KiB |
|
Before Width: | Height: | Size: 971 B After Width: | Height: | Size: 971 B |
|
After Width: | Height: | Size: 4.5 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |