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

tjty-app/pages_activity/activity_detail/activity_detail.vue

@@ -13,7 +13,7 @@
 			<view class="font-body">
 				<!--        <view class="activity_title">活动名称:<text>{{activityObject.activityName}}</text></view> -->
 				<view class="activity_detail_Name">
-					<view style="padding: 2% 4%;">{{activityObject.activityName |ellipsis}}</view>
+					<view style="padding: 2% 4%;white-space:pre-wrap">{{activityObject.activityName |ellipsis}}</view>
 				</view>
 				<view style="margin-top: -70rpx;">
 					<view class="activity_font">

tjty-app/pages_course/tjty_course_appointment/appointment.vue

@@ -8,9 +8,7 @@
 						<image :src="item"></image>
 					</swiper-item>
 					</swiper>
-					
 					<swiper circular v-else :indicator-dots="indicatorDots"  autoplay="true" interval="3000" duration="500">
-					
 						<swiper-item v-for="(item,i) in bannerlist ":key="i"  >
 							<image :src="item"></image>
 						</swiper-item>

tjty-app/pages_events/tjty_ans_detail/tjty_ans_detail.vue

@@ -8,7 +8,7 @@
 				<image class="image-status" src="../../static/oper-icon/content_tag_jinxingzhong@2x.png"
 					v-else-if="activityInfo.activityStatus=='1'"></image>
 				<image v-else class="image-status" src="../../static/oper-icon/content_tag_yijieshu@2x.png"></image>
-				<view class="activity_title"><view style="padding: 2% 4%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{activityInfo.activityName}}</view></view>
+				<view class="activity_title"><view style="padding: 2% 4%;overflow: hidden;text-overflow: ellipsis;white-space: pre-wrap;">{{activityInfo.activityName}}</view></view>
 			</view>
 			<view class="info">
 				<view class="item" style="height: 75rpx;display: flex;justify-content: space-between;" v-if="activityInfo.signupTime">

tjty-app/pages_my/my/my.vue

@@ -212,26 +212,17 @@
 <style lang="scss" scoped>
 	.head_bg {
 		width: 100%;
-		height: 299px;
+		height: 100%;
 		position: relative;
 		overflow-x: hidden;
 		overflow-y: hidden;
-		
-		// top: 88rpx;
-		/* #ifdef APP-PLUS */
+		top: 88rpx;
 		top: calc(var(--top-window-height) + 0px);
-		/* #endif */
-		-webkit-overflow-scroll:touch;
-		left: 0;
-		
-
-
 		.home{
 			position: absolute;
 			z-index: 2;
 			margin: 8% 0 0 3%;
 		}
-
 		.avatar {
 			position: absolute;
 			z-index: 2;

tjty-app/pages_my/myActicity/myActivity.vue

@@ -126,7 +126,8 @@
 				total: 0,
 				signInList: [],
 				signupexamlist:{},
-				signuplist:{}
+				signuplist:{},
+				str1:null,
 			}
 		},
 		
@@ -185,6 +186,8 @@
 				getMyActivitySignupByWechatId(wechatId).then(response => {
 					console.log(response)
 					this.myActivitylist = [...this.myActivitylist, ...response.rows] || []
+					this.str1=this.myActivitylist.activityTime.slice('6');
+
 					console.log(this.myActivitylist)
 					this.total = response.total || [];
 					console.log(this.total)