Pārlūkot izejas kodu

Merge branch 'master' of http://39.101.143.165:8090/hxl13994548489/LocalLivingServicesUniapp

lihongxiao 1 gadu atpakaļ
vecāks
revīzija
c53cce41be

+ 8 - 0
common/router/modules/routes.js

@@ -151,6 +151,14 @@ const routes = [{
 			title: '订单详情',
 		},
 	},
+	{
+		//注意:path必须跟pages.json中的地址对应,最前面别忘了加'/'哦
+		path: '/pages/order/record',
+		name: 'record',
+		meta: {
+			title: '协商记录',
+		},
+	},
 	{
 		//注意:path必须跟pages.json中的地址对应,最前面别忘了加'/'哦
 		path: '/pages/scan/scan',

+ 1 - 0
components/dengrq-datetime-picker/dateSelector/index.js

@@ -276,6 +276,7 @@ export default {
     },
     onCancel() {
       this.resetData();
+			this.$emit('cut')
     },
     onConfirm() {
       if (this.validateInput()) {

+ 4 - 0
pages.json

@@ -42,6 +42,10 @@
 			"path": "pages/order/details",
 			"style": {}
 		},
+		{
+			"path": "pages/order/record",
+			"style": {}
+		},
 		{
 			"path": "pages/index/full",
 			"style": {}

+ 1 - 1
pages/evaluate/evaluate.vue

@@ -22,7 +22,7 @@
 					</view>
 					<view class="separate"></view>
 					<view class="right">
-						<view class="line" v-for="(item,index) in statistics.commentAppSumVos">
+						<view class="line" v-for="(item,index) in statistics.commentAppSumVos" :key="index">
 							<span>{{item.name}}</span><u-line-progress :percent="item.percent" active-color="#FF5D39"
 								style="width: 230rpx;margin-right:5rpx"></u-line-progress>{{item.percent}}%
 						</view>

+ 5 - 4
pages/index/index.vue

@@ -141,18 +141,19 @@
 			}
 		},
 		mounted() {
-			this.gettodayData()
-			this.getMessage()
+			
 			// let info = 
 			let that = this
 		},
 		onShow() {
+			this.gettodayData()
+			this.getMessage()
 			let that = this
 			uni.getStorage({
 				key: 'login_user_info',
 				success: function (res) {
 					that.name = res.data.merchantName
-						that.merchantId = res.data.merchantId
+					that.merchantId = res.data.merchantId
 				}
 			});
 		}
@@ -168,7 +169,7 @@
 		.head {
 			width: 100%;
 			height: 272rpx;
-			background: linear-gradient(90deg, #E6FFFF 0%, #CEF7FF 40%, #A3CEFE 73%, #BCD6FF 100%), linear-gradient(to bottom , #F7F8FC 0%, rgba(247,248,252,0) 100%);
+			background: linear-gradient(90deg, #E6FFFF 0%, #CEF7FF 40%, #A3CEFE 73%, #BCD6FF 100%), linear-gradient(360deg, #F7F8FC 0%, rgba(247,248,252,0) 100%);
 			padding: 20rpx;
 			.header {
 				width: 100%;

+ 203 - 18
pages/order/details.vue

@@ -1,18 +1,23 @@
 <template>
 	<view class="check">
 		<view class="top">
-
 		</view>
 		<view class="head">
 			<span class="cuIcon-back" @click="back"></span>
 			<view class="case">
-				售后详情
+				订单详情
 			</view>
 		</view>
 		<view class="content">
 			<view class="status">
-				{{product.state}}<br />
-				<span>顾客于2025/12/30 12:20:47下单</span>
+				<view class="status_title">
+					{{product.state}}
+					<span>¥{{product.costPrice}}</span>
+				</view>
+				<view class="span">{{product.buyTime}}</view>
+			</view>
+			<view class="refund" @click="cutPopup" v-if="product.refundType == 1">
+				退款去向详情
 			</view>
 			<view class="product">
 				<view class="title">
@@ -32,6 +37,12 @@
 				</view>
 			</view>
 			<view class="product">
+				<view class="title negotiate" v-if="product.auditType">
+					协商历史
+					<view class="look" @click="goRecord" >
+						查看详情
+					</view>
+				</view>
 				<view class="title">
 					订单信息
 				</view>
@@ -49,7 +60,7 @@
 				</view>
 				<view class="data">
 					<span>联系电话</span>
-					{{product.userPhone}}
+					{{product.phone}}
 				</view>
 				<view class="data">
 					<span>下单时间</span>
@@ -65,6 +76,35 @@
 				</view>
 			</view>
 		</view>
+		<view class="popup" v-if="isDetail">
+			<view class="content">
+				<view class="title">
+					<span>退款去向详情</span>
+					<image src="/static/index/cut.png" alt="" @click="cutPopup" />
+				</view>
+				<view class="detail">
+					<view class="amount">
+						实退金额
+						<view class="money">
+							<span>¥</span>228.3
+						</view>
+					</view>
+					<view class="text">
+						退款已成功到账
+					</view>
+					<view class="fund">
+						实退金额
+						<span>¥228.3</span>
+					</view>
+					<view class="card">
+						退回(建设银行借记卡8009),退款单号为12523726342632478326483247382
+					</view>
+					<view class="card">
+						2025/12/30 12:20:47
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -72,10 +112,11 @@
 	export default {
 		data() {
 			return {
-			orderId:'',
-			product:{
-				
-			}
+				orderId: '',
+				product: {
+
+				},
+				isDetail:false
 			}
 		},
 		methods: {
@@ -85,13 +126,33 @@
 					delta: 1
 				});
 			},
-			getDetail(){
-			this.$http.get("/app/order/locaOrder/queryById?orderId="+this.orderId,).then(res => {
-				if (res.data.code == 200) {
-					console.log(res)
-					this.product = res.data.result
-				}
-			})
+			getDetail() {
+				this.$http.get("/app/order/locaOrder/queryById?orderId=" + this.orderId, ).then(res => {
+					if (res.data.code == 200) {
+						console.log(res)
+						this.product = res.data.result
+					}
+				})
+			},
+			goRecord() {
+				uni.navigateTo({
+					url: '/pages/order/record?orderId=' + this.product.orderId
+				})
+			},
+			cutPopup(){
+				this.isDetail = !this.isDetail
+			},
+			refundDetail(){
+				this.isDetail = true
+			},
+			//获取退款去向
+			getRefund(){
+				this.$http.get("/app/order/locaOrder/refundDestination?reOrderId=" + this.orderNo).then(res => {
+					if (res.data.code == 200) {
+						console.log(res)
+						// this.list = res.data.result
+					}
+				})
 			}
 		},
 		onLoad(option) {
@@ -123,7 +184,7 @@
 			padding: 20rpx;
 			display: flex;
 			align-items: center;
-			background: linear-gradient(87deg, #E2F4F8 0%, #A3CDFF 100%), linear-gradient(360deg, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%);
+			background: linear-gradient( 87deg, #E2F4F8 0%, #A3CDFF 100%), linear-gradient( 360deg, #FFFFFF 0%, rgba(255,255,255,0) 100%);
 			position: relative;
 
 			.cuIcon-back {
@@ -148,13 +209,34 @@
 				padding: 0px 20rpx;
 				color: #333333;
 
-				span {
+				.status_title {
+					display: flex;
+					justify-content: space-between;
+					margin-bottom: 15rpx;
+				}
+
+				.span {
 					font-size: 28rpx;
 					color: #666666;
 					line-height: 33rpx;
+					font-size: 32rpx;
+					color: #333333;
+					font-weight: 500;
+
 				}
 			}
 
+			.refund {
+				width: 632rpx;
+				height: 76rpx;
+				border-radius: 12rpx;
+				border: 1px solid #000000;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin: 24rpx auto;
+			}
+
 			.product {
 				width: 100%;
 				margin-top: 24rpx;
@@ -168,6 +250,26 @@
 					color: #333333;
 				}
 
+				.negotiate {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 24rpx;
+
+					.look {
+						width: 152rpx;
+						height: 50rpx;
+						background: rgba(68, 154, 255, 0.05);
+						border-radius: 8rpx;
+						border: 1px solid #449AFF;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						font-size: 26rpx;
+						color: #449AFF;
+					}
+				}
+
 				.center {
 					display: flex;
 					border-radius: 16rpx;
@@ -227,5 +329,88 @@
 				}
 			}
 		}
+
+		.popup {
+			width: 100vw;
+			height: 100vh;
+			position: fixed;
+			top: 0;
+			left: 0;
+			background: rgba(0, 0, 0, 0.4);
+
+			.content {
+				width: 100%;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 0rpx 0px;
+				padding: 20rpx 24rpx;
+				padding-bottom: 16rpx;
+				position: absolute;
+				bottom: 0;
+				left: 0;
+
+				.title {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					position: relative;
+					border-bottom: 1px solid #EEEEEE;
+					padding-bottom: 20rpx;
+					font-weight: 600;
+
+					image {
+						width: 37rpx;
+						height: 37rpx;
+						position: absolute;
+						right: 0;
+					}
+				}
+
+				.detail {
+					padding: 20rpx;
+					border-radius: 12rpx;
+					background-color: #F7F8FC;
+					margin-top: 24rpx;
+
+					.amount {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						font-weight: 600;
+
+						.money {
+							font-size: 28rpx;
+							color: #FD4912;
+
+							span {
+								font-size: 16rpx
+							}
+						}
+					}
+
+					.text {
+						font-size: 26rpx;
+						color: #666666;
+						margin-top: 12rpx;
+						border-bottom: 1px solid #EEEEEE;
+						padding-bottom: 16rpx;
+					}
+
+					.fund {
+						font-size: 28rpx;
+						color: #333333;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						margin-top: 16rpx;
+					}
+
+					.card {
+						font-size: 26rpx;
+						color: #666666;
+						margin-top: 12rpx;
+					}
+				}
+			}
+		}
 	}
 </style>

+ 13 - 8
pages/order/index.vue

@@ -4,7 +4,7 @@
 
 			<view class="top"></view>
 			<view class="head">
-				<span class="cuIcon-back" @click="back"></span>
+				<!-- <span class="cuIcon-back" @click="back"></span> -->
 				<view class="case">
 					订单
 				</view>
@@ -58,14 +58,14 @@
 					<view class="time_left">
 						顾客于{{item.buyTime}}
 					</view>
-					<view class="time_right" @click="goDetails">
+					<view class="time_right" @click.stop="goRecord(item)" v-if="item.auditType =='0'">
 						去处理
 					</view>
 				</view>
 			</view>
 			<!-- </view> -->
 		</mescroll-uni>
-		<rangTime ref="rangTime" :mode="mode" :isYear="true" @onSubmit="onEndTimeChange" />
+			<rangTime ref="rangTime" :mode="mode" :isYear="true" @onSubmit="onEndTimeChange" @cut="cutPopup"/>
 	</view>
 
 </template>
@@ -134,6 +134,10 @@
 				}
 				this.getList(page)
 			},
+			cutPopup(){
+				this.isYear = false
+				uni.showTabBar()
+			},
 			mescrollInit(mescroll) {
 				this.mescroll = mescroll;
 			},
@@ -160,9 +164,10 @@
 				this.getList(page)
 			},
 			//跳转至订单详情页
-			goDetails() {
+			goRecord(item) {
+				console.log(item)
 				uni.navigateTo({
-					url: '/pages/order/details'
+					url: '/pages/order/record?orderId='+item.orderId
 				})
 			},
 			getList(page) {
@@ -193,7 +198,7 @@
 				uni.navigateTo({
 					url: '/pages/order/details?orderId=' + item.orderId
 				})
-			}
+			},
 		},
 		mounted() {
 			this.mescroll.optDown.use = false
@@ -214,7 +219,7 @@
 <style lang="scss" scoped>
 	.order {
 		width: 100%;
-		height: 100vh;
+		height:100vh;
 		background: #F7F8FC;
 		display: flex;
 		flex-direction: column;
@@ -318,7 +323,7 @@
 			width: 100%;
 			margin-top: 20rpx;
 			overflow-y: auto;
-			padding-bottom: 100rpx;
+			padding-bottom: var(--window-bottom);
 			.order_item {
 				width: 100%;
 				background-color: #fff;

+ 491 - 0
pages/order/record.vue

@@ -0,0 +1,491 @@
+<template>
+	<view class="record">
+		<view class="top">
+		</view>
+		<view class="head">
+			<span class="cuIcon-back" @click="back"></span>
+			<view class="case">
+				协商记录
+			</view>
+		</view>
+		<view class="product">
+			<view class="img">
+				<image :src="list.productImage" mode=""></image>
+			</view>
+			<view class="name">
+				{{list.productName}}
+				<view class="price">
+					退款金额:{{list.orderPrice}}
+				</view>
+			</view>
+		</view>
+		<view class="history">
+			<view class="client"  v-for="(item,index) in list.afterSaleReasonVo" :key="index">
+				<view class="title">
+					<view class="img" v-if="item.refundType == 0">
+						<image :src="item.userAvatar" alt="" />
+					</view>
+					<view class="img" v-else>
+						<image :src="item.logo" alt="" />
+					</view>
+					<view class="message"  v-if="item.refundType == 0">
+						{{item.nickName}}<br />
+						<span>{{item.createTime}}</span>
+					</view>
+					<view class="message" v-else>
+						{{item.corporateName}}<br />
+						<span>{{item.rejectionTime}}</span>
+					</view>
+				</view>
+				<!-- 用户提交 -->
+				<view class="" v-if="item.refundType == 0">
+					<view class="information">
+						退货金额:¥ {{item.refundPrice}}
+					</view>
+					<view class="information">
+						联系方式:{{item.phone}}
+					</view>
+					<view class="information">
+						申请原因:{{item.reason}}
+					</view>
+					<view class="information">
+						补充说明:{{item.reasonReasonExplain}}
+					</view>
+				</view>
+				<!-- 商家拒绝 -->
+				<view class="" v-if="item.refundType == 1">
+				<view class="information" >
+					拒绝原因:{{item.refuseReason}}
+				</view>
+				<view class="information">
+					补充说明:{{item.refuseReasonExplain}}
+				</view>
+					</view>
+				<!-- 商家同意 -->
+				<!-- <view class="information" v-if="item.refundType == 0">
+					您已同意退货退款,平台会将退款原路退回。
+				</view> -->
+				<view class="request" v-if="item.auditType ==0">
+					<view class="btn" @click="reject(item)">拒绝</view>
+					<view class="btn" @click="agree(item)">同意</view>
+				</view>
+			</view>
+		</view>
+		<!-- 拒绝原因弹窗 -->
+		<view class="popup" v-if="isRefuse">
+			<view class="content">
+				<view class="title">
+					<span>拒绝原因 </span>
+					<image src="/static/index/cut.png" alt="" @click="cutPopup" />
+				</view>
+				<view class="popup_title">
+					拒绝原因
+				</view>
+				<view class="item" v-for="(item,index) in reasonList" :key="index" @click="selectReason(item,index)">
+					{{item.text}}
+					<image v-if="item.check" src="/static/product/select.png" mode=""></image>
+					<image v-else src="/static/product/round.png" mode=""></image>
+				</view>
+				<view class="popup_title">
+					补充说明(选填)
+					<view class="input">
+						<textarea v-model="rejectData.refuseReasonExplain" type="textarea" :maxlength="500" rows="3" />
+						<span>{{ rejectData.refuseReasonExplain.length }}/500</span>
+					</view>
+				</view>
+				<view class="submit">
+					<view class="cancel_btn" @click="cutPopup">
+						取消
+					</view>
+					<view class="submit_btn" @click="refusalRefund">
+						确定
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [],
+				orderNo: '',
+				reasonList: [{
+						name: '商品已使用',
+						check: false,
+					},
+					{
+						name: '服务已核销',
+						check: false,
+					}
+				],
+				isRefuse: false,
+				rejectData: {
+					id: '',
+					reOrderId: '',
+					refuseReason: '',
+					refuseReasonExplain: ''
+				}
+			}
+		},
+		methods: {
+			//返回
+			back() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+			getRecord() {
+				let data = {
+					orderNo: this.orderNo
+				}
+				this.$http.get("/app/order/locaOrder/afterSaleDetails?orderNo=" + this.orderNo).then(res => {
+					if (res.data.code == 200) {
+						console.log(res)
+						this.list = res.data.result
+					}
+				})
+			},
+			selectReason(item, index) {
+				console.log(item)
+				this.reasonList.forEach(reason => {
+					reason.check = false;
+				});
+				this.reasonList[index].check = true
+				this.rejectData.refuseReason = item.value
+			},
+			cutPopup() {
+				this.isRefuse = false
+			},
+			reject(item) {
+				console.log(item)
+				
+				this.isRefuse = true
+				this.rejectData.id = item.id
+				this.rejectData.reOrderId = item.reOrderId
+			},
+			//提交拒绝
+			refusalRefund() {
+				if(this.rejectData.refuseReason==''){
+					uni.showToast({
+						icon: 'none',
+						title: '选择拒绝原因'
+					})
+					return
+				}else{
+					this.$http.post("/app/order/locaOrder/refusalRefund", this.rejectData).then(res => {
+						if (res.data.code == 200) {
+							console.log(res)
+							uni.showToast({
+								icon: 'none',
+								title: '拒绝成功'
+							})
+							this.isRefuse = false
+							this.getRecord()
+							// this.list = res.data.result
+						}
+					})
+				}
+
+			},
+			getCodeList() {
+				this.$http.get("/sys/api/getManyDictItems?dictCodeList=" + 'reason_refusal').then(res => {
+					if (res.statusCode == 200) {
+						// 
+						res.data.reason_refusal.forEach(item => {
+							item.check = false
+						})
+						this.reasonList = res.data.reason_refusal
+					}
+				})
+			},
+			// 同意退款
+			agree(item){
+				uni.showToast({
+					icon: 'none',
+					title: '商家已同意退款'
+				})
+			}
+		},
+		mounted() {
+			this.getRecord()
+			this.getCodeList()
+		},
+		onLoad(options) {
+			this.orderNo = options.orderId
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.record {
+		width: 100vw;
+		height: 100vh;
+		background: #F7F8FC;
+		display: flex;
+		flex-direction: column;
+		/*#ifdef APP-PLUS*/
+		.top {
+			width: 100%;
+			height: var(--status-bar-height);
+			background: #FFFFFF;
+		}
+
+		/*#endif*/
+		.head {
+			width: 100%;
+			height: 112rpx;
+			padding: 20rpx;
+			display: flex;
+			align-items: center;
+			background: #FFFFFF;
+			position: relative;
+
+			.cuIcon-back {
+				font-size: 40rpx;
+				margin-right: 40rpx;
+			}
+
+			.case {
+				position: absolute;
+				left: 50%;
+				transform: translateX(-50%);
+				font-size: 36rpx;
+				font-weight: 600;
+			}
+		}
+
+		.product {
+			
+			display: flex;
+			border-radius: 16rpx;
+			padding: 20rpx 24rpx;
+			background-color: #FFFFFF;
+			border-top: 1px solid #eeeeee;
+
+			.img {
+				width: 132rpx;
+				height: 132rpx;
+				border-radius: 12rpx;
+				overflow: hidden;
+				margin-right: 16rpx;
+
+				image {
+					width: 132rpx;
+					height: 132rpx;
+				}
+			}
+
+			.name {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				font-size: 28rpx;
+				color: #000000;
+				line-height: 35rpx;
+
+				.price {
+					font-size: 26rpx;
+					color: #666666;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					span {
+						color: #666666;
+					}
+				}
+			}
+		}
+
+		.history {
+			flex: 1;
+			overflow-y: auto;
+			padding: 0px 24rpx;
+			margin-top: 18rpx;
+
+			.client {
+				background-color: #FFFFFF;
+				padding: 20rpx 16rpx;
+				box-shadow: 0px 2rpx 8rpx 0px rgba(214, 225, 237, 0.1);
+				border-radius: 16rpx;
+				margin-bottom: 20rpx;
+
+				.title {
+					display: flex;
+					border-bottom: 1px solid #EEEEEE;
+					padding-bottom: 16rpx;
+					margin-bottom: 16rpx;
+
+					.img {
+						width: 80rpx;
+						height: 80rpx;
+						margin-right: 12rpx;
+						border-radius: 8rpx;
+						overflow: hidden;
+
+						image {
+							width: 80rpx;
+							height: 80rpx;
+						}
+					}
+
+					.message {
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						font-size: 28rpx;
+						color: #000000;
+
+						span {
+							font-size: 24rpx;
+							color: #999999;
+						}
+					}
+				}
+
+				.information {
+					font-size: 26rpx;
+					color: #333333;
+					margin-bottom: 10rpx;
+					word-wrap: break-word;
+				}
+
+				.request {
+					display: flex;
+					align-items: center;
+					justify-content: end;
+					margin-top: 16rpx;
+
+					.btn {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 112rpx;
+						height: 47rpx;
+						border-radius: 47rpx;
+						border: 1px solid #449AFF;
+						font-size: 24rpx;
+						color: #449AFF;
+						margin-left: 24rpx;
+					}
+				}
+			}
+		}
+
+		.popup {
+			width: 100vw;
+			height: 100vh;
+			position: fixed;
+			top: 0;
+			left: 0;
+			background: rgba(0, 0, 0, 0.4);
+
+			.content {
+				width: 100%;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 0rpx 0px;
+				padding: 20rpx 24rpx;
+				padding-bottom: 16rpx;
+				position: absolute;
+				bottom: 0;
+				left: 0;
+
+				.title {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					position: relative;
+					border-bottom: 1px solid #EEEEEE;
+					padding-bottom: 20rpx;
+					font-weight: 600;
+
+					image {
+						width: 37rpx;
+						height: 37rpx;
+						position: absolute;
+						right: 0;
+					}
+				}
+
+				.popup_title {
+					font-size: 30rpx;
+					color: #333333;
+					margin-top: 20rpx;
+					font-weight: 600;
+
+					.input {
+						width: 100%;
+						// min-height: 196rpx;
+						margin-top: 15rpx;
+						padding: 16rpx 16rpx;
+						background: #F1F1F2;
+						border-radius: 4rpx;
+						overflow-y: auto;
+						font-weight: normal;
+
+						textarea {
+							width: 100%;
+							height: 196rpx;
+						}
+
+						span {
+							display: block;
+							text-align: right;
+						}
+					}
+				}
+
+				.item {
+					height: 70rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					border-bottom: 1px solid #EEEEEE;
+
+					image {
+						width: 28rpx;
+						height: 28rpx;
+					}
+				}
+
+				.submit {
+					height: 112rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-around;
+					border-top: 1px solid #eeeeee;
+					margin-top: 20rpx;
+
+					.cancel_btn {
+						width: 324rpx;
+						height: 76rpx;
+						border-radius: 54rpx;
+						border: 1px solid #CCCCCC;
+						font-size: 28rpx;
+						color: #999999;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+					}
+
+					.submit_btn {
+						width: 324rpx;
+						height: 76rpx;
+						border-radius: 54rpx;
+						background: linear-gradient(90deg, #77B6FF 0%, #449AFF 100%);
+						border: 1px solid #CCCCCC;
+						font-size: 28rpx;
+						color: #FFFFFF;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 1 - 1
pages/product/creatProduct.vue

@@ -234,7 +234,7 @@
 				showRule: '', //显示退款规则文字
 				action: configService.apiUrl+'/sys/common/upload', //图片上传地址
 				// action: 'http://192.168.0.36:8080/jeecg-boot/sys/common/upload', //图片上传地址
-				schedule: 1, //进度
+				schedule: 2, //进度
 				fileList: [],
 				selectedTime: null,
 				isSelectDate: false,

+ 1 - 1
pages/product/group.vue

@@ -16,7 +16,7 @@
 				</view>
 				<view class="list" v-for="(item,index) in groupList" :key="index">
 					<view class="name">{{item.groupName}}</view>
-					<view class="single" v-for="(row,ind) in item.singleProduct">
+					<view class="single" v-for="(row,ind) in item.singleProduct" :key="ind">
 						<view class="single_name">
 							{{row.productName}}
 						</view>

+ 1 - 1
pages/product/index.vue

@@ -51,7 +51,7 @@
 					<view class="data">
 						<span>{{item.productName}}</span>
 						<!-- <span>售卖时间:{{item.time}}</span> -->
-						<view class="repertory">库存:不限 <span></span> 销量:{{item.soldQuantity}}</view>
+						<view class="repertory">库存:{{item.stockQuantity}} <span></span> 销量:{{item.soldQuantity}}</view>
 						<view class="price">
 							<span style="font-size: 22rpx;margin: 0px;">¥</span>{{item.soldPrice}}
 							<span style="color:#999 ;font-size: 22rpx; text-decoration: line-through;">¥{{item.price}}</span>

+ 6 - 1
pages/scan/record.vue

@@ -22,7 +22,7 @@
 			</u-dropdown> -->
 		</view>
 		<mescroll-uni class="list" :fixed="false" ref="mescrollRef" @up="getList" @init="mescrollInit" :use="false">
-			<view class="item" v-for="(item,index) in list" :key="index">
+			<view class="item" v-for="(item,index) in list" :key="index" @click="goDetail(item)">
 				<view class="time">
 					{{item.writeOffTime}}核销
 				</view>
@@ -104,6 +104,11 @@
 					size: 10
 				}
 				this.getList(page)
+			},
+			goDetail(item){
+				uni.navigateTo({
+					url:'/pages/scan/check'
+				})
 			}
 		},
 		mounted() {

BIN
static/index/cut.png


BIN
static/product/round.png