5-19-1

pages/home/user.vue

@@ -1,174 +1,142 @@
 <template>
 	<view class="container">
-		<scroll-view class="content-box" scroll-y="true">
+		<view class="content-box">
 			<view class="user-section">
-				<view class="user-info-box ">
-					<view class="detail flex">
-						<view class="portrait-box" @click="navTo('/pages/set/userinfo')">
-							<image class="portrait" :src="user.avatar || '/static/error/missing-face.png'"></image>
-						</view>
-						<view class="info-box">
-							<view class="username flex-start">
-								<text class="clamp padding-r-20">
-									{{ user.nickname || '游客' }}
-								</text>
+				<view class="avatar" @click="navTo('/pages/set/userinfo')">
+					<image class="image" :src="user.avatar|| urlFile+`/static/error/missing-face.png`"
+						mode="scaleToFill"></image>
+				</view>
+				<view class="flex-center phone">
+					{{user.nickname || '游客'}}
+					<!-- <template v-if="user.phone">
+						{{((''+user.phone).split('').splice(3,4,'****')).join('')}}
+					</template> -->
+				</view>
+				<view class="tj-sction">
+					<view class="tj-item" @click="navTo('/pages/user_home/money/wallet')">
+						<text class="num">{{user.now_money || '0.00' }}</text>
+						<text>我的余额</text>
+					</view>
+					<view class="tj-item" @click="navTo('/pages/user_home/money/wallet')">
+						<text class="num">{{'0.00' }}</text>
+						<text>我的水票</text>
+						
+					</view>
+					<view class="tj-item" @click="navTo('/pages/user_home/award/award')">
+						<text class="num">{{ user.brokerage_price || '0.00' }}</text>
+						<text>我的佣金</text>
+					</view>
+				</view>
+			</view>
 
-								<view class="tipLevel flex-shrink-false">
+			<view class="cover-container">
+
+				<view class="item-box">
+					<view class="box-title flex">
+						<view class="title"><text>配送员订单</text></view>
+						<view class="link flex" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover">
+							<text class="margin-r-10">全部</text>
+							<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
+						</view>
+					</view>
+					<view class="order-section">
+						<view class="order-item" @click="navTo('/pages/order/order?state=0')" hover-class="common-hover"
+							:hover-stay-time="50">
+							<view class=" icon position-relative">
+								<image class="icon-img" src="../../static/icon/userorder1.png" mode="aspectFit">
+								</image>
+								<view class="corner" v-if="user.unpaid_count > 0">
+									<text>{{ user.unpaid_count }}</text>
 								</view>
 							</view>
-							<view class="flex-start flex">
-								<view class="authentication"
-									@click="navTo('/pages/user/realName/realNameAuthentication')" v-if="!user.mobile">
+							<text>待付款</text>
+						</view>
+						<view class="order-item" @click="navTo('/pages/order/order?state=1')" hover-class="common-hover"
+							:hover-stay-time="50">
+							<view class="icon position-relative">
+								<image class="icon-img" src="../../static/icon/userorder2.png" mode="aspectFit">
+								</image>
+								<view class="corner" v-if="user.received_count > 0">
+									<text>{{ user.received_count }}</text>
 								</view>
-								<view class="authentication" v-else>{{user.mobile}}</view>
 							</view>
+							<text>待核销</text>
 						</view>
-						<view class="righ-tbox flex">
-							<image class="right-tip" src="../../static/icon/tiptop.png" mode="scaleToFill"></image>
-							<block v-if="!user.work_type_title">
-								普通用户
-							</block>
-							<block v-else>
-								{{user.work_type_title}}
-							</block>
+						<view class="order-item" @click="navTo('/pages/order/order?state=2')" hover-class="common-hover"
+							:hover-stay-time="50">
+							<view class=" icon position-relative">
+								<image class="icon-img" src="../../static/icon/userorder3.png" mode="aspectFit">
+								</image>
+							</view>
+							<text>已完成</text>
 						</view>
 					</view>
 				</view>
-			</view>
-			<view class="nav-model flex" @click="navcard">
-				<view class="right-card">
-					<view class="title">
-						我的数字名片
-					</view>
-					<view class="tip" v-if="user.info_audit_status==-2">
-						审核成功即可获得母婴界数字名片
-					</view>
-					<view class="tip" v-else-if="user.info_audit_status==1">
-						点击查看您的母婴界数字名片
-					</view>
-					<view class="tip" v-else-if="user.info_audit_status==0&&user.work_type_id<=0">
-						数字名片资料审核中请等待审核完毕
-					</view>
-					<view class="tip" v-else-if="user.info_audit_status==0&&user.work_type_id>0">
-						修改数字名片资料审核中请等待审核完毕
-					</view>
-				</view>
-				<image class="next" src="../../static/icon/next2.png" mode="scaleToFill"></image>
-			</view>
-			<view class="nav-model-rz flex" v-if="user.work_type_id>0&&user.type_audit_status!=1" @click="user.type_audit_status==0||navTo('/pages/user/model/shoprz')">
-				<view class="tiptext" v-if="user.type_audit_status==-2">
-					您未完成平台认证，请立即认证>>
-				</view>
-				<view class="tiptext" v-else-if="user.type_audit_status==-1">
-					您平台认证失败，请重新认证>>
-				</view>
-				<view class="tiptext" v-else-if="user.type_audit_status==-3">
-					您平台认证已失效，请重新认证>>
-				</view>
-				<view class="tiptext" v-else-if="user.type_audit_status==0">
-					您已提交认证信息请等待认证结束
-				</view>
-				<view class="rztext" v-if="user.type_audit_status==-2">
-					立即认证
-				</view>
-				<view class="rztext" v-else-if='user.type_audit_status==-3||user.type_audit_status==-1'>
-					重新生成
-				</view>
-			</view>
-			<view class="cover-container">
 				<view class="listBox">
 					<view class="list">
-						<!-- <view class="flex listItem" @click="navTo('/pages/user/myCart/myCart')">
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/mymoney.png" mode="widthFix"></image>
-								<text class="title">我的钱包</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
-							</view>
-						</view> -->
-						
-						<view class="flex listItem" @click="navTo('/pages/user/myteam')">
+						<view class="flex listItem" @click="navTo('/pages/user_home/shareQrCode')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myshare.png" mode="widthFix"></image>
-								<text class="title">影响指数</text>
+								<image class="listIconImg" src="../../static/icon/usersm.png" mode="widthFix"></image>
+								<text class="title">扫码核销</text>
 							</view>
 							<view class="right flex">
 								<text></text>
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
 						</view>
-						<view class="flex listItem" @click="navTo('/pages/user/shareQrCode')">
+						<view class="flex listItem" @click="navTo('/pages/user_home/shareQrCode')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myshareimg.png" mode="widthFix"></image>
-								<text class="title">邀请海报</text>
+								<image class="listIconImg" src="../../static/icon/useryh.png" mode="widthFix"></image>
+								<text class="title">用户管理</text>
 							</view>
 							<view class="right flex">
 								<text></text>
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
 						</view>
-						<view class="flex listItem" @click="navTo('/pages/user/model/mymodellist')">
+						<view class="flex listItem" @click="navTo('/pages/user_home/shareQrCode')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/mymodel.png" mode="widthFix"></image>
-								<text class="title">已购模板</text>
+								<image class="listIconImg" src="../../static/icon/userkt.png" mode="widthFix"></image>
+								<text class="title">空桶管理</text>
 							</view>
 							<view class="right flex">
 								<text></text>
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
 						</view>
-						<!-- <view class="flex listItem" @click="navTo('/pages/user/myCart/myCart')">
+						<view class="flex listItem" @click="navTo('/pages/user_home/shareQrCode')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myaddress.png" mode="widthFix"></image>
+								<image class="listIconImg" src="../../static/icon/userdz.png" mode="widthFix"></image>
 								<text class="title">收货地址</text>
 							</view>
 							<view class="right flex">
 								<text></text>
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
-						</view> -->
-						<!-- #ifdef MP -->
-						<button hover-class="none" class="flex listItem" open-type='contact'>
-							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myserve.png" mode="widthFix"></image>
-								<text class="title">客服中心</text>
-							</view>
-							<view class="right flex">
-								<text></text>
-								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
-							</view>
-						</button>
-						<!-- #endif -->
-						<!-- #ifndef APP -->
-						<!-- <view class="flex listItem" @click="navTo('/pages/user/shareQrCode')">
+						</view>
+						<view class="flex listItem" @click="navTo('/pages/user_home/shareQrCode')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myshare.png" mode="widthFix"></image>
+								<image class="listIconImg" src="../../static/icon/usergg.png" mode="widthFix"></image>
 								<text class="title">邀请好友</text>
 							</view>
 							<view class="right flex">
 								<text></text>
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
-						</view> -->
-						<!-- #endif -->
-						<!-- #ifdef APP -->
-						<view class="flex listItem" @click="shareDomApp">
+						</view>
+						<button hover-class="none" class="flex listItem" open-type='contact'>
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myshare.png" mode="widthFix"></image>
-								<text class="title">邀请好友</text>
+								<image class="listIconImg" src="../../static/icon/userkf.png" mode="widthFix"></image>
+								<text class="title">客服</text>
 							</view>
 							<view class="right flex">
 								<text></text>
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
-						</view>
-						<!-- #endif -->
-						<!-- #ifndef MP -->
-						<view class="flex listItem" @click="navTo('/pages/public/workwork')">
+						</button>
+						<view class="flex listItem" @click="navTo('/pages/set/set')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myinfo.png" mode="widthFix"></image>
+								<image class="listIconImg" src="../../static/icon/userabout.png" mode="widthFix"></image>
 								<text class="title">关于我们</text>
 							</view>
 							<view class="right flex">
@@ -176,11 +144,10 @@
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
 						</view>
-						<!-- #endif -->
 						<view class="flex listItem" @click="navTo('/pages/set/set')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/myset.png" mode="widthFix"></image>
-								<text class="title">系统设置</text>
+								<image class="listIconImg" src="../../static/icon/userset.png" mode="widthFix"></image>
+								<text class="title">设置</text>
 							</view>
 							<view class="right flex">
 								<text></text>
@@ -190,10 +157,14 @@
 					</view>
 				</view>
 			</view>
-		</scroll-view>
+		</view>
 	</view>
 </template>
 <script>
+	// #ifdef H5
+	import weixinObj from "@/plugin/jweixin-module/index.js";
+	// #endif
+	
 	import {
 		mapState,
 		mapMutations
@@ -206,7 +177,9 @@
 	} from '@/api/user.js';
 	import {
 		articleList,
-		notify
+		notify,
+		rentVerific,
+		orderVerific
 	} from '@/api/index.js';
 	import {
 		saveUrl,
@@ -215,9 +188,14 @@
 	export default {
 		data() {
 			return {
+				hxLoading: false,
+				hxtype: 0, //0普通核销1电池核销
+				dcode: '', //电池编号
+				code: '', //商品核销码
 				user: {
 					avatar: '', //头像
 					nickname: '', //昵称
+					phone: ''
 				},
 				shareData: {}
 			};
@@ -244,20 +222,117 @@
 		},
 		methods: {
 			...mapMutations('user', ['setUserInfo']),
+			qhx() {
+				let that = this
+				if (that.hxLoading) {
+					return
+				}
+				if (that.code == '') {
+					return that.$api.msg('请输入核销码')
+				}
+				if (that.hxtype == 0) {
+					that.hxLoading = true
+					orderVerific({
+						verify_code: that.code,
+						is_confirm: 1
+					}).then(res => {
+						uni.showToast({
+							title: '核销成功',
+							mask: true,
+							duration: 1500
+						});
+						that.close()
+						that.hxLoading = false
+					}).catch(err => [
+						that.hxLoading = false
+					])
+				} else {
+					if (that.dcode == '') {
+						return that.$api.msg('请输入电池编号')
+					}
+					that.hxLoading = false
+					rentVerific({
+						verify_code: that.code,
+						battery_number: that.dcode,
+						is_confirm: 1
+					}).then(res => {
+						uni.showToast({
+							title: '核销成功',
+							mask: true,
+							duration: 1500
+						});
+						that.close()
+						that.hxLoading = false
+					})
+				}
+			},
+			openHx() {
+				this.$refs.popuphx.open()
+			},
+			close() {
+				this.code = ''
+				this.dcode = ''
+				this.$refs.popuphx.close()
+			},
+			// 扫码
+			smsh() {
+				let that = this
+				// #ifdef H5
+				try {
+					weixinObj.scanQRCode({
+						needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+						scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+						success: function(res) {
+							var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
+							let arr = result.split('&');
+							if(arr.length > 1) {
+								that.code = arr[0];
+								that.dcode = arr[1] || '';
+								that.hxtype = 1;
+							}else {
+								that.code = arr[0];
+								that.hxtype = 0;
+							}
+							that.openHx();
+							// 判断是否为电池核销
+							
+						}
+					});
+				} catch (err) {
+					console.log(err)
+					that.openHx();
+				}
+
+				// #endif
+				// #ifndef H5
+				uni.scanCode({
+					success: (res) => {
+						let result = res.result
+						let arr = result.split('&')
+						if(arr.length > 1) {
+							that.code = arr[0];
+							that.dcode = arr[1] || '';
+							that.hxtype = 1;
+						}else {
+							that.code = arr[0];
+							that.hxtype = 0;
+						}
+						that.openHx();
+					}
+				})
+				// #endif
+
+			},
 			// 跳转卡片页面
 			navcard() {
 				// 判断是否已经认证
-				if (this.user.work_type_id <=0) {
-					this.navTo('/pages/user/model/modelrz?modelid='+this.user.show_template_id)
+				if (this.user.work_type_id <= 0) {
+					this.navTo('/pages/user/model/modelrz')
 				} else {
 					if (this.user.show_template_id) {
-						this.navTo('/pages/user/model/model?mtype=' + this.user.show_template_id+'&type=3')
-					}else{
-						uni.showModal({
-							title: '错误',
-							content: '您未购买模板请先购买',
-							showCancel: false,
-						});
+						this.navTo('/pages/user/model/model?mtype=' + this.user.show_template_id + '&look=1')
+					} else {
+						this.navTo('/pages/user/model/model')
 					}
 				}
 			},
@@ -302,7 +377,7 @@
 				this.$emit('tab', true)
 			},
 			navTo(url) {
-				console.log(this.hasLogin,'this.hasLogin');
+				console.log(this.hasLogin, 'this.hasLogin');
 				if (!this.hasLogin) {
 					// 保存地址
 					saveUrl();
@@ -321,8 +396,18 @@
 	};
 </script>
 <style lang="scss">
-	page {
-		height: 100%;
+	%section {
+		display: flex;
+		justify-content: space-around;
+		align-content: center;
+		border-radius: 10rpx;
+	}
+
+	%flex-center {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
 	}
 
 	.listBox {
@@ -338,11 +423,12 @@
 			border-radius: 20rpx;
 			border: none;
 			line-height: 1;
-			&::after{
+
+			&::after {
 				border: none;
 			}
 		}
-		
+
 		.listIconImg {
 			width: 36rpx;
 			height: 36rpx;
@@ -364,149 +450,128 @@
 	}
 
 	.container {
-		height: 100%;
 		background-color: $page-color-base;
-	}
-
-	.content-box {
-		height: 100%;
-	}
-
-	.user-section {
-		padding: 15rpx 30rpx 0;
-		position: relative;
-		background: url('https://api.myjie.cn/resource/appimage/userbg.png');
-		background-size: 100% 100%;
+		background-image: url('../../static/image/userbg.png');
+		background-repeat: no-repeat;
+		background-size: 100% auto;
 		padding-top: 100rpx;
-		height: 350rpx;
+		padding-bottom: 50rpx;
 	}
 
-	.user-info-box {
-		height: 180rpx;
-		color: white;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		position: relative;
-		z-index: 1;
+	.user-section {
+		background-color: #FFF;
+		border-radius: 20rpx;
+		margin: 0 $page-row-spacing;
+		padding: 40rpx 0;
 
-		.detail {
+		.avatar {
+			width: 130rpx;
 			height: 130rpx;
-			flex-grow: 1;
+			margin: 0 auto;
+			border-radius: 100rpx;
 			overflow: hidden;
+			margin-bottom: 30rpx;
 
-			.portrait-box {
+			.image {
+				width: 100%;
 				height: 100%;
-
-				.portrait {
-					width: 130rpx;
-					height: 100%;
-					border: 5rpx solid #fff;
-					border-radius: 50%;
-				}
 			}
+		}
 
-			.info-box {
-				margin-left: 20rpx;
-				line-height: 1.5;
-				flex-grow: 1;
-				overflow: hidden;
+		.phone {
+			height: 1rem;
+			margin-bottom: 30rpx;
+		}
+	}
 
-				.tipLevel {
-					height: 36rpx;
-					margin-right: 20rpx;
-				}
+	.cover-container {
+		padding: 0 30rpx;
+		position: relative;
+		padding-bottom: 20rpx;
+	}
 
-				.username {
-					font-size: 34rpx;
-					color: #FFF;
-					font-weight: bold;
-					height: 100%;
-				}
+	.tj-sction {
+		@extend %section;
 
-				.authentication {
-					font-size: 24rpx;
-					color: #FFF;
-					float: left;
-				}
-			}
-
-			.righ-tbox {
-				padding: 10rpx 20rpx;
-				border-radius: 12rpx;
-				font-size: 25rpx;
-				line-height: 1;
-				color: $base-color;
-				background-color: #FFF;
-
-				.right-tip {
-					width: 25rpx;
-					height: 33rpx;
-					margin-right: 10rpx;
-				}
-			}
+		.tj-item {
+			@extend %flex-center;
+			flex-direction: column;
+			height: 100rpx;
+			font-size: $font-sm;
+			color: $font-color-light;
 		}
-	}
-	.nav-model-rz{
-		background-color:#FFD7E3 ;
-		border-radius: 20rpx;
-		margin: 0 auto;
-		padding: 30rpx;
-		padding-bottom: 15rpx;
-		padding-top: 50rpx;
-		line-height: 1;
-		width: 690rpx;
-		margin-top: -38rpx;
-		.tiptext{
-			color:#F65486 ;
-			font-size: 26rpx;
+
+		.num {
+			font-size: $font-lg + 4rpx;
+			color: $font-color-dark;
+			margin-bottom: 8rpx;
 			font-weight: bold;
 		}
-		.rztext{
-			color: #FFF;
-			background-color: #F65486;
-			border-radius: 100rpx;
-			padding: 15rpx 20rpx;
-			font-size: 22rpx;
-		}
 	}
 
-	.nav-model {
-		background: url('https://api.myjie.cn/resource/appimage/uservip.png');
-		background-size: 100% 100%;
-		color: #FFF;
+	.item-box {
 		border-radius: 20rpx;
-		width: 690rpx;
-		height: 157rpx;
-		margin: 0 auto;
-		margin-top: -80rpx;
-		font-weight: bold;
-		z-index: 1;
-		position: relative;
+		background-color: white;
+		margin-top: 20rpx;
 
-		.next {
-			width: 26rpx;
-			height: 28rpx;
-			margin-right: 40rpx;
-		}
+		.box-title {
+			line-height: 1;
+			padding: 30rpx 40rpx;
 
-		.right-card {
-			padding-left: 170rpx;
-		}
+			.title {
+				font-size: $font-lg;
+				font-weight: bold;
+			}
 
-		.title {
-			font-size: 35rpx;
-		}
+			.link {
+				font-size: $font-base - 2rpx;
+				color: $font-color-light;
 
-		.tip {
-			font-size: 26rpx;
+				.img {
+					width: 26rpx;
+				}
+			}
 		}
 
-	}
+		.order-section {
+			@extend %section;
+			padding: 28rpx 0;
+			padding-top: 0;
 
-	.cover-container {
-		padding: 0 30rpx;
-		position: relative;
-		padding-bottom: 20rpx;
+			.order-item {
+				@extend %flex-center;
+				width: 120rpx;
+				height: 120rpx;
+				border-radius: 10rpx;
+				font-size: $font-sm;
+				color: $font-color-dark;
+			}
+
+			.iconfont {
+				font-size: 48rpx;
+				margin-bottom: 18rpx;
+				color: #fa436a;
+			}
+
+			.icon-shouhoutuikuan {
+				font-size: 44rpx;
+			}
+
+			.icon {
+				height: 50rpx;
+				width: 48rpx;
+				margin-bottom: 18rpx;
+				background-size: 100%;
+				background-repeat: no-repeat;
+				background-position: center;
+
+				.icon-img {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
 	}
-</style>
+
+	
+</style>