2023-5-22

pages/home/order.vue

@@ -386,10 +386,6 @@
 		}
 	}
 
-	.uni-swiper-item {
-		height: auto;
-	}
-
 	.order-item {
 		padding-left: 30rpx;
 		padding-right: 30rpx;
@@ -514,138 +510,6 @@
 		}
 	}
 
-	/* load-more */
-	.uni-load-more {
-		display: flex;
-		flex-direction: row;
-		height: 80rpx;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.uni-load-more__text {
-		font-size: 28rpx;
-		color: #999;
-	}
-
-	.uni-load-more__img {
-		height: 24px;
-		width: 24px;
-		margin-right: 10px;
-	}
-
-	.uni-load-more__img>view {
-		position: absolute;
-	}
-
-	.uni-load-more__img>view view {
-		width: 6px;
-		height: 2px;
-		border-top-left-radius: 1px;
-		border-bottom-left-radius: 1px;
-		background: #999;
-		position: absolute;
-		opacity: 0.2;
-		transform-origin: 50%;
-		animation: load 1.56s ease infinite;
-	}
-
-	.uni-load-more__img>view view:nth-child(1) {
-		transform: rotate(90deg);
-		top: 2px;
-		left: 9px;
-	}
-
-	.uni-load-more__img>view view:nth-child(2) {
-		transform: rotate(180deg);
-		top: 11px;
-		right: 0;
-	}
-
-	.uni-load-more__img>view view:nth-child(3) {
-		transform: rotate(270deg);
-		bottom: 2px;
-		left: 9px;
-	}
-
-	.uni-load-more__img>view view:nth-child(4) {
-		top: 11px;
-		left: 0;
-	}
-
-	.load1,
-	.load2,
-	.load3 {
-		height: 24px;
-		width: 24px;
-	}
-
-	.load2 {
-		transform: rotate(30deg);
-	}
-
-	.load3 {
-		transform: rotate(60deg);
-	}
-
-	.load1 view:nth-child(1) {
-		animation-delay: 0s;
-	}
-
-	.load2 view:nth-child(1) {
-		animation-delay: 0.13s;
-	}
-
-	.load3 view:nth-child(1) {
-		animation-delay: 0.26s;
-	}
-
-	.load1 view:nth-child(2) {
-		animation-delay: 0.39s;
-	}
-
-	.load2 view:nth-child(2) {
-		animation-delay: 0.52s;
-	}
-
-	.load3 view:nth-child(2) {
-		animation-delay: 0.65s;
-	}
-
-	.load1 view:nth-child(3) {
-		animation-delay: 0.78s;
-	}
-
-	.load2 view:nth-child(3) {
-		animation-delay: 0.91s;
-	}
-
-	.load3 view:nth-child(3) {
-		animation-delay: 1.04s;
-	}
-
-	.load1 view:nth-child(4) {
-		animation-delay: 1.17s;
-	}
-
-	.load2 view:nth-child(4) {
-		animation-delay: 1.3s;
-	}
-
-	.load3 view:nth-child(4) {
-		animation-delay: 1.43s;
-	}
-
-	@-webkit-keyframes load {
-		0% {
-			opacity: 1;
-		}
-
-		100% {
-			opacity: 0.2;
-		}
-	}
-
 	/deep/ .empty-content {
 		background: transparent;
 	}

pages/home/user.vue

@@ -3,27 +3,24 @@
 		<view class="content-box">
 			<view class="user-section">
 				<view class="avatar" @click="navTo('/pages/set/userinfo')">
-					<image class="image" :src="user.avatar|| urlFile+`/static/error/missing-face.png`"
+					<image class="image" :src="userInfo.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> -->
+					{{userInfo.nickname || '游客'}}
 				</view>
-				<view class="tj-sction">
-					<view class="tj-item" @click="navTo('/pages/user/money/wallet')">
-						<text class="num">{{user.now_money || '0.00' }}</text>
+				<view class="tj-sction flex">
+					<view class="tj-item flex-line" @click="navTo('/pages/user/money/wallet')">
+						<text class="num">{{userInfo.now_money || '0.00' }}</text>
 						<text>我的余额</text>
 					</view>
-					<view class="tj-item" @click="navTo('/pages/water/myWaterList')">
-						<text class="num">{{'0.00' }}</text>
+					<view class="tj-item flex-line" @click="navTo('/pages/water/myWaterList')">
+						<text class="num">{{userInfo.certificate_count }}</text>
 						<text>我的水票</text>
-						
+
 					</view>
-					<view class="tj-item" @click="navTo('/pages/water/deposit')">
-						<text class="num">{{ user.brokerage_price || '0.00' }}</text>
+					<view class="tj-item flex-line" @click="navTo('/pages/water/deposit')">
+						<text class="num">{{ +userInfo.certificate_pledge || '0.00' }}</text>
 						<text>我的押金</text>
 					</view>
 				</view>
@@ -34,36 +31,37 @@
 				<view class="item-box">
 					<view class="box-title flex">
 						<view class="title"><text>配送员订单</text></view>
-						<view class="link flex" @click="navTo('/pages/user/admin/orderAdmin?state=0')" hover-class="common-hover">
+						<view class="link flex" @click="navTo('/pages/user/admin/orderAdmin?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/user/admin/orderAdmin?state=0')" hover-class="common-hover"
-							:hover-stay-time="50">
+					<view class="order-section flex">
+						<view class="order-item flex-line" @click="navTo('/pages/user/admin/orderAdmin?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 class="corner" v-if="userInfo.unpaid_count > 0">
+									<text>{{ userInfo.unpaid_count }}</text>
 								</view>
 							</view>
 							<text>待付款</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/admin/orderAdmin?state=1')" hover-class="common-hover"
-							:hover-stay-time="50">
+						<view class="order-item flex-line" @click="navTo('/pages/user/admin/orderAdmin?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 class="corner" v-if="userInfo.received_count > 0">
+									<text>{{ userInfo.received_count }}</text>
 								</view>
 							</view>
 							<text>待核销</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/admin/orderAdmin?state=2')" hover-class="common-hover"
-							:hover-stay-time="50">
+						<view class="order-item flex-line" @click="navTo('/pages/user/admin/orderAdmin?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>
@@ -136,7 +134,8 @@
 						</button>
 						<view class="flex listItem" @click="navTo('/pages/set/set')">
 							<view class="flex titleBox">
-								<image class="listIconImg" src="../../static/icon/userabout.png" mode="widthFix"></image>
+								<image class="listIconImg" src="../../static/icon/userabout.png" mode="widthFix">
+								</image>
 								<text class="title">关于我们</text>
 							</view>
 							<view class="right flex">
@@ -164,7 +163,7 @@
 	// #ifdef H5
 	import weixinObj from "@/plugin/jweixin-module/index.js";
 	// #endif
-	
+
 	import {
 		mapState,
 		mapMutations
@@ -192,11 +191,6 @@
 				hxtype: 0, //0普通核销1电池核销
 				dcode: '', //电池编号
 				code: '', //商品核销码
-				user: {
-					avatar: '', //头像
-					nickname: '', //昵称
-					phone: ''
-				},
 				shareData: {}
 			};
 		},
@@ -285,17 +279,17 @@
 						success: function(res) {
 							var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
 							let arr = result.split('&');
-							if(arr.length > 1) {
+							if (arr.length > 1) {
 								that.code = arr[0];
 								that.dcode = arr[1] || '';
 								that.hxtype = 1;
-							}else {
+							} else {
 								that.code = arr[0];
 								that.hxtype = 0;
 							}
 							that.openHx();
 							// 判断是否为电池核销
-							
+
 						}
 					});
 				} catch (err) {
@@ -309,11 +303,11 @@
 					success: (res) => {
 						let result = res.result
 						let arr = result.split('&')
-						if(arr.length > 1) {
+						if (arr.length > 1) {
 							that.code = arr[0];
 							that.dcode = arr[1] || '';
 							that.hxtype = 1;
-						}else {
+						} else {
 							that.code = arr[0];
 							that.hxtype = 0;
 						}
@@ -354,7 +348,6 @@
 				console.log('data')
 				const that = this;
 				getUser({}).then((e) => {
-					this.user = e.data;
 					this.setUserInfo(e.data)
 				}).catch((e) => {
 					console.log(e, 'sj');
@@ -396,20 +389,6 @@
 	};
 </script>
 <style lang="scss">
-	%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 {
 		margin-top: 20rpx;
 		overflow: hidden;
@@ -455,7 +434,7 @@
 		background-repeat: no-repeat;
 		background-size: 100% auto;
 		padding-top: 100rpx;
-		padding-bottom: 50rpx;
+		padding-bottom: 150rpx;
 	}
 
 	.user-section {
@@ -491,10 +470,9 @@
 	}
 
 	.tj-sction {
-		@extend %section;
+		justify-content: space-around;
 
 		.tj-item {
-			@extend %flex-center;
 			flex-direction: column;
 			height: 100rpx;
 			font-size: $font-sm;
@@ -534,12 +512,11 @@
 		}
 
 		.order-section {
-			@extend %section;
 			padding: 28rpx 0;
 			padding-top: 0;
+			justify-content: space-around;
 
 			.order-item {
-				@extend %flex-center;
 				width: 120rpx;
 				height: 120rpx;
 				border-radius: 10rpx;
@@ -572,6 +549,4 @@
 			}
 		}
 	}
-
-	
-</style>
+</style>

pages/water/waterUse.vue

@@ -13,7 +13,7 @@
 			</empty>
 			<!-- #endif -->
 			<view @click="navTo( '/pages/order/orderDetail?id=' + item.order_id )"
-				v-for="(item, index) in navList[tabCurrentIndex].orderList" :key="index" class="order-item position-relative">
+				v-for="(item, index) in tabItem.orderList" :key="index" class="order-item position-relative">
 				<view class="i-top b-b flex">
 					<view class="order-code flex">
 						<view class="no">
@@ -44,7 +44,41 @@
 						合计:￥{{item.pay_price}}
 					</view>
 				</view>
+				<!-- 底部操作栏 -->
+				<view class="btm-btn-wrap flex">
+					<view class="btm-left">
+						下单时间：{{item._add_time.split(' ')[0].replace(/-/g,'/')}}
+					</view>
+					<view class="btm-right flex">
+						<view class="btm-btn" @click.stop="cancelOrder(item)"
+							v-if="item._status._title == '未支付'">
+							取消订单
+						</view>
+						<view class="btm-btn ksps"
+							@click.stop="navTo( '/pages/user/money/pay?type=1&ordid=' + item.order_id + '&money=' + item.pay_price)"
+							v-if="item._status._title == '未支付'">
+							前往支付
+						</view>
+						<view class="btm-btn ksps" @click.stop="orderTake(item, index)"
+							v-if="item._status._title == '待收货'">
+							确认收货
+						</view>
+						<view class="btm-btn ksps"
+							@click.stop="navTo('/pages/order/orderRefund?id=' + item.order_id)"
+							v-if="item._status._title == '未发货'||item._status._title == '未核销'">
+							申请退款
+						</view>
+						<view class="btm-btn ksps"
+							@click.stop="navTo('/pages/order/WriteOff?id=' + item.order_id)"
+							v-if="item._status._title == '待核销'">
+							核销码
+						</view>
+					</view>
+				</view>
 			</view>
+			
+			
+			
 			<uni-load-more :status="navList[tabCurrentIndex].loadingType"></uni-load-more>
 		</scroll-view>
 
@@ -205,5 +239,128 @@
 		height: calc(100% - 200px - var(--status-bar-height));
 		padding: 20rpx;
 	}
+	.order-item {
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		margin: 0 30rpx;
+		margin-bottom: 30rpx;
+		border-radius: 30rpx;
+		background: #fff;
+		color: #A8ADBF;
+	
+		.i-top {
+			height: 80rpx;
+			.order-code{
+				font-size: $font-sm;
+				.no{
+					padding: 10rpx 10rpx;
+					background-color: #FFEAE5;
+					color: #FD5B23;
+					line-height: 1;
+					border-top-right-radius: 10rpx;
+					border-bottom-left-radius: 10rpx;
+					margin-right: 10rpx;
+					
+				}
+			}
+			
+			.del-btn {
+				padding: 10rpx 0 10rpx 36rpx;
+				font-size: $font-lg;
+				position: relative;
+	
+				&:after {
+					content: '';
+					width: 0;
+					height: 30rpx;
+					border-left: 1px solid $border-color-dark;
+					position: absolute;
+					left: 20rpx;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+			}
+		}
+	
+		.info-info {
+			width: 215rpx;
+			height: 200rpx;
+			position: absolute;
+			top: 80rpx;
+			right: 35rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: flex-end;
+			align-items: flex-end;
+			font-size: 30rpx;
+			font-weight: 500;
+	
+			.hj {
+				padding-top: 40rpx;
+				color: $font-color-dark;
+				padding-bottom: 20rpx;
+			}
+		}
+	
+		/* 多条商品 */
+		.goods-box {
+			height: 200rpx;
+			padding: 20rpx 0;
+			white-space: nowrap;
+			padding-right: 250rpx;
+	
+			.goods-item {
+				width: 120rpx;
+				height: 180rpx;
+				display: inline-block;
+				margin-right: 24rpx;
+			}
+	
+			.goods-img {
+				display: block;
+				width: 120rpx;
+				height: 120rpx;
+			}
+	
+			.good-name {
+				font-size: 24rpx;
+				text-align: center;
+				width: 120rpx;
+				padding-top: 10rpx;
+				margin-right: 0;
+				color: $font-color-dark;
+			}
+		}
+	
+		.btm-btn-wrap {
+			height: 90rpx;
+			width: 100%;
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #A3A8BB;
+			line-height: 1;
+	
+			.btm-right {
+				justify-content: flex-end;
+			}
+	
+			.btm-btn {
+				width: 144rpx;
+				padding: 10rpx 0;
+				border: 2px solid #ededed;
+				border-radius: 28rpx;
+				font-size: 26rpx;
+				font-weight: 500;
+				text-align: center;
+				margin-left: 10rpx;
+				color: #999999;
+			}
+	
+			.ksps {
+				border-color: #4589ec;
+				color: #4589ec;
+			}
+		}
+	}
 
 </style>