diff --git a/components/nav-bar/nav-bar.vue b/components/nav-bar/nav-bar.vue index 50e9187..1401129 100644 --- a/components/nav-bar/nav-bar.vue +++ b/components/nav-bar/nav-bar.vue @@ -10,7 +10,9 @@ - + @@ -25,7 +27,9 @@ - + @@ -74,276 +78,276 @@ \ No newline at end of file diff --git a/main.js b/main.js index 6840a2a..21d0707 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.0.sp7') + uni.setStorageSync('version', '1.0.0.sp9') app.config.globalProperties.$version = uni.getStorageSync('version') app.use(globalMethods); diff --git a/pages.json b/pages.json index da0343b..9b21885 100644 --- a/pages.json +++ b/pages.json @@ -70,7 +70,8 @@ } } ] - }, { + }, + { "root": "pages/finance-management", "pages": [{ "path": "index", @@ -111,6 +112,29 @@ "navigationBarTitleText": "工资单", "navigationStyle": "custom" } + }, + { + "path": "train-tickets/12306-tickets/12306-tickets", + "style": { + "navigationBarTitleText": "12306火车票", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "train-tickets/edit/edit", + "style": { + "navigationBarTitleText": "修改火车票信息", + "navigationStyle": "custom" + } + }, + { + "path": "air-tickets/qunar-air-tickets/qunar-air-tickets", + "style": { + "navigationBarTitleText": "去哪儿", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } ] }, @@ -155,7 +179,8 @@ "pages/bill", "pages/common", "pages/finance-management", - "pages/ant-credit-pay" + "pages/ant-credit-pay", + "pages/other" ] } }, diff --git a/pages/ant-credit-pay/overdue-payment/overdue-payment.vue b/pages/ant-credit-pay/overdue-payment/overdue-payment.vue index 8a9a330..8a5d3db 100644 --- a/pages/ant-credit-pay/overdue-payment/overdue-payment.vue +++ b/pages/ant-credit-pay/overdue-payment/overdue-payment.vue @@ -95,6 +95,8 @@ + + 抱歉,您暂时无法使用该服务!服务机构将不定期评估您的使用资格,请保持良好信用行为并耐心等待通知 @@ -258,7 +260,7 @@ const buttonGroup = [{ openStyleDialog() } }, { - name: "逾期后停用", + name: "逾期停用", isSwitch: true, key: 'isOverdueDeactivate', click: () => { @@ -471,7 +473,7 @@ const goBack = () => { display: flex; flex-direction: column; background-color: #F6F6F6; - height: 100vh; + // height: 100vh; // overflow: hidden; padding-bottom: 16rpx; @@ -646,26 +648,42 @@ const goBack = () => { } .overdue-box { + position: relative; + width: 100%; + height: auto; display: flex; - align-items: center; justify-content: center; padding-top: 18rpx; - background-image: url('/static/image/ant-credit-pay/overdue-payment/overdue-bg.png'); - background-size: contain; - background-repeat: no-repeat; + // background-image: url('/static/image/ant-credit-pay/overdue-payment/overdue-bg.png'); + // background-size: contain; + // background-repeat: no-repeat; margin-top: -1px; + // height: 700rpx; + + .bg-image { + position: absolute; + width: 100%; + top: 0; + left: 0; + right: 0; + } .overdue-info { - width: 654rpx; - // height: 628rpx; + position: relative; + width: 100%; + margin: 0 48rpx; background: linear-gradient(180deg, #FFF5F4 0%, #FFFBF7 100%); border-radius: 20rpx 20rpx 20rpx 20rpx; padding: 100rpx 24rpx 60rpx; - display: flex; - align-items: center; - flex-direction: column; + text-align: center; + // display: flex; + // align-items: center; + // flex-direction: column; + // min-height: 628rpx; + // max-height: 100%; .icon { + position: relative; width: 72rpx; height: 72rpx; } @@ -710,7 +728,7 @@ const goBack = () => { border-radius: 16rpx; margin: 16rpx 24rpx 0; display: flex; - align-items: center; + // align-items: center; flex-wrap: wrap; padding-bottom: 12rpx; diff --git a/pages/index/index.nvue b/pages/index/index.nvue index 1f5e13b..0f5d189 100644 --- a/pages/index/index.nvue +++ b/pages/index/index.nvue @@ -16,7 +16,7 @@ - @@ -125,6 +125,8 @@ 版本:{{ vision }} + {{ qqgroup.text }} + {{ qqgroup.number }} @@ -150,7 +152,9 @@ import { import { onLoad, - onShow + onShow, + onHide, + onUnload } from '@dcloudio/uni-app'; // 内部埋点方法 @@ -222,7 +226,7 @@ const otherList = [{ { icon: "/static/image/index/qita/huochepiao.png", name: "火车票", - path: "" + path: "/pages/other/train-tickets/12306-tickets/12306-tickets" }, { icon: "/static/image/index/qita/gongzidan.png", @@ -245,7 +249,8 @@ const data = reactive({ videoHelpList: [], noticeInfo: {}, vision: "", - platform: '' // 添加平台信息 + platform: '', // 添加平台信息, + qqgroup: {} }) const { @@ -256,7 +261,8 @@ const { videoHelpList, noticeInfo, vision, - platform + platform, + qqgroup } = toRefs(data); /** @@ -389,6 +395,7 @@ const setUserData = () => { // 启动走马灯 startMarquee(); data.videoHelpList = configData.config['client.uniapp.alipay.video_help'] || [] + data.qqgroup = configData.config['client.uniapp.qqgroup'] || { enable: false, number: "", text: "" } } else { data.noticeInfo = { text: '加载中...', @@ -437,6 +444,30 @@ const clickNotice = () => { util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${noticeInfo.value.title}`) } +/** + * 终极兼容版复制函数 + */ +const copyNumber = (number) => { + if (!number) return; + const text = String(number); + uni.setClipboardData({ + data: text, + success: function () { + uni.showToast({ + title: '复制成功', + icon: 'none' + }); + }, + fail: function () { + uni.showToast({ + title: '复制失败', + icon: 'none' + }); + } + }); +} + + /** * 退出模拟器 */ @@ -566,12 +597,38 @@ const runMarqueeAnimation = (containerWidth, textWidth, myId) => { }); }); } + +/** + * 停止走马灯 + */ +const stopMarquee = () => { + // 清除定时器 + if (marqueeTimer) { + clearTimeout(marqueeTimer); + marqueeTimer = null; + } + // 增加ID使其失效 + currentMarqueeId.value++; +} + +onHide(() => { + stopMarquee(); +}) + +onUnload(() => { + stopMarquee(); +}) + diff --git a/pages/other/splash/splash.vue b/pages/other/splash/splash.vue index fb2fe6a..69911c3 100644 --- a/pages/other/splash/splash.vue +++ b/pages/other/splash/splash.vue @@ -579,14 +579,14 @@ onReachBottom(() => { } .btn-save-image { - background-color: #07C160; + background: linear-gradient(90deg, #187AFF 0%, #3295FC 100%); color: #fff; border: none; padding: 18rpx 60rpx; border-radius: 40rpx; font-size: 26rpx; font-weight: bold; - box-shadow: 0 3rpx 10rpx rgba(7, 193, 96, 0.3); + box-shadow: 0 3rpx 10rpx rgba(7, 66, 193, 0.3); transition: all 0.3s ease; text-align: center; min-width: 160rpx; @@ -594,11 +594,11 @@ onReachBottom(() => { .btn-save-image:hover { transform: translateY(-2rpx); - box-shadow: 0 4rpx 12rpx rgba(7, 193, 96, 0.4); + box-shadow: 0 4rpx 12rpx rgba(7, 72, 193, 0.4); } .btn-save-image:active { transform: translateY(0); - box-shadow: 0 2rpx 6rpx rgba(7, 193, 96, 0.3); + box-shadow: 0 2rpx 6rpx rgba(7, 140, 193, 0.3); } \ No newline at end of file diff --git a/pages/other/train-tickets/12306-tickets/12306-tickets.vue b/pages/other/train-tickets/12306-tickets/12306-tickets.vue new file mode 100644 index 0000000..c434012 --- /dev/null +++ b/pages/other/train-tickets/12306-tickets/12306-tickets.vue @@ -0,0 +1,930 @@ + + + + + diff --git a/pages/other/train-tickets/edit/edit.vue b/pages/other/train-tickets/edit/edit.vue new file mode 100644 index 0000000..98b3b0a --- /dev/null +++ b/pages/other/train-tickets/edit/edit.vue @@ -0,0 +1,757 @@ + + + + + + + diff --git a/static/image/other/air-tickets/qunar/banner.png b/static/image/other/air-tickets/qunar/banner.png new file mode 100644 index 0000000..6210b3c Binary files /dev/null and b/static/image/other/air-tickets/qunar/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 new file mode 100644 index 0000000..3c63fe1 Binary files /dev/null and b/static/image/other/train-tickets/12306-tickets/bottom-bg.png differ diff --git a/static/image/other/train-tickets/12306-tickets/copy-button.png b/static/image/other/train-tickets/12306-tickets/copy-button.png new file mode 100644 index 0000000..0231a48 Binary files /dev/null and b/static/image/other/train-tickets/12306-tickets/copy-button.png differ diff --git a/static/image/other/train-tickets/12306-tickets/hotel-bg.png b/static/image/other/train-tickets/12306-tickets/hotel-bg.png new file mode 100644 index 0000000..6ada860 Binary files /dev/null and b/static/image/other/train-tickets/12306-tickets/hotel-bg.png differ diff --git a/static/image/other/train-tickets/12306-tickets/qr-code.png b/static/image/other/train-tickets/12306-tickets/qr-code.png new file mode 100644 index 0000000..9aede36 Binary files /dev/null and b/static/image/other/train-tickets/12306-tickets/qr-code.png differ diff --git a/static/image/other/train-tickets/12306-tickets/share.png b/static/image/other/train-tickets/12306-tickets/share.png new file mode 100644 index 0000000..8dce2ab Binary files /dev/null and b/static/image/other/train-tickets/12306-tickets/share.png differ diff --git a/static/image/other/train-tickets/12306-tickets/stopover-bg.png b/static/image/other/train-tickets/12306-tickets/stopover-bg.png new file mode 100644 index 0000000..fb92246 Binary files /dev/null and b/static/image/other/train-tickets/12306-tickets/stopover-bg.png differ