diff --git a/.env b/.env index 623b3a0..b63e24c 100644 --- a/.env +++ b/.env @@ -17,21 +17,22 @@ VITE_PWD_ENC_KEY='pigxpigxpigxpigx' VITE_OAUTH2_APP_CLIENT='mini:mini' # 图片访问基础地址 -# VITE_IMAGE_BASE_PATH = http://localhost:9999 -VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 +#VITE_IMAGE_BASE_PATH = http://localhost:9999 +#VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上 - +VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上 # ******************** start 开发环境 start ******************** # VITE_APP_DEV_SERVICE =http://123.156.228.134:48080/app-api # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api -VITE_APP_DEV_SERVICE = http://192.168.101.29:9999 # 邓-本地 -#VITE_APP_DEV_SERVICE = http://pjcloud.center.takin.cc # 张 -# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api # 线上 +#VITE_APP_DEV_SERVICE = http://192.168.101.29:9999 # 邓-本地 +VITE_APP_DEV_SERVICE = http://127.0.0.1:9999 +# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api # VITE_APP_DEV_SERVICE = http://localhost:9999 # ******************** end 开发环境 end ******************** # ******************** start 生产环境 start ******************** #VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api -VITE_APP_PROD_SERVICE = http://123.156.230.15:8089/api +#VITE_APP_PROD_SERVICE = http://123.156.230.15:8089/api +VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api # ******************** end 生产环境 end ******************** diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue index 314d4e4..a687daf 100644 --- a/src/pages/tabbar/order.vue +++ b/src/pages/tabbar/order.vue @@ -15,7 +15,7 @@ const data = { { id: 1, name: "未支付", disabled: false }, { id: 5, name: "待核销", disabled: false }, { id: 10, name: "售后", disabled: false }, - { id: 15, name: "已核销", disabled: false }, + { id: 20, name: "已核销", disabled: false }, ], } const state = reactive({ @@ -98,8 +98,8 @@ const doRefund = (v: any) => { 未支付 待核销 - 售后中 - 已核销 + 售后 + 已核销 diff --git a/src/pages/wallet/apply-detail.vue b/src/pages/wallet/apply-detail.vue index 1f8b76e..57a4924 100644 --- a/src/pages/wallet/apply-detail.vue +++ b/src/pages/wallet/apply-detail.vue @@ -1,33 +1,23 @@ - - \ No newline at end of file + diff --git a/src/pages/wallet/detail.vue b/src/pages/wallet/detail.vue index 4cdcbe0..5033e4e 100644 --- a/src/pages/wallet/detail.vue +++ b/src/pages/wallet/detail.vue @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/src/pages/wallet/list.vue b/src/pages/wallet/list.vue index 5ae9644..76ce397 100644 --- a/src/pages/wallet/list.vue +++ b/src/pages/wallet/list.vue @@ -158,28 +158,25 @@ const doFreeze = async () => { - + {{ v.walletTypeName }} - 冻结审核中 - - 正常 - 已冻结 - + 正常 + 已冻结 ¥{{ hooks.useMoney(v.balance) }} - + 绑定 diff --git a/src/pages/wallet/recharge.vue b/src/pages/wallet/recharge.vue index 562ffa1..1b26eda 100644 --- a/src/pages/wallet/recharge.vue +++ b/src/pages/wallet/recharge.vue @@ -1,156 +1,158 @@ - \ No newline at end of file + diff --git a/src/sheep/api/wallet.ts b/src/sheep/api/wallet.ts index 0754360..d1c6340 100644 --- a/src/sheep/api/wallet.ts +++ b/src/sheep/api/wallet.ts @@ -29,7 +29,7 @@ export default { }), bind: (data: any) => request({ - url: "pay/wallet/bind-card", + url: "wallet/wallet-active/app/bind-card", method: "POST", data, custom: { @@ -38,7 +38,7 @@ export default { }), freeze: (data: any) => request({ - url: "pay/wallet/apply-freeze", + url: "wallet/wallet-freeze/app/apply-freeze", method: "POST", data, custom: {