2023-5-22

api/water.js

@@ -128,6 +128,41 @@ export function take_delivery(data) {
 	});
 }
 
+//确认支付
+export function offlinePay(data) {
+	return request({
+		url: '/api/admin/order/offline',
+		method: 'post',
+		data
+	});
+}
+//店员定位
+export function staff_location(data) {
+	return request({
+		url: '/api/store/staff_location',
+		method: 'post',
+		data
+	});
+}
+//空桶管理
+export function admin_certificate(data) {
+	return request({
+		url: '/api/admin/certificate',
+		method: 'get',
+		data
+	});
+}
+//回收桶
+export function pledge_recovery(data) {
+	return request({
+		url: '/api/admin/pledge/recovery',
+		method: 'post',
+		data
+	});
+}
+
+
+
 
 
 

pages.json

@@ -117,12 +117,12 @@
 						}
 					}
 				},
-				// {
-				// 	"path": "/evaluate",
-				// 	"style": {
-				// 		"navigationBarTitleText": "评论"
-				// 	}
-				// },
+				{
+					"path": "/evaluate",
+					"style": {
+						"navigationBarTitleText": "评论"
+					}
+				},
 				{
 					"path": "/WriteOff",
 					"style": {
@@ -356,7 +356,7 @@
 								"searchInput": {
 									"backgroundColor": "rgba(231, 231, 231,.7)",
 									"borderRadius": "16px",
-									"placeholder": "请输入关键字",
+									"placeholder": "请输入用户名/手机号",
 									"disabled": false,
 									"placeholderColor": "#606266",
 									"align": "left"
@@ -383,7 +383,7 @@
 								"searchInput": {
 									"backgroundColor": "rgba(231, 231, 231,.7)",
 									"borderRadius": "16px",
-									"placeholder": "请输入关键字",
+									"placeholder": "请输入用户名/手机号",
 									"disabled": false,
 									"placeholderColor": "#606266",
 									"align": "left"

pages/home/index.vue

@@ -23,12 +23,12 @@
 		</view>
 		<!-- 分类 start -->
 		<view class="cate-section flex">
-			<view class="cate-item flex" @click="navto('/pages/category/category')">
+			<!-- <view class="cate-item flex" @click="navto('/pages/category/category')">
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/index1.png" mode=""></image>
 				</view>
 				<view class="item-title">一键叫水</view>
-			</view>
+			</view> -->
 			<view class="cate-item flex" @click="navto('/pages/order/shopList?type=2')">
 				<view class="img-wrapper flex">
 					<image src="../../static/icon/index2.png" mode=""></image>

pages/home/order.vue

@@ -85,6 +85,10 @@
 									v-if="item._status._title == '待核销'">
 									核销码
 								</view>
+								<view class="btm-btn ksps" @click.stop="evaluate(item)"
+									v-if="item._status._title == '待评价'">
+									立即评价
+								</view>
 							</view>
 						</view>
 					</view>
@@ -122,6 +126,14 @@
 						page: 1, //当前页数
 						limit: 10 //每次信息条数
 					},
+					{
+						state: 3,
+						text: '待评价',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10 //每次信息条数
+					},
 					{
 						state: 4,
 						text: '已完成',
@@ -146,9 +158,15 @@
 		},
 		// #endif
 		methods: {
-			// 转换金额为数字
-			moneyNum(value) {
-				return +value;
+			// 评价
+			evaluate(item){
+				if(item.cartInfo.length==1){
+					uni.navigateTo({
+						url: '/pages/order/evaluate?unique=' + item.cartInfo[0].unique
+					});
+				}else{
+					this.navTo( '/pages/order/orderDetail?type=1&id=' + item.order_id )
+				}
 			},
 			// 确认收货
 			orderTake(item, index) {

pages/home/user.vue

@@ -60,6 +60,17 @@
 							<text>待发货</text>
 						</view>
 						<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/userorder2.png" mode="aspectFit">
+								</image>
+								<view class="corner" v-if="shopOrderDetail.received_count > 0">
+									<text>{{ shopOrderDetail.received_count }}</text>
+								</view>
+							</view>
+							<text>待收货</text>
+						</view>
+						<view class="order-item flex-line" @click="navTo('/pages/user/admin/orderAdmin?state=4')"
 							hover-class="common-hover" :hover-stay-time="50">
 							<view class=" icon position-relative">
 								<image class="icon-img" src="../../static/icon/userorder3.png" mode="aspectFit">
@@ -101,7 +112,7 @@
 								<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/set/address')">
 							<view class="flex titleBox">
 								<image class="listIconImg" src="../../static/icon/userdz.png" mode="widthFix"></image>
 								<text class="title">收货地址</text>
@@ -111,7 +122,7 @@
 								<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/shareQrCode')">
 							<view class="flex titleBox">
 								<image class="listIconImg" src="../../static/icon/usergg.png" mode="widthFix"></image>
 								<text class="title">邀请好友</text>
@@ -120,8 +131,8 @@
 								<text></text>
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
-						</view>
-						<button hover-class="none" class="flex listItem" open-type='contact'>
+						</view> -->
+						<!-- <button hover-class="none" class="flex listItem" open-type='contact'>
 							<view class="flex titleBox">
 								<image class="listIconImg" src="../../static/icon/userkf.png" mode="widthFix"></image>
 								<text class="title">客服</text>
@@ -130,7 +141,7 @@
 								<text></text>
 								<image class="img" src="../../static/icon/next1.png" mode="widthFix"></image>
 							</view>
-						</button>
+						</button> -->
 						<!-- <view class="flex listItem" @click="navTo('/pages/set/set')">
 							<view class="flex titleBox">
 								<image class="listIconImg" src="../../static/icon/userabout.png" mode="widthFix">

pages/order/createOrder.vue

@@ -1070,7 +1070,6 @@
 			background-color: #FFF;
 			border-top-right-radius: 20rpx;
 			border-top-left-radius: 20rpx;
-			min-height: 70vh;
 
 			.right-content {
 				width: 70%;

pages/order/evaluate.vue

@@ -16,41 +16,35 @@
 			<view>
 				<view class="flex_item zhil">
 					<view>商品质量</view>
-					<view><uniRate text="1" size="20" margin="10" :value="rateValue1" @change="rateChange1"></uniRate></view>
+					<view class="padding-l-10"><uni-rate text="1" size="20" margin="10" :value="rateValue1" @change="rateChange1"></uni-rate></view>
 				</view>
 				<view class="flex_item zhil">
 					<view>服务态度</view>
-					<view><uniRate text="1" size="20" margin="10" :value="rateValue2" @change="rateChange2"></uniRate></view>
+					<view class="padding-l-10"><uni-rate text="1" size="20" margin="10" :value="rateValue2" @change="rateChange2"></uni-rate></view>
 				</view>
 				<view class="equity_box">
-					<view class="text-box uni-textarea">
-						<textarea placeholder-style="color:#999" :placeholder="placeholder" @blur="bindTextAreaBlur"></textarea>
-					</view>
-					<view class="">
-						<view class="add-img-box flex_item">
-							<view class="add-img-item" v-for="(item, index) in imgList" :key="index">
-								<image class="add-img" @click.stop="imgInfo(index)" :src="item.url" mode="aspectFill"></image>
-								<image class="add-img-del" @click.stop="delImg(index)" src="/static/img/delete.png"></image>
-							</view>
-							<view v-if="imgList.length < 9" class="add-img-item" @click.stop="scImg()">
-								<image class="add-img" src="/static/img/add.png"></image>
-							</view>
+						<textarea class="text-box" auto-height placeholder-style="color:#999" :placeholder="placeholder" @blur="bindTextAreaBlur"></textarea>
+					<view class="add-img-box flex_item">
+						<view class="add-img-item" v-for="(item, index) in imgList" :key="index">
+							<image class="add-img" @click.stop="imgInfo(index)" :src="item.url" mode="aspectFill"></image>
+							<image class="add-img-del" @click.stop="delImg(index)" src="/static/image/delete.png"></image>
+						</view>
+						<view v-if="imgList.length < 9" class="add-img-item" @click.stop="scImg()">
+							<image class="add-img" src="/static/image/upImg.png"></image>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		<view @click.stop="submit" class="address-box submit-box"><text class="submit-btn">提交评论</text></view>
+		<view class="base-buttom" @click="submit">
+			提交评论
+		</view>
 	</view>
 </template>
 
 <script>
 import { product, upload, order_comment } from '@/api/order.js';
-import uniRate from '@/components/uni-rate/uni-rate.vue';
 export default {
-	components: {
-		uniRate
-	},
 	data() {
 		return {
 			list: '', //订单详情
@@ -118,13 +112,13 @@ export default {
 		//提交评论
 		submit(e) {
 			let obj = this;
-			if (obj.imgList.length < 1) {
-				uni.showToast({
-					title: '请添加图片',
-					icon: 'none'
-				});
-				return;
-			}
+			// if (obj.imgList.length < 1) {
+			// 	uni.showToast({
+			// 		title: '请添加图片',
+			// 		icon: 'none'
+			// 	});
+			// 	return;
+			// }
 			for (let i = 0; i < obj.imgList.length; i++) {
 				obj.cloudimgList.push(obj.imgList[i].url);
 			}
@@ -138,13 +132,13 @@ export default {
 				
 			})
 				.then(e => {
-					uni.navigateTo({
-						url: '/pages/order/order?state=4'
+					uni.reLaunch({
+						url: '/pages/home/order'
 					});
 				})
 				.catch(e => {
-					uni.navigateTo({
-						url: '/pages/order/order?state=4'
+					uni.reLaunch({
+						url: '/pages/home/order'
 					});
 				});
 		},
@@ -257,114 +251,27 @@ page {
 	padding: 25rpx 25rpx;
 	margin: 25rpx 0rpx;
 	.text-box {
-		height: 200rpx;
-		textarea {
-			font-size: 25rpx;
-			width: 100%;
-			height: 100%;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			display: -webkit-box;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 5;
-		}
+		font-size: 25rpx;
+		width: 100%;
 	}
 }
 .zhil {
 	font-size: 28rpx !important;
 	padding: 15rpx 15rpx;
 }
-.submit-box {
-	bottom: 0;
-	left: 0;
-	width: 750rpx;
-}
-.submit-btn {
-	margin-top: 10px;
-	display: inline-block;
-	width: 670rpx;
-	height: 96rpx;
-	line-height: 96rpx;
-	text-align: center;
-	background-color: #1BCC26 !important;
-	opacity: 1;
-	border-radius: 32rpx;
-	border-width: 8rpx;
-	border-color: rgba(255, 255, 255, 1);
-	box-shadow: 0rpx 8rpx 12rpx rgba(0, 0, 0, 0.16);
-	border-radius: 56rpx;
-	font-size: 39rpx;
-	font-weight: bold;
-	color: rgba(255, 255, 255, 1);
-}
-.submit-btn-txt {
-	font-size: 39rpx;
-	font-weight: bold;
-	line-height: 47rpx;
-	color: rgba(255, 255, 255, 1);
-	opacity: 1;
-}
-.map-box {
-	width: 484rpx;
-	height: 256rpx;
-	border-width: 4rpx;
-	border-color: rgba(255, 255, 255, 1);
-	box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.16);
-	/* border-radius: 12rpx; */
-	position: relative;
-}
-.map {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	width: 476rpx;
-	height: 250rpx;
-}
-.map-img {
-	position: absolute;
-	top: 90rpx;
-	left: 156rpx;
-	width: 230rpx;
-	height: 68rpx;
-	background-color: rgba(51, 51, 51, 0.64);
-	border-width: 1rpx;
-	border-color: rgba(0, 0, 0, 0);
-	border-radius: 34px;
-
-	font-size: 28rpx;
-	font-weight: bold;
-	line-height: 66rpx;
-	color: rgba(255, 255, 255, 1);
-	text-align: center;
-}
-.address-box {
-	padding: 15rpx 40rpx;
-	margin-bottom: 10px;
-}
-.label {
-	font-size: 36rpx;
-	font-weight: bold;
-	line-height: 50rpx;
-	color: #222222;
-}
-.label-img {
-	padding-left: 40rpx;
-}
 
 .add-img-box {
 	width: 100%;
 	flex-direction: row;
 	flex-wrap: wrap;
-	margin-top: 50rpx;
+	margin-top: 30rpx;
 }
 .add-img-item {
-	width: 180rpx;
-	height: 180rpx;
+	width: 190rpx;
+	height: 190rpx;
 	border-radius: 24rpx;
 	position: relative;
-	margin: 0rpx 20rpx;
+	margin-right: 20rpx;
 	margin-bottom: 25rpx;
 	.add-img {
 		width: 100%;
@@ -372,9 +279,6 @@ page {
 		border-radius: 24rpx;
 	}
 }
-.add-img-camera {
-	flex: 1;
-}
 .add-img-del {
 	position: absolute;
 	width: 40rpx;
@@ -384,22 +288,4 @@ page {
 	//background-color: rgba(238, 0, 0, 1);
 	border-radius: 20rpx;
 }
-.address-time {
-	width: 484rpx;
-	height: 88rpx;
-	background-color: rgba(245, 245, 245, 1);
-	opacity: 1;
-	border-radius: 24rpx;
-	text-align: center;
-
-	font-size: 35rpx;
-	font-weight: 500;
-	color: rgba(51, 51, 51, 1);
-}
-.line {
-	width: 750rpx;
-	height: 1px;
-	transform: scaleY(0.3);
-	background-color: rgba(0, 0, 0, 0.5);
-}
 </style>

pages/order/orderDetail.vue

@@ -43,15 +43,15 @@
 								{{ goodsItem.attrInfo ? goodsItem.attrInfo.suk : '' }} x
 								{{ goodsItem.cart_num + '' + (goodsItem.productInfo.unit_name ||'') }}
 							</view>
-							<!-- <view>
+							<view class="padding-t-20">
 								<view v-if="status._type ==  3">
-									<view @click="evaluate(goodsItem)" class="yesevaluate"
-										v-if="goodsItem.is_reply > 0"><text>已评价</text></view>
-									<view @click="evaluate(goodsItem)" class="evaluate" v-if="goodsItem.is_reply < 1">
-										<text>去评价</text>
+									<view @click.stop="evaluate(goodsItem)" class="yesevaluate"
+										v-if="goodsItem.is_reply > 0">已评价</view>
+									<view @click.stop="evaluate(goodsItem)" class="evaluate" v-if="goodsItem.is_reply < 1">
+										去评价
 									</view>
 								</view>
-							</view> -->
+							</view>
 						</view>
 					</view>
 				</view>
@@ -165,7 +165,7 @@
 			<view class="buttomBottom" @click="shopNext" >
 				导航
 			</view>
-			<view v-if="item._status._title=='待发货'" class="buttomBottom bgYellow flex-grow-true" @click="send">
+			<view v-if="item._status._title=='待收货'" class="buttomBottom bgYellow flex-grow-true" @click="send">
 				确认送达
 			</view>
 		</view>
@@ -173,11 +173,13 @@
 </template>
 
 <script>
+	import util from '@/utils/util.js';
 	import {
 		orderDetail
 	} from '@/api/order.js';
 	import {
-		take_delivery
+		take_delivery,
+		staff_location
 	} from '@/api/water.js';
 	export default {
 		filters: {
@@ -213,6 +215,9 @@
 			this.orderId = option.id;
 			this.type = option.type;
 			this.loadOrder();
+			if(this.type==2){
+				util.$L.getLocation();
+			}
 		},
 		computed: {
 			payAllMoney() {
@@ -223,6 +228,18 @@
 			// 送达
 			send(){
 				const that= this;
+				const longitude = uni.getStorageSync('CACHE_LONGITUDE');
+				const latitude = uni.getStorageSync('CACHE_LATITUDE');
+				
+				staff_location({
+					longitude,
+					latitude
+				}).then((res)=>{
+				}).catch((res)=>{
+					console.log(res,'定位错误');
+				})
+				
+				
 				uni.showModal({
 					title: '送货',
 					content: '是否确认送达到用户',
@@ -575,16 +592,14 @@
 				}
 
 				.evaluate {
+					line-height: 1;
 					color: #FFFFFF;
 					font-size: 24rpx;
 					display: inline-block;
 					text-align: right;
-
-					text {
-						background: #FA2740;
-						padding: 5rpx 15rpx;
-
-					}
+					padding: 10rpx 20rpx;
+					background: #FA2740;
+					border-radius: 10rpx;
 				}
 
 				.yesevaluate {

pages/set/set.vue

@@ -23,7 +23,7 @@
 						<text class="title">手机号</text>
 					</view>
 					<view class="right flex">
-						<text>{{userInfo.mobile}}</text>
+						<text>{{userInfo.phone}}</text>
 						<!-- <image class="img" src="../../static/icon/next1.png" mode="widthFix"></image> -->
 					</view>
 				</view>

pages/user/admin/ktadmin.vue

@@ -9,37 +9,43 @@
 		<empty src="../../static/error/emptyOrder.png"
 			v-if="searchData.loaded === true && searchData.list.length === 0"></empty>
 		<!-- #endif -->
-		<view class="user-item flex" v-for="(item,index) in searchData.list">
-			<image :src="item.avatar" mode="scaleToFill" class="item-logo"></image>
-			<view class="item-info">
-				<view class="info-name clamp padding-b-10">
-					{{item.nickname}} {{item.phone}}
-				</view>
-				<view class="info padding-b-10">
-					椒江区东海大道400号
-				</view>
-				<view class="info padding-b-10">
-					空桶型号：小瓶330ML
-				</view>
-				<view class="info-info flex">
-					<view>
-						押桶：<text>0</text>
+		<view class="user-item" v-for="(item,index) in searchData.list">
+			<view class="flex">
+				<image :src="item.user.avatar" mode="scaleToFill" class="item-logo"></image>
+				<view class="item-info">
+					<view class="info-name clamp padding-b-10">
+						{{item.address.real_name}} {{item.address.phone}}
 					</view>
-					<view>
-						押金：<text>0</text>元
+					<view class="info padding-b-10">
+						{{item.address.locate_address}}
 					</view>
-					<view>
-						借桶：<text>0</text>
+					<view class="info padding-b-10">
+						空桶型号：{{item.product.keyword}}
 					</view>
 				</view>
 			</view>
+			<view class="info-info flex">
+				<view>
+					持桶：<text class="font-color-red">{{item.hold_num}}</text>
+				</view>
+				<view>
+					押桶：<text class="font-color-red">{{item.pledge_num}}</text>
+				</view>
+				<view>
+					借桶：<text class="font-color-red">{{item.borrow_num}}</text>
+				</view>
+				<view class="btn" @click="out(item)">
+					回收桶
+				</view>
+			</view>
 		</view>
 		<uni-load-more :status="searchData.loadingType"></uni-load-more>
 	</view>
 </template>
 <script>
 	import {
-		certificate,
+		pledge_recovery,
+		admin_certificate,
 	} from '@/api/water.js';
 	export default {
 		data() {
@@ -84,6 +90,41 @@
 			this.getlist();
 		},
 		methods: {
+			// 空桶回收
+			out(item) {
+				const that = this;
+				uni.showModal({
+					title: '桶回收',
+					placeholderText: '请输入回收数量',
+					editable: true,
+					cancelText: '关闭',
+					confirmText: '回收',
+					success: res => {
+						if (res.confirm) {
+							if (res.content.search(/^\d*$/) < 0) {
+								uni.showModal({
+									title: '错误',
+									content: '请输入数字',
+									showCancel: false,
+								});
+								return
+							}
+							pledge_recovery({
+								id:item.id,
+								num: res.content,
+							}).then(() => {
+								uni.showToast({
+									title: '回收成功'
+								})
+								that.reLoadSearch();
+							}).catch(e => {
+								console.log(e);
+							});
+						}
+					},
+				});
+
+			},
 			// 搜索
 			reLoadSearch() {
 				this.searchData = {
@@ -110,15 +151,15 @@
 				// 修改当前对象状态为加载中
 				navItem.loadingType = 'loading';
 
-				certificate({
+				admin_certificate({
 						page: navItem.page,
 						limit: navItem.limit,
-						keyword: this.keyword
+						key: this.keyword
 					})
 					.then(({
 						data
 					}) => {
-						let arr = data.map(e => {
+						let arr = data.data.map(e => {
 							return e;
 						});
 						navItem.list = navItem.list.concat(arr);
@@ -150,6 +191,20 @@
 		margin-bottom: 15rpx;
 		border-radius: 30rpx;
 
+		.info-info {
+			width: 100%;
+			font-size: $font-base;
+			font-weight: bold;
+			line-height: 1;
+
+			.btn {
+				background: $bg-gradual;
+				color: #fff;
+				padding: 10rpx 20rpx;
+				border-radius: 10rpx;
+			}
+		}
+
 		.item-logo {
 			align-self: flex-start;
 			width: 115rpx;
@@ -178,17 +233,6 @@
 				font-weight: 500;
 				color: $font-color-light;
 			}
-
-			.info-info {
-				width: 100%;
-				font-size: $font-base;
-				font-weight: bold;
-
-				text {
-					color: $color-red;
-				}
-			}
-
 		}
 	}
 </style>

pages/user/admin/orderAdmin.vue

@@ -4,8 +4,10 @@
 			<view v-for="(item, index) in navList" :key="index" class="nav-item"
 				:class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}
 				<template v-if="item.ordertype">
+					<template v-if="shopOrderDetail[item.ordertype]>0">
 					(<text v-if="shopOrderDetail[item.ordertype]>99">99+</text>
 					<text v-else>{{shopOrderDetail[item.ordertype]}}</text>)
+					</template>
 				</template>
 			</view>
 		</view>
@@ -76,6 +78,9 @@
 								<view class="btm-btn ksps" v-if=" item.status_name=='待收货'"  @click.stop="shopNext(item)">
 									导航
 								</view>
+								<view class="btm-btn ksps" v-if=" item.status_name=='未支付'&&shopOrderDetail.is_main_store"  @click.stop="payMoney(item)">
+									确认支付
+								</view>
 							</view>
 						</view>
 					</view>
@@ -91,7 +96,8 @@
 		adminkf,
 		GetAdminOrderList,
 		adminStatistics,
-		deliveryKeep
+		deliveryKeep,
+		offlinePay
 	} from '@/api/water.js';
 	import {
 		mapState,
@@ -134,6 +140,14 @@
 						limit: 10, //每次信息条数
 						ordertype: 'received_count'
 					},
+					{
+						state: 3,
+						text: '待评价',
+						loadingType: 'more',
+						orderList: [],
+						page: 1, //当前页数
+						limit: 10, //每次信息条数
+					},
 					{
 						state: 4,
 						text: '已完成',
@@ -179,6 +193,48 @@
 		// #endif
 		methods: {
 			...mapMutations('shop', ['setShopOrder']),
+			// 重新加载数据
+			reload(){
+				this.navList[this.tabCurrentIndex].orderList=[]
+				this.navList[this.tabCurrentIndex].page=1
+				this.navList[this.tabCurrentIndex].loadingType='more'
+				this.navList[this.tabCurrentIndex].loaded=false
+				this.changeKf()
+				this.loadData()
+			},
+			// 确认支付
+			payMoney(item){
+				const that = this;
+				uni.showModal({
+					title: '支付',
+					content: '是否确认用户已支付？',
+					cancelText: '关闭',
+					confirmText: '确认',
+					success: res => {
+						uni.showLoading({
+							title: '支付中',
+							mask: true
+						});
+						if(res.confirm){
+							offlinePay({
+								order_id:item.order_id
+							}).then((e) => {
+								uni.hideLoading()
+								uni.showToast({
+									title:'支付成功'
+								})
+								that.reload();
+							}).catch((e) => {
+								uni.hideLoading()
+								console.log(e, 'sj');
+							})
+						}
+					},
+					fail: () => {},
+					complete: () => {}
+				});
+				
+			},
 			// 获取订单数量信息
 			adminStatistics() {
 				adminStatistics({}).then((e) => {

pages/user/admin/useradmin.vue

@@ -36,10 +36,10 @@
 					水票:{{item.certificate_num}}
 				</view>
 				<view class="btn flex-shrink-false clamp">
-					押桶:{{item.pledge_num}}
+					持桶:{{item.hold_num}}
 				</view>
 				<view class="btn clamp">
-					押金:5
+					押金:{{+item.pledge_money}}
 				</view>
 			</view>
 		</view>
@@ -127,12 +127,16 @@
 				storeMember({
 						page: navItem.page,
 						limit: navItem.limit,
-						keyword: this.keyword
+						key: this.keyword
 					})
 					.then(({
 						data
 					}) => {
-						let arr = data.data;
+						let arr = data.data.map(
+							(e) => {
+								return e
+							}
+						);
 						navItem.list = navItem.list.concat(arr);
 						// console.log(navItem.orderList);
 						navItem.page++;
@@ -163,10 +167,7 @@
 		border-radius: 30rpx;
 		margin-bottom: 15rpx;
 		color: $font-color-light;
-		.user-base{
-			border-bottom: 1px solid $uni-border-color;
-			margin-bottom: 20rpx;
-		}
+
 		.user-info {
 			height: 72rpx;
 			font-size: 36rpx;
@@ -188,17 +189,19 @@
 		}
 
 		.btn-list {
-			color: $font-color-white;
+			color: $font-color-light;
 			text-align: center;
 			line-height: 1;
 
 			.btn {
-				width: 32%;
+				width: 34%;
 				padding: 20rpx 0;
-				background: $bg-gradual;
-				border-radius: 10rpx;
 				font-weight: 500;
 			}
+			.btn:nth-child(2) {
+				border-right: 1px solid $border-color-base;
+				border-left: 1px solid $border-color-base;
+			}
 		}
 	}
 </style>

pages/water/deposit.vue

@@ -13,8 +13,8 @@
 		<view class="deposit-item">
 			<view class="list flex" v-for="(item,index) in navList[tabCurrentIndex].orderList" @click="open(item)">
 				<view class="content">
-					<view class="title">
-						小金康泉矿泉水
+					<view class="title clamp2">
+						{{item.product.keyword}}
 					</view>
 					<view class="flex type-list">
 						<view class="ls">

pages/water/waterDetail.vue

@@ -305,7 +305,9 @@
 								url:'/pages/home/index'
 							})
 						}else{
-							that.userinfo();
+							uni.reLaunch({
+								url:'/pages/water/waterList'
+							})
 						}
 					},
 					fail: () => {},

pages/water/waterUse.vue

@@ -23,55 +23,31 @@
 							{{ item.order_id }}
 						</view>
 					</view>
-					<text class="font-size-sm font-color-gray" >已完成}</text>
+					<text class="font-size-sm font-color-gray" >已完成</text>
 				</view>
-			
-				<scroll-view v-if="item.cartInfo.length > 0" class="goods-box" scroll-x>
-					<view v-for="(goodsItem, goodsIndex) in item.cartInfo" :key="goodsIndex" class="goods-item">
-						<image class="goods-img" :src="goodsItem.productInfo.image" mode="aspectFill">
+				<scroll-view class="goods-box" scroll-x>
+					<view class="goods-item">
+						<image class="goods-img" :src="item.cart_info.productInfo.image" mode="aspectFill">
 						</image>
 						<view class="good-name clamp">
-							{{goodsItem.productInfo.attrInfo.suk}}*{{goodsItem.cart_num}}
+							{{item.cart_info.productInfo.attrInfo.suk}}*{{item.cart_info.cart_num}}
 						</view>
 					</view>
 				</scroll-view>
 				<view class="info-info">
 					<view class="js">
-						共{{item.cartInfo.length}}件
+						<!-- 共{{item.cartInfo.length}}件 -->
 					</view>
 					<view class="hj">
-						合计:￥{{item.pay_price}}
+						合计:{{+item.number}}/张
 					</view>
 				</view>
 				<!-- 底部操作栏 -->
 				<view class="btm-btn-wrap flex">
 					<view class="btm-left">
-						下单时间：{{item._add_time.split(' ')[0].replace(/-/g,'/')}}
+						下单时间：{{item.day}}
 					</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>
@@ -151,6 +127,7 @@
 						data
 					}) => {
 						let arr = data.data
+						console.log(arr,'arr');
 						navItem.orderList = navItem.orderList.concat(arr);
 						navItem.page++;
 						if (navItem.limit == arr.length) {

utils/newRequest.js

@@ -148,7 +148,7 @@ let service = {
 							filePath: path,
 							name: 'file',
 							header: {
-								"token": uni.getStorageSync('token')
+								"Authori-zation": 'Bearer ' + uni.getStorageSync('token')
 							},
 							success: (uploadFileRes) => {
 								if ("string" === typeof uploadFileRes.data) {