志愿者提现修改

api/mine.js

@@ -72,10 +72,16 @@ export function submitAmountApply(data) {
 }
 
 //获取当前用户提现状态
+// export function getWithdrawStatus() {
+//     return request({
+//         url: `/core/volunteer/account/getWithdrawStatus`,
+//         method: 'get',
+//     })
+// }
 export function getWithdrawStatus() {
     return request({
-        url: `/core/volunteer/account/getWithdrawStatus`,
-        method: 'get',
+      url: `/core/volunteer/take/mini/list`,
+      method: 'get',
     })
 }
 

pages.json

@@ -281,7 +281,13 @@
 					"style": {
 						"navigationBarTitleText": "查看积分"
 					}
-				}
+				},
+        {
+          "path": "pages/withdrawal/details",
+          "style": {
+            "navigationBarTitleText": "账单详情"
+          }
+        }
 			]
 		},
 		{

pages_classify/pages/handle/index.vue

@@ -9,20 +9,20 @@
       <view class="handle-user-info">
         <view class="user-name">
           <text class="user-PlaEde">下单时间：</text>
-          <text>{{ detaile.workDate }}</text>
+          <text class="user-PlaEde-content">{{ detaile.workDate }}</text>
           <up-text type="primary" text="查看时间" class="view-time"></up-text>
         </view>
         <view class="user-name">
           <text class="user-PlaEde">上门时间：</text>
-          <text>{{ detaile.workDate + ' ' + detaile.workStartTime }}</text>
+          <text class="user-PlaEde-content">{{ detaile.workDate + ' ' + detaile.workStartTime }}</text>
         </view>
         <view class="user-name">
           <text class="user-PlaEde">服务人员：</text>
-          <text>{{ detaile.clientName }}</text>
+          <text class="user-PlaEde-content">{{ detaile.clientName }}</text>
         </view>
         <view class="user-name" style="display: flex">
           <text class="user-PlaEde">服务类别：</text>
-          <text>{{ detaile.businessTireName }}</text>
+          <text class="user-PlaEde-content">{{ detaile.businessTireName }}</text>
         </view>
         <view class="user-name">
           <text class="user-seRssEdc">地址：</text>
@@ -338,7 +338,7 @@ onUnload(() => {
   top: 531rpx;
   left: 0;
   right: 0;
-  background: #FFFFFF;
+  background: #ffffff;
   width: 750rpx;
   border-radius: 20rpx 20rpx 0rpx 0rpx;
   padding: 30rpx;
@@ -346,7 +346,7 @@ onUnload(() => {
   .user-name {
     width: 660rpx;
     height: 50rpx;
-    opacity: 0.4;
+    // opacity: 0.4;
     border-bottom: 1rpx solid rgba(216, 216, 216, 0.8);
     margin-bottom: 30rpx;
     margin-left: 38rpx;
@@ -363,6 +363,9 @@ onUnload(() => {
     letter-spacing: normal;
     color: #7b7b7b;
   }
+  .user-PlaEde-content {
+    margin-left: 24rpx;
+  }
   .seRssEdc {
     width: 140rpx;
     height: 40rpx;
@@ -415,6 +418,7 @@ onUnload(() => {
     display: inline-block;
     vertical-align: top;
     font-size: 28rpx;
+    margin-left: 24rpx;
   }
 
   .view-time {

pages_mine/pages/wallet/index.vue

@@ -71,15 +71,15 @@ const data = ref({
     balance: 0
 });
 const onWithdrawal = () => {
-    getWithdrawStatus().then(res => {
-        if(res.code === 200){
-        // uni.navigateTo({
-        //         url: '/pages_mine/pages/withdrawal/index'
-        //     })
-
+    // getWithdrawStatus().then(res => {
+    //     if(res.code === 200){
+    //     // uni.navigateTo({
+    //     //         url: '/pages_mine/pages/withdrawal/index'
+    //     //     })
+            // 进入提现页面
             uni.redirectTo({ url: `/pages_mine/pages/withdrawal/index` });
-        }
-    })
+        // }
+    // })
   
 }
 

pages_mine/pages/withdrawal/index.vue

@@ -77,6 +77,7 @@
 
     <view style="margin-top: 45px">
       <up-button type="primary" text="确定提现" @click="onSubmit"></up-button>
+      <up-button type="error" text="提现历史" @click="onHistory" style="margin-top: 20rpx;"></up-button>
     </view>
 
     <up-action-sheet
@@ -219,6 +220,14 @@ const onSubmit = () => {
     })
 }
 
+// 进入提现历史详情
+const onHistory = () => {
+  console.log(1123)
+  uni.navigateTo({
+      url:'/pages_mine/pages/withdrawal/details'
+    })
+}
+
 const onMaxChange = () => {
   priceData.value.price = maxPrice.value
 }
@@ -248,44 +257,44 @@ const init = async () => {
   }
 }
 
-const selectNumber = async (row) => {
+const selectNumber = (row) => {
   s_key.value = row.name
   console.log('selectNumber', row)
-  if (row.name === '他人支付宝账号提现') {
-    try {
-      uni.showLoading({
-        title: '加载历史数据...',
-        mask: true
-      })
+  // if (row.name === '他人支付宝账号提现') {
+  //   try {
+  //     uni.showLoading({
+  //       title: '加载历史数据...',
+  //       mask: true
+  //     })
       
-      // 首先尝试获取历史支付宝账户信息
-      const res = await vonTtAlipayAccountHistory()
+  //     // 首先尝试获取历史支付宝账户信息
+  //     const res = await vonTtAlipayAccountHistory()
       
-      if (res.data === null ) {
-         // 获取当前提现状态的数据
-        const statusRes = await getWithdrawStatus()
-        if (statusRes.code === 200 && statusRes.data) {
-          priceData.value.name = statusRes.data.alipayName || ''
-          priceData.value.code = statusRes.data.alipayAccountNo || ''
-          priceData.value.idCard = statusRes.data.takeIdCard || ''
+  //     if (res.data === null ) {
+  //        // 获取当前提现状态的数据
+  //       const statusRes = await getWithdrawStatus()
+  //       if (statusRes.code === 200 && statusRes.data) {
+  //         priceData.value.name = statusRes.data.alipayName || ''
+  //         priceData.value.code = statusRes.data.alipayAccountNo || ''
+  //         priceData.value.idCard = statusRes.data.takeIdCard || ''
           
-        }
-      } 
-    } catch (error) {
-      console.error('获取账户信息失败:', error)
-      uni.showToast({
-        title: '获取账户信息失败',
-        icon: 'none'
-      })
-    } finally {
-      uni.hideLoading()
-    }
-  } else {
-    // 切回本人时清空第三方账号信息
-    priceData.value.name = ''
-    priceData.value.code = ''
-    priceData.value.idCard = ''
-  }
+  //       }
+  //     } 
+  //   } catch (error) {
+  //     console.error('获取账户信息失败:', error)
+  //     uni.showToast({
+  //       title: '获取账户信息失败',
+  //       icon: 'none'
+  //     })
+  //   } finally {
+  //     uni.hideLoading()
+  //   }
+  // } else {
+  //   // 切回本人时清空第三方账号信息
+  //   priceData.value.name = ''
+  //   priceData.value.code = ''
+  //   priceData.value.idCard = ''
+  // }
 }
 
 onShow(() => {