From 8239aad928f461d4419075c1cb249382a373f1b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Mon, 28 Jun 2021 18:04:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BD=99=E9=A2=9D=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=EF=BC=8C=E4=BD=99=E9=A2=9D=E5=85=85=E5=80=BC=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/members.js                    | 143 +++++++++++----------
 pages.json                        |  23 +++-
 pages/cart/payment/payOrder.vue   |  87 +++++++------
 pages/cart/payment/success.vue    |  21 +++-
 pages/mine/deposit/index.vue      | 200 ++++++++++++++----------------
 pages/mine/deposit/operation.vue  | 110 ++++++++++++++++
 pages/mine/deposit/recharge.vue   |  50 ++++++++
 pages/mine/deposit/style.scss     |  46 +++++++
 pages/mine/deposit/withdrawal.vue |  70 +++++++++++
 pages/passport/codeLogin.vue      |  28 +++--
 pages/tabbar/user/my.vue          |   2 +-
 11 files changed, 555 insertions(+), 225 deletions(-)
 create mode 100644 pages/mine/deposit/operation.vue
 create mode 100644 pages/mine/deposit/recharge.vue
 create mode 100644 pages/mine/deposit/style.scss
 create mode 100644 pages/mine/deposit/withdrawal.vue

diff --git a/api/members.js b/api/members.js
index a4f46d1..20faf55 100644
--- a/api/members.js
+++ b/api/members.js
@@ -1,28 +1,55 @@
-import storage from "@/utils/storage"
-import {http, Method} from '@/utils/request.js';
-
-
+import storage from "@/utils/storage";
+import { http, Method } from "@/utils/request.js";
 
 /**
  * 意见反馈
  */
- export function feedBack(params) {
+export function feedBack(params) {
   return http.request({
-    url: '/feedback',
+    url: "/feedback",
     method: Method.POST,
     needToken: true,
     params,
   });
 }
 
+// 提现
+export function withdrawalApply(params) {
+  return http.request({
+    url: "/members/wallet/withdrawal",
+    method: Method.POST,
+    needToken: true,
+    params,
+  });
+}
 
+/**
+ * 支付结果查询
+ * @param orderType 交易类型,可用值:TRADE,ORDER,RECHARGE
+ * @param sn   订单编号
+ */
+export function payCallback(params) {
+  return http.request({
+    url: `/cashier/result`,
+    method: Method.GET,
+    params,
+  });
+}
 
+// 在线充值
+export function recharge(params) {
+  return http.request({
+    url: "/trade/recharge",
+    method: Method.POST,
+    params,
+  });
+}
 
 /**
  * 分页获取预存款充值记录
  * @param params
  */
- export function getUserRecharge(params) {
+export function getUserRecharge(params) {
   return http.request({
     url: "/member/recharge",
     method: Method.GET,
@@ -35,7 +62,7 @@ import {http, Method} from '@/utils/request.js';
  * 分页获取预存款充值记录
  * @param params
  */
- export function getWalletLog(params) {
+export function getWalletLog(params) {
   return http.request({
     url: "/wallet/log",
     method: Method.GET,
@@ -44,16 +71,13 @@ import {http, Method} from '@/utils/request.js';
   });
 }
 
-
-
-
 /**
  * 获取优惠券列表
  * @param params
  */
 export function getCoupons(params) {
   return http.request({
-    url: '/promotion/coupon/getCoupons',
+    url: "/promotion/coupon/getCoupons",
     method: Method.GET,
     needToken: true,
     params,
@@ -79,14 +103,13 @@ export function receiveCoupons(couponId) {
  */
 export function getPointsData(params) {
   return http.request({
-    url: 'member/memberPointsHistory/getByPage',
+    url: "member/memberPointsHistory/getByPage",
     method: Method.GET,
     needToken: true,
     params,
   });
 }
 
-
 /**
  * 获取我的评论列表
  * @param params
@@ -94,7 +117,7 @@ export function getPointsData(params) {
  */
 export function getComments(params) {
   return http.request({
-    url: '/memberEvaluation',
+    url: "/memberEvaluation",
     method: Method.GET,
     needToken: true,
     params,
@@ -108,26 +131,23 @@ export function getComments(params) {
  */
 export function getFootprintNum(params) {
   return http.request({
-    url: '/footprint/getFootprintNum',
+    url: "/footprint/getFootprintNum",
     method: Method.GET,
     needToken: true,
     params,
   });
 }
 
-
-
-
 /**
  * 订单评论
  * @param params
  */
 export function commentsMemberOrder(params) {
   return http.request({
-    url: '/memberEvaluation',
+    url: "/memberEvaluation",
     method: Method.POST,
     needToken: true,
-	  header:{'content-type':"application/x-www-form-urlencoded"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     data: params,
   });
 }
@@ -138,30 +158,30 @@ export function commentsMemberOrder(params) {
  */
 export function AppendCommentsOrder(params) {
   return http.request({
-    url: 'members/comments/additional',
+    url: "members/comments/additional",
     method: Method.POST,
     needToken: true,
-	  header:{'content-type':"application/x-www-form-urlencoded"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     data: params,
   });
 }
 
 // TODO 第一版本暂未实现此功能
-/** 
+/**
  * 商品咨询
  * @param goods_id
  * @param ask_content
  */
-export function consultating(goods_id, ask_content,anonymous) {
+export function consultating(goods_id, ask_content, anonymous) {
   return http.request({
-    url: 'members/asks',
+    url: "members/asks",
     method: Method.POST,
-	  header:{'content-type':"application/x-www-form-urlencoded"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     needToken: true,
     data: {
       goods_id,
       ask_content,
-      anonymous
+      anonymous,
     },
   });
 }
@@ -171,7 +191,7 @@ export function consultating(goods_id, ask_content,anonymous) {
  * @param params
  * @returns {AxiosPromise}
  */
-export function getGoodsCollection(params,type) {
+export function getGoodsCollection(params, type) {
   return http.request({
     url: `/member/collection/${type}`,
     method: Method.GET,
@@ -182,23 +202,18 @@ export function getGoodsCollection(params,type) {
   });
 }
 
-
-
 /**
  * 收藏商品
  * @returns {AxiosPromise}
  */
-export function collectionGoods(id,type) {
+export function collectionGoods(id, type) {
   return http.request({
     url: `/member/collection/add/${type}/${id}`,
     method: Method.POST,
     needToken: true,
- 
   });
 }
 
-
-
 /**
  * 删除商品收藏
  * @param ids 收藏ID【集合或单个商品ID】
@@ -206,7 +221,7 @@ export function collectionGoods(id,type) {
  */
 export function deleteGoodsCollection(ids) {
   if (Array.isArray(ids)) {
-    ids = ids.join(',');
+    ids = ids.join(",");
   }
   return http.request({
     url: `/member/collection/delete/GOODS/${ids}`,
@@ -219,7 +234,7 @@ export function deleteGoodsCollection(ids) {
  * 获取商品是否被收藏
  * @param good_id
  */
-export function getGoodsIsCollect(good_id,type) {
+export function getGoodsIsCollect(good_id, type) {
   return http.request({
     url: `/member/collection/isCollection/${type}/${good_id}`,
     method: Method.GET,
@@ -228,7 +243,6 @@ export function getGoodsIsCollect(good_id,type) {
   });
 }
 
-
 /**
  * 收藏店铺
  * @param store_id 店铺ID
@@ -236,10 +250,10 @@ export function getGoodsIsCollect(good_id,type) {
  */
 export function collectionStore(store_id) {
   return http.request({
-    url: 'members/collection/store',
-    header:{'content-type':"application/x-www-form-urlencoded"},
+    url: "members/collection/store",
+    header: { "content-type": "application/x-www-form-urlencoded" },
     method: Method.POST,
-    data: {store_id},
+    data: { store_id },
   });
 }
 
@@ -255,14 +269,13 @@ export function deleteStoreCollection(store_id) {
   });
 }
 
-
 /**
  * 获取当前登录的用户信息
  * @returns {AxiosPromise}
  */
- export function getUserInfo() {
+export function getUserInfo() {
   return http.request({
-    url: '/members',
+    url: "/members",
     method: Method.GET,
     needToken: true,
   });
@@ -274,7 +287,7 @@ export function deleteStoreCollection(store_id) {
  */
 export function getUserWallet() {
   return http.request({
-    url: '/members/wallet',
+    url: "/members/wallet",
     method: Method.GET,
     needToken: true,
   });
@@ -287,30 +300,27 @@ export function getUserWallet() {
  */
 export function saveUserInfo(params) {
   return http.request({
-    url: '/members/editOwn',
+    url: "/members/editOwn",
     method: Method.PUT,
-	header:{'content-type':"application/x-www-form-urlencoded"},
+    header: { "content-type": "application/x-www-form-urlencoded" },
     needToken: true,
     data: params,
   });
 }
 
-
 /**
  * 添加发票
  * @param params
  */
 export function addReceipt(params) {
   return http.request({
-    url: '/trade/receipt',
+    url: "/trade/receipt",
     method: Method.POST,
     needToken: true,
     params,
   });
 }
 
-
-
 /**
  * 获取商品评论列表
  * @param goodsId
@@ -337,7 +347,6 @@ export function getGoodsCommentsCount(goodsId) {
   });
 }
 
-
 /**
  * 获取未读消息数量信息
  */
@@ -345,21 +354,21 @@ export function getNoReadMessageNum() {
   return http.request({
     url: `members/member-nocice-logs/number`,
     method: Method.GET,
-    needToken: true
-  })
+    needToken: true,
+  });
 }
 
 /**
  * 我的足迹列表
  * @param pageNumber  pageSize
- * 
+ *
  */
 export function myTrackList(params) {
   return http.request({
     url: `/footprint`,
     method: Method.GET,
     needToken: true,
-	params
+    params,
   });
 }
 
@@ -371,42 +380,42 @@ export function deleteHistoryListId(ids) {
   return http.request({
     url: `/footprint/delByIds/${ids}`,
     method: Method.DELETE,
-    needToken: true
-  })
+    needToken: true,
+  });
 }
 
 /**
  * 获取当前会员优惠券列表
- * @param 
+ * @param
  */
 export function getMemberCoupons(data) {
   return http.request({
     url: `/promotion/coupon/getCoupons`,
     method: Method.GET,
     needToken: true,
-    params:data
-  })
+    params: data,
+  });
 }
 
 /**
  * 获取当前会员可使用的优惠券数量
- * 
+ *
  */
 export function getCouponsNum() {
   return http.request({
     url: `/promotion/coupon/getCouponsNum`,
     method: Method.GET,
-    needToken: true
-  })
+    needToken: true,
+  });
 }
 
 /**
  * 获取会员积分VO
- * @param 
+ * @param
  */
 export function getMemberPointSum() {
   return http.request({
     url: `member/memberPointsHistory/getMemberPointsHistoryVO`,
-    method: Method.GET
-  })
+    method: Method.GET,
+  });
 }
diff --git a/pages.json b/pages.json
index 676b6da..381018d 100644
--- a/pages.json
+++ b/pages.json
@@ -168,7 +168,28 @@
 				{
 					"path": "deposit/index",
 					"style": {
-						"navigationBarTitleText": "预存款列表"
+						"navigationStyle": "custom"
+
+					}
+				},
+				{
+					"path": "deposit/operation",
+					"style": {
+						"navigationStyle": "custom"
+
+					}
+				},
+				{
+					"path": "deposit/recharge",
+					"style": {
+						"navigationBarTitleText": "充值金额"
+
+					}
+				},
+				{
+					"path": "deposit/withdrawal",
+					"style": {
+						"navigationBarTitleText": "提现金额"
 
 					}
 				},
diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue
index 3b2a629..4f17c6b 100644
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -45,7 +45,7 @@
 </template>
 <script>
 	import * as API_Trade from "@/api/trade";
-
+	import {payCallback} from '@/api/members'
 	export default {
 		data() {
 			return {
@@ -71,6 +71,7 @@
 				walletValue: 0.0,
 				// 支付倒计时
 				autoCancel: 0,
+			
 			};
 		},
 		onLoad(val) {
@@ -91,12 +92,23 @@
 			// 区别是：h5是通过浏览器外部调用微信app进行支付，而JSAPI则是 在微信浏览器内部，或者小程序 调用微信支付
 			this.paymentClient = this.isWeiXin() ? "JSAPI" : "H5";
 			//#endif
+
+
+
+			// 
 		},
 		onBackPress(e) {
 			if (e.from == "backbutton") {
+				if(this.routerVal.recharge_sn){
+					uni.switchTab({
+						 url: '/pages/tabbar/user/my'
+					});
+				}
+				else{
 				uni.redirectTo({
 					url: "/pages/order/myOrder?status=0",
 				});
+				}
 				return true; //阻止默认返回行为
 			}
 		},
@@ -104,16 +116,28 @@
 			this.cashierData();
 		},
 		methods: {
-			navigateTo(url) {
+
+			/**
+			 * 支付成功后跳转
+			 */
+			callback(paymentMethod){
 				uni.navigateTo({
-					url,
+					url: "/pages/cart/payment/success?paymentMethod=" +
+					paymentMethod +
+					"&payPrice=" +
+					this.cashierParams.price+
+					"&orderType="+this.orderType 
 				});
 			},
-			// 获取收银详情
+			
+			/**
+			 * 获取收银详情
+			 */
 			cashierData() {
 				let parms = {};
 
 				if (this.routerVal.recharge_sn) {
+					// 判断当前是否是充值
 					this.sn = this.routerVal.recharge_sn;
 					this.orderType = "RECHARGE";
 				} else if (this.routerVal.trade_sn) {
@@ -136,8 +160,18 @@
 					});
 					// #endif
 
+				
+
 					// #ifndef MP-WEIXIN
-					this.payList = res.data.result.support;
+				    if(this.routerVal.recharge_sn){
+					 this.payList = res.data.result.support.filter((item) => {
+						return item != "WALLET";
+					 })
+					}
+					 else{
+						this.payList = res.data.result.support;
+					}
+					
 					// #endif
 					this.walletValue = res.data.result.walletValue;
 					this.autoCancel =
@@ -154,6 +188,7 @@
 
 			//订单支付
 			async pay(payment) {
+				
 				// 支付编号
 				const sn = this.sn;
 				// 交易类型【交易号|订单号】
@@ -188,7 +223,6 @@
 
 						let payForm = signXml.data.result;
 
-						console.log(payForm)
 						let paymentType = paymentMethod === "WECHAT" ? "wxpay" : "alipay";
 						uni.requestPayment({
 							provider: paymentType,
@@ -199,12 +233,10 @@
 									icon: "none",
 									title: "支付成功!",
 								});
-								uni.navigateTo({
-									url: "/pages/payment/success?paymentType=" +
-										paymentType +
-										"&payPrice=" +
-										this.cashierParams.price,
-								});
+
+								this.callback(paymentMethod)
+								
+								 
 							},
 							fail: (e) => {
 								console.log(e);
@@ -253,12 +285,8 @@
 												icon: "none",
 												title: "支付成功!",
 											});
-											uni.navigateTo({
-												url: "/pages/cart/payment/success?paymentMethod=" +
-													paymentMethod +
-													"&payPrice=" +
-													this.cashierParams.price,
-											});
+											this.callback(paymentMethod)
+											 
 										} else {
 											uni.showModal({
 												content: "支付失败,如果您已支付，请勿反复支付",
@@ -276,12 +304,7 @@
 								icon: "none",
 							});
 							if (response.success) {
-								uni.navigateTo({
-									url: "/pages/cart/payment/success?paymentMethod=" +
-										paymentMethod +
-										"&payPrice=" +
-										this.cashierParams.price,
-								});
+								this.callback(paymentMethod)
 							}
 						}
 					}
@@ -317,12 +340,8 @@
 										icon: "none",
 										title: "支付成功!",
 									});
-									uni.navigateTo({
-										url: "/pages/cart/payment/success?paymentMethod=" +
-											paymentType +
-											"&payPrice=" +
-											this.cashierParams.price,
-									});
+									this.callback(paymentMethod)
+									 
 								},
 								fail: (e) => {
 									console.log(e);
@@ -338,12 +357,8 @@
 								icon: "none",
 								title: "支付成功!",
 							});
-							uni.navigateTo({
-								url: "/pages/cart/payment/success?paymentMethod=" +
-									paymentMethod +
-									"&payPrice=" +
-									this.cashierParams.price,
-							});
+							this.callback(paymentMethod)
+							 
 						}
 					}
 				);
diff --git a/pages/cart/payment/success.vue b/pages/cart/payment/success.vue
index ccd4afc..49b6766 100644
--- a/pages/cart/payment/success.vue
+++ b/pages/cart/payment/success.vue
@@ -2,10 +2,10 @@
   <div class="wrapper">
     <div class="pay-wrapper">
       <div class="pay-money">
-        ￥{{ payPrice | unitPrice }}
+        ￥{{ Number(payPrice) | unitPrice }}
       </div>
       <div class="pay-btns">
-        <div v-show="!from" @click="navigateTo('/pages/order/myOrder?status=0')">查看订单</div>
+        <div v-show="!from" @click="checkOrder">查看{{this.orderType == "RECHARGE" ? '余额' : '订单'}}</div>
         <div @click="navigateTo('/pages/tabbar/home/index', 'switch')">回到首页</div>
 
       </div>
@@ -88,11 +88,26 @@ export default {
   onLoad(options) {
     this.paymentMethod = options.paymentMethod || "";
     this.from = options.from || "";
-    this.payPrice = parseInt(options.payPrice) || 0;
+    this.payPrice = options.payPrice || 0;
+    this.orderType = options.orderType;
     //搜索商品
     this.initGoods();
   },
   methods: {
+    checkOrder() {
+      /**
+       * 查看订单
+       * 1.充值跳转到明细里面
+       * 2.支付跳转到订单详情
+       */
+      if (this.orderType == "RECHARGE") {
+        uni.reLaunch({
+           url: `/pages/mine/deposit/operation`
+        })
+      } else {
+        this.navigateTo("/pages/order/myOrder?status=0");
+      }
+    },
     changeStatus(val) {
       if (val) {
         this.sendMessage();
diff --git a/pages/mine/deposit/index.vue b/pages/mine/deposit/index.vue
index 0a33f2f..85287ee 100644
--- a/pages/mine/deposit/index.vue
+++ b/pages/mine/deposit/index.vue
@@ -1,14 +1,17 @@
 <template>
   <view class="wap">
+    <u-navbar back-text="" title="预存款列表">
+    </u-navbar>
     <view class="wrapper-show-money">
       <view class="money-view">
         <h3>预存款金额 </h3>
         <view class="money">￥{{walletNum | unitPrice }}</view>
+
       </view>
     </view>
     <view class="wrapper-tabs">
-      
-      <swiper class="swiper-box" @change="changeSwiper" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
+
+      <swiper class="swiper-box"  :current="swiperCurrent">
         <swiper-item class="swiper-item" v-for="index in list.length" :key="index">
           <scroll-view class="scroll-v view-wrapper" enableBackToTop="true" scroll-with-animation scroll-y @scrolltolower="loadMore">
             <view v-if="datas.length!=0" class="view-item" v-for="(logItem, logIndex) in datas" :key="logIndex">
@@ -37,12 +40,11 @@
 
 <script>
 import { getUserRecharge, getWalletLog } from "@/api/members";
-import storage from "@/utils/storage.js";
 import { getUserWallet } from "@/api/members";
 export default {
   data() {
     return {
-      walletNum:0,
+      walletNum: 0,
       status: "loadmore",
       current: 0,
       swiperCurrent: 0,
@@ -77,6 +79,7 @@ export default {
     this.walletNum = result.data.result.memberWallet;
   },
   methods: {
+   
     /**分页获取预存款充值记录 */
     getRecharge() {
       this.status = "loading";
@@ -105,10 +108,7 @@ export default {
       });
     },
 
-    // 点击swiper的时候清空数据
-    changeSwiper() {
-      this.groupBuy = [];
-    },
+  
     changed(index) {
       this.datas = [];
       this.swiperCurrent = index;
@@ -121,19 +121,6 @@ export default {
       }
     },
 
-    // swiper-item左右移动，通知tabs的滑块跟随移动
-    transition({ detail: { dx } }) {
-      this.$refs.tabs.setDx(dx);
-    },
-    // 由于swiper的内部机制问题，快速切换swiper不会触发dx的连续变化，需要在结束时重置状态
-    // swiper滑动结束，分别设置tabs和swiper的状态
-    animationfinish(e) {
-      // this.groupBuy = []
-      let current = e.detail.current;
-      this.$refs.tabs.setFinishCurrent(current);
-      this.swiperCurrent = current;
-      this.current = current;
-    },
     loadMore() {
       this.params.pageNumber++;
       this.getWallet();
@@ -144,93 +131,96 @@ export default {
 
 <style lang="scss" scoped>
 .green {
-  color: $aider-color-green !important;
-}
-.view-item {
-  padding: 32rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-.view-item-change {
-  text-align: right;
-  > .-money {
-    font-size: 36rpx;
-    color: $main-color;
+    color: $aider-color-green !important;
+  }
+  .view-item {
+    padding: 32rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .view-item-change {
+    text-align: right;
+    > .-money {
+      font-size: 36rpx;
+      color: $main-color;
+      font-weight: bold;
+    }
+    > .-time {
+      font-size: 22rpx;
+      color: #999;
+    }
+  }
+  .view-item-detail {
+    line-height: 1.75;
+    > .-title {
+      font-size: 28rpx;
+    }
+    > .-number {
+      font-size: 22rpx;
+      color: #999;
+    }
+  }
+  .submit-btn {
+    line-height: 90rpx;
+    text-align: center;
+  
+    color: #fff;
+    background: $main-color;
+  
+    margin: 0 auto;
+    height: 90rpx;
+  }
+  
+  .operation {
+    font-size: 32rpx;
+    margin-right: 24rpx;
+    color: rgb(96, 98, 102);
+  }
+  .money {
+    font-size: 40rpx;
     font-weight: bold;
   }
-  > .-time {
-    font-size: 22rpx;
-    color: #999;
+  
+  .money-view {
+    height: 100%;
+    width: 100%;
+    padding: 0 32rpx;
+    display: flex;
+    align-items: flex-end;
+    justify-content: center;
+    flex-direction: column;
+    color: #fff;
+    background-image: linear-gradient(
+      25deg,
+      $main-color,
+      $light-color,
+      $aider-light-color
+    );
   }
-}
-.view-item-detail {
-  line-height: 1.75;
-  > .-title {
-    font-size: 28rpx;
+  
+  .swiper-item,
+  .scroll-v {
+    height: 100%;
   }
-  > .-number {
-    font-size: 22rpx;
-    color: #999;
+  
+  .swiper-box {
+    /* #ifndef H5 */
+    height: calc(100vh - 200rpx);
+    /* #endif */
+  
+    /* #ifdef H5 */
+    height: calc(100vh - 288rpx);
+    /* #endif */
+  }
+  
+  .wap {
+    width: 100%;
+    height: calc(100vh - 44px);
+  }
+  
+  .wrapper-show-money {
+    height: 200rpx;
+    // background-image: url('/static/img/main-bg.jpg');
   }
-}
-.submit-btn {
-  line-height: 90rpx;
-  text-align: center;
-
-  color: #fff;
-  background: $main-color;
-
-  margin: 0 auto;
-  height: 90rpx;
-}
-.wap {
-}
-
-.money {
-  font-size: 40rpx;
-  font-weight: bold;
-}
-
-.money-view {
-  height: 100%;
-  width: 100%;
-  padding: 0 32rpx;
-  display: flex;
-  align-items: flex-end;
-  justify-content: center;
-  flex-direction: column;
-  color: #fff;
-  background-image: linear-gradient(
-    25deg,
-    $main-color,
-    $light-color,
-    $aider-light-color
-  );
-}
-
-.swiper-item,
-.scroll-v {
-  height: 100%;
-}
-
-.swiper-box {
-  /* #ifndef H5 */
-  height: calc(100vh - 200rpx);
-  /* #endif */
-
-  /* #ifdef H5 */
-  height: calc(100vh - 288rpx);
-  /* #endif */
-}
-
-.wap {
-  width: 100%;
-  height: calc(100vh - 44px);
-}
-
-.wrapper-show-money {
-  height: 200rpx;
-  // background-image: url('/static/img/main-bg.jpg');
-}
 </style>
diff --git a/pages/mine/deposit/operation.vue b/pages/mine/deposit/operation.vue
new file mode 100644
index 0000000..693ecba
--- /dev/null
+++ b/pages/mine/deposit/operation.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="wrapper">
+    <u-navbar :custom-back="back" title="余额"></u-navbar>
+    <div class="box">
+      <div class="deposit">预存款金额</div>
+      <div class="money">￥{{walletNum | unitPrice }}</div>
+      <div class="operation-btns">
+        <div class="operation-btn light" @click="navgition('/pages/mine/deposit/withdrawal')">提现</div>
+        <div class="operation-btn" @click="navgition('/pages/mine/deposit/recharge')">充值</div>
+      </div>
+    </div>
+    <div class="box list" @click="navgition('/pages/mine/deposit/index')">
+      <div class="list-left">预存款明细</div>
+      <div class="list-right">
+        <u-icon name="arrow-right"></u-icon>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getUserWallet } from "@/api/members";
+export default {
+  data() {
+    return {
+      walletNum: 0,
+    };
+  },
+  async mounted() {
+    let result = await getUserWallet(); //预存款
+    this.walletNum = result.data.result.memberWallet;
+  },
+  methods: {
+    back() {
+      uni.switchTab({
+        url: "/pages/tabbar/user/my",
+      });
+    },
+    /**
+     * 跳转
+     */
+    navgition(url) {
+      uni.navigateTo({
+        url,
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.list {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.list-left {
+  flex: 8;
+}
+.list-right {
+  flex: 2;
+  text-align: right;
+}
+.wrapper {
+  width: 94%;
+  margin: 0 3%;
+}
+.box {
+  margin: 20rpx 0;
+  background: #fff;
+  border-radius: 20rpx;
+
+  padding: 40rpx;
+}
+.operation-btns {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.money {
+  text-align: center;
+  color: #333;
+  font-size: 50rpx;
+  margin: 20rpx 0 40rpx 0;
+  letter-spacing: 2rpx;
+}
+.deposit {
+  margin-top: 50rpx;
+  text-align: center;
+  color: #999;
+  font-size: 28rpx;
+
+  letter-spacing: 2rpx;
+}
+.operation-btn {
+  background: #ee6d41;
+  color: #fff;
+  height: 90rpx;
+  width: 240rpx;
+  margin: 0 20rpx;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+  font-size: 32rpx;
+}
+.light {
+  background: #fdf2ee;
+  color: #ee6d41;
+}
+</style>
\ No newline at end of file
diff --git a/pages/mine/deposit/recharge.vue b/pages/mine/deposit/recharge.vue
new file mode 100644
index 0000000..37c9b51
--- /dev/null
+++ b/pages/mine/deposit/recharge.vue
@@ -0,0 +1,50 @@
+<template>
+  <view>
+    <view class="-list">
+      <view class="title">充值金额</view>
+      <view class="content">
+        <view class="price">
+          <span> ￥</span>
+          <u-input v-model="price" placeholder="" type="number" />
+        </view>
+
+      </view>
+    </view>
+
+    <view class="submit" :class="{'light':flag}" @click="handlerRecharge">充值</view>
+  </view>
+</template>
+<script>
+import { recharge } from "@/api/members";
+export default {
+  data() {
+    return {
+      price: 0,
+      flag: true,
+    };
+  },
+  watch: {
+    price(val) {
+      val <= 0 ? (this.flag = true) : (this.flag = false);
+    },
+  },
+  mounted() {},
+  methods: {
+    // 充值
+    async handlerRecharge() {
+      if (this.price > 0) {
+       
+        let res = await recharge({ price: this.price });
+        if (res.data.success) {
+          uni.navigateTo({
+            url: `/pages/cart/payment/payOrder?orderType=RECHARGE&recharge_sn=${res.data.result.rechargeSn}`,
+          });
+        }
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import './style.scss';
+</style>
\ No newline at end of file
diff --git a/pages/mine/deposit/style.scss b/pages/mine/deposit/style.scss
new file mode 100644
index 0000000..a193243
--- /dev/null
+++ b/pages/mine/deposit/style.scss
@@ -0,0 +1,46 @@
+/deep/ .u-input__input,
+.u-input {
+  font-size: 80rpx !important;
+  height: 102rpx !important;
+}
+/deep/ .u-input__input {
+  height: 100%;
+  font-size: 80rpx;
+}
+.content {
+  display: flex;
+  > .price {
+    width: 60%;
+    margin: 20rpx 0;
+    font-size: 80rpx;
+    display: flex;
+  }
+  > .all {
+    justify-content: center;
+    width: 40%;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+  }
+}
+.-list {
+  margin: 20rpx 0;
+  background: #fff;
+  padding: 16rpx 32rpx;
+}
+.title {
+  font-size: 35rpx;
+}
+.light {
+  opacity: 0.6;
+}
+.submit {
+  margin: 80rpx auto;
+  width: 94%;
+  background: $light-color;
+  height: 90rpx;
+  color: #fff;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 90rpx;
+}
\ No newline at end of file
diff --git a/pages/mine/deposit/withdrawal.vue b/pages/mine/deposit/withdrawal.vue
new file mode 100644
index 0000000..8e98c79
--- /dev/null
+++ b/pages/mine/deposit/withdrawal.vue
@@ -0,0 +1,70 @@
+<template>
+  <view>
+    <view class="-list">
+      <view class="title">提现金额</view>
+      <view class="content">
+        <view class="price">
+          <span> ￥</span>
+          <u-input v-model="price" placeholder="" type="number" />
+        </view>
+
+        <view class="all">
+          <view @click="handleAll" :style="{ color: $mainColor }">全部</view>
+          <view style="font-size: 24rpx; color: #999">可提现金额<span>{{ walletNum | unitPrice }}</span>元</view>
+        </view>
+      </view>
+    </view>
+
+    <view class="submit" @click="cashd">提现</view>
+  </view>
+</template>
+<script>
+import { getUserWallet,withdrawalApply } from "@/api/members";
+export default {
+  data() {
+    return {
+      price: 0,
+      walletNum: 0,
+    };
+  },
+  async mounted() {
+    let result = await getUserWallet(); //预存款
+    this.walletNum = result.data.result.memberWallet;
+  },
+
+  methods: {
+    cashd() {
+      this.price = this.price + "";
+
+      if (this.$u.test.amount(parseInt(this.price))) {
+        withdrawalApply({ price: this.price }).then((res) => {
+          if (res.data.success) {
+            uni.showToast({
+              title: "提现成功!",
+              duration: 2000,
+              icon: "none",
+            });
+            setTimeout(() => {
+              uni.navigateBack({
+                delta: 1,
+              });
+            }, 1000);
+          }
+        });
+      } else {
+        uni.showToast({
+          title: "请输入正确金额",
+          duration: 2000,
+          icon: "none",
+        });
+      }
+    },
+    handleAll() {
+      this.price = this.walletNum;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "./style.scss";
+</style>
\ No newline at end of file
diff --git a/pages/passport/codeLogin.vue b/pages/passport/codeLogin.vue
index 1d9e810..15999eb 100644
--- a/pages/passport/codeLogin.vue
+++ b/pages/passport/codeLogin.vue
@@ -90,19 +90,23 @@ export default {
           uni.showLoading({
             title: "正在获取验证码",
           });
-          sendMobile(this.codeForm.mobile).then((res) => {
-            uni.hideLoading();
-            // 这里此提示会被this.start()方法中的提示覆盖
-            if (res.data.success) {
+          sendMobile(this.codeForm.mobile)
+            .then((res) => {
+              uni.hideLoading();
+              // 这里此提示会被this.start()方法中的提示覆盖
+              if (res.data.success) {
+                this.$refs.uCode.start();
+              } else {
+                uni.showToast({
+                  title: res.data.message,
+                  duration: 2000,
+                  icon: "none",
+                });
+              }
+            })
+            .catch((e) => {
               this.$refs.uCode.start();
-            } else {
-              uni.showToast({
-                title: res.data.message,
-                duration: 2000,
-                icon: "none",
-              });
-            }
-          });
+            });
         } else {
           this.$u.toast("请倒计时结束后再发送");
         }
diff --git a/pages/tabbar/user/my.vue b/pages/tabbar/user/my.vue
index c8e00f8..9639a83 100644
--- a/pages/tabbar/user/my.vue
+++ b/pages/tabbar/user/my.vue
@@ -20,7 +20,7 @@
     <!-- 积分，优惠券，关注， -->
     <div class="pointBox">
       <u-row text-align="center" gutter="16" class="point">
-        <u-col text-align="center" span="4" @click="navigateTo('/pages/mine/deposit/index')">
+        <u-col text-align="center" span="4" @click="navigateTo('/pages/mine/deposit/operation')">
           <view>预存款</view>
           <view class="money">{{ walletNum | unitPrice}}</view>
         </u-col>