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

tjty-app/api/activity.js

@@ -78,12 +78,3 @@ export function addUnifiedOrder(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_detail/activity_detail.vue

@@ -128,10 +128,9 @@
      console.log(this.activityId)
      this.getList(this.activityId)
     },
-    // onShow() {
-    //   console.log('onShow')
-    //   this.getList(this.activityId)
-    // },
+    onShow() {
+      this.getList(this.activityId)
+    },
     filters: {
            ellipsis(value){
                 if (!value) return '';

tjty-app/pages_activity/activity_immedSignIn/activity_immedSignIn.vue

@@ -26,7 +26,7 @@
         	<uni-easyinput :inputBorder="false" v-model="info.idCard" placeholder="请输入证件号" :clearable="false">
         	</uni-easyinput>
         </uni-forms-item>
-		<uni-forms-item label="活动分类" required name="projectId">
+		<uni-forms-item label="项目分类" required name="projectId">
 					<picker @change="projectPickerChange" :value="projectIndex" :range="projectList" range-key="projectName"
 						:disabled="projectDisable" @cancel="projectCancel">
 						<view v-if="projectIndex ===projectList.length" class="uni-input">请选择项目
@@ -244,7 +244,7 @@ import {
             this.info.status = '0'
             addsignInInfo(this.info).then(response=>{
               console.log(response)   //存在的话就返回报错
-              if(response.data.code === 500)
+              if(response.code === 500)
               return uni.$showMsg(response.msg)
               this.orderVo.signupId = response.data.signupId
               this.orderVo.wechatId = this.info.wechatId

tjty-app/pages_course/tjty_course_course/course.vue

@@ -358,11 +358,6 @@
 							this.flag = false
 							this.list(this.type, this.queryParams.pageNum)	
 					},
-			
-			
-			
-			
-			
 			...mapMutations('m_user', ['updateToken']),
 			...mapMutations('m_user', ['updateUserInfo']),
 			//登录判断

tjty-app/pages_my/my/my.vue

@@ -217,6 +217,14 @@
 		overflow-x: hidden;
 		overflow-y: hidden;
 		
+		// top: 88rpx;
+		/* #ifdef APP-PLUS */
+		top: calc(var(--top-window-height) + 0px);
+		/* #endif */
+		-webkit-overflow-scroll:touch;
+		left: 0;
+		
+
 
 		.home{
 			position: absolute;

tjty-app/pages_my/myActicity/myActivity.vue

@@ -25,7 +25,7 @@
 			<view class="info">
 				<view class="question" style="display: flex;width: 100%; justify-content: space-between;">
 					<view style="width: 80%;height: 100%;">
-							<view style="padding: 6% 3% 0 5%;height: 100%;">{{item.activityName}}</view>
+							<view style="padding: 6% 3% 0 5%;height: 100%;">{{item.activityName|ellipsis}}</view>
 					</view>
 					<view style="width: 20%;height: 100%;">
 						<!-- <view class="item1"> -->
@@ -44,26 +44,25 @@
 				</view>
 
 				<dividerface></dividerface>
-				<view class="item" style="display: flex">比赛时间:<view class="time">{{item.activityTime}}</view>
+				<view class="item" style="display: flex">比赛时间：<view class="time">{{item.activityTime}}</view>
 				</view>
-				<view class="item" style="display: flex">报名时间:<view class="time">
+				<view class="item" style="display: flex">报名时间：<view class="time">
 						{{item.taseCreateTime||item.tasCreateTime}}
 					</view>
 				</view>
-				<view class="item" style="display: flex;margin-left: 34rpx;">参赛人:<view class="time">
+				<view class="item" style="display: flex;margin-left: 34rpx;">参赛人：<view class="time">
 						{{item.tasName||item.taseName}}
 					</view>
 				</view>
 
 				<view style="display: flex;">
-					<button @tap="tapPopup(item.type,item.tasSignupId,item.taseSignupId)" style="width: 50%;background-color: #3b7cde;border-radius:0 0 0 16px;">报名详情</button>
+					<button @tap="tapPopup(item.type,item.tasSignupId,item.taseSignupId)" style="width: 50%;background-color: #3b7cde;border-radius:0 0 0 16px;color: aliceblue">报名详情</button>
 					<button @click="goDetail(item.type,wechatId,item.activityId)"
-						style="width: 50%;background-color: #3b7cde;border-radius:0 0 16px 0;">活动详情</button>
+						style="width: 50%;background-color: #3b7cde;border-radius:0 0 16px 0;color: aliceblue">活动详情</button>
 
 				</view>
 			</view>
 		</view>
-
 		<view class="popup" v-show="showexam" >
 					<view class="popup-info">
 					<view style="margin-bottom: 20px;margin-left: 45px;">学校&nbsp;:{{signupexamlist.school}}</view>
@@ -77,7 +76,6 @@
 					</view>
 				</view>
 		</view>
-		
 		<view class="popup" v-show="show">else
 					<view class="popup-info">
 			
@@ -116,6 +114,7 @@
 		userInfo
 	} from 'os';
 	export default {
+
 		data() {
 			return {
 				showtime:false,
@@ -130,6 +129,17 @@
 				signuplist:{}
 			}
 		},
+		
+		filters: {
+		       ellipsis(value){
+		            if (!value) return '';
+		            if (value.length > 31) {
+		              return value.slice(0,31) + '...'
+		            }
+		            return value
+		          }
+		},
+
 		computed: {
 			...mapState('m_user', ['userInfo']),
 		},