From 5b6d14c85be7db389ca71a4983005ef55a88b043 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 5 Aug 2024 18:00:36 +0800 Subject: [PATCH] 1 --- api/user.js | 19 ++ config/app.js | 6 +- pages.json | 21 ++ pages/index/index.vue | 3 +- pages/login/login.vue | 9 +- pages/my/my.vue | 5 +- pages/product/product.vue | 85 +++++-- pages/user_cash/index.vue | 506 +++++++++++++++++++++++++++++++++++++ pages/user_cash/list.vue | 93 +++++++ pages/user_cash/status.vue | 34 +++ 10 files changed, 756 insertions(+), 25 deletions(-) create mode 100644 pages/user_cash/index.vue create mode 100644 pages/user_cash/list.vue create mode 100644 pages/user_cash/status.vue diff --git a/api/user.js b/api/user.js index 6af8132..a8e631b 100644 --- a/api/user.js +++ b/api/user.js @@ -165,4 +165,23 @@ export const isUserShipApi = (data) => { export const getRechargeListApi = (data) => { return request.get('/user/UserRecharge/recharge_list', data); +} + +/** + * 提现信息 + */ +export const getCashInfoApi = (data) => { + return request.get('/user/User/cash_info', data); +} +/** + * 提交提现申请 + */ +export const CashApplicationApi = (data) => { + return request.post('/user/User/cash_application', data); +} +/** + * 提现申请记录 + */ +export const getCashRecordApi = (data) => { + return request.get('/user/User/cash_record', data); } \ No newline at end of file diff --git a/config/app.js b/config/app.js index 5657b7c..da7298e 100644 --- a/config/app.js +++ b/config/app.js @@ -3,9 +3,9 @@ let WSS_URL import store from "@/store/user.js" // 环境 // let env = "dev" -// let env = "prod" +let env = "prod" // let env = "release"; -let env = "local"; +// let env = "local"; switch (env) { case 'dev': @@ -17,7 +17,7 @@ switch (env) { WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' break; case 'local': - BASE_URL = 'http://192.168.1.22:8545'; + BASE_URL = 'http://192.168.1.231:8545'; WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' break; default: diff --git a/pages.json b/pages.json index 3df30a7..c50dca4 100644 --- a/pages.json +++ b/pages.json @@ -100,6 +100,27 @@ "navigationBarTitleText" : "商品列表", "enablePullDownRefresh": true } + }, + { + "path" : "pages/user_cash/index", + "style" : + { + "navigationBarTitleText" : "提现" + } + }, + { + "path" : "pages/user_cash/status", + "style" : + { + "navigationBarTitleText" : "" + } + }, + { + "path" : "pages/user_cash/list", + "style" : + { + "navigationBarTitleText" : "提现申请记录" + } } ], "subPackages": [{ diff --git a/pages/index/index.vue b/pages/index/index.vue index 9ac8b1b..5ba2761 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -655,8 +655,7 @@ } const settleAccounts = () => { - - if (+cartInfo.value.pay_price < 500) return showOverlay.value = true; + if (+cartInfo.value.pay_price < 500 && userStore.userInfo.user_ship==0 ) return showOverlay.value = true; uni.navigateTo({ url: '/pagesOrder/settle/settle' }) diff --git a/pages/login/login.vue b/pages/login/login.vue index 0b1ddc5..8018f19 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -7,7 +7,7 @@ - + 欢迎登录泸优采 @@ -16,7 +16,7 @@ 手机号快捷登录 - + 账号登录 @@ -100,8 +100,11 @@ config } from "@/config/app.js" - + const test_click=ref(0); const showOfficial = ref(false); + const test=()=>{ + test_click.value++ + } const navToIndex = () => { if (userStore.userInfo && userStore.token) uni.reLaunch({ url: '/pages/index/index' diff --git a/pages/my/my.vue b/pages/my/my.vue index 3ae918c..f4045a6 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -51,7 +51,8 @@ 会员报备 - + + 余额: @@ -121,7 +122,7 @@ --> - + diff --git a/pages/product/product.vue b/pages/product/product.vue index c3e03bc..2163cc4 100644 --- a/pages/product/product.vue +++ b/pages/product/product.vue @@ -4,14 +4,14 @@ - - - + + + - + - + @@ -29,15 +29,15 @@ - - + + - + @@ -57,7 +57,7 @@ let status = ref('loadmore') let list1 = ['零售', '商户', '会员'] let keyword = ref(''); - + let enable_flex=ref(true) const where = ref({ page_no: 1, page_size: 15, @@ -99,6 +99,34 @@ \ No newline at end of file diff --git a/pages/user_cash/index.vue b/pages/user_cash/index.vue new file mode 100644 index 0000000..56ecc43 --- /dev/null +++ b/pages/user_cash/index.vue @@ -0,0 +1,506 @@ + + + + + \ No newline at end of file diff --git a/pages/user_cash/list.vue b/pages/user_cash/list.vue new file mode 100644 index 0000000..a4cb8db --- /dev/null +++ b/pages/user_cash/list.vue @@ -0,0 +1,93 @@ + + + + + \ No newline at end of file diff --git a/pages/user_cash/status.vue b/pages/user_cash/status.vue new file mode 100644 index 0000000..14757fd --- /dev/null +++ b/pages/user_cash/status.vue @@ -0,0 +1,34 @@ + + + + +