diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index c1e12e6..e608e7a 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -7,7 +7,7 @@ }, { "customPlaygroundType" : "local", - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" } ] diff --git a/App.vue b/App.vue index 25df398..579b3c2 100644 --- a/App.vue +++ b/App.vue @@ -11,7 +11,10 @@ export default { console.log('启动参数:', JSON.stringify(options)) console.log('环境:', process.env.NODE_ENV) + uni.setStorageSync('onNativeEventReceive', "no") + // 清除上次遗留的跳转指令,防止正常启动时自动跳转 + uni.removeStorageSync('jumpTarget_url'); const startTime = Date.now() // 1. 获取并存储系统信息(只获取一次) @@ -91,14 +94,12 @@ export default { } } else if (event == "jump") { if (data) { - let pages = getCurrentPages(); - let currentPage = pages[pages.length - 1]; - let currentUrl = currentPage.route; - if (currentUrl != data) { - uni.navigateTo({ - url: '/' + data - }); - } + console.log('接收到跳转指令,已缓存目标地址:', data); + uni.setStorageSync('jumpTarget_url', data); + // 强制重定向到首页,触发onShow获取用户信息后再跳转 + uni.reLaunch({ + url: '/pages/index/index' + }); } } else if (event == 'wx_pay_result' || event == 'ios_pay_result') { this.globalData.recentNativeEvent = event diff --git a/common/global.css b/common/global.css new file mode 100644 index 0000000..c3d40fd --- /dev/null +++ b/common/global.css @@ -0,0 +1,530 @@ +/************************************************************ +** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 ** +** 否则页面将无法正常显示 ** +************************************************************/ + +html { + font-size: 16px; +} + +body { + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', + 'Droid Sans', 'Helvetica Neue', 'Microsoft Yahei', sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +view, +image, +text { + box-sizing: border-box; + flex-shrink: 0; +} + +#app { + width: 100vw; + height: 100vh; +} + +.codefun-flex-row { + display: flex; + flex-direction: row; +} + +.codefun-flex-col { + display: flex; + flex-direction: column; +} + +.codefun-justify-start { + justify-content: flex-start; +} + +.codefun-justify-end { + justify-content: flex-end; +} + +.codefun-justify-center { + justify-content: center; +} + +.codefun-justify-between { + justify-content: space-between; +} + +.codefun-justify-around { + justify-content: space-around; +} + +.codefun-justify-evenly { + justify-content: space-evenly; +} + +.codefun-items-start { + align-items: flex-start; +} + +.codefun-items-end { + align-items: flex-end; +} + +.codefun-items-center { + align-items: center; +} + +.codefun-items-baseline { + align-items: baseline; +} + +.codefun-items-stretch { + align-items: stretch; +} + +.codefun-self-start { + align-self: flex-start; +} + +.codefun-self-end { + align-self: flex-end; +} + +.codefun-self-center { + align-self: center; +} + +.codefun-self-baseline { + align-self: baseline; +} + +.codefun-self-stretch { + align-self: stretch; +} + +.codefun-flex-1 { + flex: 1 1 0%; +} + +.codefun-flex-auto { + flex: 1 1 auto; +} + +.codefun-grow { + flex-grow: 1; +} + +.codefun-grow-0 { + flex-grow: 0; +} + +.codefun-shrink { + flex-shrink: 1; +} + +.codefun-shrink-0 { + flex-shrink: 0; +} + +.codefun-relative { + position: relative; +} + +.codefun-ml-2 { + margin-left: 4rpx; +} + +.codefun-mt-2 { + margin-top: 4rpx; +} + +.codefun-ml-4 { + margin-left: 8rpx; +} + +.codefun-mt-4 { + margin-top: 8rpx; +} + +.codefun-ml-6 { + margin-left: 12rpx; +} + +.codefun-mt-6 { + margin-top: 12rpx; +} + +.codefun-ml-8 { + margin-left: 16rpx; +} + +.codefun-mt-8 { + margin-top: 16rpx; +} + +.codefun-ml-10 { + margin-left: 20rpx; +} + +.codefun-mt-10 { + margin-top: 20rpx; +} + +.codefun-ml-12 { + margin-left: 24rpx; +} + +.codefun-mt-12 { + margin-top: 24rpx; +} + +.codefun-ml-14 { + margin-left: 28rpx; +} + +.codefun-mt-14 { + margin-top: 28rpx; +} + +.codefun-ml-16 { + margin-left: 32rpx; +} + +.codefun-mt-16 { + margin-top: 32rpx; +} + +.codefun-ml-18 { + margin-left: 36rpx; +} + +.codefun-mt-18 { + margin-top: 36rpx; +} + +.codefun-ml-20 { + margin-left: 40rpx; +} + +.codefun-mt-20 { + margin-top: 40rpx; +} + +.codefun-ml-22 { + margin-left: 44rpx; +} + +.codefun-mt-22 { + margin-top: 44rpx; +} + +.codefun-ml-24 { + margin-left: 48rpx; +} + +.codefun-mt-24 { + margin-top: 48rpx; +} + +.codefun-ml-26 { + margin-left: 52rpx; +} + +.codefun-mt-26 { + margin-top: 52rpx; +} + +.codefun-ml-28 { + margin-left: 56rpx; +} + +.codefun-mt-28 { + margin-top: 56rpx; +} + +.codefun-ml-30 { + margin-left: 60rpx; +} + +.codefun-mt-30 { + margin-top: 60rpx; +} + +.codefun-ml-32 { + margin-left: 64rpx; +} + +.codefun-mt-32 { + margin-top: 64rpx; +} + +.codefun-ml-34 { + margin-left: 68rpx; +} + +.codefun-mt-34 { + margin-top: 68rpx; +} + +.codefun-ml-36 { + margin-left: 72rpx; +} + +.codefun-mt-36 { + margin-top: 72rpx; +} + +.codefun-ml-38 { + margin-left: 76rpx; +} + +.codefun-mt-38 { + margin-top: 76rpx; +} + +.codefun-ml-40 { + margin-left: 80rpx; +} + +.codefun-mt-40 { + margin-top: 80rpx; +} + +.codefun-ml-42 { + margin-left: 84rpx; +} + +.codefun-mt-42 { + margin-top: 84rpx; +} + +.codefun-ml-44 { + margin-left: 88rpx; +} + +.codefun-mt-44 { + margin-top: 88rpx; +} + +.codefun-ml-46 { + margin-left: 92rpx; +} + +.codefun-mt-46 { + margin-top: 92rpx; +} + +.codefun-ml-48 { + margin-left: 96rpx; +} + +.codefun-mt-48 { + margin-top: 96rpx; +} + +.codefun-ml-50 { + margin-left: 100rpx; +} + +.codefun-mt-50 { + margin-top: 100rpx; +} + +.codefun-ml-52 { + margin-left: 104rpx; +} + +.codefun-mt-52 { + margin-top: 104rpx; +} + +.codefun-ml-54 { + margin-left: 108rpx; +} + +.codefun-mt-54 { + margin-top: 108rpx; +} + +.codefun-ml-56 { + margin-left: 112rpx; +} + +.codefun-mt-56 { + margin-top: 112rpx; +} + +.codefun-ml-58 { + margin-left: 116rpx; +} + +.codefun-mt-58 { + margin-top: 116rpx; +} + +.codefun-ml-60 { + margin-left: 120rpx; +} + +.codefun-mt-60 { + margin-top: 120rpx; +} + +.codefun-ml-62 { + margin-left: 124rpx; +} + +.codefun-mt-62 { + margin-top: 124rpx; +} + +.codefun-ml-64 { + margin-left: 128rpx; +} + +.codefun-mt-64 { + margin-top: 128rpx; +} + +.codefun-ml-66 { + margin-left: 132rpx; +} + +.codefun-mt-66 { + margin-top: 132rpx; +} + +.codefun-ml-68 { + margin-left: 136rpx; +} + +.codefun-mt-68 { + margin-top: 136rpx; +} + +.codefun-ml-70 { + margin-left: 140rpx; +} + +.codefun-mt-70 { + margin-top: 140rpx; +} + +.codefun-ml-72 { + margin-left: 144rpx; +} + +.codefun-mt-72 { + margin-top: 144rpx; +} + +.codefun-ml-74 { + margin-left: 148rpx; +} + +.codefun-mt-74 { + margin-top: 148rpx; +} + +.codefun-ml-76 { + margin-left: 152rpx; +} + +.codefun-mt-76 { + margin-top: 152rpx; +} + +.codefun-ml-78 { + margin-left: 156rpx; +} + +.codefun-mt-78 { + margin-top: 156rpx; +} + +.codefun-ml-80 { + margin-left: 160rpx; +} + +.codefun-mt-80 { + margin-top: 160rpx; +} + +.codefun-ml-82 { + margin-left: 164rpx; +} + +.codefun-mt-82 { + margin-top: 164rpx; +} + +.codefun-ml-84 { + margin-left: 168rpx; +} + +.codefun-mt-84 { + margin-top: 168rpx; +} + +.codefun-ml-86 { + margin-left: 172rpx; +} + +.codefun-mt-86 { + margin-top: 172rpx; +} + +.codefun-ml-88 { + margin-left: 176rpx; +} + +.codefun-mt-88 { + margin-top: 176rpx; +} + +.codefun-ml-90 { + margin-left: 180rpx; +} + +.codefun-mt-90 { + margin-top: 180rpx; +} + +.codefun-ml-92 { + margin-left: 184rpx; +} + +.codefun-mt-92 { + margin-top: 184rpx; +} + +.codefun-ml-94 { + margin-left: 188rpx; +} + +.codefun-mt-94 { + margin-top: 188rpx; +} + +.codefun-ml-96 { + margin-left: 192rpx; +} + +.codefun-mt-96 { + margin-top: 192rpx; +} + +.codefun-ml-98 { + margin-left: 196rpx; +} + +.codefun-mt-98 { + margin-top: 196rpx; +} + +.codefun-ml-100 { + margin-left: 200rpx; +} + +.codefun-mt-100 { + margin-top: 200rpx; +} \ No newline at end of file diff --git a/components/bill-management-popup/bill-management-popup.vue b/components/bill-management-popup/bill-management-popup.vue index de6a783..d4fd111 100644 --- a/components/bill-management-popup/bill-management-popup.vue +++ b/components/bill-management-popup/bill-management-popup.vue @@ -1,7 +1,7 @@