Bläddra i källkod

7.7下班后提交

李万涛 2 år sedan
förälder
incheckning
a5dcc2a22d

+ 2 - 2
pages.json

xqd
@@ -639,9 +639,9 @@
 			}
 
 		}, {
-			"path": "pages/user/draw/draw",
+			"path": "pages/user/withdrawRes/index",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "提现结果",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"

+ 1 - 4
pages/tusk/index.vue

xqd xqd
@@ -267,9 +267,6 @@
 				this.totalElements = res.total
 			}
 			console.log('任务分类导航返回值', res);
-
-			this.fetchTuskList()
-
 		},
 
 		async onReachBottom() {
@@ -313,7 +310,7 @@
 
 		},
 		onShow() {
-
+			this.fetchTuskList()
 		},
 		onUnload() {
 

+ 9 - 1
pages/tusk/tuskDetail/index.vue

xqd xqd
@@ -24,7 +24,7 @@
 			</view>
 			<view class="des" style="color: #999;font-size: 28rpx;">
 				<!-- 任务人数:8人/287人 -->
-				任务人数:{{detail.order_complete }}人/{{ detail.order_total }}人
+				任务人数:{{detail.order_total }}人/{{ detail.max_count}}人
 			</view>
 			<view class="content">
 				<!-- 此单主要为用户学习caht gpt应用场景学习,主要掌握人工智能对人生活各方面的助力 -->
@@ -105,6 +105,14 @@
 			},
 
 			async handleReceiveOrder(task_id) {
+				if (this.detail.max_count == this.detail.order_total) {
+					uni.showToast({
+						title: '接单失败,允许的最大接单人数是:' + this.detail.max_count,
+						icon: 'none'
+					})
+					return
+				}
+
 				let res = await receiveOrder({
 					task_id
 				})

+ 1 - 1
pages/user/commission/commission-log.vue

xqd
@@ -415,7 +415,7 @@
 
 	.wallet-card {
 		width: 690rpx;
-		height: 301rpx;
+		// height: 301rpx;
 		background: url('http://file.shopro.top/imgs/commission/commission_card_bg.png') no-repeat;
 		background-size: 100% 100%;
 		border-radius: 20rpx;

+ 1 - 1
pages/user/commission/commission-log2.vue

xqd
@@ -441,7 +441,7 @@
 
 	.wallet-card {
 		width: 690rpx;
-		height: 301rpx;
+		// height: 301rpx;
 		background: url('http://file.shopro.top/imgs/commission/commission_card_bg.png') no-repeat;
 		background-size: 100% 100%;
 		border-radius: 20rpx;

+ 7 - 5
pages/user/commission/withdraw-log.vue

xqd xqd
@@ -10,7 +10,7 @@
 		<!-- <view slot="top" class="z_tabs" :style="{marginTop: tobheight+'px'}"></view> -->
 		<view class="z_tabs" :style="{marginTop: tobheight+'px'}"></view>
 		<view class="wallet-log-box u-p-b-30">
-			<view class="log-list" v-for="(item,index) in withdrawList" :key="item.id">
+			<view class="log-list" v-for="(item,index) in withdrawList" :key="item.id" @click="toWithdrawRes(item)">
 				<view class="head u-flex u-col-center u-row-between">
 					<view class="title">{{item.title}}</view>
 					<view class="num">{{item.amount}}元</view>
@@ -101,10 +101,12 @@
 		// 	}
 		// },
 		methods: {
-
-
-
-
+			toWithdrawRes(item) {
+				getApp().withDrawRes = item
+				uni.navigateTo({
+					url: 'pages/user/withdrawRes/index'
+				})
+			},
 			queryList(pageNo, pageSize) {
 				//这里的pageNo和pageSize会自动计算好,直接传给服务器即可
 				const params = {

+ 0 - 144
pages/user/draw/draw.vue

xqd
@@ -1,144 +0,0 @@
-<template>
-	<view>
-		<view style="color: #fff;">
-			<tn-nav-bar backgroundColor="#26B3A0" :bottomShadow="false">绘画记录</tn-nav-bar>
-		</view>
-		<z-paging ref="paging" refresher-complete-delay="200" v-model="drawList" @query="queryList">
-			<view slot="top" class="z_tabs" :style="{ marginTop: tobheight + 'px' }"></view>
-			
-			<view class="u-flex flex-wrap">
-				<block v-for="(item,index) in drawList" :key="index">
-				<view @click="preview(index)" class="draw_view">
-					<image :src="item.path" mode="aspectFill"></image>
-					<view class="prompt">{{item.prompt}}</view>
-					<view class="circle" @click.stop="gallerydel(index)">
-						<u-icon name="close-circle-fill" color="#e83a30" size="24"></u-icon>
-					</view>
-				</view>
-				</block>
-				<!-- <view class="draw_view">
-					<image src="https://yijian-painting-prod.cdn.bcebos.com/content/766556a3c73e28803cf28e30d06b88e0/85aa8a0e-e4d3-40c0-8a4d-38c21e8dfd2e.jpg" mode="aspectFill"></image>
-					<view class="">画一碗猪脚面</view>
-				</view>
-				<view class="draw_view">
-					<image src="https://yijian-painting-prod.cdn.bcebos.com/content/766556a3c73e28803cf28e30d06b88e0/85aa8a0e-e4d3-40c0-8a4d-38c21e8dfd2e.jpg" mode="aspectFill"></image>
-					<view class="">画一碗猪脚面</view>
-				</view>
-				<view class="draw_view">
-					<image src="https://yijian-painting-prod.cdn.bcebos.com/content/766556a3c73e28803cf28e30d06b88e0/85aa8a0e-e4d3-40c0-8a4d-38c21e8dfd2e.jpg" mode="aspectFill"></image>
-					<view class="">画一碗猪脚面</view>
-				</view> -->
-			</view>
-			
-		</z-paging>
-		<wike-loading-page :isLoading="isLoading"></wike-loading-page>
-	</view>
-</template>
-
-<script>
-	import { mapMutations, mapActions, mapState, mapGetters } from 'vuex';
-	export default {
-		data() {
-			return {
-				tobheight: 45,
-				platform: this.$platform.get(),
-				isLoading: true,
-				drawList:[]
-			}
-		},
-		computed: {
-			...mapGetters(['appInfo', 'userInfo', 'isLogin'])
-		},
-		onLoad() {
-			const that = this;
-			if (this.platform == 'wxMiniProgram') {
-				var menumtop = uni.getMenuButtonBoundingClientRect().top - uni.getSystemInfoSync().statusBarHeight;
-				var paddingtop = uni.getSystemInfoSync().statusBarHeight + menumtop;
-				this.tobheight = menumtop + paddingtop + uni.getMenuButtonBoundingClientRect().height;
-			}
-			
-		},
-		methods: {
-			queryList(pageNo, pageSize) {
-				//这里的pageNo和pageSize会自动计算好,直接传给服务器即可
-				const params = {
-					page: pageNo,
-					limit: pageSize
-				};
-				this.$http('gallery.list', params).then(res => {
-					if (res.code == 0) {
-						uni.setNavigationBarTitle({
-							title: this.appInfo.site_name
-						});
-						this.$refs.paging.complete(res.data.data);
-						this.isLoading = false;
-					}
-				});
-			},
-			preview(e){
-				uni.previewImage({
-					urls: [this.drawList[e].path],
-					
-				});
-			},
-			gallerydel(e){
-				var that = this;
-				uni.showModal({
-					confirmText: '删除',
-					content: '是否删除此绘画记录',
-					title: '提示',
-					confirmColor: '#26B3A0',
-					success(res) {
-						// console.log(res);
-						if (res.confirm) {
-							that.$http('gallery.del', {id:that.drawList[e].id}).then(res => {
-								if (res.code == 0) {
-									uni.showToast({
-										title:'删除成功'
-									})
-									// that.drawList = []
-									that.$refs.paging.reload(true);
-								}else{
-									uni.showToast({
-										title:'删除失败',
-										icon:'none'
-									})
-								}
-							});
-						}
-					}
-				})
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-	    background: #f6f7fb;
-	}
-.draw_view{
-	margin: 30rpx;
-	width: 100%;
-	background: #fff;
-	border-radius: 0 0 20rpx 20rpx;
-	// padding: 30rpx;
-	position: relative;
-	image{
-		width: 100%;
-		height: 280rpx;
-		border-radius: 20rpx 20rpx 0 0;
-	}
-	.prompt{
-		padding: 20rpx 30rpx 30rpx;
-	}
-	.circle{
-		position: absolute;
-		right: -12rpx;
-		top: -12rpx;
-		background: #fff;
-		border-radius: 50%;
-	}
-}
-</style>

+ 112 - 0
pages/user/withdrawRes/index.scss

xqd
@@ -0,0 +1,112 @@
+page {
+			background: #fff;
+		}
+	.container {
+			.content{
+				.topIcon{
+					display: flex;
+					flex-direction: column;
+			
+					align-items: center;
+					// height:600rpx;
+					margin-top: 200rpx;
+					padding-bottom: 200rpx;
+					justify-content: center;
+					padding-top: 150rpx;
+					image{
+						width: 100rpx;
+						height: 100rpx;
+						border-radius: 50%;
+					}
+					.txt{
+						margin-top: 50rpx;
+						font-size: 34rpx;
+						color:#26B3A0 ;
+					}
+					
+				}
+				.tips{
+					font-size: 32rpx;
+					color: #26B3A0;
+					margin-top: 100rpx;
+					height: 100rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					
+				}
+			}
+			
+		}
+		
+		.line{
+			height: 12rpx;
+			background: #eee;
+		}
+		.sunTitle{
+			padding: 0 40rpx;
+			font-size: 36rpx;
+			font-weight: 600;
+			margin-top: 40rpx;
+			margin-bottom: 20rpx;
+		}
+		.content2{
+			margin-left: 50%;
+			transform: translateX(-50%);
+			margin-top: 30rpx;
+			width: 90%;
+			background: #eee;
+			padding: 30rpx;
+			border-radius: 20rpx;
+			margin-bottom: 50rpx;
+			line-height: 50rpx;
+			font-size: 32rpx;
+			word-break: break-all;
+			word-wrap: break-word;
+		}
+		
+		
+		// 图片上传区域
+		.chooscontainer {
+				display: flex;
+				flex-wrap: wrap;
+				position: relative;
+				// border-bottom: 1rpx solid #EDEDED;
+				margin-bottom: 48rpx;
+				padding: 0 30rpx;
+				.addpicall {
+					width: 28%;
+					margin-right: 6rpx;
+					margin-left: 6rpx;
+					margin-top: 15rpx;
+					position: relative;
+					// z-index: 10;
+		
+					&:nth-child(3n) {
+						margin-right: 0;
+					}
+		
+					.image {
+						width: 100%;
+						height: 100%;
+						border-radius: 20rpx;
+					}
+					.playBtn{
+						position: absolute;
+						width: 50rpx;
+						height: 50rpx;
+						z-index: 11;
+						right: 40%;
+						transform: translateX(40%);
+						top: 50%;
+						transform: translateY(-50%);
+					}
+				}
+		
+		
+			}
+			
+			
+			// 图片上传区域结束
+		
+		

+ 70 - 0
pages/user/withdrawRes/index.vue

xqd
@@ -0,0 +1,70 @@
+<template>
+	<view class="container">
+		<view style="color: #fff;">
+			<tn-nav-bar backgroundColor="#26B3A0" :bottomShadow="false">提现结果</tn-nav-bar>
+		</view>
+		<view class="z_tabs" :style="{ marginTop: tobheight + 'px' }"></view>
+		<view class="content">
+			<view class="topIcon">
+				<icon :type="detail.status==2?'error':'success'" size="54" color="#26B3A0" />
+				<view class="txt">
+					{{detail.status==2?'提现审核失败':'提现审核成功'}}
+				</view>
+			</view>
+			<view class="line">
+			</view>
+			<view class="sunTitle">
+				反馈内容
+			</view>
+
+			<view class="content2">
+				{{detail.feedback_reason}}
+			</view>
+			<view class="sunTitle">
+				反馈图片
+			</view>
+
+			<view class="chooscontainer">
+				<view class="addpicall" v-for="(item,index) in pic_url" :key="index">
+					<image style="width: 184rpx;height:186rpx;border-radius: 20rpx;" @click="previewImg(item)"
+						:src="item" mode="aspectFill"></image>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				tobheight: 45,
+				detail: {},
+				pic_url: []
+			}
+		},
+		computed: {
+
+		},
+		onLoad() {
+			this.detail = getApp().withDrawRes
+			this.pic_url = getApp().withDrawRes.feedback_image.split(',')
+			console.log('提现结果', this.detail);
+		},
+		methods: {
+			//点击预览图片
+			previewImg(item) {
+				uni.previewImage({
+					current: item,
+					urls: this.pic_url, //存放图片的数组
+					loop: true,
+					indicator: 'default'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import './index.scss';
+</style>