前端接入

agentApp/common/api.js

@@ -1,3 +1,57 @@
-const { http } = uni.$u
-// 获取菜单
-export const fetchMenu = (params, config = {}) => http.post('/ebapi/public_api/index', params, config)
+import {
+	baseUrl
+} from "./config"
+
+const {
+	http
+} = uni.$u
+
+// 响应拦截
+http.interceptors.response.use((response) => {
+	/* 对响应成功做点什么 可使用async await 做异步操作*/
+	const data = response.data
+
+	// 自定义参数
+	const custom = response.config?.custom
+	if (data.code !== 200) {
+		// 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
+		if (custom.toast !== false) {
+			uni.$u.toast(data.msg)
+		}
+
+		// 如果需要catch返回，则进行reject
+		if (custom?.catch) {
+			return Promise.reject(data)
+		} else {
+			// 否则返回一个pending中的promise，请求不会进入catch中
+			return new Promise(() => {})
+		}
+	}
+	return data.data === undefined ? {} : data.data
+}, (response) => {
+	// 对响应错误做点什么 （statusCode !== 200）
+	return Promise.reject(response)
+})
+
+// 带上用户token
+const userConfig = function() {
+	return {
+		header: {
+			'User-Token': uni.getStorageSync('user_token')
+		}
+	}
+}
+
+export const userGetMerchantInfo = (params) => http.post(baseUrl + '/api/user/getMerchantInfo', params, userConfig())
+
+export const userCreateOrder = (params) => http.post(baseUrl + '/api/user/createOrder', params, userConfig())
+
+export const userAccountInfo = () => http.post(baseUrl + '/api/user/accountInfo', {}, userConfig())
+
+export const userQueueRebateList = (params) => http.post(baseUrl + '/api/user/queueRebateList', params, userConfig())
+
+export const userOrderList = (params) => http.post(baseUrl + '/api/user/orderList', params, userConfig())
+
+export const userFillAlipayAccount = (params) => http.post(baseUrl + '/api/user/fillAlipayAccount', params, userConfig())
+
+export const userWithdraw = (params) => http.post(baseUrl + '/api/user/withdraw', params, userConfig())

agentApp/common/config.js

@@ -1,3 +1,3 @@
 module.exports = {
-    baseUrl: 'https://api.youzixy.com'
+    baseUrl: 'https://pdsk.leadfyy.com'
 }

agentApp/manifest.json

@@ -1,6 +1,6 @@
 {
-    "name" : "agentApp",
-    "appid" : "__UNI__41F40AB",
+    "name" : "排队收款",
+    "appid" : "__UNI__A0FF0B7",
     "description" : "多平台快速开发的UI框架",
     "versionName" : "2.0.36",
     "versionCode" : 1,
@@ -130,18 +130,21 @@
         "template" : "template.h5.html",
         "router" : {
             "mode" : "history",
-            "base" : "/wap/"
+            "base" : "/h5/"
         },
         "optimization" : {
             "treeShaking" : {
-                "enable" : false
+                "enable" : true
             }
         },
-        "title" : "星链创动",
+        "title" : "排队收款",
         "sdkConfigs" : {
             "maps" : {}
         },
-        "domain" : ""
+        "domain" : "",
+        "devServer" : {
+            "https" : false
+        }
     },
     "vueVersion" : "2"
 }

agentApp/pages.json

@@ -14,7 +14,19 @@
 	    
 	},
 		{
-		    "path" : "pages/login/index",
+		    "path" : "pages/user-login/index",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "用户登录",
+				"navigationBarBackgroundColor": "#1783FF",
+				"navigationBarTextStyle": "white"
+		       // "enablePullDownRefresh": false
+				
+		    }
+		    
+		},
+		{
+		    "path" : "pages/agent-login/index",
 		    "style" :                                                                                    
 		    {
 		        "navigationBarTitleText": "代理登录",

agentApp/pages/allpages/index.vue

@@ -32,7 +32,7 @@
 				switch(num) {
 					case 1: 
 					uni.navigateTo({
-						url: '/pages/login/index'
+						url: '/pages/agent-login/index'
 					});
 					break;
 					case 2:

agentApp/pages/payment/payment.vue

@@ -4,14 +4,16 @@
 			<view class="pam-shop">
 				<view class="pam-mess">
 					<view class="picon">
-						<img src="../../static/page/people.png" style="width: 110rpx;height: 110rpx;" alt="" srcset="" />
+						<img v-if="merchant.logo" :src="merchant.logo" style="width: 110rpx;height: 110rpx; border-radius: 50%;"
+							alt="" srcset="" />
+						<img v-else src="../../static/page/people.png" style="width: 110rpx;height: 110rpx;" alt="" srcset="" />
 					</view>
 					<view class="pam-address">
 						<view class="pname">
-							付款给李姐烧烤(普罗旺斯店)
+							{{merchant.name}}
 						</view>
 						<view class="paddre">
-							广西南宁市江南区波尔多庄园2-109号商铺
+							{{merchant.address}}
 						</view>
 					</view>
 				</view>
@@ -29,7 +31,8 @@
 						￥
 					</view>
 					<view class="num">
-						<input type="text" class="pr-num" v-model="amount" placeholder="请输入金额" placeholder-style="color: #cfcfcf;" />
+						<input type="text" class="pr-num" v-model="amount" placeholder="请输入金额"
+							placeholder-style="color: #cfcfcf;" />
 					</view>
 				</view>
 				<view class="pfooter u-border-top">
@@ -52,27 +55,46 @@
 					查看活动规则
 				</view>
 			</view>
-<!-- 			<u-keyboard confirmText="1" mode="number" :closeOnClickOverlay="true" @close="close" :show="show" @confirm="confirm" @cancel="cancel"></u-keyboard> -->
-<cu-keyboard ref="cukeyboard" @change="change" @confirm="confirm" @hide="hide"></cu-keyboard>
+			<!-- 			<u-keyboard confirmText="1" mode="number" :closeOnClickOverlay="true" @close="close" :show="show" @confirm="confirm" @cancel="cancel"></u-keyboard> -->
+			<cu-keyboard ref="cukeyboard" @change="change" @confirm="confirm" @hide="hide"></cu-keyboard>
 		</view>
 	</view>
 </template>
 
 <script>
-export default {
+	import {
+		userGetMerchantInfo,
+		userCreateOrder
+	} from '../../common/api.js'
+
+	export default {
 		data() {
 			return {
 				show: false,
-			amount:''
+				amount: '',
+				payment_code: '',
+				merchant: {
+					name: '加载中...',
+					address: '',
+					logo: ''
+				}
 			}
 		},
 		onReady() {
 			this.$refs.cukeyboard.open();
-		
+		},
+		onLoad() {
+			this.payment_code = uni.getStorageSync('payment_code')
+			this.getMerchantInfo()
 		},
 		methods: {
+			getMerchantInfo() {
+				userGetMerchantInfo({
+					payment_code: this.payment_code
+				}).then(data => this.merchant = data);
+			},
 			playFoucus() {
-			if(this.show){
+				if (this.show) {
 					return
 				}
 				this.show = true;
@@ -80,16 +102,51 @@ export default {
 			},
 			confirm() {
 				//this.show = false;
-			if(!this.checkMoney( this.amount)){
+				if (!this.checkMoney(this.amount)) {
 					//alert("请输入正确金额");
 					uni.showModal({
-					content:"请输入正确金额",
-					showCancel:false,
-					confirmText:"知道了"
+						content: "请输入正确金额",
+						showCancel: false,
+						confirmText: "知道了"
 					})
 					return
 				}
-			console.log("pay:",this.amount)
+
+				userCreateOrder({
+					payment_code: this.payment_code,
+					amount: this.amount
+				}).then(data => {
+					const onBridgeReady = function() {
+						WeixinJSBridge.invoke(
+							'getBrandWCPayRequest', {
+								appId: data.app_id, //公众号ID，由商户传入
+								timeStamp: data.time_stamp, //时间戳，自1970年以来的秒数
+								nonceStr: data.nonce_str, //随机串
+								package: data.package,
+								signType: data.sign_type, //微信签名方式：
+								paySign: data.pay_sign //微信签名
+							},
+							function(res) {
+								console.log(res)
+								if (res.err_msg == "get_brand_wcpay_request:ok") {
+									// 使用以上方式判断前端返回,微信团队郑重提示：
+									//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+								}
+							}
+						);
+					}
+
+					if (typeof WeixinJSBridge == "undefined") {
+						if (document.addEventListener) {
+							document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
+						} else if (document.attachEvent) {
+							document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
+							document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
+						}
+					} else {
+						onBridgeReady();
+					}
+				});
 			},
 			cancel() {
 				this.show = false;
@@ -97,11 +154,11 @@ export default {
 			close() {
 				this.show = false;
 			},
-		change(v){
-			console.log("change :",v)
+			change(v) {
+				console.log("change :", v)
 				this.amount = v
 			},
-		hide(){
+			hide() {
 
 			},
 			checkMoney(val) {
@@ -114,29 +171,28 @@ export default {
 					return false;
 				} else if (rechargeMoney.trim() == "") {
 					return false;
-			} else if (!reg.test(rechargeMoney)){
+				} else if (!reg.test(rechargeMoney)) {
 					return false;
-			} else if (rechargeMoney == 0){
+				} else if (rechargeMoney == 0) {
 					return false;
 				} else {
 					return true;
 				}
 			},
-		showDetail(){
+			showDetail() {
 				console.log("showDetail")
 			}
 
-		
 		}
-}
+	}
 </script>
 
 <style lang="scss">
-.uni-page-body {
+	.uni-page-body {
 		background: #ededed;
-}
+	}
 
-.pam-content {
+	.pam-content {
 		padding-top: 50rpx;
 		padding-left: 30rpx;
 		padding-right: 30rpx;
@@ -365,5 +421,5 @@ export default {
 				}
 			}
 		}
-}
+	}
 </style>

agentApp/pages/user-login/index.vue

@@ -0,0 +1,34 @@
+<template>
+	<view class="app-container">
+			登录中...
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+			};
+		},
+		onLoad(q) {
+			let payment_code = q.payment_code;
+			let user_token = q.token;
+			
+			if (!payment_code || !user_token) {
+				uni.showToast({
+					title:'缺少参数',
+					icon:'none'
+				})
+				return;
+			}
+			
+			uni.setStorageSync('user_token', user_token);
+			uni.setStorageSync('payment_code', payment_code);
+			
+			uni.redirectTo({
+				url:'/pages/payment/payment'
+			})
+		}
+	}
+</script>
+

agentApp/pages/user-orders/user-orders.vue

@@ -1,5 +1,5 @@
 <template>
-<view class="app-container" style="background-color: #f7f7f7;">
+	<view class="app-container" style="background-color: #f7f7f7;">
 
 		<view class="page-bg">
 			<view class="withdrawal-management">
@@ -9,13 +9,14 @@
 			</view>
 			<view class="withdrawal-limit">
 				<view class="limit-symbol">￥</view>
-	  <view class="withdrawal-volume">458.00</view>
+				<view class="withdrawal-volume">{{accountInfo.wallet_balance}}</view>
 			</view>
 			<view class="Withdrawable-text">可提现</view>
 			<view class="withdrawal-content">
-	   <image class="withdrawal-line" src="https://common-1257637852.cos.ap-guangzhou.myqcloud.com/paidui-pay/withdrawal-line.png" />
+				<image class="withdrawal-line"
+					src="https://common-1257637852.cos.ap-guangzhou.myqcloud.com/paidui-pay/withdrawal-line.png" />
 			</view>
-	<view class="to-be-credited">待入账：￥200.00</view>
+			<view class="to-be-credited">待入账：￥{{accountInfo.waiting_amount}}</view>
 			<view class="divider-style"></view>
 
 			<view class="information-id-content">
@@ -24,7 +25,7 @@
 						用户ID：
 					</view>
 					<view class="id-value">
-				54568gh
+						{{accountInfo.id}}
 					</view>
 				</view>
 			</view>
@@ -32,17 +33,19 @@
 
 			<view class="queuing-information-content">
 				<view class="recent-orders-title">
-	      <image class="title-stlye" src="https://common-1257637852.cos.ap-guangzhou.myqcloud.com/paidui-pay/title-stlye.png" />
+					<image class="title-stlye"
+						src="https://common-1257637852.cos.ap-guangzhou.myqcloud.com/paidui-pay/title-stlye.png" />
 					<view class="title-text">最近排队信息</view>
 				</view>
 				<view class="information-item">
-	    <view class="item-content">
-	      <view class="item-content-titie">李姐烧烤（普罗旺斯店）：</view>
-	      <view class="item-content-text">购买时排队<span class="style-text">10</span>，当前<span class="style-text">2</span></view>
+				<view class="item-content" v-if="!queueList.length">
+					<view class="item-content-text">暂无排队</view>
+				</view>
+					<view class="item-content" v-for="item in queueList" :key="item.id">
+						<view class="item-content-titie">{{item.merchant.name}}：</view>
+						<view class="item-content-text">购买时排队<span class="style-text">{{item.buy_queue_index}}</span>，当前<span
+								class="style-text">{{item.now_queue_index}}</span>
 						</view>
-	    <view class="item-content">
-	      <view class="item-content-titie">李姐烧烤（青秀万达店）：</view>
-	      <view class="item-content-text">购买时排队<span class="style-text">200</span>，当前<span class="style-text">48</span></view>
 					</view>
 					<navigator hover-class="none" url="/pages/queuing-information/queuing-information">
 						<view class="see-more-content">
@@ -53,81 +56,89 @@
 				</view>
 			</view>
 			<view class="ordering-information">
-	  <view class="ordering-information-item">
-	      <view class="order-number">订单编号 22398983498</view>
-	      <view class="ordering-item-content">
-	            <view class="ordering-pic">
-	              <image class="order-chart" src="https://common-1257637852.cos.ap-guangzhou.myqcloud.com/paidui-pay/order-chart.png" />
-	            </view>
-	            <view class="ordering-text">
-	              <view class="ordering-text-title">李姐烧烤(普罗旺斯店)</view>
-	              <view class="amount-of-money">金额：<span class="price-style">￥450.00</span></view>
-	              <view class="order-time">订单时间：2023-10-24 20:39:56</view>
-	            </view>
-	    </view>
+				<view class="ordering-information-item" v-if="!orderList.length">
+					<view class="order-number">暂无订单</view>
 				</view>
-	  <view class="ordering-information-item">
-	      <view class="order-number">订单编号 22398983498</view>
+				<view class="ordering-information-item" v-for="order in orderList" :key="order.out_trade_no">
+					<view class="order-number">订单编号 {{order.out_trade_no}}</view>
 					<view class="ordering-item-content">
 						<view class="ordering-pic">
-	              <image class="order-chart" src="https://common-1257637852.cos.ap-guangzhou.myqcloud.com/paidui-pay/order-chart.png" />
+							<image class="order-chart" :src="order.merchant.logo" />
 						</view>
 						<view class="ordering-text">
-	              <view class="ordering-text-title">李姐烧烤(普罗旺斯店)</view>
-	              <view class="amount-of-money">金额：<span class="price-style">￥450.00</span></view>
-	              <view class="order-time">订单时间：2023-10-24 20:39:56</view>
+							<view class="ordering-text-title">{{order.merchant.name}}</view>
+							<view class="amount-of-money">金额：<span class="price-style">￥{{order.amount}}</span></view>
+							<view class="order-time">订单时间：{{order.paid_at}}</view>
 						</view>
 					</view>
 				</view>
-	  <view class="ordering-information-item">
-	      <view class="order-number">订单编号 22398983498</view>
-	      <view class="ordering-item-content">
-	            <view class="ordering-pic">
-	              <image class="order-chart" src="https://common-1257637852.cos.ap-guangzhou.myqcloud.com/paidui-pay/order-chart.png" />
-	            </view>
-	            <view class="ordering-text">
-	              <view class="ordering-text-title">李姐烧烤(普罗旺斯店)</view>
-	              <view class="amount-of-money">金额：<span class="price-style">￥450.00</span></view>
-	              <view class="order-time">订单时间：2023-10-24 20:39:56</view>
-	            </view>
-	    </view>
 			</view>
 		</view>
 	</view>
-</view>
 
 </template>
 
 <script>
+	import {
+		userAccountInfo,
+		userQueueRebateList,
+		userOrderList
+	} from '../../common/api.js'
+
 	export default {
 		data() {
 			return {
-				
+				accountInfo: {},
+				queueList: [],
+				orderList: []
 			}
 		},
+		onLoad() {
+			this.getAccountInfo();
+			this.getQueueList();
+			this.getOrderList();
+		},
 		methods: {
-			
+			getAccountInfo() {
+				userAccountInfo().then(data => this.accountInfo = data)
+			},
+			getQueueList() {
+				userQueueRebateList({
+					page: 1,
+					page_size: 2,
+					status: 0,
+					sort_type: 1
+				}).then(data => this.queueList = data.list)
+			},
+			getOrderList() {
+				userOrderList({
+					page: 1,
+					page_size: 5
+				}).then(data => this.orderList = data.list)
+			},
 		}
 	}
 </script>
 
 <style>
-.uni-page-body {
+	.uni-page-body {
 		background: #f7f7f7;
-}
+	}
 
-.page-bg{
+	.page-bg {
 		height: 525rpx;
 		background: url("https://common-1257637852.cos.ap-guangzhou.myqcloud.com/paidui-pay/withdrawal-bg.png") no-repeat center center;
-  background-size:cover;
+		background-size: cover;
 		padding: 0 30rpx;
-}
-.withdrawal-management{
+	}
+
+	.withdrawal-management {
 		position: absolute;
 		top: 0;
 		right: 0;
-}
-button.withdrawal-button{
+	}
+
+	button.withdrawal-button {
 		width: 160rpx;
 		height: 60rpx;
 		line-height: 60rpx;
@@ -140,149 +151,172 @@ button.withdrawal-button{
 		border-top-right-radius: 0;
 		border-bottom-right-radius: 0;
 		border-bottom-left-radius: 30rpx;
-}
-button::after{
-  border: none;
-}
-.withdrawal-limit{
+	}
+
+	button::after {
+		border: none;
+	}
+
+	.withdrawal-limit {
 		display: flex;
 		justify-content: center;
 		align-items: baseline;
 		padding-top: 30rpx;
 		text-align: center;
-}
-.limit-symbol{
+	}
+
+	.limit-symbol {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 30rpx;
 		color: #fff;
-}
-.withdrawal-volume{
+	}
+
+	.withdrawal-volume {
 		font-family: "Din";
 		font-size: 60rpx;
 		color: #fff;
 		font-weight: bold;
 		margin-left: 10rpx;
-}
-.Withdrawable-text{
+	}
+
+	.Withdrawable-text {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 30rpx;
 		color: #fff;
 		text-align: center;
 		margin-top: 10rpx;
-}
-.withdrawal-content{
+	}
+
+	.withdrawal-content {
 		display: flex;
 		justify-content: center;
 		align-items: center;
 		padding: 15rpx 0;
-}
-image.withdrawal-line{
+	}
+
+	image.withdrawal-line {
 		text-align: center;
 		width: 200rpx;
 		height: 1rpx;
 		background-size: cover;
-}
-.to-be-credited{
+	}
+
+	.to-be-credited {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 30rpx;
 		color: #fff;
 		text-align: center;
-}
+	}
 
-.divider-style{
+	.divider-style {
 		width: 690rpx;
 		height: 1rpx;
 		background: #F8A0A6;
 		margin: 20rpx 0;
-}
-.information-id-content{
+	}
+
+	.information-id-content {
 		display: flex;
 		justify-content: center;
 		align-items: center;
-}
-.content-id-item{
+	}
+
+	.content-id-item {
 		display: flex;
 		justify-content: center;
 		align-items: center;
-}
-.id-text{
+	}
+
+	.id-text {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 24rpx;
 		color: #fff;
-}
-.id-value{
+	}
+
+	.id-value {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 24rpx;
 		color: #fff;
-}
+	}
 
 
 
-.queuing-information-content{
+	.queuing-information-content {
 		background: #fff;
 		border-radius: 20rpx;
 		padding: 30rpx 0;
 		margin-top: 30rpx;
-}
-.recent-orders-title {
+	}
+
+	.recent-orders-title {
 		display: flex;
 		justify-content: left;
 		align-items: center;
 		padding: 0 30rpx;
 		border-bottom: 1rpx solid #eeeeee;
 		padding-bottom: 30rpx;
-}
-image.title-stlye {
+	}
+
+	image.title-stlye {
 		width: 15rpx;
 		height: 19rpx;
 		background-size: cover;
 		margin-right: 20rpx;
-}
-.title-text {
+	}
+
+	.title-text {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 30rpx;
 		color: #454545;
 		font-weight: bold;
-}
-.information-item{
+	}
+
+	.information-item {
 		padding: 0 30rpx;
-}
-.item-content{
+	}
+
+	.item-content {
 		display: flex;
 		justify-content: left;
 		align-items: center;
 		margin-top: 30rpx;
-}
-.item-content-titie{
+	}
+
+	.item-content-titie {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 24rpx;
 		color: #454545;
 		font-weight: bold;
-}
-.item-content-text{
+	}
+
+	.item-content-text {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 24rpx;
 		color: #666;
-}
-span.style-text{
+	}
+
+	span.style-text {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 24rpx;
 		color: #F52F3E;
 		font-weight: bold;
 		padding: 0 15rpx;
-}
-.see-more-content{
+	}
+
+	.see-more-content {
 		display: flex;
 		justify-content: center;
 		align-items: center;
 		margin-top: 30rpx;
-}
-.see-more-text{
+	}
+
+	.see-more-text {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 24rpx;
 		color: #F52F3E;
-}
-.see-more-icon{
+	}
+
+	.see-more-icon {
 		width: 0;
 		height: 0;
 		border-left: 14rpx solid #FDD5D8;
@@ -290,63 +324,71 @@ span.style-text{
 		border-bottom: 14rpx solid transparent;
 		margin-left: 10rpx;
 		border-radius: 10rpx;
-}
-.ordering-information{
+	}
+
+	.ordering-information {
 		padding: 30rpx;
 		background: #fff;
 		margin-top: 20rpx;
 		border-radius: 20rpx;
 		padding-top: 0;
-}
-.order-number {
+	}
+
+	.order-number {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 26rpx;
 		color: #454545;
 		padding: 30rpx 0;
-}
-.ordering-pic {
+	}
+
+	.ordering-pic {
 		width: 120rpx;
 		height: 120rpx;
 		background-size: cover;
 		border-radius: 15rpx;
-}
-image.order-chart {
+	}
+
+	image.order-chart {
 		width: 120rpx;
 		height: 120rpx;
 		background-size: cover;
 		border-radius: 15rpx;
-}
-.ordering-text {
+	}
+
+	.ordering-text {
 		margin-left: 30rpx;
-}
-.ordering-text-title {
+	}
+
+	.ordering-text-title {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 30rpx;
 		color: #454545;
-}
-.amount-of-money {
+	}
+
+	.amount-of-money {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 24rpx;
 		color: #999;
 		padding: 10rpx 0;
-}
-span.price-style {
+	}
+
+	span.price-style {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 24rpx;
 		color: #F52F3E;
-}
-.order-time {
+	}
+
+	.order-time {
 		font-family: PingFangSC-Regular, sans-serif;
 		font-size: 24rpx;
 		color: #999;
-}
-.ordering-item-content{
+	}
+
+	.ordering-item-content {
 		display: flex;
 		justify-content: left;
 		align-items: center;
 		border-bottom: 1rpx solid #eee;
 		padding-bottom: 30rpx;
-}
-
-
+	}
 </style>

agentApp/pages/withdrawal-management/withdrawal-management.vue

@@ -10,7 +10,7 @@
 						￥
 					</view>
 					<view class="au-num">
-						458.00
+						{{accountInfo.wallet_balance}}
 					</view>
 				</view>
 				<view class="age-font">
@@ -20,20 +20,20 @@
 					<img src="../../static/page/line-style.png" style="width: 200rpx;height: 2rpx;" alt="" srcset="" />
 				</view>
 				<view class="age-wait">
-					总提现：￥500.00
+					总提现：￥{{accountInfo.withdraw_total}}
 				</view>
 				<view class="age-linemore">
 					<img src="../../static/page/divider-style.png" style="width: 690rpx;height: 2rpx;" alt="" srcset="" />
 				</view>
 				<div class="age-mnum">
 					<view class="mtext">
-						待入账：1000元
+						待入账：{{accountInfo.waiting_amount}}元
 					</view>
 					<view class="mline">
 
 					</view>
 					<view class="mtext">
-						提现中：458元
+						提现中：{{accountInfo.withdrawing_amount}}元
 					</view>
 				</div>
 			</view>
@@ -44,30 +44,137 @@
 							支付宝账户
 						</view>
 					</view>
-					<view class="agp-detail">
-						<view class="agp-make" @click="makecash">
+					<view class="agp-detail" v-if="!accountInfo.alipay_account">
+						<view class="agp-make" @click="showInputForm(1)">
 							去开通
 						</view>
 					</view>
 				</view>
+
+				<template v-if="isInputForm">
+					<view class="apt-main u-border-top u-border-bottom" v-if="isInputForm">
+						<view class="apm-cell">
+							<view class="am-title">
+								支付宝账号
+							</view>
+							<view class="am-value" style="width:70%;">
+								<u--input placeholder="绑定的手机号或邮箱" border="surround" v-model="inputAlipayAccount"></u--input>
+							</view>
+						</view>
+						<view class="apm-cell">
+							<view class="am-title">
+								支付宝姓名
+							</view>
+							<view class="am-value" style="width:70%;">
+								<u--input placeholder="账号真实姓名" border="surround" v-model="inputAlipayName"></u--input>
+							</view>
+						</view>
+					</view>
+					<view class="apt-btn">
+						<view class="savebtn" @click="saveAlipayAccount">
+							保存
+						</view>
+					</view>
+				</template>
+
+				<template v-if="accountInfo.alipay_account && !isInputForm">
+					<view class="apt-main u-border-top u-border-bottom">
+						<view class="apm-cell">
+							<view class="am-title">
+								提现账户
+							</view>
+							<view class="am-value">
+								<view class="mphone">
+									{{accountInfo.alipay_account}}
+								</view>
+								<view class="mlink" @click="showInputForm(2)">
+									修改
+								</view>
+							</view>
+						</view>
+						<view class="apm-cell">
+							<view class="am-title">
+								可提现金额
+							</view>
+							<view class="am-value">
+								<view class="mnum">
+									￥{{accountInfo.wallet_balance}}
+								</view>
+							</view>
 						</view>
 					</view>
+					<view class="apt-btn">
+						<view class="cashbtn" @click="showWithdrawForm">
+							提现
+						</view>
+					</view>
+				</template>
+			</view>
+		</view>
+
+		<u-modal title="确认提现金额" :show="isWithdrawForm" :showCancelButton="true" @confirm="confirmWithdraw" @cancel="isWithdrawForm=false">
+			<view class="slot-content">
+				<u--input prefixIcon="￥" placeholder="提现金额" border="surround" v-model="withdrawAmount"></u--input>
+			</view>
+		</u-modal>
 
 	</view>
 </template>
 
 <script>
-export default {
+	import {
+		userAccountInfo,
+		userFillAlipayAccount,
+		userWithdraw
+	} from '../../common/api.js'
+
+	export default {
 		data() {
 			return {
-
+				accountInfo: {},
+				isInputForm: false,
+				inputAlipayAccount: '',
+				inputAlipayName: '',
+				isWithdrawForm: false,
+				withdrawAmount: ''
 			}
 		},
+		onLoad() {
+			this.getAccountInfo();
+		},
 		methods: {
-		makecash() {
-			uni.navigateTo({
-				url: '/pages/account-opened/account-opened'
-			});
+			getAccountInfo() {
+				userAccountInfo().then(data => this.accountInfo = data)
+			},
+			saveAlipayAccount() {
+				userFillAlipayAccount({
+					alipay_account: this.inputAlipayAccount,
+					alipay_name: this.inputAlipayName,
+				}).then(() => {
+					this.getAccountInfo()
+					this.isInputForm = false
+				})
+			},
+			showInputForm(flag) {
+				this.isInputForm = true
+				if (flag == 2) {
+					this.inputAlipayAccount = this.accountInfo.alipay_account
+					this.inputAlipayName = this.accountInfo.alipay_name
+				}
+				// uni.navigateTo({
+				// 	url: '/pages/account-opened/account-opened'
+				// });
+			},
+			showWithdrawForm() {
+				this.isWithdrawForm = true
+				this.withdrawAmount = this.accountInfo.wallet_balance
+			},
+			confirmWithdraw() {
+				userWithdraw({
+					amount: this.accountInfo.wallet_balance
+				}).then(() => {
+					this.isWithdrawForm = false
+				})
 			},
 			cashManager() {
 				uni.navigateTo({
@@ -75,14 +182,15 @@ export default {
 				});
 			}
 		}
-}
+	}
 </script>
 
 <style lang="scss">
 	.uni-page-body {
-		background:#f7f7f7;
+		background: #f7f7f7;
 	}
-.agent-content {
+
+	.agent-content {
 		position: relative;
 		width: 100%;
 		height: 1400rpx;
@@ -218,5 +326,78 @@ export default {
 				}
 			}
 		}
-}
+
+		.apt-main {
+			padding: 10rpx 0;
+
+			.apm-cell {
+				display: flex;
+				justify-content: space-between;
+
+				.am-title {
+					height: 70rpx;
+					line-height: 70rpx;
+					color: 454545;
+					font-size: 12px;
+				}
+
+				.am-value {
+					display: flex;
+					justify-content: flex-end;
+					height: 70rpx;
+					line-height: 70rpx;
+
+					.mphone {
+						margin-right: 20rpx;
+						font-size: 12px;
+						color: #454545;
+					}
+
+					.mlink {
+						font-size: 12px;
+						color: #32A2FC;
+					}
+
+					.mnum {
+						font-size: 14px;
+						color: 454545;
+						font-weight: bold;
+					}
+				}
+			}
+		}
+
+		.u-border-bottom,
+		.u-border-top {
+			border-color: #eee !important;
+		}
+
+		.apt-btn {
+			display: flex;
+			justify-content: flex-end;
+			padding: 30rpx 0;
+
+			.cashbtn {
+				width: 110rpx;
+				height: 48rpx;
+				text-align: center;
+				line-height: 48rpx;
+				color: #fff;
+				font-size: 12px;
+				background: #F52F3E;
+				border-radius: 100rpx;
+			}
+
+			.savebtn {
+				width: 110rpx;
+				height: 48rpx;
+				text-align: center;
+				line-height: 48rpx;
+				color: #fff;
+				font-size: 12px;
+				background: #00aaff;
+				border-radius: 100rpx;
+			}
+		}
+	}
 </style>

agentApp/template.h5.html

@@ -7,17 +7,19 @@
 		<title>
 			<%= htmlWebpackPlugin.options.title %>
 		</title>
+		<% if (process.env.NODE_ENV == 'production') { %>
 		<!-- 正式发布的时候使用，开发期间不启用。↓ -->
 		<script src="/static/common/js/touch-emulator.js"></script>
 		<script>
 			TouchEmulator();
 		</script>
 		<style>
-            ::-webkit-scrollbar{
+			::-webkit-scrollbar {
 				display: none;
 			}
 		</style>
 		<!-- 正式发布的时候使用，开发期间不启用。↑ -->
+		<% } %>
 		<script>
 			document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'