diff --git a/src/api/chargePackage.js b/src/api/chargePackage.js new file mode 100644 index 0000000..1c75928 --- /dev/null +++ b/src/api/chargePackage.js @@ -0,0 +1,3 @@ +import http from './index.js'; +import {SERVER_API_URL} from "@/config"; +export const listChargePackage = () => http.get(`/shop/charge-package`) diff --git a/src/api/shop.js b/src/api/shop.js index 62fc24c..06a314b 100644 --- a/src/api/shop.js +++ b/src/api/shop.js @@ -26,3 +26,4 @@ export const messageInfoReq = (id) => http.get(`/shop/message/${id}`) export const messageReadReq = (data) => http.post(`/shop/message/read`, data) export const messageHasUnreadReq = (data) => http.post(`/shop/message/has-unread`, data) export const messageUnreadNumReq = (data) => http.post(`/shop/message/unread-num`, data) +export const newChargeOrderReq = (data) => http.post(`/shop/order/charge-order`, data) diff --git a/src/manifest.json b/src/manifest.json index 0761191..9196bcc 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,8 +3,8 @@ "appid" : "__UNI__06C03D0", //__UNI__06C03D0 "description" : "", - "versionName" : "1.34.3", - "versionCode" : "252", + "versionName" : "1.35.0", + "versionCode" : "254", "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/src/pages.json b/src/pages.json index 6ed1b54..3402689 100644 --- a/src/pages.json +++ b/src/pages.json @@ -650,6 +650,12 @@ "style": { "navigationBarTitleText": "详情" } + }, + { + "path": "pages/user/balance", + "style": { + "navigationBarTitleText": "钱包" + } } ], "tabBar": { diff --git a/src/pages/shop/checkout.vue b/src/pages/shop/checkout.vue index 243f95c..26747bb 100644 --- a/src/pages/shop/checkout.vue +++ b/src/pages/shop/checkout.vue @@ -1,67 +1,70 @@ \ No newline at end of file diff --git a/src/pages/signUp/info.vue b/src/pages/signUp/info.vue index 6bb60b8..8c139bd 100644 --- a/src/pages/signUp/info.vue +++ b/src/pages/signUp/info.vue @@ -339,7 +339,8 @@ - @@ -771,6 +772,10 @@ const join = async () => { if (workDateEndJudge.value && !form.value.workDateEnd) { return $toast('请选择从业结束日期') } + if (workDateEndJudge.value && form.value.workDateEnd) { + if (dayjs(form.value.workDateStart).isAfter(form.value.workDateEnd)) + return $toast('从业开始日期不能晚于从业结束日期') + } if (!form.value.idCardFront) { return $toast('请上传身份证正面') } diff --git a/src/pages/signUp/self.vue b/src/pages/signUp/self.vue index 4323faf..40558c2 100644 --- a/src/pages/signUp/self.vue +++ b/src/pages/signUp/self.vue @@ -860,6 +860,10 @@ const join = async () => { if (workDateEndJudge.value && !form.value.workDateEnd) { return $toast('请选择从业结束日期') } + if (workDateEndJudge.value && form.value.workDateEnd) { + if (dayjs(form.value.workDateStart).isAfter(form.value.workDateEnd)) + return $toast('从业开始日期不能晚于从业结束日期') + } if (!form.value.idCardFront) { return $toast('请上传身份证正面') } diff --git a/src/pages/user/balance.vue b/src/pages/user/balance.vue new file mode 100644 index 0000000..bb1e38d --- /dev/null +++ b/src/pages/user/balance.vue @@ -0,0 +1,92 @@ + + + + + \ No newline at end of file diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue index ed30f64..3f59712 100644 --- a/src/pages/user/user.vue +++ b/src/pages/user/user.vue @@ -32,7 +32,15 @@ - + + + + + + 钱包 + + + diff --git a/src/static/image/balance-bg.png b/src/static/image/balance-bg.png new file mode 100644 index 0000000..ba65439 Binary files /dev/null and b/src/static/image/balance-bg.png differ diff --git a/src/static/image/balance.png b/src/static/image/balance.png new file mode 100644 index 0000000..8f1bf22 Binary files /dev/null and b/src/static/image/balance.png differ