部分退款和选择位置调整

center/orderdetails.vue

@@ -392,7 +392,7 @@
 			},
 			refund(item){
 				console.log('this.orderDetails',this.orderDetails);
-				uni.$u.route('/center/refund', {
+				uni.$u.route('/center/refundselect', {
 					id: this.orderDetails.id,
 					realPrice:this.orderDetails.realPrice
 				});

center/refund.vue

@@ -8,7 +8,7 @@
 			<view class="box base-info">
 				<view class="title u-flex u-row-between">
 					<text>申请退款金额</text>
-					<text>¥ {{realPrice}}</text>
+					<text>¥ {{refundAmount}}</text>
 				</view>
 				<view class="con">
 					（预计3个工作日内退回）
@@ -39,7 +39,8 @@
 			return {
 				staticUrl:this.$commonConfig.staticUrl,
 				orderId:'',
-				realPrice:'',
+				refundAmount:'',
+				viewerList:[],
 				refundReason:'',
 				reasonshow:false,
 				reasonList:[
@@ -61,7 +62,8 @@
 		onLoad(page) {
 			console.log('page',page);
 			this.orderId = page.id;
-			this.realPrice = page.realPrice;
+			this.refundAmount = page.refundAmount;
+			this.viewerList = JSON.parse(page.viewerList);
 			this.getSystemInfo();
 			this.getTemplateIdList();//获取模板列表
 
@@ -70,10 +72,10 @@
 			leftClick(e){
 				let pages = getCurrentPages();
 				if(pages.length==1){
-					console.log('1111');
+					// console.log('1111');
 					uni.$u.route('/pages/index/index')
 				}else{
-					console.log('2222222');
+					// console.log('2222222');
 					uni.navigateBack()
 				};
 			},
@@ -112,11 +114,16 @@
 			handleSubmit(){
 				let params = {
 					orderId:this.orderId,
-					refundReason:this.refundReason
+					refundReason:this.refundReason,
+					refundAmount:this.refundAmount,
+					viewerList:this.viewerList
 				}
 				this.$u.api.refundSubmit(params).then(res=>{
 					uni.$u.toast(res.msg)
-					uni.navigateBack()
+					// uni.navigateBack()
+					setTimeout(()=>{
+						uni.$u.route('/center/order');
+					},1500)
 					console.log('res',res.data);
 				}).catch(err=>{
 					console.log('refundSubmit',err);

center/refundselect.vue

@@ -0,0 +1,310 @@
+<template>
+	<view class="">
+		<u-navbar title="选择退款信息" :placeholder="true" @leftClick="leftClick" :autoBack="false" :safeAreaInsetTop="true">
+		</u-navbar>
+		<view class="item-list">
+			<!-- <view class="til u-flex u-row-between" :style="{top:navHeight+'px'}">
+				<u-checkbox-group @change="allCheckboxChange">
+					<u-checkbox shape="circle" :checked="allChecked" :name="allCheckbox.name"
+						label="观影人列表"></u-checkbox>
+				</u-checkbox-group>
+			</view> -->
+			<u-checkbox-group placement="column" @change="checkboxChange">
+				<view v-for="(item,index) in dataList" :key="item.id" class="item u-flex">
+					<u-checkbox shape="circle" :disabled="item.status !== 3" activeColor="#ED0000" :key="index"
+						:name="item.name" :checked="item.checked" @change="toggleCheck(index)" class="checkbox" />
+					<view class="text" @click="toggleCheck(index)">
+						<view class="up u-flex u-row-between">
+							<view class="left">订单编号：{{item.orderId}}</view>
+							<view class="right status" :class="item.class">{{item.status|filterOrderState}}</view>
+						</view>
+						<view class="down u-flex u-row-between">
+							<view class="left">
+								<view class="name">观影人:{{item.name}}</view>
+								<view class="idcard">身份证号:{{item.idcard}}</view>
+							</view>
+							<view class="right">
+								¥ {{item.salePrice}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</u-checkbox-group>
+		</view>
+		<view class="cart-bottom">
+			<view class="inner u-flex u-row-between">
+				<view class="left u-flex">
+					<view class="checkbox" @click="checkboxClick" style="padding: 10px;">
+						<u-checkbox-group @change="allCheckboxChange">
+							<u-checkbox shape="circle" :checked="allChecked" activeColor="#ED0000" :name="allCheckbox.name"
+								label="全选"></u-checkbox>
+						</u-checkbox-group>
+					</view>
+					<view class="total-price-wrap u-flex">
+						<view class="total">共{{selectGoods.length}}张</view>
+						<view class="totalPrice  u-flex">
+							合计: <text class="num"> {{totalPrice}}</text>
+						</view>
+					</view>
+				</view>
+				<view class="btn active" v-if="selectGoods.length>0&&cansubmit" @click="submitorder">确定</view>
+				<view class="btn" v-else>确定</view>
+			</view>
+		</view>
+		<u-toast ref="uToast"></u-toast>
+	</view>
+</template>
+<script>
+	import {
+		systemInfo
+	} from "@/mixin.js";
+	export default {
+		mixins: [systemInfo], // 使用mixin
+		data() {
+			return {
+				orderId: '',
+				cansubmit: true,
+				staticUrl: this.$commonConfig.staticUrl,
+				allCheckbox: {
+					name: '全选'
+				},
+				options: [{
+					text: '删除',
+					style: {
+						backgroundColor: '#FF3C3F',
+						'padding-left': '10px'
+					}
+				}],
+				// 购物车列表
+				dataList: [],
+			}
+		},
+		computed: {
+			// 是否全选
+			allChecked() {
+				return this.dataList.every(item => item.checked)
+			},
+			selectGoods() {
+				let selectGoods = [];
+				this.dataList.forEach(item => {
+					if (item.checked) {
+						selectGoods.push(item)
+					}
+				})
+				return selectGoods
+			},
+			// 合计价格
+			totalPrice() {
+				let that = this;
+				return this.dataList.reduce((total, item) => {
+					if (item.checked) {
+						let price = null;
+						price = item.salePrice
+						total += price;
+					}
+					return total;
+				}, 0).toFixed(2);
+			}
+		},
+		onLoad(page) {
+			this.getSystemInfo();
+			this.orderId = page.id;
+		},
+		onShow() {
+			this.getViewers();
+		},
+		methods: {
+			leftClick(e) {
+				uni.reLaunch({
+					url: '/pages/index/index'
+				});
+				console.log('leftClick', e);
+			},
+			// 切换全选状态
+			allCheckboxChange(n) {
+				// console.log('allCheckboxChange',n[0]);
+				console.log('allCheckboxChange', n);
+				let selectAll = n[0] ? true : false;
+				this.dataList.forEach(item => {
+					if (item.status === 3) {
+						item.checked = selectAll
+					}
+				})
+			},
+			checkboxClick() {
+				// console.log('checkboxClick',this.allChecked);
+				this.dataList.forEach(item => {
+					if (item.status === 3) {
+						item.checked = !this.allChecked
+					}
+				})
+			},
+			checkboxChange(n) {
+				// console.log('checkboxChange',n);
+			},
+			// 切换商品选中状态
+			toggleCheck(index) {
+				// console.log('toggleCheck',index);
+				if(this.dataList[index].status !== 3){
+					uni.showToast({
+						icon:'none',
+						title:'该状态不能退款',
+						duration:1000
+					})
+					return
+				}
+				this.dataList[index].checked = !this.dataList[index].checked
+			},
+			submitorder() {
+				let viewerList = this.selectGoods.map(item=>{
+					return {viewerId:item.id,salePrice:item.salePrice}
+				});
+				let params = {
+					id:this.orderId,
+					refundAmount:this.totalPrice,
+					viewerList:JSON.stringify(viewerList)
+				};
+				// console.log('selectGoods', this.selectGoods);
+				uni.$u.route('/center/refund', params);
+			},
+			getViewers() {
+				this.$u.api.getViewers({
+					orderId: this.orderId
+				}).then(res => {
+					this.dataList = res.data.list.map(item => {
+						item.checked = false;
+						return {
+							...item,
+							class: {
+							  0: 'status-0',
+							  1: 'status-1',
+							  2: 'status-2',
+							  3: 'status-3',
+							  4: 'status-4',
+							  5: 'status-5',
+							  6: 'status-6',
+							  7: 'status-7',
+							  8: 'status-8'
+							}[item.status] || ''
+						} 
+					})
+				}).catch(err => {
+					console.log('getOrderDetails', err.data);
+				})
+			},
+		}
+	}
+</script>
+<style>
+page {
+	background: #F7F7F9;
+}
+</style>
+<style lang="scss" scoped>
+.item-list{
+	margin: 28rpx 32rpx 20rpx;
+	.item{
+		background: #FFFFFF;
+		border-radius: 20rpx;
+		padding-left: 18rpx;
+		margin-bottom: 24rpx;
+		.text{
+			margin-left: 20rpx;
+			flex: 1;
+			padding: 30rpx 32rpx 52rpx;
+			box-shadow: -6rpx 0rpx 20rpx -18rpx rgba(0,0,0,0.5);
+		}
+		.up{
+			border-bottom: 1px solid #EBEBEB;
+			padding-bottom: 24rpx;
+			margin-bottom: 32rpx;
+			.left{
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #606060;
+			}
+			.status{
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #9E9E9E;
+				&.status-3{
+					color: #56CE53;
+				}
+				&.status-4{
+					color: #FF6C17;
+				}
+			}
+		}
+		.down{
+			.name{
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #363636;
+				margin-bottom: 20rpx;
+			}
+			.idcard{
+				font-size: 22rpx;
+				font-weight: 400;
+				color: #7F7F7F;
+			}
+			.right{
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #ED0000;
+			}
+		}
+	}
+}
+	.cart-bottom {
+		position: relative;
+		z-index: 1001;
+		height: 98rpx;
+
+		.inner {
+			position: fixed;
+			background-color: #fff;
+			height: 98rpx;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			padding: 0 20rpx;
+			padding-left: 0;
+
+			.total-price-wrap {
+				margin-left: 30rpx;
+				.totalPrice{
+					font-size: 30rpx;
+					color: #333;
+					font-weight: 400;
+					.num{
+						font-size: 40rpx;
+						font-weight: bold;
+						color: #ED0000;
+						margin-left: 5px;
+					}
+				}
+				.total{
+					font-size: 20rpx;
+					font-weight: 400;
+					color: #999999;
+					margin-right: 16rpx;
+				}
+			}
+
+			.btn {
+				height: 80rpx;
+				line-height: 80rpx;
+				border-radius: 50rpx;
+				padding: 0 50rpx;
+				background-color: #eee;
+				color: #333;
+				text-align: center;
+
+				&.active {
+					background-color: #FF3C3F;
+					color: #fff;
+				}
+			}
+		}
+	}
+</style>

common/apiurl.js

@@ -157,6 +157,11 @@ const apiurl = {
 		url: '/order/orderInfo/selectById',
 		type: 'get'
 	},
+	// 查询订单观影人信息
+	getViewers: {
+		url: '/order/orderInfo/getViewers',
+		type: 'get'
+	},
 	// 提交退款
 	refundSubmit: {
 		url: '/order/orderInfo/refundSubmit',

common/config.js

@@ -33,8 +33,8 @@ let staticUrl= null // 静态文件地址
 
 //正式
 // #ifdef MP
-	baseUrl='https://serviceapi.wdzzgs.com';
-	upFileUrl='https://serviceapi.wdzzgs.com/thirdapi/upload/single/minio';
+	// baseUrl='https://serviceapi.wdzzgs.com';
+	// upFileUrl='https://serviceapi.wdzzgs.com/thirdapi/upload/single/minio';
 	staticUrl='https://minio.wdzzgs.com/greattransition/staticfile';
 // #endif
 // #ifdef H5

pages.json

@@ -145,6 +145,13 @@
 						"navigationStyle": "custom"
 					}
 				},
+				{
+					"path": "refundselect",
+					"style": {
+						"navigationBarTitleText": "选择退款信息",
+						"navigationStyle": "custom"
+					}
+				},
 				{
 					"path": "paysuccess",
 					"style": {

pages/bookticket.vue

@@ -269,16 +269,16 @@
 					this.visitorList = res.data.list;
 					// this.visitors = this.visitorList.filter(obj => obj.memberId==userId);
 					this.visitors = this.visitorList.filter(obj => that.selectedVisitor.includes(obj.idcard));
-					console.log('this.visitorList',this.visitorList);
+					// console.log('this.visitorList',this.visitorList);
 					// console.log('this.selectedVisitor',this.selectedVisitor);
-					console.log('this.visitors',this.visitors);
+					// console.log('this.visitors',this.visitors);
 				}).catch(err => {
 					console.log('getMemberAll', err);
 				})
 			},
 			confirmVisitor() {
 				let that = this;
-				console.log('selectedVisitor',this.selectedVisitor);
+				// console.log('selectedVisitor',this.selectedVisitor);
 				this.visitorShow = false;
 				this.visitors = this.visitorList.filter(obj => that.selectedVisitor.includes(obj.idcard)).map(item => {
 					return {
@@ -287,7 +287,7 @@
 						idcard: item.idcard
 					}
 				});
-				console.log('this.visitors',this.visitors);
+				// console.log('this.visitors',this.visitors);
 			},
 			delVisitor(visitor) {
 				// console.log('delVisitor',visitor);
@@ -317,7 +317,7 @@
 				this.$u.api.templateIdList({
 					templateLabel: 'order_pay'
 				}).then(res => {
-					console.log('getTemplateIdList', res.data);
+					// console.log('getTemplateIdList', res.data);
 					this.templateIdList = res.data.list.map(item => {
 						return item.templateId
 					});
@@ -393,11 +393,11 @@
 					success: function(res) {
 						if (res.confirm) {
 							//调用订阅消息
-							console.log('用户点击确定');
+							// console.log('用户点击确定');
 							//调用订阅
 							that.setTemplate();
 						} else if (res.cancel) {
-							console.log('用户点击取消');
+							// console.log('用户点击取消');
 							///显示第二个弹说明一下
 							wx.showModal({
 								title: '温馨提示',
@@ -417,7 +417,7 @@
 			// 设置小程序订阅消息
 			setTemplate() {
 				let that = this;
-				console.log('templateIdList', this.templateIdList);
+				// console.log('templateIdList', this.templateIdList);
 				// #ifdef MP
 				uni.requestSubscribeMessage({
 					tmplIds: that.templateIdList,
@@ -458,7 +458,7 @@
 					// }else{
 					// 	uni.$u.route('/shopping/paysuccess');
 					// }
-					console.log('gotoPayres', res.data);
+					// console.log('gotoPayres', res.data);
 				}).catch(err => {
 					this.cansubmit = true;
 					// this.paypass = '';
@@ -615,6 +615,7 @@
 			}
 
 			.text {
+				flex: 1;
 				font-size: 22rpx;
 				font-weight: 400;
 				color: #606060;
@@ -627,6 +628,7 @@
 
 			.name {
 				font-size: 32rpx;
+				line-height: 1.5;
 				font-weight: bold;
 				color: #2D2D2D;
 			}

pages/ticketlist.vue

@@ -83,7 +83,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="date-block auditorium">
+				<view class="date-block auditorium generic-block">
 					<view class="title">演出厅</view>
 					<view class="date-list u-flex u-flex-wrap">
 						<view class="date-item" :class="{active:auditoriumIndex==index}" @click="auditoriumClick(index)" v-for="(date,index) in auditoriumList" :key="index">
@@ -102,30 +102,45 @@
 						当前日期暂无演出场次，请重新选择
 					</view>
 				</view>
-				<view class="date-block ticket-type">
-					<view class="title">门票</view>
+				<view class="date-block ticket-type generic-block">
+					<view class="title">票务信息</view>
 					<view class="empty" v-if="ticketTypeList.length<1">
 						暂无门票
 					</view>
-					<view class="type-item" :class="{active:sessionIndex==index}" v-for="(item,index) in  ticketTypeList" :key="index">
+					<view class="date-list u-flex u-flex-wrap">
+						<view class="date-item" :class="{active:ticketTypeIndex==index}" @click="ticketTypeClick(index)" v-for="(date,index) in ticketTypeList" :key="index">
+							<view class="name">{{ date.goodsName }}</view>
+						</view>
+					</view>
+					<!-- <view class="type-item" :class="{active:sessionIndex==index}" v-for="(item,index) in  ticketTypeList" :key="index">
 						<view class="name-price u-flex u-row-between">
 							<view class="name">{{item.goodsName}}</view>
 							<view class="prices">¥ {{item.salePrice}} 起</view>
 						</view>
-						<!-- <view class="ishave">
-							<text class="text">{{(item.quantity>0&&sessionList.length>=1)?'有票':'无票'}}</text>
-						</view> -->
 						<view class="bottom u-flex u-row-between">
 							<view class="left u-flex" v-html="item.goodsSnapshot||''">
-								<!-- 购票须知
-								<u-icon name="arrow-right" color="#7F7F7F" size="24rpx"></u-icon> -->
-								<!-- {{item.goodsSnapshot||''}} -->
 							</view>
 							<view class="btn" @click="book(item)" v-if="item.quantity!==0&&sessionList.length>=1">预定</view>
 							<view class="btn disabled" v-else>无票</view>
 						</view>
+					</view> -->
+				</view>
+				<view class="date-block position-select generic-block">
+					<view class="title u-flex u-row-between">
+						<view class="">类型选择</view>
+						<view v-if="positionData.seatImg" class="" style="font-size: 24rpx;color: #aaa" @click="showSeatImg">票区图</view>
+					</view>
+					<view class="empty" v-if="positionArr.length<1">
+						没有座位信息
+					</view>
+					<view class="date-list u-flex u-flex-wrap">
+						<view class="date-item" :class="{active:positionIndex==index}" @click="positionClick(index)" v-for="(date,index) in positionArr" :key="index">
+							<view class="name">{{ date.seatTypeName }} <br />¥ {{date.salePrice}}</view>
+						</view>
 					</view>
 				</view>
+				<view class="book-btn full-btn" v-if="positionArr.length>=1" @click="book()">确定</view>
+				<view class="full-btn gray" v-else>确定</view>
 			</view>
 			<!-- ticket end -->
 			<view class="details" v-if="tabsIndex==1">
@@ -255,6 +270,11 @@
 				formerNotice:{},//节目观影须知
 				performDateList:[],//有票的日期
 				// firstGet:0,
+				ticketTypeIndex:0,
+				positionData:{},//座位信息接口
+				positionArr:[],
+				positionIndex:0,
+				
 			}
 		},
 		onShow() {
@@ -380,13 +400,19 @@
 						item.performTimeEnd = item.performTimeEnd;
 						return item
 					});
-					uni.hideLoading();
+					this.sessionIndex = 0;
+					let session = this.sessionList[this.sessionIndex];
+					this.getPositionData();
 				}).catch(err=>{
 					console.log('getPoster',err);
 				})
 			},
 			 formatter: (day) => {
+				 if(!parentThis){
+				 	return
+				 }
 				 day.date = moment(day.date).format("YYYY-MM-DD HH:mm:ss")
+				 
 				 // console.log('day',day);
 				 // console.log('thisthisthisthisthisthisthisthisthis',parentThis);
 				 // console.log('==================================',day.date.toISOString().split('T')[0]);
@@ -480,7 +506,47 @@
 				this.tabsIndex = e.index;
 			},
 			sessionClick(index){
+				if(this.sessionIndex==index){
+					// console.log('不变');
+					return
+				}
 				this.sessionIndex = index;
+				let session = this.sessionList[this.sessionIndex];
+				this.getPositionData();
+				console.log('sessionClick',this.sessionList[this.sessionIndex]);
+			},
+			getPositionData(){
+				let session = this.sessionList[this.sessionIndex]||{};
+				let ticketType = this.ticketTypeList[this.ticketTypeIndex];
+				let params ={
+					performId:this.performId,
+					goodsId:ticketType.id,
+					auditoriumId:this.auditoriumList[this.auditoriumIndex].id,
+					performTimeId:session.id,
+				}
+				this.$u.api.selectRegion(params).then(res=>{
+					// console.log('getPositionData',res.data);
+					this.positionData =  res.data;
+					this.positionArr = res.data.regionPriceList||[];
+					uni.hideLoading();
+				}).catch(err=>{
+					uni.hideLoading();
+					console.log('getPositionData',err);
+				})
+			},
+			ticketTypeClick(index){
+				if(this.ticketTypeIndex==index){
+					// console.log('不变');
+					return
+				}
+				this.ticketTypeIndex = index;
+			},
+			positionClick(index){
+				if(this.positionIndex==index){
+					// console.log('不变');
+					return
+				}
+				this.positionIndex = index;
 			},
 			book(item){
 				// console.log('book',item);
@@ -490,16 +556,33 @@
 				let performTimeStart = session.performTimeStart;
 				let performTimeEnd = session.performTimeEnd;
 				let dateOBJ = this.dateList[this.dateIndex];
-				uni.$u.route('pages/chosenposition',{
-					goodsId:item.id,
+				let ticketType = this.ticketTypeList[this.ticketTypeIndex];
+				let seatType = this.positionArr[this.positionIndex];
+				// console.log('ticketType',ticketType);
+				
+				let params ={
 					performId:this.performId,
-					performName:this.performInfo.name,
-					day:`${dateOBJ.year}-${dateOBJ.month}-${dateOBJ.day}`,
-					performTimeStart:session.performTimeStart,
-					performTimeEnd:session.performTimeEnd,
+					goodsId:ticketType.id,
+					auditoriumId:this.auditoriumList[this.auditoriumIndex].id,
 					performTimeId:session.id,
-					auditoriumId:this.auditoriumList[this.auditoriumIndex].id
-				})
+					seatTypeId:seatType.seatTypeId,
+					salePrice:seatType.salePrice
+				}
+				// console.log('book params',params);
+				uni.$u.route('pages/bookticket',params)
+				
+				
+				// 调整选择位置类型页面
+				// uni.$u.route('pages/chosenposition',{
+				// 	goodsId:item.id,
+				// 	performId:this.performId,
+				// 	performName:this.performInfo.name,
+				// 	day:`${dateOBJ.year}-${dateOBJ.month}-${dateOBJ.day}`,
+				// 	performTimeStart:session.performTimeStart,
+				// 	performTimeEnd:session.performTimeEnd,
+				// 	performTimeId:session.id,
+				// 	auditoriumId:this.auditoriumList[this.auditoriumIndex].id
+				// })
 			},
 			openShare(){
 				if(!this.performInfo.posterImg){
@@ -676,6 +759,17 @@
 						console.log('fail');
 					}
 				});
+			},
+			showSeatImg(){
+				if(!this.positionData.seatImg){
+					uni.$u.toast('没有图片')
+					return
+				}
+				let urls = [];
+				urls.push(this.positionData.seatImg)
+				uni.previewImage({
+					urls: urls,
+				})
 			}
 
 		}

static/css/common.scss

@@ -175,7 +175,7 @@ $pagegap:32rpx;
 		}
 	}
 }
-.date-block.auditorium{
+.date-block.generic-block{
 	.name{
 		margin-bottom: 0;
 		padding: 34rpx 0;