Merge branch 'dev' of http://gitlab.91isoft.com:90/wyf/tjty-app into dev

tjty-app/api/activity.js

@@ -76,4 +76,14 @@ export function addUnifiedOrder(orderVo) {
     method: 'post',
     data: orderVo
   })
+}
+
+
+//微信支付回调下
+export function addUnifiedOrderWx(orderVo) {
+  return request({
+    url: 'http://bin001.free.idcfengye.com/dealFlow/stream/wxPayNotify',
+    method: 'post',
+    data: orderVo
+  })
 }
\ No newline at end of file

tjty-app/pages_activity/activity/activity.vue

@@ -220,8 +220,8 @@
 
 				.image {
 					position: absolute;
-					border-top-left-radius: 15rpx;
-					border-top-right-radius: 15rpx;
+					border-top-left-radius: 30rpx;
+					border-top-right-radius: 30rpx;
 					height: 400rpx;
           width: 100%;
 				}
@@ -230,6 +230,7 @@
 					// justify-content: end;
 					position: absolute;
 					padding-left: 86%;
+          // right: 0.01rpx;
 					top: 0rpx;
 					width: 98rpx;
 					height: 98rpx;

tjty-app/pages_activity/activity_detail/activity_detail.vue

@@ -104,6 +104,8 @@
   export default {
     data() {
       return {
+        //加载一次导航
+       isGoNavigate: false,
         activityId: null,
         wechatId: 1,
         activityObject:{},
@@ -122,6 +124,7 @@
     onLoad(options) {
      console.log('onLoad')
      this.activityId =Number.parseInt(options.activity_id)
+     this.isGoNavigate = true
      console.log(this.activityId)
      this.getList(this.activityId)
     },
@@ -264,39 +267,21 @@
           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!')
+          return uni.$showMsg('报名人数已满!')
           if (this.activityObject.activityStatus === '2') {
           	return uni.$showMsg('活动已结束!')
           }
-         // let signupTime = Date.parse(this.activityObject.signupTime)
-         // console.log('signupTime'+signupTime)
-         // console.log('now'+Date.parse(new Date))
-         //  if(signupTime <= Date.parse(new Date)){
-         //  return uni.$showMsg('报名已结束!')}
-         console.log(Date.parse(this.activityObject.signupTime))
-         console.log(Date.parse(new Date()))
          if (Date.parse(this.activityObject.signupTime.replace(/-/g, '/')) < Date.parse(new Date())) {
-         	return wx.showToast({
-                      title: '报名已结束!',
-                      icon: 'none',
-                      duration: 2000})
-         }
-         else{
-           uni.navigateTo({
-                 url: '/pages_activity/activity_immedSignIn/activity_immedSignIn?activity_id=' + this.activityId
-               })
-         }
+            return uni.$showMsg('报名已结束!')}
+  
           
           if(Date.parse(this.activityObject.activityEnd.replace(/-/g, '/'))< new Date()){
            return uni.$showMsg('报名已结束!')}
-          else{
           uni.navigateTo({
               url: '/pages_activity/activity_immedSignIn/activity_immedSignIn?activity_id=' + this.activityId
             })
-            }
+            this.isGoNavigate = false
         },
     }
     }

tjty-app/pages_activity/activity_immedSignIn/activity_immedSignIn.vue

@@ -59,7 +59,7 @@ import {
 		mapState
 	} from 'vuex'
   import {
-  	getProjectInfo,addsignInInfo,addUnifiedOrder
+  	getProjectInfo,addsignInInfo,addUnifiedOrder,addUnifiedOrderWx
   } from "@/api/activity.js";
 	export default {
 		data() {
@@ -243,12 +243,11 @@ import {
           if(this.projectFee !== 0){
             this.info.status = '0'
             addsignInInfo(this.info).then(response=>{
-              console.log(response)
-              if(response.data.status ==='1')
+              console.log(response)   //存在的话就返回报错
+              if(response.data.code === 500)
               return uni.$showMsg(response.msg)
               this.orderVo.signupId = response.data.signupId
               this.orderVo.wechatId = this.info.wechatId
-              if(response.data.status === '0'){
               addUnifiedOrder(this.orderVo).then(response =>{
                 console.log(response)
                 uni.requestPayment({
@@ -274,7 +273,7 @@ import {
                   	}
                 })
               })
-              }
+        
               })
           }else{
             this.info.status = '1'

tjty-app/pages_service/tjty_customer/tjty_customer.vue

@@ -15,11 +15,9 @@
 		</view>
 		<noData v-if="!customerListLength" :style="fullHeight"></noData>
 		<!-- 选项卡内容轮播滑动显示，current为当前第几个swiper子项 -->
-		<!-- <swiper @change="change" :current="isActive" class="swiper-content" :style="fullHeight"
+		<swiper @change="change" :current="isActive" class="swiper-content" :style="fullHeight"
 			v-if="customerList.length !== 0">
-			<swiper-item class="swiperitem-content"> -->
-		<view class="swiper-content" :style="fullHeight" v-if="customerList.length !== 0">
-			<view class="swiperitem-content">
+			<swiper-item class="swiperitem-content" @touchmove.stop="stopTouchMove">
 				<scroll-view scroll-y style="height: 100%;" @scrolltolower="lowerBottom" lower-threshold="150px"
 					refresher-enabled="true" @refresherrefresh="refresh" :refresher-triggered="triggered">
 					<view class="nav_item">
@@ -34,11 +32,8 @@
 						</view>
 					</view>
 				</scroll-view>
-			</view>
-		</view>
-
-		<!-- </swiper-item>
-		</swiper> -->
+			</swiper-item>
+		</swiper>
 		<view class="nav_item_bottom">
 			<button style="background-color:#3b7cde; color:white;" @click="goPhoneBtn(phoneNumber)">咨询电话</button>
 			<button type="primary" @click="gotoMessageConsult">留言咨询</button>
@@ -158,6 +153,10 @@
 					}
 				});
 			},
+			//限制页面左右滑动
+			stopTouchMove() {
+				return true
+			},
 			//留言咨询
 			gotoMessageConsult() {
 				console.log("准备进入到留言咨询。。。。")
@@ -357,7 +356,7 @@
 					min-height: calc(100% - 10%);
 					padding: 5rpx;
 					height: auto;
-					padding-bottom: 20%;
+					padding-bottom: 35%;
 
 					.customer-item {
 						margin: 20rpx 5%;