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_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_home/tjty_home_page/tjty_home_page.vue

@@ -81,25 +81,25 @@
 					<image style="width: 51px; height: 16px; float: right; margin-right: 11px;"
 						src="../../static/home-imgs/home_pic_gengduo@2x.png" @click="toExeMore()"></image>
 				</view>
-				<view class="home_exercise_item" v-for="(item,index) in exerciseList" :key="index">
+				<view class="home_exercise_item" v-for="(item,index) in exerciseList" :key="index"  @click="toAppoint(item)">
 					<view class="ima">
 						<image style="width: 116px;height:116px;border-radius:16px "
 							:src="'https://www.aiwanyundong.com/stage-api' + item.image"></image>
 					</view>
-					<view style="width: 66%;">
-						<view style="height: 80px;">
+					<view style="width: 66%; margin-left: 10rpx;">
+						
 							<view class="a-card">
 								{{item.mechanismName}}
 							</view>
 							<view class="c-card">
 								适用人群:&nbsp;&nbsp;{{item.propertyPeople}}
 							</view>
-						</view>
-						<view>
+						
+						<!-- <view>
 							<button class="b-card" @click="toAppoint(item)">
 								详情
 							</button>
-						</view>
+						</view> -->
 					</view>
 				</view>
 			</view>
@@ -410,7 +410,7 @@
 						font-weight: 400;
 						text-align: left;
 						color: #666666;
-						line-height: 50px;
+						line-height: 100rpx;
 
 					}
 
@@ -426,7 +426,7 @@
 						font-weight: 700;
 						text-align: left;
 						color: #333333;
-						line-height: 42px;
+						line-height: 120rpx;
 					}
 
 					.b-card {

tjty-app/pages_vote/tjty_vote_detail/tjty_vote_detail.vue

@@ -4,7 +4,7 @@
 			<swiper v-if="opusType == '1'" class="swiper-home" indicator-dots="true" autoplay="true" interval="2000"
 				circular="true" indicator-color="#000" indicator-active-color="#FF0000">
 				<swiper-item v-for="(item,index) in bannerList" :key="index">
-					<image :src="item.url" :webp="true" @click="clickImg(item.url)"></image>
+					<image :src="item.url" :webp="true" @click="clickImg(index)"></image>
 				</swiper-item>
 			</swiper>
 			<video v-if=" opusType == '2'" id="myVideo" class="video" show-fullscreen-btn :src="bannerList[0].url"
@@ -54,7 +54,7 @@
 			...mapState('m_user', ['userInfo']),
 		},
 		onLoad(option) { //option为object类型，会序列化上个页面传递的参数
-		this.weChatId = this.userInfo.wechatId
+			this.weChatId = this.userInfo.wechatId
 			console.log("详情页获取的信息：", JSON.parse(option.param))
 			if (option.param) {
 				console.log("详情页获取的信息：", JSON.parse(option.param))
@@ -68,18 +68,25 @@
 				this.opusType = JSON.parse(option.param).opusType
 				this.opusId = JSON.parse(option.param).productionId
 			}
-			
+
 		},
 		methods: {
 
-			clickImg(imgUrl) {
-				wx.previewImage({
-					urls: [imgUrl], //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
-					current: '', // 当前显示图片的http链接，默认是第一个
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {},
+			clickImg(index) {
+				let photoList = this.bannerList.map(item => {
+					return item.url;
+				});
+				uni.previewImage({
+					current: index,
+					urls: photoList
 				})
+				// wx.previewImage({
+				// 	urls: [imgUrl], //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
+				// 	current: '', // 当前显示图片的http链接，默认是第一个
+				// 	success: function(res) {},
+				// 	fail: function(res) {},
+				// 	complete: function(res) {},
+				// })
 			},
 
 			setVote() {
@@ -122,7 +129,7 @@
 				})
 			}
 		},
-		
+
 	}
 </script>