合并冲突

tjty-app/pages_activity/activity/activity.vue

@@ -87,13 +87,13 @@
 		},
 		onLoad() {
 			this.login()
-			this.getList()
+		// 	this.getList()
 		},
-		// created() {
+		created() {
 		// uni.setStorageSync("title", '赛事活动')
 		// this.getList()
-		// 	this.getList()
-		// },
+			this.getList()
+		},
 		onShow() {
 			console.log('onShow')
 			this.getList()
@@ -206,7 +206,7 @@
 		overflow-x:hidden;
     
 		.activity_item {
-		  margin: 20rpx 20rpx 20rpx 20rpx;
+		  margin: 30rpx 30rpx 30rpx 30rpx;
 			height: 100%;
 			// width: 706rpx;
 			background: #ffffff;
@@ -229,10 +229,10 @@
 				.image-status {
 					// justify-content: end;
 					position: absolute;
-					padding-left: 87%;
-					top: -5rpx;
-					width: 105rpx;
-					height: 105rpx;
+					padding-left: 86%;
+					top: 0rpx;
+					width: 98rpx;
+					height: 98rpx;
 					z-index: 99;
 					// margin-left: 128rpx;
 				}
@@ -258,7 +258,7 @@
 					height: 77rpx;
 					opacity: 0.6;
 					background: #000000;
-					top: -90rpx;
+					top: -80rpx;
 					z-index: 9;
 					font-size: 18px;
 					font-weight: 500;

tjty-app/pages_activity/activity_detail/activity_detail.vue

@@ -115,14 +115,20 @@
         signupId: null,
       }
     },
+    // onLaunch(){
+    //   this.getList(this.activityId)
+      
+    // },
     onLoad(options) {
+     console.log('onLoad')
      this.activityId =Number.parseInt(options.activity_id)
+     console.log(this.activityId)
      this.getList(this.activityId)
     },
-    onShow() {
-      console.log('onShow')
-      this.getList(this.activityId)
-    },
+    // onShow() {
+    //   console.log('onShow')
+    //   this.getList(this.activityId)
+    // },
     filters: {
            ellipsis(value){
                 if (!value) return '';
@@ -139,6 +145,7 @@
     methods:{
        getList(activityId){
          getActivity(activityId).then(response=>{
+           console.log(response)
           this.activityObject = response.data
           this.activityObject.detail =  this.activityObject.detail.replace(/src="/,`src="https://www.aiwanyundong.com`)
           console.log(this.activityObject)
@@ -249,6 +256,18 @@
         },
         //立即报名
         immedSignIn(){  
+          var signInSum = 0
+          var limitSum = 0
+          for (var i = 0; i < this.activityObject.tjtActivityProjectVoList.length; i++) {
+            signInSum = signInSum + this.activityObject.tjtActivityProjectVoList[i].projectSignupNum
+          }
+          for (var i = 0; i < this.activityObject.tjtActivityProjectVoList.length; i++) {
+            limitSum = limitSum + this.activityObject.tjtActivityProjectVoList[i].limitPeople
+          }
+          console.log(signInSum)
+          console.log(limitSum)
+          if(signInSum === limitSum)
+          return uni.$showMsg('报名人数已满1!')
           if (this.activityObject.activityStatus === '2') {
           	return uni.$showMsg('活动已结束!')
           }
@@ -337,7 +356,7 @@
           height: 77rpx;
           opacity: 0.6;
           background: #000000;
-          top: -90rpx;
+          top: -82rpx;
           z-index: 9;
           font-size: 18px;
           font-weight: 500;

tjty-app/pages_activity/activity_immedSignIn/activity_immedSignIn.vue

@@ -212,7 +212,7 @@ import {
         if(this.projectIndex===this.projectList.length)
         return ''
         else
-        return this.projectSignupNum + '人/' + this.limitPeople + '人'
+        return this.projectSignupNum  + '/' + this.limitPeople 
       }
     },
 		methods: {
@@ -241,39 +241,40 @@ import {
             return uni.$showMsg('报名人数已满!')
           }
           if(this.projectFee !== 0){
+            this.info.status = '0'
             addsignInInfo(this.info).then(response=>{
               console.log(response)
-              if(response.code === 500)
+              if(response.data.status ==='1')
               return uni.$showMsg(response.msg)
-              this.orderVo.signupId = response.data
+              this.orderVo.signupId = response.data.signupId
               this.orderVo.wechatId = this.info.wechatId
-              // if(response.code === 200){
-              // addUnifiedOrder(this.orderVo).then(response =>{
-              //   console.log(response)
-              //   uni.requestPayment({
-              //     provider:'wxpay',
-              //     timeStamp: response.data.timeStamp,
-              //     nonceStr: response.data.nonceStr,
-              //     package: response.data.package,
-              //     signType: response.data.signType,
-              //     paySign: response.data.paySign,
-              //     success:function(res){
-              //       console.log('success'+ JSON.stringify(res))
-              //       uni.showLoading({
-              //       		  title: '报名成功!',
-              //       		})
-              //       			setTimeout(() => {
-              //       			uni.navigateBack({
-              //       			    delta: 1
-              //       			});
-              //       			}, 1000);
-              //     },
-              //   	fail: function (err) {
-              //     	console.log('fail:' + JSON.stringify(err));
-              //     	}
-              //   })
-              // })
-              // }
+              if(response.data.status === '0'){
+              addUnifiedOrder(this.orderVo).then(response =>{
+                console.log(response)
+                uni.requestPayment({
+                  provider:'wxpay',
+                  timeStamp: response.data.timeStamp,
+                  nonceStr: response.data.nonceStr,
+                  package: response.data.package,
+                  signType: response.data.signType,
+                  paySign: response.data.paySign,
+                  success:function(res){
+                    console.log('success'+ JSON.stringify(res))
+                    uni.showLoading({
+                    		  title: '报名成功!',
+                    		})
+                    			setTimeout(() => {
+                    			uni.navigateBack({
+                    			    delta: 1
+                    			});
+                    			}, 1000);
+                  },
+                	fail: function (err) {
+                  	console.log('fail:' + JSON.stringify(err));
+                  	}
+                })
+              })
+              }
               })
           }else{
             this.info.status = '1'

tjty-app/pages_new_media/tity_message_consult/tity_message_consult.vue

@@ -54,12 +54,12 @@
 				contentFlag: false,
 				url: '',
 				personnel: {
-					consultType:'1',
+					consultType:'',
 					consultContent: '',
 					nickName: '',
 					phone: '',
 					wechatId: '',
-					consult_type : '0'
+					// consult_type : '0'
 				},
 				rules: {
 					// consultContent: {
@@ -128,7 +128,8 @@
 		onLoad(options) {
 			this.personnel.wechatId = this.userInfo.wechatId
 			console.log("this.userInfo:", this.userInfo)
-			this.url = options.url
+			this.personnel.consultType = options.consultType
+			console.log("从别的页面传来的consultType--->", this.personnel.consultType)
 		},
 		onReady() {
 			// 需要在onReady中设置规则

tjty-app/pages_new_media/tity_new_media/tity_new_media.vue

@@ -100,7 +100,7 @@
 			},
 			messageConsult(e) {
 				uni.navigateTo({
-					url: '/pages_new_media/tity_message_consult/tity_message_consult?url=' + this.url
+					url: '/pages_new_media/tity_message_consult/tity_message_consult?consultType=' + 1
 				})
 			},