1

components/auth/index.vue

@@ -104,6 +104,7 @@
 										OpenId: '',
 										Name: info.userInfo.nickName,
 										Photo: info.userInfo.avatarUrl,
+										Gender:info.userInfo.gender,
 										Moblie: '',
 										SuperiorId: 0,
 										code: res.code
@@ -170,6 +171,7 @@
 							OpenId: obj.OpenId,
 							Name: obj.Name,
 							Photo: obj.Photo,
+							Gender:obj.Gender,
 							Moblie: '',
 							SuperiorId: pid,
 							SmallShopId: SmallShopId,

pages/index/index.vue

@@ -1221,6 +1221,7 @@
 			yj(){
 				uni.navigateTo({
 					url: '/pages/school/Jiaheactivity'
+					// url: '/pages/school/personal/JhphoneRz'
 				})
 				
 			}

pages/school/JIaheactivitydetails.vue

@@ -109,7 +109,7 @@
 </style>
 <template>
 	<view class="Jiaheactivitydetails">
-		<view style="width: 100%;height: 450rpx;">
+		<view style="width: 100%;height: 450rpx;" @click="previewImage(detial.CoverImg)">
 			<image :src="detial.CoverImg" style="width: 100%;height: 100%;"></image>
 		</view>
 		
@@ -260,6 +260,12 @@
 				uni.navigateTo({
 					url: '/pages/school/jieheactivityBM?details=' +  dataList
 				})
+			},
+			previewImage(x){
+				uni.previewImage({
+					urls: [x],
+					current: 0,
+				});
 			}
 		}
 	}

pages/school/components/signUpList.vue

@@ -209,7 +209,7 @@ export default {
       
 	  this.request2(
 	  	{
-	  		url: '/api/AppletEducation/GetUserActivityList',
+	  		url: '/api/AppletEducation/GetUserJoinActivityPageList',
 	  		data: this.msg
 	  	},
 	  	res => {
@@ -249,7 +249,8 @@ export default {
 	cancel(x,i){
 		this.bmobj={
 			ActivityId:x.ActivityId,
-			index:i
+			index:i,
+			Id:x.Id
 		}
 		
 		this.show=true
@@ -257,8 +258,12 @@ export default {
 	queren(){
 		this.request2(
 			{
-				url: '/api/AppletTrade/CancelCommerceConsult',
-				data: {ActivityId:this.bmobj.ActivityId,CancelRemark:this.cancelRemark}
+				url: '/api/AppletEducation/CancelCommerceConsult',
+				data: {
+					ActivityId:this.bmobj.ActivityId,
+					CancelRemark:this.cancelRemark,
+					Id:this.bmobj.Id
+				}
 			},
 			res => {
 				if(res.resultCode==1){

pages/school/jieheactivityBM.vue

@@ -97,6 +97,7 @@
 					:active-color='mainColor'
 					@change="radioChange" 
 					v-for="(item, index) in list" :key="index" 
+					:disabled="item.disabled"
 					:name="item.Id"
 				>
 					{{item.name}}
@@ -104,10 +105,10 @@
 			</u-radio-group>
 		</view>
 		<view class="box-c-i" v-if="details.IsFree==2" style="justify-content: flex-end;border-bottom: none;height: 35px;margin-top: 10px;">
-			<view><text class="box-c-l">{{addMsg.PaymentWay==1?'现金单价:':'点数单价:'}} </text>{{addMsg.UnitPrice}}{{addMsg.PaymentWay==1?'元':'点'}}</view>
+			<view><text class="box-c-l">{{addMsg.PaymentWay==1?'现金单价:':'点数单价:'}} </text>{{addMsg.PaymentWay==1?addMsg.UnitPrice:addMsg.UnitPoint}}{{addMsg.PaymentWay==1?'元':'点'}}</view>
 		</view>
 		<view class="box-c-i" v-if="details.IsFree==2" style="justify-content: flex-end;border-bottom: none;height: 35px;">
-			<view><text  class="box-c-l">{{addMsg.PaymentWay==1?'现金总价:':'点数总价:'}}</text>{{addMsg.Money}}{{addMsg.PaymentWay==1?'元':'点'}}</view>
+			<view><text  class="box-c-l">{{addMsg.PaymentWay==1?'现金总价:':'点数总价:'}}</text>{{addMsg.PaymentWay==1?addMsg.Money:addMsg.TotalPoint}}{{addMsg.PaymentWay==1?'元':'点'}}</view>
 		</view>
 		<view class="box-c-i" v-if="details.IsFree==1" style="justify-content: flex-end;border-bottom: none;height: 35px;">
 			<view class="box-c-l" style="text-align: right;">免费</view>
@@ -144,7 +145,7 @@ export default {
 		 UnitPoint:0,
 		 TotalPoint:0,
 	 },
-	 list: [{name: '在线支付',Id: 1},{name: '点数支付',Id: 6}],
+	 list: [{name: '在线支付',Id: 1,disabled:false},{name: '点数支付',Id: 6,disabled:false}],
 	 orderInfo:{},
     };
   },
@@ -164,11 +165,18 @@ export default {
     this.addMsg.ActivityId = this.details.Id
    if(this.details.IsFree==1){
 	   this.addMsg.PaymentWay = 6;
+		this.list[0].disabled = true
    }else{
 	   this.addMsg.UnitPrice = this.details.Price;
 	   this.addMsg.UnitPoint = this.details.PointNum;
 	   this.addMsg.Money = this.addMsg.UnitPrice * this.addMsg.PeopleNum;
 	   this.addMsg.TotalPoint = this.addMsg.UnitPoint * this.addMsg.PeopleNum;
+	   if(this.addMsg.UnitPrice==0){
+		   this.list[0].disabled = true
+	   }
+	   if(this.addMsg.UnitPoint==0){
+	   		this.list[1].disabled = true
+	   }
    }
   
  
@@ -184,8 +192,7 @@ export default {
 		  // console.log(this.addMsg.PaymentWay)
 	  },
 	signup(){
-		let pages = getCurrentPages(); // 当前页面
-		let beforePage = pages[pages.length - 3]; // 前2个页面
+		
 		
 		if(this.addMsg.LinkMan == ''){
 			uni.showToast({
@@ -207,10 +214,12 @@ export default {
 		if(this.addMsg.PaymentWay==6){
 			this.addMsg.UnitPrice = 0;
 			this.addMsg.Money = 0;
+			this.addMsg.PayWay = 0
 		}
 		if(this.addMsg.PaymentWay==1){
 			this.addMsg.UnitPoint = 0;
 			this.addMsg.TotalPoint = 0;
+			this.addMsg.PayWay = 1
 		}
 		this.request2({
 				url: '/api/WeChatPay/SetActivityEnrollInfo',
@@ -227,9 +236,7 @@ export default {
 						});
 						this.getbackurl()//返回列表
 					}else{
-						
 						this.orderInfo = JSON.parse(res.data);
-						console.log(this.orderInfo)
 						this.Pay()
 					}
 				}
@@ -255,9 +262,16 @@ export default {
 				uni.showToast({
 					title: "支付成功"
 				})
-				this.getbackurl()
-				
-				
+				let pages = getCurrentPages(); // 当前页面
+				let beforePage = pages[pages.length - 3]; // 前2个页面
+				setTimeout(()=>{
+					uni.navigateBack({
+					    delta: 2,
+						success: function() {
+							beforePage.$vm.getorder(); // 执行前一个页面的方法
+						}
+					});
+				},1000)
 			},
 			fail: function(err) {
 				console.log('fail:', err);
@@ -268,6 +282,8 @@ export default {
 		});
 	},
 	getbackurl(){
+		let pages = getCurrentPages(); // 当前页面
+		let beforePage = pages[pages.length - 3]; // 前2个页面
 		setTimeout(()=>{
 			uni.navigateBack({
 			    delta: 2,

pages/school/personal/JhphoneRz.vue

@@ -64,7 +64,7 @@
 </style>
 <template>
 	<div  class='JhphoneRz'>
-		<view class="box">
+		<view class="box" v-if="isAttestationEdu==0">
 			<view style="font-size: 40rpx;color: #111111;margin-top: 40rpx;">请完成手机绑定验证</view>
 			<view style="font-size: 24rpx;color: #999999;margin-top: 20rpx;">请完成手机绑定验证</view>
 			<view class="box-item" style="margin-top: 70rpx;">
@@ -116,13 +116,11 @@
 				show: true,
 				count: '',
 				timer: null,
-				daojis:'60s'
-				
+				daojis:'60s',
+				isAttestationEdu:0,//学员是否认证了 0否1是
 			};
 		},
-		onLoad(options) {
-		
-			
+		onLoad(options) {
 			this.u = uni.getStorageSync("mall_UserInfo");
 			if (!this.u) {
 			  this.u = {
@@ -132,7 +130,10 @@
 			  this.showAuth = true;
 			}	else{
 				
-			}
+			}
+			let basedata =uni.getStorageSync("basedata")?uni.getStorageSync("basedata"):'';
+			this.isAttestationEdu = basedata.user_info.isAttestationEdu ? basedata.user_info.isAttestationEdu:0
+			
 			
 		},
 		created() {