1、修复bug

2、新增充值
3、优化

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`)

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)

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" : {

src/pages.json

@@ -650,6 +650,12 @@
       "style": {
         "navigationBarTitleText": "详情"
       }
+    },
+    {
+      "path": "pages/user/balance",
+      "style": {
+        "navigationBarTitleText": "钱包"
+      }
     }
   ],
   "tabBar": {

src/pages/shop/checkout.vue

@@ -47,6 +47,9 @@
         <uv-cell-group :border="false">
           <!--                    <uv-cell isLink @click="payMethod = 'wechat' " title="微信支付" icon="/static/image/wechat-pay.png"-->
           <!--                             :rightIcon="payMethod === 'wechat' ? '/static/image/radio-checked.png' : '/static/image/radio.png'"></uv-cell>-->
+          <uv-cell isLink @click="selectPayMethod('balance')" :title="`余额支付(余额:${userInfo.balance}元)`"
+                   icon="/static/image/balance.png" :border="false"
+                   :rightIcon="payMethod === 'balance' ? '/static/image/radio-checked.png' : '/static/image/radio.png'"></uv-cell>
           <uv-cell isLink @click="selectPayMethod('alipay')" title="支付宝支付"
                    icon="/static/image/alipay-pay.png" :border="false"
                    :rightIcon="payMethod === 'alipay' ? '/static/image/radio-checked.png' : '/static/image/radio.png'"></uv-cell>
@@ -70,7 +73,7 @@ import HeaderItem from "@/components/HeaderItem.vue";
 import {addOrderReq, cartListReq} from "@/api/shop";
 import {onLoad} from "@dcloudio/uni-app";
 import * as COLORS from "@/config/color";
-import {userDetailReq} from "@/api/user";
+import {getUser, userDetailReq} from "@/api/user";
 import {toast} from "@/uni_modules/uv-ui-tools/libs/function";
 import {userAddressDefaultReq} from "@/api/address";
 
@@ -97,6 +100,13 @@ const payMethod = ref('')
 const canPay = ref(true)
 const disabled = ref(false)
 
+const userInfo = ref({})
+const getUserInfo = async () => {
+  const {data} = await getUser()
+  userInfo.value = data
+}
+getUserInfo()
+
 const userDetail = ref()
 const getUserDetail = async () => {
   const {data} = await userDetailReq()
@@ -116,6 +126,7 @@ const getUserDetail = async () => {
 }
 
 const selectPayMethod = (method) => {
+  if (method === 'balance' && userInfo.value.balance < cartData.value.totalPrice) return toast('余额不足,无法支付')
   payMethod.value = method
   canPay.value = true
 }
@@ -124,6 +135,10 @@ const action = async () => {
   if (!address.value) return toast('请先选择地址')
   if (!payMethod.value && cartData.value.totalPrice > 0) return toast('请先选择支付方式')
   disabled.value = true
+  let payType = 2
+  if (payMethod.value === 'alipay') payType = 3
+  else if (payMethod.value === 'wechat') payType = 1
+  else if (payMethod.value === 'balance') payType = 0
   const {data} = await addOrderReq({
     realName: address.value.name,
     phone: address.value.phone,
@@ -131,7 +146,7 @@ const action = async () => {
     orderId: null,
     totalPrice: cartData.value.totalPrice,
     type: 0,
-        payType: payMethod.value ? (payMethod.value === 'alipay' ? 3 : 1) : 2,
+    payType,
     goodsList: [
       {
         goodsId: cartData.value.goods.goodsId,

src/pages/signUp/info.vue

@@ -339,7 +339,8 @@
       </view>
       <uv-gap height="100rpx"/>
     </uv-popup>
-    <uv-picker ref="picker" :columns="[workTypeList, workTypeList[workTypeIndex].children]" @change="changeWorkType" @confirm="confirmWorkType"
+    <uv-picker ref="picker" :columns="[workTypeList, workTypeList[workTypeIndex].children]" @change="changeWorkType"
+               @confirm="confirmWorkType"
                keyName="title" title="选择工种"/>
     <uv-popup ref="conditionPicker" mode="bottom" round="15" closeable>
       <view class="p-50">
@@ -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('请上传身份证正面')
   }

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('请上传身份证正面')
   }

src/pages/user/balance.vue

@@ -0,0 +1,92 @@
+<template>
+  <view class="bg-gray-light min-height p-20">
+    <view class="rounded">
+      <view class="p-50 rounded-top bg text-white flex flex-col justify-center items-center">
+        <text class="text-25">当前余额</text>
+        <text class="mt-30 text-40 font-bold">￥{{ userInfo.balance }}</text>
+      </view>
+      <view class="font-bold py-20 border-bottom">充值套餐</view>
+      <view class="flex justify-start items-start flex-wrap">
+        <view v-for="(item, index) in chargePackageList" :key="index" class="w-50p">
+          <view :class="[packageId === item.id ? 'selected' : '']"
+                @click="packageId = item.id"
+                class="border rounded mr-10 mb-10 flex flex-col justify-center items-center p-20">
+            <text class="font-bold text-35">{{ item.amount }}元</text>
+            <text v-if="item.sendAmount && item.sendAmount > 0" class="text-25">送{{ item.sendAmount }}元</text>
+          </view>
+        </view>
+      </view>
+      <view class="mt-20">
+        <uv-button :disabled="!packageId" type="primary" shape="circle" @click="doCharge">立即充值</uv-button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {ref} from 'vue'
+import {getUser} from "@/api/user";
+import {listChargePackage} from "@/api/chargePackage";
+import {toast} from "@/uni_modules/uv-ui-tools/libs/function";
+import {newChargeOrderReq} from "@/api/shop";
+
+const userInfo = ref({})
+const getUserDetail = async () => {
+  const {data} = await getUser()
+  userInfo.value = data
+}
+getUserDetail()
+
+const chargePackageList = ref([])
+const getChargePackageList = async () => {
+  const {data} = await listChargePackage()
+  chargePackageList.value = data
+}
+getChargePackageList()
+const packageId = ref(0)
+
+const doCharge = async () => {
+  uni.showLoading({title: '正在提交'})
+  const {data} = await newChargeOrderReq({
+    type: 3,
+    payType: 3,
+    chargePackageId: packageId.value,
+  })
+  uni.requestPayment({
+    provider: 'alipay',
+    orderInfo: data,
+    success: async (res) => {
+      packageId.value = null
+      uni.hideLoading()
+      // if (payMethod.value === 'alipay') {
+      const rawData = JSON.parse(res.rawdata)
+      // console.log(res.errMsg, parseInt(rawData.resultCode), rawData.resultCode)
+      if (res.errMsg === 'requestPayment:ok' && parseInt(rawData.resultStatus) === 9000) {
+        toast('支付成功')
+        await getUserDetail()
+      } else {
+        toast('支付失败')
+      }
+      // }
+
+    },
+    complete: async (res) => {
+      console.log('complete', res)
+      uni.hideLoading()
+      packageId.value = null
+    },
+  })
+}
+</script>
+
+<style scoped>
+.bg {
+  background: url("https://oss.wsdns.cn/20250316/430511e96efe4ecb9f27e10f75d27389.png") 700rpx 220rpx;
+}
+
+.selected {
+  border: 1px solid #3c9cff;
+  background-color: #f3f8ff;
+  color: #007dff;
+}
+</style>

src/pages/user/user.vue

@@ -32,6 +32,14 @@
     </view>
     <!-- 五分一 -->
     <view class="layout-quarter">
+      <!-- #ifdef APP-PLUS -->
+      <view class="quarter-item" @click="$jump('/pages/user/balance')">
+        <view class="icon">
+          <image src="@/static/image/balance.png" style="width: 48rpx; height: 48rpx"/>
+        </view>
+        <view class="text">钱包</view>
+      </view>
+      <!-- #endif -->
        <view class="quarter-item" @click="$jump('/pages/user/sign')">
         <view class="icon">
           <image src="@/static/image/u-1.png" style="width: 48rpx; height: 48rpx"/>