阶段完成

center/applydetails.vue

@@ -9,19 +9,18 @@
 			<view class="status-content">
 				<view class="status-item" v-if="orderDetails.status==0">
 					<view class="text">正在审核，请耐心等待1到2个工作日～</view>
-				<!-- 	<view class="btn-wrap u-flex u-row-center" v-if="countdown!='支付超期'">
-						<view class="btn cancel" @click="cancelOrder">取消订单</view>
-						<view class="btn" @click="gotoPay(orderDetails.id)">立即支付</view>
-					</view> -->
-				</view>
-				<view class="status-item" v-else-if="orderDetails.status==3">
-					<view class="text"><text v-if="countdown!='演出已开始'">距离演出开始，还剩 </text>{{countdown}}</view>
+					<view class="btn-wrap u-flex u-row-center">
+						<view class="btn cancel" @click="cancelApply">取消订单</view>
+					</view>
 				</view>
-				<view class="status-item" v-else-if="orderDetails.status==6">
-					<view class="text"><text>退款失败: </text>{{refundInfo.errReason}}</view>
+				<view class="status-item" v-else-if="orderDetails.status==2">
+					<view class="text">报名失败！</view>
+					<view class="btn-wrap u-flex u-row-center">
+						<view class="btn white" @click="$u.route('/pages/ticketlist',{id:orderDetails.performId})">重新报名</view>
+					</view>
 				</view>
 				<view class="status-item" v-else>
-					<view class="text">{{orderDetails.status|filterOrderState}}</view>
+					<view class="text">{{orderDetails.status|filterApplyState}}</view>
 				</view>
 			</view>
 			<view class="base-info">
@@ -70,8 +69,8 @@
 			</view>
 			<view class="box order-info">
 				<view class="title u-flex u-row-between">
-					订单信息
-					<text class="btn" v-if="orderDetails.status==3" @click="refund">申请退款</text>
+					报名信息
+					<!-- <text class="btn" v-if="orderDetails.status==3" @click="refund">申请退款</text> -->
 				</view>
 				<view class="order-info-item" v-for="(item,index) in orderInfo[orderDetails.status]" :key="index">
 					<text class="til">{{item.name}}</text>
@@ -176,9 +175,9 @@
 				// 状态(0待支付，2超时取消，3支付完成，待使用，4退款中，5己退款，6退款失败，7己使用，8己超期）
 				orderInfo:{
 					0:[{name:'需付金额',key:'priceTotal'},{name:'订单编号',key:'id'},{name:'申请时间',key:'createTime'},{name:'报名状态',key:'status'}],
-					1:[{name:'订单编号',key:'id'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
-					2:[{name:'订单编号',key:'id'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
-					3:[{name:'订单金额',key:'realPrice'},{name:'订单编号',key:'id'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
+					1:[{name:'需付金额',key:'priceTotal'},{name:'下单时间',key:'createTime'},{name:'报名状态',key:'status'}],
+					2:[{name:'需付金额',key:'priceTotal'},{name:'下单时间',key:'createTime'},{name:'报名状态',key:'status'},{name:'失败原因',key:'errReason'}],
+					3:[{name:'需付金额',key:'priceTotal'},{name:'下单时间',key:'createTime'},{name:'报名状态',key:'status'}],
 					4:[{name:'订单编号',key:'id'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'}],
 					5:[{name:'订单编号',key:'id'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'},{name:'备注信息',key:'remark'}],
 					6:[{name:'订单编号',key:'id'},{name:'下单时间',key:'createTime'},{name:'支付方式',key:'payWay'},{name:'支付时间',key:'payTime'},{name:'备注信息',key:'remark'}],
@@ -357,6 +356,7 @@
 				  evaluate:this.evaluate,
 				  refund:this.refund,
 				  cancelOrder:this.cancelOrder,
+				  cancelApply:this.cancelApply,
 				  viewRefund:this.viewRefund,
 				  confirmReceipt:this.confirmReceipt
 				};
@@ -423,6 +423,29 @@
 				// console.log('logistics',item);
 				
 			},
+			cancelApply(item){
+				let that = this;
+				uni.showModal({
+				    title: '提示',
+				    content: '确认取消吗！',
+				    success: res => {
+				        if (res.confirm) {
+				            this.$u.api.teamApplyClose({applyId:this.id}).then(res=>{
+				            	this.$refs.uToast.show({
+				            		message:res.msg,
+				            		complete() {
+				            			uni.reLaunch({url: '/pages/index/index'});
+				            		}
+				            	});
+				            	// uni.$u.toast(res.msg);
+				            	console.log('res',res.data);
+				            }).catch(err=>{
+				            	console.log('teamApplyClose',err);
+				            })
+				        }
+				    }
+				});
+			},
 			confirmReceipt(item){
 				let that = this;
 				uni.showModal({
@@ -664,6 +687,11 @@
 			font-size: 24rpx;
 			font-weight: bold;
 			color: #EE0B0B;
+			&.white{
+				border-color: #fff;
+				color: #fff;
+				background-color: transparent;
+			}
 			&.cancel{
 				border-color: #FFE2E2;
 				color: #FFE2E2;
@@ -844,6 +872,8 @@
 	}
 }
 .viewers-list-tuan{
+	font-size: 24rpx;
+	color: #999;
 	.list{
 		display: grid;
 		grid-template-columns: repeat(4, 1fr);

center/applylist.vue

@@ -26,7 +26,7 @@
 				<view class="order">
 					<view v-for="(item,index) in orderListWithClass" class="order-item" 
 						:class="item.class"
-						@click="goApplyDetails(item)" :key="item.id">
+						@click="goDetails(item)" :key="item.id">
 						<view class="top u-flex u-row-between">
 							<text>{{item.theatreName}}</text>
 							<text>{{item.status|filterApplyState}}</text>
@@ -101,9 +101,9 @@
 				status:'',
 				dataList:[],
 				statusBtn:{// 状态(0待支付，2超时取消，3支付完成，待使用，4退款中，5己退款，6退款失败，7己使用，8己超期 9关闭）
-					0:[{name:'查看详情',fun:'goApplyDetails',class:''}],
-					1:[{name:'取消订单',fun:'cancelOrder',class:''},{name:'查看详情',fun:'goOrderDetails',class:'red'}],
-					2:[{name:'查看详情',fun:'goOrderDetails',class:''}],
+					0:[{name:'取消申请',fun:'cancelApply',class:''},{name:'查看详情',fun:'goApplyDetails',class:''}],
+					1:[{name:'订单列表',fun:'goOrderDetails',class:'red'}],
+					2:[{name:'查看详情',fun:'goApplyDetails',class:''}],
 					3:[],
 					//,{name:'评价',fun:'evaluate',class:'green'}
 					4:[],
@@ -160,7 +160,7 @@
 			const index = this.tabsList.findIndex(item => item.status === status);
 			this.tabsCurrent = index>=0?index:0;
 			
-			this.getTemplateIdList();//获取模板列表
+			// this.getTemplateIdList();//获取模板列表
 			
 		},
 		onShow() {
@@ -242,9 +242,21 @@
 				// console.log('item',item);
 			},
 			goOrderDetails(item){
-				uni.$u.route('/center/orderdetails', {
-					id: item.id
-				});
+				uni.$u.route('/center/order', {
+					status: 0
+				});				
+				
+				// uni.$u.route('/center/orderdetails', {
+				// 	id: item.id
+				// });
+			},
+			goDetails(item){
+				console.log('goDetails',item);
+				if(item.status==1){
+					this.goOrderDetails(item)
+				}else{
+					this.goApplyDetails(item)
+				}
 			},
 			goApplyDetails(item){
 				uni.$u.route('/center/applydetails', {
@@ -265,6 +277,7 @@
 				  evaluate:this.evaluate,
 				  refund:this.refund,
 				  cancelOrder:this.cancelOrder,
+				  cancelApply:this.cancelApply,
 				  viewRefund:this.viewRefund,
 				  confirmReceipt:this.confirmReceipt,
 				  viewEvaluate:this.viewEvaluate
@@ -352,6 +365,29 @@
 				// console.log('logistics',item);
 				
 			},
+			cancelApply(item){
+				let that = this;
+				uni.showModal({
+				    title: '提示',
+				    content: '确认取消吗！',
+				    success: res => {
+				        if (res.confirm) {
+				            this.$u.api.teamApplyClose({applyId:item.id}).then(res=>{
+				            	this.$refs.uToast.show({
+				            		message:res.msg,
+				            		complete() {
+				            			that.reloadList();
+				            		}
+				            	});
+				            	// uni.$u.toast(res.msg);
+				            	console.log('res',res.data);
+				            }).catch(err=>{
+				            	console.log('teamApplyClose',err);
+				            })
+				        }
+				    }
+				});
+			},
 			viewRefund(item){
 				uni.$u.route('/center/viewRefund', {
 					orderId: item.id

center/memberinfo.vue

@@ -1,19 +1,20 @@
 <template>
 	<view class="pages">
 		<u-navbar
-			title="个人信息"
+			title="信息"
 			:placeholder="true"
-			:autoBack="true"
+			:autoBack="false"
 			 :safeAreaInsetTop="true"
+			 @leftClick="leftClick"
 		>
 		</u-navbar>
 		<view class="page-wrap">
-			<view class="cell-title">个人信息</view>
+			<view class="cell-title">信息</view>
 			<u-cell-group :border="false" :customStyle="{background:'#fff','border-radius':'20rpx'}">
 				<!-- <u-cell  title="头像">
 					<u-avatar slot="right-icon" :src="memberInfo.avatar" size="80rpx"></u-avatar>
 				</u-cell> -->
-				<view class="avatar u-flex u-row-between u-border-bottom">
+				<!-- <view class="avatar u-flex u-row-between u-border-bottom">
 					<text>头像</text>
 					<view class="right">
 						<u--image :src="memberInfo.avatar" shape="circle" width="80rpx" height="80rpx"></u--image>
@@ -28,13 +29,13 @@
 						    :maxCount="2"
 						></u-upload>
 					</view>
-				</view>
+				</view> -->
 				<u-cell title="姓名" v-if="memberInfo.isAuth==1" @click="$u.toast('不允许修改')" :value="vuex_member_info.name" :border="true"></u-cell>
-				<u-cell title="昵称" @click="nameShow=true" :value="vuex_member_info.nickName" :border="true"></u-cell>
+				<u-cell title="名称" @click="nameShow=true" :value="vuex_member_info.name" :border="true"></u-cell>
 				<!-- <u-cell title="性别" @click="handleChangeSex" :value="memberInfo.sex|filterSex"></u-cell> -->
 				<!-- <u-cell title="生日" :value="memberInfo.birthdayTime||'未设置'" @click="handleChangeBirthday" :isLink="true"></u-cell> -->
 				<!-- <u-cell title="会员等级" :value="memberInfo.levelName"></u-cell> -->
-				<u-cell title="实名制认证" @click="factorAuth" :value="memberInfo.isAuth==1?'已认证':'去认证'"></u-cell>
+				<!-- <u-cell title="实名制认证" @click="factorAuth" :value="memberInfo.isAuth==1?'已认证':'去认证'"></u-cell> -->
 			</u-cell-group>
 			<u-button text="取消登录" type="error" @click="logOut" :customStyle="{'margin-top': '120rpx'}"></u-button>
 			<u-datetime-picker
@@ -105,6 +106,14 @@
 
 		},
 		methods: {
+			leftClick(e){
+				let pages = getCurrentPages();
+				if(pages.length==1){
+					uni.$u.route('/pages/index/index')
+				}else{
+					uni.navigateBack()
+				};
+			},
 			logOut(){
 				this.$u.vuex('vuex_member_info', {});
 				this.$u.vuex('vuex_user_info', {});
@@ -112,9 +121,9 @@
 				// this.getMemberInfo()
 			},
 			getMemberInfo(){
-				this.$u.api.memberInfo({id:this.vuex_user_info.userId}).then(res=>{
+				this.$u.api.getInfo({userid:this.vuex_user_info.userId}).then(res=>{
 					this.memberInfo = res.data;
-					this.avatar =  res.data.avatar;
+					this.avatar =  res.data.contractImg;
 					// console.log('memberInfo',this.memberInfo);
 					this.$u.vuex('vuex_member_info', res.data);
 					}).catch(err=>{

center/order.vue

@@ -158,7 +158,7 @@
 			const index = this.tabsList.findIndex(item => item.status === status);
 			this.tabsCurrent = index>=0?index:0;
 			
-			this.getTemplateIdList();//获取模板列表
+			// this.getTemplateIdList();//获取模板列表
 			
 		},
 		onShow() {

center/orderdetails.vue

@@ -8,8 +8,8 @@
 		<view class="page-wrap">
 			<view class="status-content">
 				<view class="status-item" v-if="orderDetails.status==0">
-					<view class="text"><text v-if="countdown!='支付超期'"> 请尽快完成付款，还剩 </text>{{countdown}}</view>
-					<view class="btn-wrap u-flex u-row-center" v-if="countdown!='支付超期'">
+					<view class="text"><text v-if="orderDetails.cancelDateTime&&countdown!='支付超期'"> 请尽快完成付款，还剩 </text>{{countdown}}</view>
+					<view class="btn-wrap u-flex u-row-center" v-if="orderDetails.cancelDateTime&&countdown!='支付超期'">
 						<view class="btn cancel" @click="cancelOrder">取消订单</view>
 						<view class="btn" @click="gotoPay(orderDetails.id)">立即支付</view>
 					</view>
@@ -62,13 +62,13 @@
 					<view class="order-num">取票号：{{orderDetails.parentQrcodeNo}}</view>
 				</view>
 			</view>
-			<view class="box viewers-list">
+			<view class="box viewers-list-tuan">
 				<view class="title">观影人员</view>
-				<view class="item u-flex u-row-around" v-for="(item,index) in orderDetails.viewersList" :key="index">
-					<text>观影人员{{index + 1}}</text>
-					<text style="width: 96rpx;">{{item.name}}</text>
-					<text>{{item.idcard|maskID}}</text>
-					<text v-if="orderDetails.status==3" @click="singleQR(item,index)" class="qrbtn" :style="{opacity:item.qrcodeStatus===0?'1':'0.5'}">查看二维码</text>
+				<view class="list">
+					<text class="item" v-for="(item,index) in orderDetails.viewersList" :key="index">
+						<text v-if="orderDetails.status==3" @click="singleQR(item,index)">{{item.name}}</text> 
+						<text v-else>{{item.name}}</text> 
+					</text>
 				</view>
 			</view>
 			<view class="box order-info">
@@ -213,7 +213,7 @@
 			this.id = page.id;
 			this.getSystemInfo();
 			
-			this.getTemplateIdList();//获取模板列表
+			// this.getTemplateIdList();//获取模板列表
 
 		},
 		onUnload() {
@@ -842,6 +842,15 @@
 		}
 	}
 }
+.viewers-list-tuan{
+	.list{
+		font-size: 24rpx;
+		color: #999;
+		display: grid;
+		grid-template-columns: repeat(4, 1fr);
+		gap: 24rpx;
+	}
+}
 .singleQR-wrap{
 	padding: 0 24rpx 50rpx;
 	box-sizing: border-box;

common/apiurl.js

@@ -203,6 +203,11 @@ const apiurl = {
 		url: '/member/marketTeamApply/selectById',
 		type: 'get'
 	},
+	// 申请关闭
+	teamApplyClose: {
+		url: '/member/marketTeamApply/teamApplyClose',
+		type: 'post'
+	},
 	
 	
 	/**

common/config.js

@@ -1,61 +1,27 @@
 /**
  * 配置通用 
  */
-// const node_dev = process.env.H_NODE_ENV;
-// //运行到浏览器用的
-// let baseUrl='/api';
-// let upFileUrl='/api';
-// //打包用的
-// if (node_dev) {
-//  baseUrl = process.env.H_BASE_URL;
-//  upFileUrl = process.env.H_UP_FILE_URL
-// }
-
-/**
- * 后端环境配置
- */
-let baseUrl = null // 后端服务接口
-let upFileUrl= null // 后端上传接口
-let staticUrl= null // 静态文件地址
-let authUrl = null //微信登录
-
-let appid = 'wx6490eaa0d20d2be2';
-let redirectUri = encodeURIComponent('https://greath5.dev.gztjy.top/pages/login/login');
-
-//64
-// #ifdef MP
-	baseUrl='https://greatadmin.dev.gztjy.top/serviceapi';
-	upFileUrl='http://fileupload.hw.hongweisoft.com/upload/single/minio';
-	// staticUrl='http://res.hw.hongweisoft.com/xushuo/';
-	staticUrl='https://miniores.hw.hongweisoft.com/greattransition/staticfile';
-	authUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${redirectUri}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect`;
-// #endif
-// #ifdef H5
-	baseUrl='/api/serviceapi';
-	upFileUrl='http://fileupload.hw.hongweisoft.com/upload/single/minio';
-	// staticUrl='http://res.hw.hongweisoft.com/xushuo/';
-	staticUrl='https://minio.wdzzgs.com/greattransition/staticfile';
-// #endif
-
-//正式
-// #ifdef MP
-	// baseUrl='https://xusapi.gzxsjt.cn/appapi/app';
-	// upFileUrl='https://xusapi.gzxsjt.cn/thirdapi/upload/single/minio';
-	// staticUrl='https://xusapi.gzxsjt.cn/miniores/imgs/app';
-// #endif
-// #ifdef H5
-	// baseUrl='https://xusapi.gzxsjt.cn/appapi/app';
-	// upFileUrl='https://xusapi.gzxsjt.cn/thirdapi/upload/single/minio';
-	// staticUrl='https://xusapi.gzxsjt.cn/miniores/imgs/app';
-// #endif
-
-
+const node_dev = process.env.H_NODE_ENV;
+let baseUrl = '/api/serviceapi',
+  wxAppid = 'wx6490eaa0d20d2be2', // 
+  staticUrl = 'https://minio.wdzzgs.com/greattransition/staticfile',
+  redirectUri = encodeURIComponent('https://greath5.dev.gztjy.top/greatgroup/pages/login/login'),
+  authUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${wxAppid}&redirect_uri=${redirectUri}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect`,
+  upFileUrl = 'https://serviceapi.wdzzgs.com/thirdapi/upload/single/minio';
+console.log('node_dev',node_dev);
+if (node_dev) {
+	if(process.env.H_NODE_ENV=='production'){
+		redirectUri = encodeURIComponent('https://h5.wdzzgs.com/pages/login/login')
+	};
+  (baseUrl = process.env.H_BASE_URL), (upFileUrl = process.env.H_UP_FILE_URL), (authUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${wxAppid}&redirect_uri=${redirectUri}&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect`);
+}
 
 const commonConfig = {
-	wxAppid: '', // 测试wxAppid
+	wxAppid: wxAppid, // 测试wxAppid
 	baseUrl: baseUrl, // 服务器地址
 	uploadFileUrl: upFileUrl, // 上传文件路径
 	staticUrl:staticUrl,
+	authUrl:authUrl,
 	paginationConfig:{
 		  pageNum: 1,
 		  pageSize: 10

common/request.js

@@ -75,7 +75,8 @@ module.exports = (vm) => {
 			  content: '你需要登录后,才可使用此功能！',
 			  success: res => {
 			    if (res.confirm) {
-			      uni.$u.route(commonConfig.authUrl);
+					window.location.href = commonConfig.authUrl;
+			      // uni.$u.route(commonConfig.authUrl);
 			    }else{
 					uni.removeStorage({
 						key: 'backUrl',

manifest.json

@@ -82,12 +82,12 @@
     "vueVersion" : "2",
     "h5" : {
         "devServer" : {
-			"port" : 8080, //浏览器运行端口
-			"disableHostCheck" : true,
+            "port" : 8080, //浏览器运行端口
+            "disableHostCheck" : true,
             "proxy" : {
                 "/api" : {
                     // "disableHostCheck" : true,
-                    "target" : "https://greath5.dev.gztjy.top/", //请求的目标域名
+                    "target" : "https://greatadmin.dev.gztjy.top/", //请求的目标域名
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {
@@ -103,7 +103,8 @@
         },
         "title" : "伟大转折",
         "router" : {
-            "mode" : "history"
+            "mode" : "history",
+            "base" : "/greatgroup/"
         },
         "template" : ""
     },

package.json

@@ -6,8 +6,8 @@
         "env": {
           "UNI_PLATFORM": "h5",
           "H_NODE_ENV": "development",
-          "H_BASE_URL": "https://scenicadmin.hw.hongweisoft.com/serviceapi",
-          "H_UP_FILE_URL": "https://scenicadmin.hw.hongweisoft.com/serviceapi"
+          "H_BASE_URL": "https://greath5.dev.gztjy.top/serviceapi",
+          "H_UP_FILE_URL": "https://serviceapi.wdzzgs.com/thirdapi/upload/single/minio"
         }
       },
       "build:buildOnline": {
@@ -15,8 +15,8 @@
         "env": {
           "UNI_PLATFORM": "h5",
           "H_NODE_ENV": "production",
-          "H_BASE_URL": "https://scenicadmin.hw.hongweisoft.com/serviceapi",
-          "H_UP_FILE_URL": "https://scenicadmin.hw.hongweisoft.com/serviceapi"
+          "H_BASE_URL": "https://greath5.dev.gztjy.top/serviceapi",
+          "H_UP_FILE_URL": "https://serviceapi.wdzzgs.com/thirdapi/upload/single/minio"
         }
       }
     }

pages/login/login.vue

@@ -57,6 +57,7 @@
 	export default {
 		data() {
 			return {
+				code:'',
 				staticUrl:this.$commonConfig.staticUrl,
 				title: '《伟大转折》剧目团购系统',
 				logoUrl: this.$commonConfig.staticUrl + "login/logo.png",
@@ -88,9 +89,10 @@
 		},
 		onLoad(e) {
 			let that = this;
-			if(e&&e.code) { // 微信第三方登录成功
+			if(!e.code) { // 微信第三方登录失败
+				this.redirectToAuth()
+			}else {
 				this.code = e.code
-				this.submit(e)
 			}
 			// 测试环境填充用户名密码
 			if(process.env.NODE_ENV=='development'){
@@ -144,6 +146,10 @@
 						uni.reLaunch({url: this.backUrl});
 					}).catch(err=>{
 						console.log('login',err);
+						this.$u.toast(err.msg)
+						setTimeout(()=>{
+							this.redirectToAuth();
+						},1500)
 						this.loading = false
 					})
 				}).catch(errors => {

pages/searchpage.vue

@@ -71,7 +71,7 @@
 					},
 					noMoreSize: 3, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
 					empty: {
-						tip: '暂无相关数据'
+						tip: '没有搜到相关结果'
 					}
 				},
 				title:'搜索',

utils/filter.js

@@ -44,7 +44,7 @@ Vue.filter("filterOrderState", function(val) {
 
 // 申请状态
 Vue.filter("filterApplyState", function(val) {	
-	let orderList = ['待审核', '审核成功','审核失败']
+	let orderList = ['待审核', '审核成功','审核失败','已撤回']
 	return orderList[val]
 });