From 55b4c78c1e7bc2aa2d1c2a24f545f9b51e25af76 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Tue, 26 Sep 2023 19:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=95=8C=E9=9D=A2=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 1 + pages/margin/margin.vue | 6 +- pages/moreProject/moreProject.vue | 52 +- pages/product/addGoods/index.vue | 10 +- pages/store/home/index.vue | 4265 +++++++++++++++-------------- pages/store/settled/index.vue | 13 +- 6 files changed, 2218 insertions(+), 2129 deletions(-) diff --git a/pages.json b/pages.json index ddcf831..b957f87 100644 --- a/pages.json +++ b/pages.json @@ -125,6 +125,7 @@ "path": "pages/moreProject/moreProject", "style": { "navigationBarTitleText": "商户平台", + "navigationStyle": "custom", "enablePullDownRefresh": false } diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue index a9ab8a1..65a8231 100644 --- a/pages/margin/margin.vue +++ b/pages/margin/margin.vue @@ -8,6 +8,10 @@ 已缴纳保证金 {{merchant_Data.paid_margin}} + + 未缴纳保证金 + {{merchant_Data.unpaid_margin}} + 缴纳店铺账户 {{merchant_Data.mer_name}} @@ -236,7 +240,7 @@ display: flex; flex-direction: column; padding: 0 28rpx; - margin-top: 50rpx; + margin-top: 85rpx; .title { font-size: 32rpx; diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 321617c..62ede90 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -1,5 +1,16 @@