Quellcode durchsuchen

Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

gjy vor 2 Jahren
Ursprung
Commit
12a3c93d89
1 geänderte Dateien mit 19 neuen und 14 gelöschten Zeilen
  1. 19 14
      pages/riders/fleetSee.vue

+ 19 - 14
pages/riders/fleetSee.vue

@@ -4,9 +4,9 @@
 		<view class="fleet_info">
 			<view class="fleet_top_css">
 				<view class="">
-					<u-avatar :src="fleetInfo.coverUrl" size="75" class="fleetInfo_img"  mode="circle"></u-avatar>
+					<u-avatar :src="fleetInfo.coverUrl" size="75" class="fleetInfo_img" mode="circle"></u-avatar>
 				</view>
-				<view class="fleetInfo_top_right"> 
+				<view class="fleetInfo_top_right">
 					<view class="fleetInfo_name">{{fleetInfo.fleetName}}
 						<!-- type 1队长 2队员 -->
 						<image v-if="type == 1" src="../../static/images/riders/shezhi.png" mode=""
@@ -16,7 +16,7 @@
 					<view class="fleetInfo_address">{{fleetInfo.province}}{{fleetInfo.city}}{{fleetInfo.area}}</view>
 				</view>
 				<view class="notice_title">公告</view>
-				<view class="flex notice_center" >
+				<view class="flex notice_center">
 					<view class="notice_text">{{fleetInfo.notice?fleetInfo.notice:"暂无公告"}}</view>
 					<image src="../../static/images/myimg/gengduo1.png" mode="" @click="noticeSee"
 						style="width: 18rpx;height: 24rpx;margin:10rpx 0 0 20rpx;"></image>
@@ -25,7 +25,7 @@
 				<view class="introduce_info" @click="seeInfo">
 					{{fleetInfo.fleetProfile}}
 				</view>
-				<u-popup :show="seeInfoShow" @close="seeInfoClose" @open="seeInfo" round="20" >
+				<u-popup :show="seeInfoShow" @close="seeInfoClose" @open="seeInfo" round="20">
 					<view class="popUp">
 						<view class="fleet_introduce_css">车队简介</view>
 						<text>{{fleetInfo.fleetProfile}}</text>
@@ -42,7 +42,7 @@
 					</view>
 				</view>
 				<view class="flex member_avatar">
-					<!-- <view v-for="(item,index) in 4" class="member_item" :key="index"
+					<view v-for="(item,index) in 4" class="member_item" :key="index"
 						v-if="fleetInfo.fleetMemberInfoList[index]">
 						<u-avatar
 							:src="fleetInfo.fleetMemberInfoList[index].driverPortrait"
@@ -50,7 +50,7 @@
 						<view class="member_name">
 							{{fleetInfo.fleetMemberInfoList[index].driverNickname}}
 						</view>
-					</view> -->
+					</view>
 					<view class="del" @click="setUp('/pages/riders/setMember',1)" v-if="type == 1">
 						<view class="del_img">—</view>
 						<view class="member_name">删除</view>
@@ -97,7 +97,7 @@
 		</chunLei-popups> -->
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="quitShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick" ></u-modal>
+			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 
@@ -109,11 +109,13 @@
 				type: "",
 				id: "",
 				fleetId: "",
-				fleetInfo: {},
+				fleetInfo: {
+					fleetMemberInfoList:[],
+				},
 				quitShow: false,
 				alertTitle: "",
-				seeInfoShow:false,
-				four:4
+				seeInfoShow: false,
+				four: 4
 			}
 		},
 		onShow() {
@@ -130,7 +132,7 @@
 			seeInfo() {
 				this.seeInfoShow = true
 			},
-			seeInfoClose(){
+			seeInfoClose() {
 				this.seeInfoShow = false
 			},
 			cancelClick() {
@@ -187,7 +189,7 @@
 				this.quitShow = true
 			},
 			noticeSee() {
-				if(!this.fleetInfo.notice){
+				if (!this.fleetInfo.notice) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "暂无公告!",
@@ -254,6 +256,7 @@
 	}
 
 	.fleet_info {
+
 		// padding-top: 20rpx;
 		.fleet_top_css {
 			padding: 10rpx 30rpx;
@@ -324,9 +327,11 @@
 				-webkit-line-clamp: 3;
 				/** 显示的行数 **/
 			}
-			.popUp{
+
+			.popUp {
 				padding: 60rpx 30rpx;
-				.fleet_introduce_css{
+
+				.fleet_introduce_css {
 					text-align: center;
 					margin-bottom: 40rpx;
 					font-size: 36rpx;