diff --git a/.env b/.env index 103caf2..38ef8e7 100644 --- a/.env +++ b/.env @@ -15,15 +15,15 @@ SHOPRO_VERSION=v2.4.1 #SHOPRO_DEV_BASE_URL=http://192.168.101.58:48090 # 服务器 -# SHOPRO_DEV_BASE_URL=http://www.qflyqzy.net:48090 +SHOPRO_DEV_BASE_URL=http://www.qflyqzy.net:48090 -#SHOPRO_DEV_BASE_URL=https://www.qflyqzy.net/yg-api +# SHOPRO_DEV_BASE_URL=https://www.qflyqzy.net/yg-api # 伟伟 -# SHOPRO_DEV_BASE_URL=http://192.168.3.1:48090 +# SHOPRO_DEV_BASE_URL=http://192.168.10.38:48090 # 测试环境 -SHOPRO_DEV_BASE_URL=https://yougoutest.api.riananyoumu.com +# SHOPRO_DEV_BASE_URL=https://yougoutest.api.riananyoumu.com # 本地 # SHOPRO_DEV_BASE_URL=http://8.136.55.200:48090 diff --git a/CHANGELOG.md b/CHANGELOG.md index a72bc04..8d3ecc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,4 +31,9 @@ ## [1.4.9] - 2026-06-22 ### 新增 - 添加跳转江文数商链接 - - 提现未实名跳转实名认证 \ No newline at end of file + - 提现未实名跳转实名认证 + +## [1.5.0] - 2026-06-24 +### 新增 + - 添加收支明细页面 + - 我的店铺文案展示当前用户名称 \ No newline at end of file diff --git a/pages.json b/pages.json index decdad5..6790840 100644 --- a/pages.json +++ b/pages.json @@ -855,6 +855,12 @@ "navigationBarTitleText": "待释放明细" } }, + { + "path": "noReleaseAmount", + "style": { + "navigationBarTitleText": "收支明细" + } + }, { "path" : "wallet", "style" : diff --git a/pages/home/agency.vue b/pages/home/agency.vue index ecc17b9..854806e 100644 --- a/pages/home/agency.vue +++ b/pages/home/agency.vue @@ -9,9 +9,10 @@ 今日收益(元) {{ $fen2yuan(trendObj?.earnings || 0) }} - + 未行权金额(元) {{ $fen2yuan(norelease || 0) }} + > @@ -424,6 +425,12 @@ currentMonth2.value = year + '-' + month; } + function goNoRelease() { + uni.navigateTo({ + url: '/pages/home/noReleaseAmount', + }); + } + onMounted(() => { select_value.value = range.value[0].text select_cur.value = range.value[0].value @@ -478,6 +485,16 @@ margin-left: 40rpx; } + .release-entry { + display: inline-flex; + } + + .arrow { + font-size: 24rpx; + margin-left: 12rpx; + opacity: 0.8; + } + .line { width: 418rpx; height: 4rpx; diff --git a/pages/home/noReleaseAmount.vue b/pages/home/noReleaseAmount.vue new file mode 100644 index 0000000..aeb1696 --- /dev/null +++ b/pages/home/noReleaseAmount.vue @@ -0,0 +1,273 @@ + + + + + diff --git a/pages/home/pay/withdraw.vue b/pages/home/pay/withdraw.vue index 219cb40..932163a 100644 --- a/pages/home/pay/withdraw.vue +++ b/pages/home/pay/withdraw.vue @@ -51,6 +51,10 @@ * {{ `提现时间为${config.brokerageWithdrawTime}` }} + + * + 一天(24小时)内只可提现1次 + 提现 diff --git a/pages/home/seed.vue b/pages/home/seed.vue index 905a0c5..0e25674 100644 --- a/pages/home/seed.vue +++ b/pages/home/seed.vue @@ -19,7 +19,9 @@ 当日价格{{ dataObj.todayPrice || 0 }}当日价格 + {{ dataObj.todayPrice || 0 }} + @@ -51,7 +53,10 @@ 当前价格 - {{ formatSeedPrice(dataObj.todayPrice) }} + + + **.**** + diff --git a/pages/index/aiStore.vue b/pages/index/aiStore.vue index 760750b..01d7a9e 100644 --- a/pages/index/aiStore.vue +++ b/pages/index/aiStore.vue @@ -97,7 +97,7 @@ - {{ shopSummary.title }} + {{ shopTitle }} ID:{{ shopSummary.shopId }} @@ -170,6 +170,7 @@