Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-app

pages/riders/addFleet.vue

@@ -24,7 +24,7 @@
 			<view class="right-text">
 				<u-radio-group v-model="formData.invitationPermission">
 					<u-radio key="1" label="所有队员" name="1" style="margin-right: 30rpx;" checked="true"></u-radio>
-					<u-radio key="2" label="仅队长" name="2"></u-radio>
+					<u-radio key="2" label="仅管理员" name="2"></u-radio>
 				</u-radio-group>
 			</view>
 		</view>

pages/riders/fleetSee.vue

@@ -8,7 +8,7 @@
 				</view>
 				<view class="fleetInfo_top_right">
 					<view class="fleetInfo_name">{{fleetInfo.fleetName}}
-						<!-- type 1队长 2队员 -->
+						<!-- type 1管理 2队员 -->
 						<image v-if="type == 1" src="../../static/images/riders/shezhi.png" mode=""
 							style="width: 26rpx;height: 26rpx;margin:10rpx 0 0 20rpx;"
 							@click="setUp('/pages/riders/addFleet')"></image>
@@ -169,7 +169,7 @@
 						id: this.fleetId,
 						type: 1
 					})
-				} else if (num == 2) { //转移队长
+				} else if (num == 2) { //转移管理
 					this.$u.route(url, {
 						id: this.fleetId,
 						type: 2

pages/riders/index.vue

@@ -595,7 +595,7 @@
 						if (res.code == '200') {
 							this.$refs.uToast.show({
 								type: 'success',
-								message: "申请成功，等待队长审核",
+								message: "申请成功，等待管理审核",
 							})
 							this.getList()
 						} else {

pages/riders/myTeam.vue

@@ -36,7 +36,7 @@
 						<view class="fleet_name">
 							{{item.fleetName}}({{item.fleetMemberNum}})
 						</view>
-						<!-- “审核中”和“已驳回”只有队长本人可见 -->
+						<!-- “审核中”和“已驳回”只有管理本人可见 -->
 						<view class="fleet_invite audit" v-if="item.captainFlag == 1 && item.fleetStatus =='审核中'">{{item.fleetStatus}}</view>
 						<view class="fleet_invite rebut" v-if="item.captainFlag == 1 && item.fleetStatus =='已驳回'">{{item.fleetStatus}}</view>
 						<!-- 审核通过的不显示状态 -->

pages/riders/setMember.vue

@@ -80,11 +80,11 @@
 				if (!this.transferId) {
 					this.$refs.uToast.show({
 						type: 'error',
-						message: "请选择一名新队长！",
+						message: "请选择一名新管理！",
 					})
 					return
 				}
-				this.alertTitle = "转移后您将不再是该车队的队长，确认转移？"
+				this.alertTitle = "转移后您将不再是该车队的管理，确认转移？"
 				this.setShow = true
 			}
 		},
@@ -180,7 +180,7 @@
 						if (res.code == 200) {
 							this.$refs.uToast.show({
 								type: 'success',
-								message: "队长转移成功！",
+								message: "管理转移成功！",
 								complete() {
 									uni.$u.route("pages/riders/myTeam")
 								}