zhongtianhaoyuan 3 年 前
コミット
5dce2cc161
3 ファイル変更22 行追加36 行削除
  1. 7 24
      pages/riders/fleetSee.vue
  2. 9 11
      pages/riders/inTeam.vue
  3. 6 1
      pages/riders/myTeam.vue

+ 7 - 24
pages/riders/fleetSee.vue

@@ -3,7 +3,6 @@
 
 
 		<view class="fleet_info">
 		<view class="fleet_info">
 			<view class="fleet_top_css">
 			<view class="fleet_top_css">
-				<!-- {{fleetInfo.coverUrl}} -->
 				<view class="">
 				<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>
@@ -11,7 +10,7 @@
 					<view class="fleetInfo_name">{{fleetInfo.fleetName}}
 					<view class="fleetInfo_name">{{fleetInfo.fleetName}}
 						<!-- type 1队长 2队员 -->
 						<!-- type 1队长 2队员 -->
 						<image v-if="type == 1" src="../../static/images/riders/shezhi.png" mode=""
 						<image v-if="type == 1" src="../../static/images/riders/shezhi.png" mode=""
-							style="width: 22rpx;height: 22rpx;margin:10rpx 0 0 20rpx;"
+							style="width: 26rpx;height: 26rpx;margin:10rpx 0 0 20rpx;"
 							@click="setUp('/pages/riders/addFleet')"></image>
 							@click="setUp('/pages/riders/addFleet')"></image>
 					</view>
 					</view>
 					<view class="fleetInfo_address">{{fleetInfo.province}}{{fleetInfo.city}}{{fleetInfo.area}}</view>
 					<view class="fleetInfo_address">{{fleetInfo.province}}{{fleetInfo.city}}{{fleetInfo.area}}</view>
@@ -42,22 +41,20 @@
 							style="width: 18rpx;height: 24rpx;margin:10rpx 0 0 20rpx;"></image>
 							style="width: 18rpx;height: 24rpx;margin:10rpx 0 0 20rpx;"></image>
 					</view>
 					</view>
 				</view>
 				</view>
-
 				<view class="flex member_avatar">
 				<view class="flex member_avatar">
-					<view margin v-for="(item,index) in  4" class="member_item"
+					<!-- <view v-for="(item,index) in 4" class="member_item" :key="index"
 						v-if="fleetInfo.fleetMemberInfoList[index]">
 						v-if="fleetInfo.fleetMemberInfoList[index]">
 						<u-avatar
 						<u-avatar
-							:src="fleetInfo.fleetMemberInfoList[index].driverPortrait?fleetInfo.fleetMemberInfoList[index].driverPortrait:''"
+							:src="fleetInfo.fleetMemberInfoList[index].driverPortrait"
 							size="48" style="margin: 0 auto;"></u-avatar>
 							size="48" style="margin: 0 auto;"></u-avatar>
 						<view class="member_name">
 						<view class="member_name">
 							{{fleetInfo.fleetMemberInfoList[index].driverNickname}}
 							{{fleetInfo.fleetMemberInfoList[index].driverNickname}}
 						</view>
 						</view>
-					</view>
+					</view> -->
 					<view class="del" @click="setUp('/pages/riders/setMember',1)" v-if="type == 1">
 					<view class="del" @click="setUp('/pages/riders/setMember',1)" v-if="type == 1">
 						<view class="del_img">—</view>
 						<view class="del_img">—</view>
 						<view class="member_name">删除</view>
 						<view class="member_name">删除</view>
 					</view>
 					</view>
-
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="setUp" v-if="type == 1">
 			<view class="setUp" v-if="type == 1">
@@ -100,17 +97,12 @@
 		</chunLei-popups> -->
 		</chunLei-popups> -->
 		<u-toast ref="uToast"></u-toast>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="quitShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 		<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>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
-	// import chunLeiPopups from "@/components/chunLei-popups/chunLei-popups.vue";
 	export default {
 	export default {
-		components: {
-			// chunLeiPopups
-		},
 		data() {
 		data() {
 			return {
 			return {
 				value: false,
 				value: false,
@@ -120,7 +112,8 @@
 				fleetInfo: {},
 				fleetInfo: {},
 				quitShow: false,
 				quitShow: false,
 				alertTitle: "",
 				alertTitle: "",
-				seeInfoShow:false
+				seeInfoShow:false,
+				four:4
 			}
 			}
 		},
 		},
 		onShow() {
 		onShow() {
@@ -218,15 +211,6 @@
 			clickRightIcon() {
 			clickRightIcon() {
 				this.value = true
 				this.value = true
 			},
 			},
-			// tapPopup(e) {
-			// 	this.$u.route(e.src, {
-			// 		id: this.id
-			// 	})
-			// 	// uni.showToast({
-			// 	// 	title:e.title,
-			// 	// 	icon:'none'
-			// 	// })
-			// },
 			returnPage() {
 			returnPage() {
 				this.$u.route("/pages/riders/myTeam")
 				this.$u.route("/pages/riders/myTeam")
 			},
 			},
@@ -240,7 +224,6 @@
 						// }else{
 						// }else{
 						// 	this.imgList = this.fleetInfo.coverUrl.split(",")
 						// 	this.imgList = this.fleetInfo.coverUrl.split(",")
 						// }
 						// }
-
 					})
 					})
 					.catch(res => {
 					.catch(res => {
 						uni.$u.toast(res.message);
 						uni.$u.toast(res.message);

+ 9 - 11
pages/riders/inTeam.vue

@@ -1,10 +1,9 @@
 <template>
 <template>
 	<view class="center">
 	<view class="center">
-
-		<view v-for="(item,index) in applyList" class="fleet">
+		<!-- <view v-for="(item,index) in applyList" class="fleet"> -->
 			<u-swipe-action>
 			<u-swipe-action>
-				<u-swipe-action-item :options="options1" :disabled="item.status == '已申请'" @click="delInfo(item)">
-					<view class="flex">
+				<u-swipe-action-item :options="options1" v-for="(item,index) in applyList" class="fleet" :disabled="item.status == '已申请'" @click="delInfo(item)" :autoClose="true">
+					<view class="flex"style="height: 80px;margin-top: 30rpx;">
 						<view class="fleet_img">
 						<view class="fleet_img">
 							<u--image class="flex-end" :showLoading="true" :src="item.driverPortrait" width="60px"
 							<u--image class="flex-end" :showLoading="true" :src="item.driverPortrait" width="60px"
 								height="60px" shape='circle'>
 								height="60px" shape='circle'>
@@ -18,7 +17,6 @@
 								<view class="fleet_name">
 								<view class="fleet_name">
 									{{item.fleetName}}
 									{{item.fleetName}}
 								</view>
 								</view>
-
 							</view>
 							</view>
 							<view class="fleet_btn">
 							<view class="fleet_btn">
 								<view class="fleet_invite btn1" @click="auditSubmit(item,1)" v-if="item.status =='已申请'">
 								<view class="fleet_invite btn1" @click="auditSubmit(item,1)" v-if="item.status =='已申请'">
@@ -29,13 +27,10 @@
 								</view>
 								</view>
 								<view class="btn3" v-else>{{item.status == '已加入' ? "已通过" : item.status}}</view>
 								<view class="btn3" v-else>{{item.status == '已加入' ? "已通过" : item.status}}</view>
 							</view>
 							</view>
-
 						</view>
 						</view>
 					</view>
 					</view>
 				</u-swipe-action-item>
 				</u-swipe-action-item>
 			</u-swipe-action>
 			</u-swipe-action>
-
-
 			<!-- <view class="fleet_img">
 			<!-- <view class="fleet_img">
 				<u--image class="flex-end" :showLoading="true" :src="item.driverPortrait" width="60px" height="60px"
 				<u--image class="flex-end" :showLoading="true" :src="item.driverPortrait" width="60px" height="60px"
 					shape='circle'>
 					shape='circle'>
@@ -55,7 +50,7 @@
 					{{item.fleetName}}
 					{{item.fleetName}}
 				</view>
 				</view>
 			</view> -->
 			</view> -->
-		</view>
+		<!-- </view> -->
 		<u-loadmore :status="status"  :nomore-text="nomoreText" />
 		<u-loadmore :status="status"  :nomore-text="nomoreText" />
 		<u-modal :show="auditShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 		<u-modal :show="auditShow" :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>
@@ -214,8 +209,8 @@
 
 
 	.fleet {
 	.fleet {
 		// padding: 0 30rpx;
 		// padding: 0 30rpx;
-		margin: 40rpx 0;
-		padding-bottom: 40rpx;
+		// margin: 40rpx 0;
+		// padding-bottom: 40rpx;
 		border-bottom: 1px solid #E6E6E6;
 		border-bottom: 1px solid #E6E6E6;
 
 
 		.fleet_img {
 		.fleet_img {
@@ -281,4 +276,7 @@
 
 
 		}
 		}
 	}
 	}
+	// .u-swipe-action-item__content{
+	// 	height: 100px;
+	// }
 </style>
 </style>

+ 6 - 1
pages/riders/myTeam.vue

@@ -108,11 +108,16 @@
 					});
 					});
 			},
 			},
 			fleetInfo(item) {
 			fleetInfo(item) {
-				this.$u.route("/pages/riders/fleetSee", {
+				console.log(item)
+				uni.$u.route("/pages/riders/fleetSee", {
 					fleetId: item.fleetId,
 					fleetId: item.fleetId,
 					id: item.id,
 					id: item.id,
 					type: item.captainFlag
 					type: item.captainFlag
 				})
 				})
+				// uni.$u.route('/pages/goodSource/shippingDetails', {
+				// 	id: id,
+				// });
+				// this.$u.route("/pages/riders/fleetSee")
 			},
 			},
 			inTeam() {
 			inTeam() {
 				this.$u.route("/pages/riders/inTeam")
 				this.$u.route("/pages/riders/inTeam")