上传

components/user/signInOnePopup.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="configPopup">
-		<uv-popup ref="popup" :round="30" :customStyle="{height: '50vh'}">
+		<uv-popup ref="popup" :round="30" 
+		:safeAreaInsetBottom="false"
+		:customStyle="{height: '50vh'}">
 			<view class="content">
 				<view class="title">今日签到获取积分</view>
 				

components/userShop/userShopCommission.vue

@@ -3,19 +3,19 @@
 		<image src="/static/image/center/10.png" mode=""></image>
 		<view class="price">
 			<view class="title">
-				总佣金（元）
+				余额（元）
 			</view>
 			<view class="num">
-				7890.34元
+				{{ userInfo.price }}元
 			</view>
 		</view>
-		
-		<view class="font-menu"
+		s
+		<!-- <view class="font-menu"
 		v-if="purse">
 			<view @click="toRunningWater(index)"
 			v-for="(item, index) in list"
 			:key="index">{{ item.name }}</view>
-		</view>
+		</view> -->
 		
 		<view class="btn"
 		v-if="!purse"
@@ -118,7 +118,7 @@
 			position: absolute;
 			right: 50rpx;
 			bottom: 50rpx;
-			background-color: #FDC440;
+			background-color: $uni-color;
 			width: 160rpx;
 			height: 60rpx;
 			display: flex;

pages.json

@@ -178,6 +178,9 @@
 			},
 			{
 				"path": "product/addProduct"
+			},
+			{
+				"path": "mine/purse"
 			}
 		]
 	}],

pages_order/mine/purse.vue

@@ -4,7 +4,7 @@
 
 		<!-- 水洗店 -->
 		<view class="userShop">
-			<userShopCommission purse />
+			<userShopCommission purse/>
 		</view>
 
 		<view class="from-body">
@@ -15,22 +15,25 @@
 			<view class="from-line">
 				<input placeholder="请输入姓名" />
 			</view>
-			<view class="from-line">
+			<!-- <view class="from-line">
 				<input placeholder="请输入开户行" />
 			</view>
 			<view class="from-line">
 				<input placeholder="请输入银行卡卡号" />
-			</view>
-			<view class="mt56">提现说明</view>
-			<view style="line-height: 45rpx; font-size: 24rpx;color: #666666;" v-html="notice">
-			</view>
+			</view> -->
+			<!-- <view class="mt56">提现说明</view>
+			<view 
+			style="line-height: 45rpx; font-size: 24rpx;color: #666666;" 
+			v-html="notice">
+			</view> -->
 			<!-- <p>1、本次提现必须通过银行卡提现，暂不支持其他途径。</p>
 				<p>2、如若遇到24小时提现未到账，请联系客服。</p> -->
 		</view>
 
 
 		<view class="b-fiexd">
-			<view class="button-submit">提交</view>
+			<view class="button-submit"
+			@click="submit">提交</view>
 		</view>
 
 	</view>
@@ -48,6 +51,26 @@
 			}
 		},
 		methods: {
+			submit() {
+				if (this.$utils.verificationAll(this.form, {
+						money: '请输入提现金额',
+						name: '请输入姓名',
+					})) {
+					return
+				}
+				this.$api('storeWithdrawalApplication', this.form, res => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '提交成功，待后台审核！',
+							icon: 'none',
+						})
+						
+						setTimeout(uni.navigateTo, 800, {
+							url: '/pages_order/mine/runningWater?status=1'
+						})
+					}
+				})
+			},
 
 		}
 	}

pages_order/mine/runningWater.vue

@@ -2,15 +2,42 @@
 	<view class="running-water">
 		<navbar :title="title[status]" leftClick @leftClick="leftClick" />
 		
+		<userShopCommission/>
+		
 		<view class="tab-box">
 			<view class="tab-box1">
-				<uv-cell 
+				<!-- <uv-cell 
 				center 
 				border 
 				:title="item.title"
 				v-for="(item, index) in list"
 				:value="x[item.type] + item.intger" 
-				:label="item.createTime" />
+				:label="item.createTime" /> -->
+				
+				<uv-cell center border
+				:key="item.id"
+				:title="item.title" v-for="(item, index) in list"
+				:label="item.createTime">
+				
+					<template #value>
+						<view class="info">
+							<view class="price">
+								{{ x[item.type] + item.balance }}
+							</view>
+							<view class="uni-color-btn"
+							@click="requestMerchantTransfer(item)"
+							v-if="status == 1 && item.status == 4"
+							>
+								领取
+							</view>
+							<view class="status"
+							v-else>
+								{{ item.status_dictText }}
+							</view>
+						</view>
+					</template>
+				
+				</uv-cell>
 			</view>
 			
 			<view 
@@ -27,8 +54,12 @@
 </template>
 
 <script>
+	import userShopCommission from '@/components/userShop/userShopCommission.vue'
 	import mixinsList from '@/mixins/list.js'
 	export default {
+		components : {
+			userShopCommission,
+		},
 		mixins: [mixinsList],
 		data() {
 			return {
@@ -69,6 +100,29 @@
 			leftClick() {		//返回钱包
 				uni.navigateBack(-1)
 			},
+			requestMerchantTransfer(item) {
+				if (!wx.canIUse('requestMerchantTransfer')) {
+					wx.showModal({
+						content: '你的微信版本过低，请更新至最新版本。',
+						showCancel: false,
+					});
+					return
+				}
+				wx.requestMerchantTransfer({
+					mchId: '1684424511',
+					appId: wx.getAccountInfoSync().miniProgram.appId,
+					package: item.packageInfo,
+					success: (res) => {
+						// res.err_msg将在页面展示成功后返回应用时返回ok，并不代表付款成功
+						console.log('success:', res);
+						this.getData()
+					},
+					fail: (res) => {
+						console.log('fail:', res);
+						this.getData()
+					},
+				});
+			},
 		}
 	}
 </script>