上传

api/api.js

@@ -217,6 +217,7 @@ const config = {
 		method: 'POST',
 		showLoading: true,
 		auth: true,
+		limit : 2000,
 	},
 	// 提现日志
 	withdrawalLog: {
@@ -367,6 +368,13 @@ const config = {
 		auth: true,
 		debounce: 500,
 	},
+	
+	// 查询物流
+	queryLogistics : {
+		url: '/order/query/logistics',
+		method: 'POST',
+		auth: true,
+	},
 
 }
 

components/config/customerServicePopup.vue

@@ -51,7 +51,7 @@
 			},
 			// 拨打电话
 			confirm() {
-				this.show = false
+				this.$refs.popup.close()
 				uni.makePhoneCall({
 					phoneNumber: this.bPhone || this.phone,
 					success() {

mixins/order.js

@@ -129,5 +129,14 @@ export default {
 				}
 			})
 		},
+		
+		// 查看物流
+		toQueryLogistics(item){
+			// if([2, 23].includes(item.status)){
+				uni.navigateTo({
+					url: `/pages_order/order/queryLogistics?no=${item.logisticsCode}`
+				})
+			// }
+		},
 	}
 }

pages.json

@@ -89,6 +89,9 @@
 			},
 			{
 				"path": "mine/coupon"
+			},
+			{
+				"path": "order/queryLogistics"
 			}
 		]
 	}],

pages/index/cart.vue

@@ -483,7 +483,7 @@
 			justify-content: center;
 			align-items: center;
 			overflow: hidden;
-			z-index: 99;
+			z-index: 999;
 
 			.icon {
 				position: relative;

pages/index/order.vue

@@ -122,7 +122,7 @@
 						<view @click.stop="confirmReceiveGoods(item)" class="b2">
 							确认收货
 						</view>
-						<view @click.stop="" class="b1">
+						<view @click.stop="toQueryLogistics(item)" class="b1">
 							查看物流
 						</view>
 					</template>
@@ -212,7 +212,7 @@
 						<view @click.stop="confirmReceiveGoods(item)" class="b2">
 							确认收货
 						</view>
-						<view @click.stop="" class="b1">
+						<view @click.stop="toQueryLogistics(item)" class="b1">
 							查看物流
 						</view>
 					</template>

pages_order/mine/purse.vue

@@ -25,10 +25,9 @@
 				<input v-model="form.bankCard" placeholder="请输入银行卡卡号" />
 			</view>
 			<view class="mt56">提现说明</view>
-			<view style="line-height: 45rpx; font-size: 24rpx;color: #666666;" v-html="notice">
-			</view>
-			<view style="font-size: 28rpx;height: 40rpx;font-weight: 400;pad: 10rpx;">1、本次提现必须通过银行卡提现，暂不支持其他途径。</view>
-			<view style="font-size: 28rpx;height: 40rpx;font-weight: 400;">2、如若遇到24小时提现未到账，请联系客服。</view>
+			
+			<!-- <view style="font-size: 28rpx;height: 40rpx;font-weight: 400;pad: 10rpx;">1、本次提现必须通过银行卡提现，暂不支持其他途径。</view> -->
+			<!-- <view style="font-size: 28rpx;height: 40rpx;font-weight: 400;">2、如若遇到24小时提现未到账，请联系客服。</view> -->
 		</view>
 
 
@@ -59,9 +58,22 @@
 		},
 		methods: {
 			submit() {
+				if (this.$utils.verificationAll(this.form, {
+						money: '请输入提现金额',
+						name: '请输入姓名',
+					})) {
+					return
+				}
 				this.$api('storeWithdrawalApplication', this.form, res => {
 					if (res.code == 200) {
-						uni.navigateBack(-1)
+						uni.showToast({
+							title: '提交成功，待后台审核！',
+							icon: 'none',
+						})
+						
+						setTimeout(uni.navigateTo, 800, {
+							url: '/pages_order/mine/runningWater?status=1'
+						})
 					}
 				})
 			},
@@ -77,7 +89,7 @@
 
 		.from-body {
 			padding: 40rpx 20rpx 0rpx 20rpx;
-
+			padding-bottom: 30rpx;
 			font-size: 28rpx;
 			font-family: PingFang SC, PingFang SC-Bold;
 			font-weight: 700;

pages_order/mine/runningWater.vue

@@ -3,9 +3,32 @@
 		<navbar :title="title[status]" leftClick @leftClick="leftClick" />
 
 		<view class="tab-box">
-			<view class="tab-box1" v-if="agentFlow && agentFlow.total">
-				<uv-cell center border :title="item.title" v-for="(item, index) in agentFlow.records"
-					:value="x[item.type] + item.balance" :label="item.createTime" />
+			<view class="tab-box1" 
+			v-if="total">
+				<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 style="padding: 100rpx 0;" v-else>
 				<uv-empty mode="history" textSize="28rpx" iconSize="100rpx" />
@@ -16,56 +39,60 @@
 </template>
 
 <script>
+	import mixinsList from '@/mixins/list.js'
 	export default {
+		mixins: [mixinsList],
 		data() {
 			return {
 				title: ['余额记录', '提现记录', '佣金记录'],
-				agentFlow: {
-					total: 0,
-					records: [
-						// {
-						// 	type: 0,
-						// 	money: 100,
-						// 	createTime: '2024-04-02 20:00',
-						// 	title: "佣金提现",
-						// },
-						// {
-						// 	type: 0,
-						// 	money: 100,
-						// 	createTime: '2024-04-02 20:00',
-						// 	title: "佣金提现",
-						// },
-						// {
-						// 	type: 0,
-						// 	money: 100,
-						// 	createTime: '2024-04-02 20:00',
-						// 	title: "佣金提现",
-						// },
-					]
-				},
+				mixinsListApi: 'withdrawalLog',
 				x: ['+', '-', '+', '+'],
 				status: 0,
 			}
 		},
 		onLoad(e) {
 			this.status = e.status
+			this.queryParams.type = e.status
 		},
 		onShow() {
-			this.getAgentFlow()
+			// this.getAgentFlow()
 		},
 		methods: {
 			leftClick() { //返回钱包
 				uni.navigateBack(-1)
 			},
-			getAgentFlow() { //获取流水记录(余额记录 提现记录 佣金记录)
-				let type = this.status;
-				this.$api('withdrawalLog', {
-					type
-				}, res => {
-					if (res.code == 200) {
-						this.agentFlow = res.result
-					}
-				})
+			// getAgentFlow() { //获取流水记录(余额记录 提现记录 佣金记录)
+			// 	let type = this.status;
+			// 	this.$api('withdrawalLog', {
+			// 		type
+			// 	}, res => {
+			// 		if (res.code == 200) {
+			// 			this.agentFlow = res.result
+			// 		}
+			// 	})
+			// },
+			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()
+					},
+				});
 			},
 		}
 	}
@@ -83,6 +110,23 @@
 			background-color: #fff;
 			border-radius: 20rpx;
 			overflow: hidden;
+			.info{
+				text-align: right;
+				.price{
+					font-size:28rpx;
+					color: #555;
+				}
+				.status{
+					font-size: 22rpx;
+					color: #888;
+				}
+			}
+		}
+		.uni-color-btn{
+			font-size: 24rpx;
+			padding: 10rpx 20rpx;
+			border-radius: 10rpx;
+			margin: 10rpx 0 0 0;
 		}
 	}
 </style>

pages_order/order/orderDetail.vue

@@ -41,7 +41,7 @@
 						<view @click.stop="confirmReceiveGoods(order)">
 							确认收货
 						</view>
-						<view @click.stop="" class="btn2">
+						<view @click.stop="toQueryLogistics(order)" class="btn2">
 							查看物流
 						</view>
 					</template>

pages_order/order/queryLogistics.vue

@@ -0,0 +1,128 @@
+<template>
+	<view class="page">
+		<navbar leftClick @leftClick="$utils.navigateBack" />
+		
+		<view class="info">
+			<view class="no">
+				<image class="logo" :src="detail.logo" mode="aspectFill"></image>
+				<view class="">
+					{{ detail.expName }}
+				</view>
+				<view class="">
+					{{ detail.number }}
+				</view>
+			</view>
+			<view class="conc">
+				<view class="btn"
+				@click="$utils.copyText(detail.number)">
+					复制
+				</view>
+				<view class=""
+				@click="callPhone(detail.courierPhone)">
+					打电话
+				</view>
+			</view>
+		</view>
+		
+		<view class="steps">
+			<uv-steps current="0" direction="column" dot>
+				<uv-steps-item
+				v-for="(item, index) in detail.list"
+				:key="index"
+				:title="item.status"
+				:desc="item.time"></uv-steps-item>
+			</uv-steps>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				no : '',
+				detail : {
+					list : [],
+				},
+			}
+		},
+		onLoad({no}) {
+			this.no = no
+			this.queryLogistics()
+		},
+		methods: {
+			queryLogistics(){
+				this.$api('queryLogistics', {
+					no : this.no
+				}, res => {
+					if(res.code == 200){
+						let data = JSON.parse(res.result)
+						this.detail = data.result
+						console.log(JSON.parse(res.result));
+					}
+				})
+			},
+			callPhone(phone){
+				uni.makePhoneCall({
+					phoneNumber: phone
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page{
+		min-height: 100vh;
+		.info{
+			background-color: #fff;
+			padding: 30rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.no{
+				display: flex;
+				align-items: center;
+				flex-shrink: 0;
+				font-size: 28rpx;
+				color: #777;
+				gap: 20rpx;
+				.logo{
+					width: 50rpx;
+					height: 50rpx;
+					border-radius: 50%;
+					flex-shrink: 0;
+				}
+			}
+			.conc{
+				margin-left: auto;
+				display: flex;
+				flex-shrink: 0;
+				font-size: 28rpx;
+				color: #777;
+				gap: 40rpx;
+			}
+		}
+		.steps {
+			background-color: #fff;
+			display: flex;
+			flex-direction: column;
+			border-radius: 20rpx;
+			padding: 0rpx 20rpx;
+			padding-bottom: 100rpx;
+			/deep/ .uv-text__value {
+				font-size: 28rpx !important;
+				line-height: 56rpx !important;
+			}
+			/deep/ .uv-text__value--main{
+				font-size: 28rpx !important;
+				line-height: 52rpx !important;
+			}
+			/deep/ .uv-text__value--tips{
+				font-size: 24rpx !important;
+				line-height: 56rpx !important;
+				
+			}
+		}
+	}
+</style>