货站

App.vue

@@ -183,7 +183,7 @@
 			// 				radius:10,
 			// 			    // cancelText: '否',
 			// 				// showCancel:false,
-			// 				okButtonColor:'#2772FB'
+			// 				okButtonColor:'#F5BA3C'
 			// 			};
 			// 			const native = uni.requireNativePlugin('AJ-Alert');
 			// 			native.showAction(options, result => {
@@ -227,7 +227,7 @@
 							radius: 10,
 							// cancelText: '否',
 							showCancel: false,
-							okButtonColor: '#2772FB'
+							okButtonColor: '#F5BA3C'
 						};
 						const native = uni.requireNativePlugin('AJ-Alert');
 						native.showAction(options, result => {

components/bert-suggest/suggest.vue

@@ -103,7 +103,7 @@
 	}
 
 	.submit-btn {
-		background-color: #2772FB;
+		background-color: #F5BA3C;
 		color: #fff;
 		border-radius: 30px;
 		margin: 20rpx;

components/upload.vue

@@ -173,7 +173,7 @@
 			// 成功背景颜色
 			checkBgColor: {
 				type: String,
-				default: '#2772FB'
+				default: '#F5BA3C'
 			},
 			// 成功icon颜色
 			checkColor: {

config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	baseUrlNew: 'https://api.changyuntong56.com',
-	// baseUrlNew: 'http://192.168.110.138:8999',
+	// baseUrlNew: 'https://api.changyuntong56.com',
+	baseUrlNew: 'http://192.168.110.138:8999',
 	// baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'http://192.168.110.82:8999',

demo.vue

@@ -81,7 +81,7 @@
 	
 				// uni.$u.toast('倒计时结束后再发送');
 				// 9、
-				// <u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#2772FB'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+				// <u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#F5BA3C'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 				// confirmClick(){
 				// 	this.isShowAlert = fasle
 				// },

pages.json

@@ -2,7 +2,7 @@
 	"tabBar": {
 		"custom": false,
 		"color": "#656765",
-		"selectedColor": "#2772FB",
+		"selectedColor": "#F5BA3C",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [{
@@ -12,10 +12,10 @@
 				"text": "货源"
 			},
 			{
-				"pagePath": "pages/riders/index",
+				"pagePath": "pages/cargoTerminal/cargoTerminal",
 				"iconPath": "static/images/common/zhaoche.png",
 				"selectedIconPath": "static/images/common/zhaoche_check.png",
-				"text": "车友"
+				"text": "货站"
 			},
 			{
 				"pagePath": "pages/order/index",
@@ -216,7 +216,7 @@
 							"text": "保存",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
 							"fontSize": "30rpx",
-							"color": "#2772FB",
+							"color": "#F5BA3C",
 							"width": "80rpx",
 							"textAlign": "left",
 							"fontWeight": "600"
@@ -275,7 +275,7 @@
 							"text": "提交",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
 							"fontSize": "28rpx",
-							"color": "#2772FB",
+							"color": "#F5BA3C",
 							"width": "80rpx",
 							"textAlign": "left"
 						}]
@@ -294,7 +294,7 @@
 							"text": "完成",
 							"fontSrc": "/static/addfleet/iconfont.ttf",
 							"fontSize": "28rpx",
-							"color": "#2772FB",
+							"color": "#F5BA3C",
 							"width": "80rpx",
 							"textAlign": "left"
 						}]
@@ -341,7 +341,7 @@
 			"path": "pages/mine/driverCertification",
 			"style": {
 				"navigationBarTitleText": "司机认证",
-				"navigationBarBackgroundColor": "#2772FB",
+				"navigationBarBackgroundColor": "#F5BA3C",
 				"navigationBarTextStyle": "white"
 			}
 
@@ -349,7 +349,7 @@
 			"path": "pages/mine/driverCertificationNext",
 			"style": {
 				"navigationBarTitleText": "司机认证",
-				"navigationBarBackgroundColor": "#2772FB",
+				"navigationBarBackgroundColor": "#F5BA3C",
 				"navigationBarTextStyle": "white"
 			}
 
@@ -358,7 +358,7 @@
 			"path": "pages/mine/editDriverCertification",
 			"style": {
 				"navigationBarTitleText": "司机认证",
-				"navigationBarBackgroundColor": "#2772FB",
+				"navigationBarBackgroundColor": "#F5BA3C",
 				"navigationBarTextStyle": "white"
 			}
 
@@ -366,7 +366,7 @@
 			"path": "pages/mine/editDriverCertificationNext",
 			"style": {
 				"navigationBarTitleText": "司机认证",
-				"navigationBarBackgroundColor": "#2772FB",
+				"navigationBarBackgroundColor": "#F5BA3C",
 				"navigationBarTextStyle": "white"
 			}
 
@@ -376,7 +376,7 @@
 			"path": "pages/mine/often/addRoute",
 			"style": {
 				"navigationBarTitleText": "添加路线",
-				"navigationBarBackgroundColor": "#2772FB",
+				"navigationBarBackgroundColor": "#F5BA3C",
 				"navigationBarTextStyle": "white"
 			}
 		},
@@ -596,7 +596,36 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/cargoTerminal/cargoTerminal",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "货站",
+                "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+            }
+            
+        },
+		{
+		    "path" : "pages/cargoTerminal/hzSelectCity",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "货站",
+		        "enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+		    }
+		    
+		},
+		{
+		    "path" : "pages/cargoTerminal/cargoTerminalDetail",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "发货详情",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

pages/cargoTerminal/cargoTerminal.vue

@@ -0,0 +1,838 @@
+<!-- 货源 -->
+<template>
+	<view :class="{popupShow:isShowAlert}" class="content">
+		<view class="banner">
+			<view class="head flex">
+				<view class="text flex" @click="goCity(0)">{{startPlace.sendCity}} {{startPlace.sendArea}}
+					<u-icon name="arrow-down" color="##fff" size="20"></u-icon>
+				</view>
+				<image class="jt-icon item2" src="@/static/images/goodSource/jt.png" mode='widthFix'>
+				</image>
+				<view class="text flex" @click="goCity(1)">{{endPlace.unloadCity}} {{endPlace.unloadArea}}
+					<u-icon name="arrow-down" color="#fff" size="20"></u-icon>
+				</view>
+			</view>
+		</view>
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
+			:down="downOption">
+			<view v-for="(good,index) in goods" :key="index" @click="toDetail(good.id)">
+				<view v-if="good.peripheralInfo==1&&isFirstIndex==index" class="other-goods">周边货源</view>
+				<view class="good-list">
+					<view class="good-view">
+						<!-- 			<image src="@/static/images/goodSource/xf.png" mode="widthFix" class="xf-iamge"
+							v-if="good.freightAdvance==1"></image> -->
+						<view class="list-left">
+							<view class="flex align-center">
+								<view class="item1">
+									<!-- <view class="ssx">
+										{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}
+									</view> -->
+									<view class="level2-title">{{$helper.filterUrban(good.sendCity)}}
+										{{$helper.filterArea(good.sendArea)}}
+									</view>
+								</view>
+
+								<image class="jt-icon item2" src="@/static/images/goodSource/jt.png" mode='widthFix'>
+								</image>
+								<view class="item3">
+									<!-- <view class="ssx">
+										{{$helper.getProvinceAbbreviation(good.unloadPrivate?good.unloadPrivate:good.unloadCity)}}
+									</view> -->
+									<view class="level2-title">{{$helper.filterUrban(good.unloadCity)}}
+										{{$helper.filterArea(good.unloadArea)}}
+									</view>
+								</view>
+							</view>
+
+							<view class="flex flex-space-between row row2">
+								<view class="left">
+									距离约{{good.cargoDistance}}公里
+								</view>
+								<view class="right">
+									{{good.updateDate}}发布
+								</view>
+							</view>
+							<view class="flex flex-space-between row row3">
+								<view class="left">
+									<text>￥{{good.freightPrice}}</text>
+									<text v-if="good.billingMethod==0">元/吨</text>
+									<text v-if="good.billingMethod==1">元/车</text>
+									<text v-if="good.billingMethod==2">元/方</text>
+								</view>
+								<view class="right">
+									{{good.packageType}}{{good.goodsName}}
+								</view>
+							</view>
+							<view class="row-content">
+								{{good.content}}
+							</view>
+						</view>
+					</view>
+					<view class="flex flex-space-between item-bottom">
+						<view class="left flex row">
+							<u--image :src="good.headSculpture?good.headSculpture:'../../static/images/mine/tx.png'"
+								width='57rpx' height='57rpx' shape="circle">
+							</u--image>
+							<view class="name">{{good.freightStationName}}·{{good.contacts}}</view>
+						</view>
+						<view class="right">
+							<view @click.native.stop="toCaLL(good)" class="qd" v-if='hasLogin'><u-icon name="phone-fill"
+									color="#F5BA3C"></u-icon>去电</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</mescroll-body>
+		<u-toast ref="uToast"></u-toast>
+	</view>
+</template>
+<script>
+	var that
+	import permision from "@/js_sdk/wa-permission/permission.js"
+	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		mixins: [MescrollMixin], // 使用mixin
+		data() {
+			return {
+				isToday: false,
+				downOption: {
+					auto: false,
+					textColor: '#bbb'
+				},
+				upOption: {
+					page: {
+						size: 10 // 每页数据的数量,默认10
+					},
+					auto: false,
+					noMoreSize: 1,
+					textNoMore: '没有更多了~',
+					textColor: '#bbb'
+				},
+				confirmText: '确定',
+				showCancelButton: true,
+				isFirstIndex: null,
+				ObjSelect: {},
+				isShowAlert: false,
+				alertTitle: '确定抢单？',
+				show: false,
+				columns: [
+					['全部类型', '运费先付']
+				],
+				startPlace: {},
+				endPlace: {},
+				otherGoods: [], // 数据列表
+				goods: [], // 数据列表
+				src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+				height: "", // 需要固定swiper的高度
+				tabList: [
+					// 	{
+					// 	name: '全部'
+					// }, 
+					{
+						name: '推荐'
+					}, {
+						name: '按时间'
+					}, {
+						name: '按距离'
+					},
+					// {
+					// 	name: '运费先付'
+					// },
+				],
+				pickerSelect: '全部类型',
+				tabIndex: 0,
+				scrollTop: 0,
+				isdblclick: 0,
+				count: 0,
+				lng: '',
+				lat: '',
+				bool: false,
+				showMenu: false,
+				driverCommonId: "",
+				driverPhone: "",
+				driverName: ""
+			}
+		},
+		onTabItemTap(e) {
+			this.isdblclick++
+			// tab 点击时执行，此处直接接收单击事件
+			if (this.scrollTop > 1200) {
+				if (this.isdblclick > 1) {
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: 300
+					});
+				}
+			}
+		},
+		created() {
+
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
+		},
+		watch: {
+			// startPlace(){
+			// 	console.log(this.startPlace)
+			//              this.upCallback({page});
+			//          },
+		},
+		onLoad() {
+			that = this
+			// this.checkOpenGPSServiceByAndroidIOS()
+		},
+		onHide() {
+			this.isdblclick = 0
+		},
+		async onShow() {
+			// if (this.scrollTop > 1200) {
+			// 	uni.setTabBarItem({
+			// 		index: 0,
+			// 		text: '返回顶部',
+			// 		iconPath: 's',
+			// 		selectedIconPath: 'static/images/common/top@2x.png'
+			// 	})
+			// }
+			uni.setTabBarItem({
+				index: 2,
+				text: '订单',
+				iconPath: 'static/images/common/dingdan@2x(1).png',
+				selectedIconPath: 'static/images/common/dingdan@2x.png'
+			})
+			var that = this
+			//获取上一次起始位置
+			if (uni.getStorageSync('fHzPlaceObj')) {
+				that.startPlace = uni.getStorageSync('fHzPlaceObj');
+			} else {
+
+				that.startPlace = {
+					sendPrivate: '辽宁省',
+					sendCity: '营口市',
+					sendArea: '鲅鱼圈区',
+					selected: '营口市'
+				}
+
+			}
+			if (uni.getStorageSync('sHzPlaceObj')) {
+				that.endPlace = uni.getStorageSync('sHzPlaceObj');
+			} else {
+				that.endPlace = {
+					unloadPrivate: '吉林省',
+					unloadCity: '齐齐哈尔市',
+					unloadArea: '富拉尔基',
+					selected: '齐齐哈尔市'
+				}
+				// uni.setStorageSync('sPlaceObj', {
+				// 	schoosearea: '请选择区',
+				// 	schoosecity: '请选择市',
+				// 	schooseprovince: '全国',
+				// 	selected: '全国'
+				// })
+			}
+			that.upCallback({
+				size: 10,
+				num: 1
+			})
+
+			that.$request.baseRequest('get', '/newsInfo/unreadMessage', {
+				reCommonId: this.userInfo.id,
+			}).then(res3 => {
+				if (res3.data || res3.data == 0) {
+					let name = 'myTip';
+					let value = res3.data
+					if (value == 0) {
+						uni.removeTabBarBadge({
+							index: 3
+						})
+					}
+					that.$store.commit('$uStore', {
+						name,
+						value
+					});
+					if (value != 0 && value) {
+						uni.setTabBarBadge({
+							index: 3,
+							text: value + ""
+						})
+					}
+				}
+			})
+			// this.mescroll.resetUpScroll()
+
+		},
+		// async onLoad() {
+		// 	that = this
+		// 	// #ifdef APP-PLUS
+		// 	let _status = await that.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+		// 		driverPhone: this.userInfo.phone,
+		// 	}).then(res => {
+		// 		return res.data.authenticationStatus
+		// 	})
+		// 	// if (_status == '已禁用') {
+		// 	// 	this.isShowAlert = true
+		// 	// 	this.alertTitle = '账号审核中'
+		// 	// 	this.confirmText = '退出APP'
+		// 	// 	this.showCancelButton = false
+		// 	// } else {
+		// 	// 	console.log(1231233212332312312213)
+		// 	// }
+		// 	// #endif
+
+		// },
+
+		onPageScroll(res) {
+			this.scrollTop = res.scrollTop
+			// console.log("页面滚动了", res.scrollTop)
+			if (this.scrollTop > 1200) {
+				uni.setTabBarItem({
+					index: 0,
+					text: '返回顶部',
+					iconPath: 'static/images/common/top@2x.png',
+					selectedIconPath: 'static/images/common/top@2x.png'
+				})
+			} else {
+				uni.setTabBarItem({
+					index: 0,
+					text: '货源',
+					iconPath: 'static/images/common/huoyuan@2x(1).png',
+					selectedIconPath: 'static/images/common/huoyuan@2x.png'
+				})
+			}
+
+		},
+		methods: {
+			stopRoll() {
+
+			},
+			async get_localtion_permission() {
+				var photol = await permision.checkSystemEnableLocation()
+				if (photol == true) {
+					this.getLngLat()
+				} else {
+					// that.$refs.uToast.show({
+					// 	type: 'error',
+					// 	message: "未获取定位权限！",
+					// })
+					this.checkOpenGPSServiceByAndroidIOS()
+				}
+			},
+			async getLngLat() {
+				await uni.getLocation({
+					type: 'gcj02',
+					geocode: true,
+					success: res => {
+						if (res.latitude) {
+							if (res.address.city) {
+								if (res.address.city.indexOf('市') != -1) {
+									res.address.city = res.address.city.substring(0, res.address.city
+										.length - 1)
+								}
+							}
+							if (res.address.province) {
+								if (res.address.province.indexOf('省') != -1) {
+									res.address.province = res.address.province.substring(0, res.address
+										.province.length - 1)
+								}
+							}
+							uni.setStorageSync('fPlaceObj', {
+								fchoosearea: '全部',
+								fchoosecity: res.address.city,
+								fchooseprovince: res.address.province,
+								selected: res.address.city
+							})
+							uni.setStorageSync('sPlaceObj', {
+								schoosearea: '请选择区',
+								schoosecity: '请选择市',
+								schooseprovince: '全国',
+								selected: '全国'
+							})
+							uni.setStorageSync('longitudeAndLatitude', res.longitude + ',' + res.latitude)
+							that.upCallback({
+								size: 10,
+								num: 1
+							})
+						}
+					}
+				})
+			},
+			checkOpenGPSServiceByAndroidIOS() {
+				let system = uni.getSystemInfoSync(); // 获取系统信息
+				// console.log(system);
+				if (system.platform === 'android') { // 判断平台
+					var context = plus.android.importClass("android.content.Context");
+					var locationManager = plus.android.importClass("android.location.LocationManager");
+					var main = plus.android.runtimeMainActivity();
+					var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+					if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
+						uni.showModal({
+							title: '提示',
+							content: '请打开定位服务功能',
+							// showCancel: false, // 不显示取消按钮
+							success(res) {
+								if (res.confirm) {
+									uni.setStorageSync('confirm_location', 1)
+									if (!mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER)) {
+
+										var Intent = plus.android.importClass('android.content.Intent');
+										var Settings = plus.android.importClass('android.provider.Settings');
+										var intent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+										main.startActivity(intent); // 打开系统设置GPS服务页面
+										console.log()
+									}
+									// else {
+									// 	uni.setStorageSync('fPlaceObj', {
+									// 		fchoosearea: '全部',
+									// 		fchoosecity: '市辖区',
+									// 		fchooseprovince: '北京',
+									// 		selected: '东城'
+									// 	})
+									// 	uni.setStorageSync('sPlaceObj', {
+									// 		schoosearea: '请选择区',
+									// 		schoosecity: '请选择市',
+									// 		schooseprovince: '全国',
+									// 		selected: '全国'
+									// 	})
+									// 	uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
+									// }
+								} else {
+									// uni.setStorageSync('fPlaceObj', {
+									// 	fchoosearea: '全部',
+									// 	fchoosecity: '市辖区',
+									// 	fchooseprovince: '北京',
+									// 	selected: '东城'
+									// })
+									// uni.setStorageSync('sPlaceObj', {
+									// 	schoosearea: '请选择区',
+									// 	schoosecity: '请选择市',
+									// 	schooseprovince: '全国',
+									// 	selected: '全国'
+									// })
+									// uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
+								}
+							}
+						});
+						// uni.setStorageSync('fPlaceObj', {
+						// 	fchoosearea: '全部',
+						// 	fchoosecity: '市辖区',
+						// 	fchooseprovince: '北京',
+						// 	selected: '东城'
+						// })
+						// uni.setStorageSync('sPlaceObj', {
+						// 	schoosearea: '请选择区',
+						// 	schoosecity: '请选择市',
+						// 	schooseprovince: '全国',
+						// 	selected: '全国'
+						// })
+						if (uni.getStorageSync('fPlaceObj')) {
+							that.startPlace = uni.getStorageSync('fPlaceObj');
+						}
+						if (uni.getStorageSync('sPlaceObj')) {
+							that.endPlace = uni.getStorageSync('sPlaceObj');
+						}
+						uni.setStorageSync('longitudeAndLatitude', '116.3972,39.9096')
+					} else {
+						this.getLngLat()
+					}
+				} else if (system.platform === 'ios') {
+					// console.log("苹果");
+					var cllocationManger = plus.ios.import("CLLocationManager");
+					var enable = cllocationManger.locationServicesEnabled();
+					var status = cllocationManger.authorizationStatus();
+					plus.ios.deleteObject(cllocationManger);
+					if (enable && status != 2) {
+						this.getLngLat()
+						console.log("手机系统的定位已经打开");
+					} else {
+						console.log("手机系统的定位没有打开");
+						uni.showModal({
+							title: '提示',
+							content: '请前往设置-隐私-定位服务打开定位服务功能',
+							// showCancel: false, // 不显示取消按钮
+							success(res) {
+								if (res.confirm) {
+									var UIApplication = plus.ios.import("UIApplication");
+									var application2 = UIApplication.sharedApplication();
+									var NSURL2 = plus.ios.import("NSURL");
+									// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");
+									// var setting2 = NSURL2.URLWithString("App-Prefs:root=LOCATION_SERVICES");
+									// var setting2 = NSURL2.URLWithString("app-settings");
+									var setting2 = NSURL2.URLWithString("App-Prefs:root=Privacy&path=LOCATION");
+									// var setting2 = NSURL2.URLWithString("App-Prefs:root=Privacy&path=LOCATION_SERVICES");
+									application2.openURL(setting2);
+									plus.ios.deleteObject(setting2);
+									plus.ios.deleteObject(NSURL2);
+									plus.ios.deleteObject(application2);
+									this.getLngLat()
+								}
+							}
+						});
+					}
+				}
+			},
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			getdate() {
+				var date = new Date()
+				var year = date.getFullYear() //获取完整的年份(4位)
+				var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+				var datetime = date.getDate() //获取当前日(1-31)
+				if (mouth < 10) {
+					mouth = '0' + mouth
+				}
+				if (datetime < 10) {
+					datetime = '0' + datetime
+				}
+				return String(year) + String(mouth) + String(datetime)
+			},
+			toCaLL(item) {
+				let that = this
+				this.$request.baseRequest('get', '/driverInfo/firstAuthentication', {
+					driverPhone: this.userInfo.phone,
+				}).then(res2 => {
+					if (res2.data.authenticationStatus == '已过期') {
+						that.$refs.uToast.show({
+							type: 'error',
+							message: '证件已过期,请上传新证件！',
+						})
+						return
+					} else if (res2.data.authenticationStatus == '未认证' || res2.data.authenticationStatus ==
+						'已驳回') {
+						that.$refs.uToast.show({
+							type: 'error',
+							message: '请先完成司机认证！',
+						})
+						return
+					} else if (res2.data.authenticationStatus == '审核中') {
+						that.$refs.uToast.show({
+							type: 'error',
+							message: '司机审核中！',
+						})
+						return
+					} else if (res2.data.authenticationStatus == '已认证') {
+						uni.makePhoneCall({
+							phoneNumber: item.contactsPhone
+						});
+					}
+				})
+			},
+			toDetail(id) {
+				uni.navigateTo({
+					url: "/pages/cargoTerminal/cargoTerminalDetail?id=" + id
+				})
+			},
+			getData(time) {
+				let _todayDate = new Date().setHours(0, 0, 0, 0)
+				if (_todayDate == time) return true
+				return false
+			},
+			upCallback(page) {
+				console.log(this.startPlace)
+				console.log(this.endPlace)
+				this.$request.baseRequest('get', '/hyReleaseGoodsInfo/selectTask', {
+						currentPage: page.num,
+						pageSize: page.size,
+						searchType: this.tabIndex + 1,
+						loadingPlaceCity: this.startPlace.sendCity,
+						unLoadingPlaceCity: this.endPlace.unloadCity,
+						driverFlag: 1
+					}).then(res => {
+						uni.hideLoading()
+						let curPageData = res.data.records;
+						let totalPage = res.data.total;
+						let curPageLen = curPageData.length;
+						this.mescroll.endByPage(curPageLen, totalPage);
+						console.log(res.data)
+						if (page.num == 1) this.goods = [];
+						this.goods = this.goods.concat(curPageData);
+						for (let i = 0; i < this.goods.length; i++) {
+							let _updateDate = new Date(this.goods[i].updateDate.split(' ')[0]).setHours(0, 0, 0, 0)
+							this.isToday = this.getData(_updateDate)
+							console.log("this.isToday",this.isToday)
+							if(this.isToday){
+								this.goods[i].updateDate=this.goods[i].updateDate.split(' ')[1]
+							}else{
+								this.goods[i].updateDate=this.goods[i].updateDate.split(' ')[0]
+							}
+							let _text3 = ''
+							let _textList = this.goods[i].measuringMethod.split(',')
+							for (let i = 0; i < _textList.length; i++) {
+								if (_textList[i] == '重量（吨）') {
+									_text3 += this.goods[i].weight + '吨/'
+								} else {
+									_text3 += this.goods[i].weight + '方/'
+								}
+							}
+							_text3 = _text3.substring(0, _text3.length - 1)
+							this.goods[i].content = this.goods[i].carModel.replace(',', '/') + '、' + this
+								.goods[i].carLength.replace(',', '/') + '米、' + _text3 + '、' + this.goods[i]
+								.expectedNum + '车、' + this.goods[i].goodsName + '、' + this.goods[i]
+								.packageType + '、' + this.goods[i].cargoDistance + 'km'
+						}
+
+						for (let i = 0; i < that.goods.length; i++) {
+							if (that.goods[i].peripheralInfo == 1) {
+								that.isFirstIndex = i
+								return
+							}
+						}
+
+					})
+					.catch(res => {
+						uni.hideLoading()
+						uni.$u.toast(res.message);
+						this.mescroll.endErr();
+					});
+			},
+			goCity(type) {
+				uni.$u.route('/pages/cargoTerminal/hzSelectCity', {
+					startPlace: JSON.stringify(this.startPlace),
+					endPlace: JSON.stringify(this.endPlace),
+					type: type
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.popupShow {
+		overflow: hidden;
+		position: fixed;
+		height: 100vh;
+		width: 100%;
+	}
+
+	.content {
+		background: #F2F4F7;
+	}
+
+	.banner {
+		width: 100%;
+		position: relative;
+	}
+
+	.u-flex-wrap {
+		flex-wrap: wrap;
+	}
+
+	.fixed,
+	.fixed1 {
+		background: linear-gradient(97deg, #F5BA3C 0%, #F5BA3C 100%);
+		position: fixed;
+		top: var(--status-bar-height);
+		z-index: 999;
+		// width: calc(100% - 40rpx);
+		width: 100%;
+		// margin:0 20rpx;
+	}
+
+	.fixed1 {
+		top: 0;
+		height: var(--status-bar-height);
+		background: linear-gradient(97deg, #F5BA3C 0%, #F5BA3C 100%);
+	}
+
+	.banner-img {
+		width: 100%;
+	}
+
+	.head {
+		background: #F5BA3C;
+		padding: 20rpx;
+		box-sizing: border-box;
+		display: flex;
+
+		.text {
+			color: #fff;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+		}
+	}
+
+	.change-btn {
+		width: 86rpx;
+		height: 86rpx;
+	}
+
+	.good-list {
+		background-color: white;
+		margin: 10px 10px 15px 10px;
+		// padding: 10px 0px 0px 0;
+		border-radius: 30rpx;
+		box-shadow: 0px 5rpx 20rpx #E3E3E3;
+
+		.good-view {
+			padding: 10rpx 35rpx 10rpx 35rpx;
+			position: relative;
+		}
+
+		.item1,
+		.item3 {
+			// width: 40%;
+			display: flex;
+
+			.text {
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+			}
+
+		}
+
+		.item1 .text {
+			text-align: left;
+		}
+
+		.item3 .text {
+			text-align: right;
+		}
+
+		.row2 {
+			color: rgb(153, 153, 153)
+		}
+
+		.row3 {
+			.left {
+				color: rgb(255, 134, 0);
+			}
+
+			.right {
+				color: rgb(153, 153, 153)
+			}
+		}
+	}
+
+	.jt-icon {
+		position: relative;
+		// top: 6rpx;
+		width: 60rpx;
+		margin: 0 20rpx;
+
+	}
+
+	.row {
+		margin: 10rpx 0;
+		align-items: center;
+	}
+
+	.item-bottom {
+		// background: #F0F5FF;
+		padding: 23rpx 30rpx;
+		border-radius: 0px 0px 18px 18px;
+
+		.name {
+			font-size: 26rpx;
+			font-weight: 700;
+			color: #000000;
+			margin-left: 30rpx;
+		}
+
+		.hp {
+			margin: 30rpx;
+		}
+
+		.number-color {
+			margin: 0 10rpx;
+		}
+
+		.qd {
+			// background: linear-gradient(97deg, #F5BA3C 0%, #F5BA3C 100%);
+			border-radius: 13rpx;
+			font-size: 29rpx;
+			font-weight: 400;
+			color: #F5BA3C;
+			padding: 15rpx 35rpx;
+			display: flex;
+			align-items: center;
+			border: 1px solid #F5BA3C;
+		}
+	}
+
+	.dw {
+		align-items: center;
+	}
+
+	.place {
+		height: var(--status-bar-height);
+	}
+
+	.tab-view {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		// padding-left: 20rpx;
+	}
+
+	.tab-right {
+		display: flex;
+		margin-right: 39rpx;
+		align-items: center;
+	}
+
+	.other-goods {
+		// background: red;
+		color: #999999;
+		margin: 40rpx 0;
+		display: flex;
+		justify-content: center;
+		font-size: 36rpx;
+	}
+
+	.level2-title {
+		// font-size: 28rpx;
+	}
+
+	.yf-style {
+		position: relative;
+
+		.left {
+			font-size: 25.39rpx;
+
+			.text-space {
+				margin-right: 20rpx;
+			}
+
+			.line {
+				margin: 0 10rpx;
+			}
+		}
+
+		.h-color {
+			// position: absolute;
+			// right: 0;
+			// top: -30rpx;
+		}
+	}
+
+	.xf-iamge {
+		width: 74rpx;
+		height: 43rpx;
+		position: absolute;
+		top: -20rpx;
+		right: 0;
+	}
+
+	.place-title {
+		margin-bottom: 11rpx;
+	}
+
+	.btn-color {
+		margin-top: 52rpx;
+		padding: 30rpx 0;
+	}
+
+	.row-content {
+		color: rgb(153, 153, 153);
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+	}
+</style>

pages/cargoTerminal/cargoTerminalDetail.vue

@@ -0,0 +1,228 @@
+<template>
+	<view class="content">
+		<view class="content1">
+			<view class="title">
+				发运信息
+			</view>
+			<view class="row1 row">
+				<view class="left">
+					发货地
+				</view>
+				<view class="right">
+					{{dataObj.sendPrivate}}  {{dataObj.sendCity}}  {{dataObj.sendArea}}
+				</view>
+			</view>
+			<view class="row2 row right">
+					{{dataObj.sendDetailedAddress}}
+			</view>
+			<view class="row3 row">
+				<view class="left">
+					卸货地
+				</view>
+				<view class="right">
+					{{dataObj.unloadPrivate}}  {{dataObj.unloadCity}}  {{dataObj.unloadArea}}
+				</view>
+			</view>
+			<view class="row4 row right">
+					{{dataObj.unloadDetailedAddress}}
+			</view>
+			<view class="row5 row">
+				<view class="left">
+					装车时间
+				</view>
+				<view class="right">
+					{{dataObj.loadingDate}}  {{dataObj.periodOfTime}}
+				</view>
+			</view>
+			<view class="row6 row">
+				<view class="left">
+					运输距离
+				</view>
+				<view class="right">
+					{{dataObj.cargoDistance}}
+				</view>
+			</view>
+			<view class="row7 row">
+				<view class="left">
+					运价
+				</view>
+				<view class="right">
+					<text>￥{{dataObj.freightPrice}}</text>
+					<text v-if="dataObj.billingMethod==0">元/吨</text>
+					<text v-if="dataObj.billingMethod==1">元/车</text>
+					<text v-if="dataObj.billingMethod==2">元/方</text>
+				</view>
+			</view>
+			<view class="row8 row">
+				<view class="top">
+					备注
+				</view>
+				<view class="bottom">
+					{{dataObj.remark}}
+				</view>
+			</view>
+		</view>
+		<view class="content2">
+			<view class="title">
+				车辆货物信息
+			</view>
+			<view class="row">
+				<view class="left">
+					货名
+				</view>
+				<view class="right">
+					{{dataObj.goodsName}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					货物重量
+				</view>
+				<view class="right">
+					{{dataObj.weight}} 吨
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					货物体积
+				</view>
+				<view class="right">
+					{{dataObj.volume}} 方
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					包装方式
+				</view>
+				<view class="right">
+					{{dataObj.packageType}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					用车数量
+				</view>
+				<view class="right">
+					{{dataObj.expectedNum}}辆
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					车型
+				</view>
+				<view class="right">
+					{{dataObj.carModel}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					车长
+				</view>
+				<view class="right">
+					{{dataObj.carLength}}
+				</view>
+			</view>
+		</view>
+		<view class="content3">
+			<view class="title">
+				货站信息
+			</view>
+			<view class="row">
+				<view class="left">
+					联系人
+				</view>
+				<view class="right">
+					{{dataObj.contacts}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					联系电话
+				</view>
+				<view class="right">
+					{{dataObj.contactsPhone}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					货站名称
+				</view>
+				<view class="right">
+					{{dataObj.freightStationName}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					信息费
+				</view>
+				<view class="right">
+					{{dataObj.stationFee}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				dataObj:{}
+			};
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.init()
+		},
+		methods:{
+			init(){
+				this.$request.baseRequest('get', '/hyReleaseGoodsInfo/seeTask', {id:this.id}).then(res => {
+						uni.hideLoading()
+						this.dataObj = res.data
+					})
+					.catch(res => {});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		padding: 20rpx;
+	}
+	.content1,.content2,.content3{
+		background: #fff;
+		border-radius: 20rpx;
+		padding:20rpx;
+		box-sizing: border-box;
+		margin-bottom: 20rpx;
+	}
+.row{
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: 10rpx;
+	.left{
+		color: rgba(153,153,153,1);
+	}
+}
+.right{
+	display: flex;
+	justify-content: flex-end;
+}
+.row8{
+	display: flex;
+	flex-direction: column;
+}
+.title{
+	    font-weight: 700;
+	    font-size: 32rpx;
+	    color: rgb(51, 51, 51);
+		margin: 20rpx 0;
+}
+.row2,.row4,.row8 .top{
+	color:rgb(153, 153, 153)
+}
+.row7 .right{
+	color:rgb(255, 134, 0) ;
+}
+</style>

pages/cargoTerminal/hzSelectCity.vue

@@ -0,0 +1,905 @@
+<template>
+	<view>
+		<u-navbar :title="title" @leftClick='back' :placeholder='true'>
+		</u-navbar>
+		<view class="row1">
+			<view class="start-place" :class="type==0?'active1':''" @click="changeCity(0)">选择发货地</view>
+			<view class="end-place" :class="type==1?'active1':''" @click="changeCity(1)">选择收货地</view>
+		</view>
+		<view class="container">
+			<view class="row2">
+				<view class="content1" v-if="type==0">
+					<view class="history-city-title">历史发货地</view>
+					<view class="city-list">
+						<view class="city" v-for="(item,index) in historyFcityList" :key='index'
+							@click="historyClick(0,item)">
+							{{item.selected}}
+						</view>
+					</view>
+				</view>
+				<view class="content2" v-if="type==1">
+					<view class="history-city-title">历史收货地</view>
+					<view class="city-list">
+						<view class="city" v-for="(item,index) in historyScityList" :key='index'
+							@click="historyClick(1,item)">
+							{{item.selected}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="page">
+			<view class="title flex flex-space-between">
+				<view class="flex nav-bag-left">
+					<!-- 省 -->
+					<view class="flex" :class="(type==0?fstatus:sstatus)==0?'select-active':''" @click="titleClick(0)">
+						<view class="tt point">{{type==0?fchooseprovince:schooseprovince}}</view>
+						<view v-if="type==0?fchooseprovince:schooseprovince" style="margin: 0 10rpx;">></view>
+					</view>
+					<!-- 市 -->
+					<view class="flex"
+						v-if="(type==0?fchooseprovince:schooseprovince)!='选择'&&(type==0?fchooseprovince:schooseprovince)!='全国'"
+						:class="(type==0?fstatus:sstatus)==1?'select-active':''" @click="titleClick(1)">
+						<view class="tt point nav-point">{{type==0?fchoosecity:schoosecity}}</view>
+						<view v-if="type==0?fchoosecity:schoosecity" style="margin: 0 10rpx;">></view>
+					</view>
+					<!-- 区 -->
+					<view class="tt area"
+						v-if="(type==0?fchooseprovince:schooseprovince)!='选择'&&(type==0?fchoosecity:schoosecity)!='请选择市'&&(type==0?fchoosecity:schoosecity)!='全部'"
+						:class="(type==0?fstatus:sstatus)==2?'select-active':''" @click="titleClick(2)">
+						{{type==0?fchoosearea:schoosearea}}
+					</view>
+				</view>
+				<view class="back-level" v-if="(type==0?fstatus:sstatus)!=0" @click="backLevel">返回上一级</view>
+			</view>
+
+			<view class="link">
+				<!-- 省 -->
+				<view class="container" v-if="(type==0?fstatus:sstatus)==0">
+					<view class="content-item" :class="index ==(type==0?isfprovince:issprovince) ?'active':''"
+						@click="selectProvince(item, index,(type==0?fstatus:sstatus))"
+						v-for="(item,index) in (type==0?fprovincelist:sprovincelist)"
+						v-show='type==1||type==0&&item.label!="全国"' :key="index">
+						{{item.label}}
+					</view>
+				</view>
+				<!-- 市 -->
+				<view class="container" v-if="(type==0?fstatus:sstatus)==1">
+					<view class="content-item" :class="index == (type==0?isfcity:isscity)?'active':''"
+						@click="selectCity(item, index,type==0?fstatus:sstatus)"
+						v-for="(item,index) in (type==0?fcitylist:scitylist)" :key="index">
+						{{item.label}}
+					</view>
+				</view>
+				<!-- index ==(type==0?isfarea:issarea) -->
+				<!-- 区 -->
+				<view class="container" v-if="(type==0?fstatus:sstatus)==2">
+					<view class="content-item" :class="item.checked?'active':''"
+						@click="selectaArea(item, index,(type==0?fstatus:sstatus))"
+						v-for="(item,index) in (type==0?farealist:sarealist)" :key="index">
+						{{item.label}}
+
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-button class="btn" @click="confirmBtn">确定</u-button>
+
+		<u-toast ref="uToast"></u-toast>
+	</view>
+</template>
+
+<script>
+	import {
+		address
+	} from '@/components/data/data.js'
+	export default {
+		data() {
+			return {
+				fstatus: 0,
+				sstatus: 0,
+				isfprovince: null,
+				isfcity: null,
+				isfarea: null,
+				issprovince: null,
+				isscity: null,
+				issarea: null,
+				fprovincelist: [],
+				sprovincelist: [],
+				fcitylist: [],
+				scitylist: [],
+				farealist: [],
+				sarealist: [],
+				fchooseprovince: '选择',
+				fchoosecity: '请选择市',
+				fchoosearea: '请选择区',
+				schooseprovince: '选择',
+				schoosecity: '请选择市',
+				schoosearea: '请选择区',
+				heightCot: 0,
+				historyFcityList: [],
+				historyScityList: [],
+				title: '',
+				type: 0,
+				count: 0,
+				ftitle: '',
+				ftitleList: [],
+				stitleList: [],
+				stitle: '',
+				selectList: [],
+			}
+		},
+		created() {
+			this.fprovincelist = address
+			this.sprovincelist = address
+			console.log('---------------------------------')
+			console.log(this.type)
+		},
+		onLoad(options) {
+			console.log(options)
+			this.type = options.type
+			this.title = JSON.parse(options.startPlace).selected + '→' + JSON.parse(options.endPlace).selected
+			//获取缓存收发地
+
+			if (uni.getStorageSync('fHzPlaceList')) {
+				this.historyFcityList = uni.getStorageSync('fHzPlaceList');
+			} else {
+				this.historyFcityList = []
+			}
+			if (uni.getStorageSync('sHzPlaceList')) {
+				this.historyScityList = uni.getStorageSync('sHzPlaceList');
+			} else {
+				this.historyScityList = []
+			}
+			//赋值地区
+		},
+		mounted() {
+			if (uni.getStorageSync('fHzPlaceObj')) {
+				this.fchooseprovince = uni.getStorageSync('fHzPlaceObj').sendPrivate
+				this.fchoosecity = uni.getStorageSync('fHzPlaceObj').sendCity
+				this.fchoosearea = uni.getStorageSync('fHzPlaceObj').sendArea
+				for (var i = 0; i < this.fprovincelist.length; i++) {
+					if (this.fprovincelist[i].label == this.fchooseprovince) {
+						this.fprovincelist[i].checked = true
+						this.fcitylist = this.fprovincelist[i].child
+						for (var q = 0; q < this.fcitylist.length; q++) {
+							if (this.fcitylist[q].label == this.fchoosecity) {
+								this.fcitylist[q].checked = true
+								this.farealist = this.fcitylist[q].child
+								for (var area = 0; area < this.farealist.length; area++) {
+									if (this.farealist[area].label == this.fchoosearea) {
+										this.farealist[area].checked = true
+									}
+								}
+							}
+						}
+					}
+				}
+				this.fstatus = 2
+			}
+			if (uni.getStorageSync('sHzPlaceObj')) {
+				// sprovincelist
+				// console.log(this.sprovincelist)
+				this.schooseprovince = uni.getStorageSync('sHzPlaceObj').unloadPrivate
+				this.schoosecity = uni.getStorageSync('sHzPlaceObj').unloadCity
+				this.schoosearea = uni.getStorageSync('sHzPlaceObj').unloadArea
+
+				if (this.schooseprovince == '全国') {
+					this.sstatus = 0
+					this.$set(this.sprovincelist[0], 'checked', true)
+					this.issprovince = 0
+				} else {
+					for (var i = 0; i < this.sprovincelist.length; i++) {
+						if (this.sprovincelist[i].label == this.schooseprovince) {
+							this.sprovincelist[i].checked = true
+							this.scitylist = this.sprovincelist[i].child
+							for (var q = 0; q < this.scitylist.length; q++) {
+								if (this.scitylist[q].label == this.schoosecity) {
+									this.scitylist[q].checked = true
+									this.sarealist = this.scitylist[q].child
+									for (var area = 0; area < this.sarealist.length; area++) {
+										if (this.sarealist[area].label == this.schoosearea) {
+											this.sarealist[area].checked = true
+										}
+									}
+								}
+							}
+						}
+					}
+					this.sstatus = 2
+				}
+			}
+		},
+		methods: {
+			historyClick(type, val) {
+				console.log(type)
+				if (type == 0) {
+					this.historyFcityList.unshift(val)
+					let _newList = this.makeHistoryList(val)
+					uni.setStorageSync('fHzPlaceList', _newList);
+					uni.setStorageSync('fHzPlaceObj', val);
+				} else {
+					this.historyScityList.unshift(val)
+					let _newList = this.makeHistoryList(val)
+					uni.setStorageSync('sHzPlaceList', _newList);
+					uni.setStorageSync('sHzPlaceObj', val)
+
+				}
+				uni.switchTab({
+					url: '/pages/cargoTerminal/cargoTerminal'
+				});
+			},
+			// 历史收发地去重
+			makeHistoryList(val) {
+				if (this.type == 0) {
+					let _obj = {}
+					// for (let i = 0; i < this.historyScityList.length; i++) {
+					// 	// let _data = this.historyScityList[i]
+					// }
+					if (val.selected == '全国' || val.fchoosecity == '全部') {
+
+						this.historyFcityList = this.historyFcityList.reduce((cur, item) => {
+							_obj[item.selected] ? "" : _obj[item.selected] = true && cur.push(item);
+							return cur;
+						}, [])
+					} else {
+						this.historyFcityList = this.historyFcityList.reduce((cur, item) => {
+							if (item.fchoosecity == val.fchoosecity) {
+								_obj[item.selected] ? "" : _obj[item.selected] = true && cur.push(item);
+								return cur;
+							} else {
+								_obj[item.selected] ? "" : _obj[item.selected] = true && cur.push(item);
+								return cur;
+							}
+
+
+						}, [])
+					}
+					return this.historyFcityList
+				} else {
+					let _obj = {}
+					// for (let i = 0; i < this.historyScityList.length; i++) {
+					// 	// let _data = this.historyScityList[i]
+					// }
+					if (val.selected == '全国' || val.schoosecity == '全部') {
+
+						this.historyScityList = this.historyScityList.reduce((cur, item) => {
+							_obj[item.selected] ? "" : _obj[item.selected] = true && cur.push(item);
+							return cur;
+						}, [])
+					} else {
+						this.historyScityList = this.historyScityList.reduce((cur, item) => {
+							if (item.schoosecity == val.schoosecity) {
+								_obj[item.selected] ? "" : _obj[item.selected] = true && cur.push(item);
+								return cur;
+							} else {
+								_obj[item.selected] ? "" : _obj[item.selected] = true && cur.push(item);
+								return cur;
+							}
+
+
+						}, [])
+					}
+					return this.historyScityList
+				}
+			},
+			confirmBtn() {
+
+				//设置地区 0发货地 1收货地
+				if (this.fchooseprovince == '选择' || (this.fchoosearea == '请选择区' && this.fchoosecity != '全部') || (this
+						.fchoosecity == '请选择市' && this.fchooseprovince != '全国')) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请选择发货地区域！",
+					})
+					return
+				}
+
+				//收货地
+				if (this.schooseprovince == '选择' || (this.schoosearea == '请选择区' && this.schoosecity != '全部' && this
+						.schooseprovince != '全国') || (this.schoosecity == '请选择市' && this.schooseprovince != '全国')) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请选择收货地区域！",
+					})
+					return
+				}
+				// }
+				// console.log("省", this.fchooseprovince)
+				// console.log("市", this.fchoosecity)
+				// console.log("区", this.fchoosearea)
+				let _obj = {
+					sendPrivate: this.fchooseprovince,
+					sendCity: this.fchoosecity,
+					sendArea: this.fchoosearea,
+					selected: ''
+				}
+				//选中全国
+				if (this.fchoosecity == '请选择市' && this.fchooseprovince == '全国') {
+					_obj.selected = this.fchooseprovince
+					this.historyFcityList.unshift(_obj)
+					let _newList = this.makeHistoryList(_obj)
+					uni.setStorageSync('fHzPlaceList', _newList);
+
+				}
+				//选择省
+				if (this.fchoosearea == '请选择区' && this.fchoosecity == '全部') {
+					_obj.selected = this.fchooseprovince
+					this.historyFcityList.unshift(_obj)
+					let _newList = this.makeHistoryList(_obj)
+
+					uni.setStorageSync('fHzPlaceList', _newList);
+				}
+				//选择市
+				if (this.fchoosearea == '全部') {
+					if (this.fchoosecity == '市辖区') {
+						_obj.selected = this.fchooseprovince
+					} else {
+						_obj.selected = this.fchoosecity
+					}
+					this.historyFcityList.unshift(_obj)
+					let _newList = this.makeHistoryList(_obj)
+					uni.setStorageSync('fHzPlaceList', _newList);
+				}
+				uni.setStorageSync('fHzPlaceObj', _obj);
+				//选择区
+				if (this.fchoosearea != '请选择区' && this.fchoosearea != '全部') {
+					console.log(this.fchooseprovince, this.fchoosecity, this.fchoosearea)
+					// let _list = this.fchoosearea.split(',')
+					// let _newList
+					// //设置历史收发地并去重，区重名判断是否是同一个市在去重
+					// for (let i = 0; i < _list.length; i++) {
+					// 	let _deepObj = uni.$u.deepClone(_obj)
+					// 	_deepObj.selected = _list[i]
+					// 	this.historyFcityList.unshift(_deepObj)
+					// 	_newList = this.makeHistoryList(_deepObj)
+
+					// }
+					// console.log(_newList)
+					uni.setStorageSync('fHzPlaceList', this.historyFcityList);
+					uni.setStorageSync('fHzPlaceObj', {
+						sendPrivate: this.fchooseprovince,
+						sendCity: this.fchoosecity,
+						sendArea: this.fchoosearea,
+						selected: this.fchoosearea
+					});
+				}
+				console.log(this.historyFcityList)
+				// uni.switchTab({
+				// 	url: '/pages/goodSource/index'
+				// });
+				// } else {
+
+				let _obj1 = {
+					unloadPrivate: this.schooseprovince,
+					unloadCity: this.schoosecity,
+					unloadArea: this.schoosearea,
+					selected: ''
+				}
+				//选中全国
+				if (this.schoosecity == '请选择市' && this.schooseprovince == '全国') {
+					_obj1.selected = this.schooseprovince
+					this.historyScityList.unshift(_obj1)
+					let _newList = this.makeHistoryList(_obj1)
+					uni.setStorageSync('sHzPlaceList', _newList);
+				}
+				//选择省
+				if (this.schoosearea == '请选择区' && this.schoosecity == '全部') {
+					_obj1.selected = this.schooseprovince
+					this.historyScityList.unshift(_obj1)
+					let _newList = this.makeHistoryList(_obj1)
+
+					uni.setStorageSync('sHzPlaceList', _newList);
+				}
+				//选择市
+				if (this.schoosearea == '全部') {
+					if (this.schoosecity == '市辖区') {
+						_obj1.selected = this.schooseprovince
+					} else {
+						_obj1.selected = this.schoosecity
+					}
+
+					this.historyScityList.unshift(_obj1)
+					let _newList = this.makeHistoryList(_obj1)
+					uni.setStorageSync('sHzPlaceList', _newList);
+				}
+				uni.setStorageSync('sHzPlaceObj', _obj1);
+				//选择区
+				if (this.schoosearea != '请选择区' && this.schoosearea != '全部') {
+					let _list = this.schoosearea.split(',')
+					let _newList
+					for (let i = 0; i < _list.length; i++) {
+
+						let _deepObj = uni.$u.deepClone(_obj1)
+						_deepObj.selected = _list[i]
+						this.historyScityList.unshift(_deepObj)
+						_newList = this.makeHistoryList(_deepObj)
+					}
+					// console.log(_newList)
+					uni.setStorageSync('sHzPlaceList', this.historyScityList);
+					uni.setStorageSync('sHzPlaceObj', {
+						unloadPrivate: this.schooseprovince,
+						unloadCity: this.schoosecity,
+						unloadArea: this.schoosearea,
+						selected: this.schoosearea
+					});
+				}
+				console.log(this.historyScityList)
+				this.schooseprovince = '选择'
+				this.schoosecity = '请选择市'
+				this.schoosearea = '请选择区'
+				this.fchooseprovince = '选择'
+				this.fchoosecity = '请选择市'
+				this.fchoosearea = '请选择区'
+				uni.removeStorageSync('longitudeAndLatitude')
+				uni.switchTab({
+					url: '/pages/cargoTerminal/cargoTerminal'
+				});
+			},
+			//返回上一级
+			backLevel() {
+				// this.count=0;
+				if (this.type == 0) {
+					this.fstatus--
+				} else {
+					this.sstatus--
+				}
+				if ((this.type == 0 ? this.fstatus : this.sstatus) == 1) {
+					if (this.type == 0) {
+						this.fchoosecity = '请选择市'
+						this.fchoosearea = ''
+						this.ftitle = ''
+						this.isfcity = null
+						this.ftitleList = []
+					} else {
+						this.schoosecity = '请选择市'
+						this.schoosearea = ''
+						this.stitle = ''
+						this.isscity = null
+						this.stitleList = []
+					}
+				} else if ((this.type == 0 ? this.fstatus : this.sstatus) == 0) {
+					if (this.type == 0) {
+						this.fchooseprovince = '选择'
+						this.isfprovince = null
+					} else {
+						this.schooseprovince = '选择'
+						this.issprovince = null
+					}
+				}
+			},
+			// 点击面包屑导航
+			titleClick(status) {
+				this.ftitle = ''
+				this.stitle = ''
+				this.count = 0
+				if (this.type == 0) {
+					this.fstatus = status
+					this.isfprovince = null
+					this.isfcity = null
+					this.isfarea = null
+
+					if (this.fchoosecity == '全部') return;
+				} else {
+					this.sstatus = status
+					this.issprovince = null
+					this.isscity = null
+					this.issarea = null
+					if (this.fchoosecity == '全部') return;
+				}
+				if (status == 0) {
+					if (this.type == 0) {
+						this.fchooseprovince = '选择'
+						this.fchoosecity = '请选择市'
+						this.fchoosearea = '请选择区'
+						this.ftitleList = []
+					} else {
+						this.schooseprovince = '选择'
+						this.schoosecity = '请选择市'
+						this.schoosearea = '请选择区'
+						this.stitleList = []
+					}
+
+				} else if (status == 1) {
+					if (this.type == 0) {
+						this.fchoosecity = '请选择市'
+						this.fchoosearea = '请选择区'
+						this.ftitleList = []
+					} else {
+						this.schoosecity = '请选择市'
+						this.schoosearea = '请选择区'
+						this.stitleList = []
+					}
+				}
+			},
+			// 选择省
+			selectProvince(item, i, statusIndex) {
+				console.log(this.type)
+				this.count = 0;
+				if (this.type == 0) {
+					if (i == 0) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "发货地不可选择全国！",
+						})
+						return
+					}
+					this.fchoosecity = '请选择市'
+					this.fchoosearea = '请选择区'
+					this.isfprovince = i
+					this.fchooseprovince = item.label
+					if (item.child) {
+						this.fcitylist = item.child
+					}
+					if (this.fchoosecity != '全部') {
+						this.fstatus = statusIndex + 1
+					}
+				} else {
+					this.issprovince = i
+					this.schooseprovince = item.label
+					if (item.label == '全国') {
+						item.checked = !item.checked
+						if (!item.checked) {
+							this.issprovince = null
+						}
+						return
+					} else {
+						this.schoosecity = '请选择市'
+						this.schoosearea = '请选择区'
+						if (item.child) {
+							this.scitylist = item.child
+						}
+						if (this.schoosecity != '全部') {
+							this.sstatus = statusIndex + 1
+						}
+					}
+
+				}
+			},
+			// 选择市
+			selectCity(item, i, statusIndex) {
+				if (item.label == '全部') {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "不能选择全部，请重新选择！"
+					})
+					return
+				}
+				this.count = 0;
+				if (this.type == 0) {
+					this.isfcity = i
+				} else {
+					this.isscity = i
+				}
+				if (item.child) {
+					for (let i = 0; i < item.child.length; i++) {
+						item.child[i].checked = false
+					}
+					if (this.type == 0) {
+						this.farealist = item.child
+					} else {
+						this.sarealist = item.child
+					}
+
+				}
+				if (this.type == 0) {
+					this.fchoosecity = item.label
+				} else {
+					this.schoosecity = item.label
+				}
+				if ((this.type == 0 ? this.fchoosecity : this.schoosecity) != '全部') {
+					if (this.type == 0) {
+						this.fstatus = statusIndex + 1
+					} else {
+						this.sstatus = statusIndex + 1
+					}
+				}
+			},
+			//选择区
+			selectaArea(item, i) {
+				if (item.label == '全部') {
+					if (this.type == 0) {
+						for (let i = 0; i < this.farealist.length; i++) {
+							if (i == 0) {
+								this.farealist[i].checked = true
+							} else {
+								this.farealist[i].checked = false
+							}
+						}
+						this.ftitleList = []
+						this.fchoosearea = '全部'
+						this.$forceUpdate()
+						return
+					} else {
+						for (let i = 0; i < this.sarealist.length; i++) {
+							if (i == 0) {
+								this.sarealist[i].checked = true
+							} else {
+								this.sarealist[i].checked = false
+							}
+						}
+						this.stitleList = []
+						this.schoosearea = '全部'
+						this.$forceUpdate()
+						return
+					}
+				}
+				if (this.type == 0) {
+					this.farealist[0].checked = false
+					if (this.ftitleList.length < 3) {
+						item.checked = !item.checked
+						if (item.checked) {
+							if (this.ftitleList.indexOf(item.label) == -1) {
+								this.ftitleList.push(item.label)
+							}
+						} else if (!item.checked) {
+							for (var i = 0; i < this.ftitleList.length; i++) {
+								console.log(this.ftitleList[i])
+								if (this.ftitleList[i] == item.label) {
+									this.ftitleList.splice(i, 1)
+								}
+							}
+						}
+					} else {
+						if (item.checked) {
+							item.checked = !item.checked
+							for (var i = 0; i < this.ftitleList.length; i++) {
+								if (this.ftitleList[i] == item.label) {
+									this.ftitleList.splice(i, 1)
+								}
+							}
+						} else {
+							this.$refs.uToast.show({
+								type: 'error',
+								message: "最多选择3个地区",
+							})
+						}
+					}
+					this.ftitle = this.ftitleList.toString()
+					this.fchoosearea = this.ftitleList.toString()
+				} else {
+					this.sarealist[0].checked = false
+					if (this.stitleList.length < 3) {
+						item.checked = !item.checked
+						if (item.checked) {
+							if (this.stitleList.indexOf(item.label) == -1) {
+								this.stitleList.push(item.label)
+							}
+						} else if (!item.checked) {
+							for (var i = 0; i < this.stitleList.length; i++) {
+								console.log(this.stitleList[i])
+								if (this.stitleList[i] == item.label) {
+									this.stitleList.splice(i, 1)
+								}
+							}
+						}
+					} else {
+						if (item.checked) {
+							item.checked = !item.checked
+							for (var i = 0; i < this.stitleList.length; i++) {
+								if (this.stitleList[i] == item.label) {
+									this.stitleList.splice(i, 1)
+								}
+							}
+						} else {
+							this.$refs.uToast.show({
+								type: 'error',
+								message: "最多选择3个地区",
+							})
+						}
+					}
+					this.stitle = this.stitleList.toString()
+					this.schoosearea = this.stitleList.toString()
+				}
+				this.$forceUpdate()
+				//设置面包屑 0发货地 1收货地
+				// if (this.type == 0) {
+				// 	this.farealist[0].checked = false
+				// 	// if(this.ftitleList.indexOf(item.label)==-1){
+				// 	// 	this.ftitleList.push(item.label)
+				// 	// }
+				// 	if (item.checked && !this.fchoosearea.includes(item.label)) {
+				// 		if (this.ftitle) {
+				// 			this.ftitle += ',' + item.label
+
+				// 		} else {
+				// 			this.ftitle += item.label
+				// 		}
+				// 		this.fchoosearea = this.ftitle
+				// 		console.log(this.fchoosearea)
+				// 	} else {
+				// 		if (this.ftitle.includes(',' + item.label)) {
+				// 			this.ftitle = this.ftitle.replace(',' + item.label, '')
+				// 			this.fchoosearea = this.fchoosearea.replace(',' + item.label, '')
+				// 		} else {
+				// 			let _val = this.ftitle.split(',')
+				// 			let _len = _val.length;
+				// 			if (_len == 1) {
+				// 				this.ftitle = this.ftitle.replace(item.label, '')
+				// 				this.fchoosearea = '请选择区'
+				// 			} else if (_len > 1) {
+				// 				this.ftitle = this.ftitle.replace(item.label + ',', '')
+				// 				this.fchoosearea = this.fchoosearea.replace(item.label + ',', '')
+				// 			}
+				// 		}
+				// 	}
+				// } else {
+				// 	if (item.checked && !this.schoosearea.includes(item.label)) {
+				// 		if (this.stitle) {
+				// 			this.stitle += ',' + item.label
+				// 		} else {
+				// 			this.stitle += item.label
+				// 		}
+				// 		this.schoosearea = this.stitle
+				// 	} else {
+				// 		if (this.stitle.includes(',' + item.label)) {
+				// 			this.stitle = this.stitle.replace(',' + item.label, '')
+				// 			this.schoosearea = this.schoosearea.replace(',' + item.label, '')
+				// 		} else {
+				// 			let _val = this.stitle.split(',')
+				// 			let _len = _val.length;
+				// 			if (_len == 1) {
+				// 				this.stitle = this.stitle.replace(item.label, '')
+				// 				this.schoosearea = '请选择区'
+				// 			} else if (_len > 1) {
+				// 				this.stitle = this.stitle.replace(item.label + ',', '')
+				// 				this.schoosearea = this.schoosearea.replace(item.label + ',', '')
+				// 			}
+				// 		}
+				// 	}
+				// }
+			},
+			changeCity(type) {
+				if (type == 0) {
+					this.type = 0
+				} else {
+					this.type = 1
+				}
+			},
+			back() {
+				uni.navigateBack({
+
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.row1 {
+		display: flex;
+		justify-content: space-evenly;
+		margin-top: 10rpx;
+		border-bottom: 1px solid #E6E6E6;
+	}
+
+	.start-place,
+	.end-place {
+		font-size: 28rpx;
+		color: #B1B5C0;
+		padding-bottom: 20rpx;
+	}
+
+	.active1 {
+		position: relative;
+		color: black;
+		font-size: 32rpx;
+		font-weight: 700;
+		display: flex;
+		justify-content: center;
+	}
+
+	.active1:after {
+		content: '';
+		position: absolute;
+		bottom: 0rpx;
+		width: 50%;
+		left: 25%;
+		padding: 0 20rpx;
+		box-sizing: border-box;
+		height: 6rpx;
+		background: #F5BA3C;
+		border-radius: 3px;
+	}
+
+	.history-city-title {
+
+		font-size: 28rpx;
+		font-weight: 700;
+		color: #363636;
+		margin-bottom: 20rpx;
+	}
+
+	.container {
+		padding: 0 20rpx;
+	}
+
+	.content1 {
+		margin: 20rpx 0;
+	}
+
+	.city-list {
+		max-height: 118rpx;
+		overflow: hidden;
+	}
+
+	.city {
+		display: inline-block;
+		font-size: 26rpx;
+		text-align: center;
+		padding: 8rpx 16rpx;
+		margin: 0 20rpx 20rpx 0;
+		height: 33rpx;
+		line-height: 33rpx;
+		border-radius: 4rpx;
+		background: #F7F8FA;
+
+	}
+
+	.content2 {
+		margin: 20rpx 0;
+	}
+
+	.container {
+		// width: 100%;
+		width: calc(100% - 40rpx);
+		display: inline-flex;
+		flex-flow: row wrap;
+		align-content: flex-start;
+	}
+
+	.select-active,
+	.back-level {
+		color: #F5BA3C;
+		font-size: 28rpx;
+	}
+
+	.content-item {
+		background: #F7F8FA;
+		margin: 10rpx;
+		font-size: 24rpx;
+		color: #333333;
+		text-align: center;
+		padding: 15rpx 0;
+		border-radius: 10rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		box-sizing: border-box;
+		flex: 0 0 calc(25% - 20rpx);
+	}
+
+	.title {
+		margin: 0 20rpx;
+	}
+
+	.active {
+		background: #E5F0FE;
+		border-radius: 10rpx;
+		// border: 1px solid #F5BA3C;
+		color: #F5BA3C;
+		box-sizing: border-box;
+	}
+
+	.area {
+		width: 55%;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+	}
+
+	.nav-bag-left {
+		width: 70%;
+		font-size: 30rpx;
+	}
+
+	.btn {
+		background: #F5BA3C;
+		color: white;
+		width: 80%;
+		position: absolute;
+		bottom: 30rpx;
+		margin-left: 10%;
+		border-radius: 50rpx;
+	}
+</style>

pages/goodSource/cargoOwnerSee.vue

@@ -333,7 +333,7 @@
 		.feedback_css {
 			width: 124rpx;
 			height: 58rpx;
-			background: #2772FB;
+			background: #F5BA3C;
 			border-radius: 29rpx;
 			display: flex;
 			justify-content: center;
@@ -350,7 +350,7 @@
 	}
 
 	.switchbtn1 {
-		color: #2772FB;
+		color: #F5BA3C;
 		position: relative;
 	}
 
@@ -360,7 +360,7 @@
 		content: '';
 		position: absolute;
 		bottom: -7px;
-		background: #2772FB;
+		background: #F5BA3C;
 		left: 0;
 		right: 0;
 		margin: 0 auto;
@@ -431,7 +431,7 @@
 		}
 
 		.number {
-			color: #2772FB;
+			color: #F5BA3C;
 			font-size: 28rpx;
 		}
 
@@ -446,7 +446,7 @@
 	}
 
 	.btn-active {
-		background-color: #2772FB;
+		background-color: #F5BA3C;
 		color: white;
 		border-radius: 50rpx;
 		display: flex;

pages/goodSource/fk.vue

@@ -211,7 +211,7 @@
 
 	.row3 {
 		width: 80%;
-		background: #2772FB;
+		background: #F5BA3C;
 		text-align: center;
 		color: white;
 		padding: 25rpx;

pages/goodSource/index.vue

@@ -135,7 +135,7 @@
 		</mescroll-body>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :confirmText='confirmText'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 1000)"
+			:showCancelButton='showCancelButton' confirmColor='#F5BA3C' @confirm="$u.throttle(confirmClick(), 1000)"
 			@close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
@@ -1041,7 +1041,7 @@
 
 	.fixed,
 	.fixed1 {
-		background: linear-gradient(97deg, #4FABFD 0%, #2772FB 100%);
+		background: linear-gradient(97deg, #F5BA3C 0%, #F5BA3C 100%);
 		position: fixed;
 		top: var(--status-bar-height);
 		z-index: 999;
@@ -1053,7 +1053,7 @@
 	.fixed1 {
 		top: 0;
 		height: var(--status-bar-height);
-		background: linear-gradient(97deg, #4FABFD 0%, #2772FB 100%);
+		background: linear-gradient(97deg, #F5BA3C 0%, #F5BA3C 100%);
 	}
 
 	.banner-img {
@@ -1163,7 +1163,7 @@
 		}
 
 		.qd {
-			background: linear-gradient(97deg, #4FABFD 0%, #2772FB 100%);
+			background: linear-gradient(97deg, #F5BA3C 0%, #F5BA3C 100%);
 			border-radius: 13rpx;
 			font-size: 29rpx;
 			font-weight: 400;

pages/goodSource/jb.vue

@@ -208,7 +208,7 @@
 
 	.row3 {
 		width: 80%;
-		background: #2772FB;
+		background: #F5BA3C;
 		text-align: center;
 		color: white;
 		padding: 25rpx;

pages/goodSource/selectCity.vue

@@ -799,7 +799,7 @@
 		padding: 0 20rpx;
 		box-sizing: border-box;
 		height: 6rpx;
-		background: #2772FB;
+		background: #F5BA3C;
 		border-radius: 3px;
 	}
 
@@ -851,7 +851,7 @@
 
 	.select-active,
 	.back-level {
-		color: #2772FB;
+		color: #F5BA3C;
 		font-size: 28rpx;
 	}
 
@@ -877,8 +877,8 @@
 	.active {
 		background: #E5F0FE;
 		border-radius: 10rpx;
-		// border: 1px solid #2772FB;
-		color: #2772FB;
+		// border: 1px solid #F5BA3C;
+		color: #F5BA3C;
 		box-sizing: border-box;
 	}
 
@@ -895,7 +895,7 @@
 	}
 
 	.btn {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		width: 80%;
 		position: absolute;

pages/goodSource/shippingDetails.vue

@@ -151,7 +151,7 @@
 			</view>
 			<u-toast ref="uToast"></u-toast>
 			<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-				confirmColor='#2772FB' @confirm="$u.throttle(confirmClick(), 1000)" @close="cancelClick"
+				confirmColor='#F5BA3C' @confirm="$u.throttle(confirmClick(), 1000)" @close="cancelClick"
 				@cancel="cancelClick"></u-modal>
 		</view>
 	</view>
@@ -445,7 +445,7 @@
 				justify-content: center;
 				width: 30rpx;
 				height: 30rpx;
-				background: #2772FB;
+				background: #F5BA3C;
 				padding: 20rpx;
 				box-sizing: border-box;
 				font-size: 26rpx;
@@ -481,7 +481,7 @@
 		background: #E5F0FE;
 		padding: 10rpx 30rpx;
 		border-radius: 30rpx;
-		color: #2772FB;
+		color: #F5BA3C;
 	}
 
 	.number-color {
@@ -536,7 +536,7 @@
 	}
 
 	.btn {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		font-size: 28rpx;
 		border-radius: 40rpx;

pages/mine/driverCertification.vue

@@ -1114,7 +1114,7 @@
 	}
 
 	.top-head {
-		background: #2772FB;
+		background: #F5BA3C;
 		height: 80rpx;
 		width: 100%;
 	}
@@ -1243,7 +1243,7 @@
 		.car-text {
 			font-size: 36rpx;
 			font-weight: 700;
-			color: #2772FB;
+			color: #F5BA3C;
 		}
 	}
 
@@ -1323,7 +1323,7 @@
 		}
 
 		.type {
-			background: #2772FB;
+			background: #F5BA3C;
 			border-radius: 10rpx;
 			color: white;
 			box-sizing: border-box;
@@ -1360,7 +1360,7 @@
 	.yzm {}
 
 	.yzm-btn {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		height: 60rpx;
 	}

pages/mine/driverCertificationNext.vue

@@ -706,7 +706,7 @@
 	}
 
 	.top-head {
-		background: #2772FB;
+		background: #F5BA3C;
 		height: 80rpx;
 		width: 100%;
 	}
@@ -839,7 +839,7 @@
 	}
 
 	.path {
-		color: #2772FB;
+		color: #F5BA3C;
 	}
 
 	/deep/.u-textarea {

pages/mine/editDriverCertification.vue

@@ -560,7 +560,7 @@
 	}
 
 	.top-head {
-		background: #2772FB;
+		background: #F5BA3C;
 		height: 80rpx;
 		width: 100%;
 	}
@@ -686,7 +686,7 @@
 		.car-text {
 			font-size: 36rpx;
 			font-weight: 700;
-			color: #2772FB;
+			color: #F5BA3C;
 		}
 	}
 
@@ -765,7 +765,7 @@
 		}
 
 		.type {
-			background: #2772FB;
+			background: #F5BA3C;
 			border-radius: 10rpx;
 			color: white;
 			box-sizing: border-box;
@@ -789,7 +789,7 @@
 		padding: 40rpx 20rpx 50rpx 20rpx;
 
 		.next-btn {
-			background: rgb(39, 114, 251);
+			background:#F5BA3C;
 			width: 90%;
 			padding: 20rpx 20rpx;
 			text-align: center;
@@ -801,7 +801,7 @@
 	.yzm {}
 
 	.yzm-btn {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		height: 60rpx;
 	}

pages/mine/editDriverCertificationNext.vue

@@ -735,7 +735,7 @@
 	}
 
 	.top-head {
-		background: #2772FB;
+		background: #F5BA3C;
 		height: 80rpx;
 		width: 100%;
 	}
@@ -868,7 +868,7 @@
 	}
 
 	.path {
-		color: #2772FB;
+		color: #F5BA3C;
 	}
 
 	.btn-color {}

pages/mine/fleet/addBinding.vue

@@ -20,7 +20,7 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="tipsShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick"
+			confirmColor='#F5BA3C' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 	</view>
 </template>

pages/mine/fleet/bindingCarCaptain.vue

@@ -20,7 +20,7 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="tipsShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			confirmColor='#F5BA3C' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/mine/fleet/carCaptainAuthentication.vue

@@ -186,7 +186,7 @@
 			<u-toast ref="uToast"></u-toast>
 		</view>
 		<u-modal :show="auditShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			confirmColor='#F5BA3C' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 		<view class="content4">
 			<view class="next-btn" @click="next()">提交</view>
@@ -770,7 +770,7 @@
 	}
 
 	.top-head {
-		background: #2772FB;
+		background: #F5BA3C;
 		height: 80rpx;
 		width: 100%;
 	}
@@ -896,7 +896,7 @@
 		.car-text {
 			font-size: 36rpx;
 			font-weight: 700;
-			color: #2772FB;
+			color: #F5BA3C;
 		}
 	}
 
@@ -975,7 +975,7 @@
 		}
 
 		.type {
-			background: #2772FB;
+			background: #F5BA3C;
 			border-radius: 10rpx;
 			color: white;
 			box-sizing: border-box;
@@ -999,7 +999,7 @@
 		padding: 40rpx 20rpx 50rpx 20rpx;
 
 		.next-btn {
-			background: rgb(39, 114, 251);
+			background:#F5BA3C;
 			width: 90%;
 			padding: 20rpx 20rpx;
 			text-align: center;
@@ -1011,7 +1011,7 @@
 	.yzm {}
 
 	.yzm-btn {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		height: 60rpx;
 	}

pages/mine/fleet/fleetManage.vue

@@ -41,7 +41,7 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="tipsShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick"
+			confirmColor='#F5BA3C' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 	</view>
 </template>

pages/mine/index.vue

@@ -100,6 +100,16 @@
 					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
 			</view>
+			<view class="flex flex-space-between" @click="goDetailPage('/pages/riders/index',3)">
+				<view class="flex align-center">
+					<image class="img" src="@/static/images/mine/changyongluxian.png" mode='widthFix'>
+					</image>
+					<view>车友车队</view>
+				</view>
+				<view>
+					<image src="../../static/images/myimg/gengduo1@3x.png" class="arrow"></image>
+				</view>
+			</view>
 			<view class="flex flex-space-between" @click="$helper.contactCustomerService()">
 				<view class="flex align-center">
 					<image class="img" src="@/static/images/mine/kf.png" mode='widthFix'>
@@ -166,7 +176,7 @@
 		</view>
 		<!-- <view class="version_css">当前版本: {{ version}}</view> -->
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :confirmText='confirmText'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			:showCancelButton='showCancelButton' confirmColor='#F5BA3C' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>

pages/mine/manageBankCards/addBankCard.vue

@@ -514,7 +514,7 @@
 	}
 
 	.type {
-		background: #2772FB;
+		background: #F5BA3C;
 		border-radius: 10rpx;
 		color: white;
 		box-sizing: border-box;
@@ -531,7 +531,7 @@
 		position: fixed;
 		bottom: 40rpx;
 		width: 90%;
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		text-align: center;
 		margin: 2%;

pages/mine/manageBankCards/editBankCard.vue

@@ -307,7 +307,7 @@
 	}
 
 	.type {
-		background: #2772FB;
+		background: #F5BA3C;
 		border-radius: 10rpx;
 		color: white;
 		box-sizing: border-box;
@@ -323,7 +323,7 @@
 		position: fixed;
 		bottom: 40rpx;
 		width: 90%;
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		text-align: center;
 		margin-left: 5%;

pages/mine/manageBankCards/index.vue

@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<!-- <view @click="addBankCard">添加银行卡</view> -->
-		 <u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#2772FB'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+		 <u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#F5BA3C'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -274,7 +274,7 @@
 
 	.add-bankcard {
 		background: #EEF4FF;
-		color: #2772FB;
+		color: #F5BA3C;
 		font-weight: 700;
 		font-size: 26rpx;
 		align-items: center;

pages/mine/manageVehicles/addVehicle.vue

@@ -1802,7 +1802,7 @@
 	.submit-btn {
 		bottom: 40rpx;
 		width: 90%;
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		text-align: center;
 		margin: 0 auto;

pages/mine/manageVehicles/editVehicle.vue

@@ -1706,7 +1706,7 @@
 	.submit-btn {
 		bottom: 40rpx;
 		width: 90%;
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		text-align: center;
 		margin: 0 auto;

pages/mine/manageVehicles/index.vue

@@ -49,7 +49,7 @@
 		</view>
 		</mescroll-body>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			confirmColor='#F5BA3C' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -188,7 +188,7 @@
 
 	.add-car {
 		background: #EEF4FF;
-		color: #2772FB;
+		color: #F5BA3C;
 		font-weight: 700;
 		font-size: 26rpx;
 		align-items: center;

pages/mine/often/addRoute.vue

@@ -338,7 +338,7 @@
 			margin: 20rpx 20rpx 0 0 ; 
 		}
 		.blueDot{
-			background: #2772FB;
+			background: #F5BA3C;
 		}
 		.redDot{
 			background: #FE6300;
@@ -354,7 +354,7 @@
 			margin-left: 30rpx;
 		}
 		.site{
-			color: #2772FB;
+			color: #F5BA3C;
 			margin-top: 20rpx;
 			margin-left: 30rpx;
 				height: 64rpx;

pages/mine/often/oftenRoute.vue

@@ -32,7 +32,7 @@
 			<span class="tips">最多可创建50条</span>
 		</view>
 		<u-modal :show="tipsShow" :title="tipsText" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="delSubmit" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			confirmColor='#F5BA3C' @confirm="delSubmit" @close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 
@@ -271,7 +271,7 @@
 			}
 
 			.blueDot {
-				background: #2772FB;
+				background: #F5BA3C;
 			}
 
 			.redDot {
@@ -311,7 +311,7 @@
 			width: 90%;
 			height: 92rpx;
 			line-height: 92rpx;
-			background: #2772FB;
+			background: #F5BA3C;
 			text-align: center;
 			border-radius: 46rpx;
 			color: #FFFFFF;

pages/mine/set.vue

@@ -60,7 +60,7 @@
 			<button @click='logout()' class='exitlogin'>退出登录</button>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='true' confirmColor='#2772FB' @confirm="logOut" @close="cancelClick"
+			:showCancelButton='true' confirmColor='#F5BA3C' @confirm="logOut" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 	</view>
 </template>

pages/mine/settings/editAvatar.vue

@@ -181,7 +181,7 @@
 
 	.submit {
 		margin-top: 20rpx;
-		background: #2772FB;
+		background: #F5BA3C;
 		border-radius: 50rpx;
 		padding: 20rpx 0;
 		color: white;

pages/mine/settings/editPassword.vue

@@ -261,7 +261,7 @@
 		background: #fff;
 	}
 	.cuIcon-weixin{
-		background: #2772FB;
+		background: #F5BA3C;
 		color: #fff;
 		font-size: 18px;
 		padding: 9px;
@@ -306,7 +306,7 @@
 		border:none;
 	}
 	.verificationCode.active{
-		background:#2772FB;
+		background:#F5BA3C;
 		color:#fff;
 	}
 	.register{
@@ -342,12 +342,12 @@
 		border:none;
 	}
 	.getcode.active{
-		background:#2772FB;
+		background:#F5BA3C;
 		color:#fff;
 	}
 	uni-navigator{
 		display:inline-block;
-		color:#2772FB;
+		color:#F5BA3C;
 	}
 	.yanjingicon{
 		margin: 0;

pages/news/index.vue

@@ -46,7 +46,7 @@
 					您的驾驶证即将到期，请尽快到“我的-身份认证”中更新，逾期将影响运费支付。
 				</view> -->
 					<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true'
-						:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick"
+						:showCancelButton='showCancelButton' confirmColor='#F5BA3C' @confirm="confirmClick"
 						@close="cancelClick" @cancel="cancelClick"></u-modal>
 				</view>
 			</view>

pages/order/bankCard.vue

@@ -39,7 +39,7 @@
 			</view> -->
 		</view>
 		<!-- <view @click="addBankCard">添加银行卡</view> -->
-		 <u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#2772FB'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+		 <u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true' confirmColor='#F5BA3C'  @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -274,7 +274,7 @@
 
 	.add-bankcard {
 		background: #EEF4FF;
-		color: #2772FB;
+		color: #F5BA3C;
 		font-weight: 700;
 		font-size: 26rpx;
 		align-items: center;

pages/order/cargoOwnerSee.vue

@@ -328,7 +328,7 @@
 	}
 
 	.switchbtn1 {
-		color: #2772FB;
+		color: #F5BA3C;
 		position: relative;
 	}
 
@@ -338,7 +338,7 @@
 		content: '';
 		position: absolute;
 		bottom: -7px;
-		background: #2772FB;
+		background: #F5BA3C;
 		left: 0;
 		right: 0;
 		margin: 0 auto;
@@ -396,7 +396,7 @@
 		}
 
 		.number {
-			color: #2772FB;
+			color: #F5BA3C;
 		}
 
 		.flex {
@@ -409,7 +409,7 @@
 	}
 
 	.btn-active {
-		background-color: #2772FB;
+		background-color: #F5BA3C;
 		color: white;
 		border-radius: 50rpx;
 		display: flex;

pages/order/confirmLoading.vue

@@ -110,7 +110,7 @@
 			<view class="submit" @click="$u.throttle(submit(3), 1000)">提交</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='true' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			:showCancelButton='true' confirmColor='#F5BA3C' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
 			:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
@@ -922,7 +922,7 @@
 
 	.store {
 		padding: 20rpx 30rpx;
-		color: #2772FB;
+		color: #F5BA3C;
 		width: 40%;
 		background: #EEF4FF;
 		border-radius: 40rpx;
@@ -935,7 +935,7 @@
 		padding: 20rpx 30rpx;
 		color: white;
 		width: 40%;
-		background: #2772FB;
+		background: #F5BA3C;
 		border-radius: 40rpx;
 		text-align: center;
 	}
@@ -945,7 +945,7 @@
 	}
 
 	.sx-style {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		padding: 2rpx 16rpx;
 		box-sizing: border-box;

pages/order/confirmUnloading.vue

@@ -99,7 +99,7 @@
 			<view class="submit" @click="$u.throttle(submit(3), 1000)">提交</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='true' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			:showCancelButton='true' confirmColor='#F5BA3C' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 		<!--<u- picker :show="isShowValidity" :defaultIndex='defaultIndex' ref="uPicker" :columns="validityPeriod" @confirm="confirmValidityPeriod"
 			:closeOnClickOverlay='true' @close='isShowValidity=false' @cancel='isShowValidity=false'>
@@ -826,7 +826,7 @@
 
 	.store {
 		padding: 20rpx 30rpx;
-		color: #2772FB;
+		color: #F5BA3C;
 		width: 40%;
 		background: #EEF4FF;
 		border-radius: 40rpx;
@@ -839,7 +839,7 @@
 		padding: 20rpx 30rpx;
 		color: white;
 		width: 40%;
-		background: #2772FB;
+		background: #F5BA3C;
 		border-radius: 40rpx;
 		text-align: center;
 	}
@@ -849,7 +849,7 @@
 	}
 
 	.sx-style {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		padding: 2rpx 16rpx;
 		box-sizing: border-box;

pages/order/index.vue

@@ -11,8 +11,8 @@
 					<!-- <u-icon class="search" name="search" color="" size="28" @click="search"></u-icon> -->
 				</view>
 				<view class="tab-content">
-					<u-tabs :list="tabList" @click="clickTab" lineColor='#2772FB' :current='tabIndex' :activeStyle="{
-									color: '#2772FB',
+					<u-tabs :list="tabList" @click="clickTab" lineColor='#F5BA3C' :current='tabIndex' :activeStyle="{
+									color: '#F5BA3C',
 									fontWeight: 'bold',
 									transform: 'scale(1.05)'
 								}"></u-tabs>
@@ -187,7 +187,7 @@
 			</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
-			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 1000)"
+			:showCancelButton='showCancelButton' confirmColor='#F5BA3C' @confirm="$u.throttle(confirmClick, 1000)"
 			@close="cancelClick" @cancel="cancelClick">
 
 			<view style="margin: 0 auto;">
@@ -899,7 +899,7 @@
 	// 	}
 
 	// 	.qd {
-	// 		background: linear-gradient(97deg, #4FABFD 0%, #2772FB 100%);
+	// 		background: linear-gradient(97deg, #F5BA3C 0%, #F5BA3C 100%);
 	// 		border-radius: 13px;
 	// 		font-size: 29rpx;
 	// 		font-weight: 400;
@@ -1002,7 +1002,7 @@
 		}
 
 		.menu-active {
-			background: #2772FB;
+			background: #F5BA3C;
 			color: white;
 		}
 	}
@@ -1023,7 +1023,7 @@
 	}
 
 	.menu-active {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 	}
 
@@ -1054,7 +1054,7 @@
 	}
 
 	.termination.active {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 	}
 

pages/order/orderDetails.vue

@@ -43,7 +43,7 @@
 				<view class="right flex s-row align-center phone">
 					<view class="bgc">
 						<image class="phone" style='width:24px;height:24px;' src="../../static/images/dianhua.png" @click="$helper.contactCustomerService(dataObj.cargoOwnerPhone)" mode=""></image>
-						<!-- <u-icon class="phone" name="phone-fill" color="#2772FB" size="20" @click="$helper.contactCustomerService(dataObj.cargoOwnerPhone)"></u-icon> -->
+						<!-- <u-icon class="phone" name="phone-fill" color="#F5BA3C" size="20" @click="$helper.contactCustomerService(dataObj.cargoOwnerPhone)"></u-icon> -->
 					</view>
 
 					<view class="hz-name">联系货主</view>
@@ -694,7 +694,7 @@
 
 				.hz-name {
 					font-size: 26rpx;
-					color: #2772FB;
+					color: #F5BA3C;
 				}
 
 			}
@@ -801,7 +801,7 @@
 		margin-top:30rpx;
 	}
 	.termination.active{
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 	}
 	.u-popup-wrap{

pages/order/signContract.vue

@@ -784,7 +784,7 @@
 		.preview {
 			width: 50%;
 			text-align: right;
-			color: #2772FB;
+			color: #F5BA3C;
 			font-size: 26rpx;
 		}
 
@@ -858,7 +858,7 @@
 
 	.saveBtn {
 		width: 80%;
-		background: #2772FB;
+		background: #F5BA3C;
 		color: white;
 		text-align: center;
 		border-radius: 50rpx;

pages/public/login.vue

@@ -43,7 +43,7 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' confirmText='退出登录'
-			:showCancelButton='true' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
+			:showCancelButton='true' confirmColor='#F5BA3C' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
 	</view>
 	</view>
@@ -554,7 +554,7 @@
 	}
 
 	.cuIcon-weixin {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: #fff;
 		font-size: 18px;
 		padding: 9px;
@@ -602,7 +602,7 @@
 	}
 
 	.verificationCode.active {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: #fff;
 	}
 

pages/public/loginOther.vue

@@ -171,7 +171,7 @@
 	}
 
 	.cuIcon-weixin {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: #fff;
 		font-size: 18px;
 		padding: 9px;
@@ -222,7 +222,7 @@
 	}
 
 	.verificationCode.active {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: #fff;
 	}
 

pages/public/register.vue

@@ -388,7 +388,7 @@
 <style lang='scss' scoped>
 	uni-navigator {
 		display: inline-block;
-		color: #2772FB;
+		color: #F5BA3C;
 	}
 
 	.password {
@@ -411,7 +411,7 @@
 	}
 
 	.cuIcon-weixin {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: #fff;
 		font-size: 18px;
 		padding: 9px;
@@ -499,7 +499,7 @@
 	}
 
 	.verificationCode.active {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: #fff;
 	}
 
@@ -522,11 +522,11 @@
 
 	uni-navigator {
 		display: inline-block;
-		color: #2772FB;
+		color: #F5BA3C;
 	}
 
 	.getcode.active {
-		background: #2772FB;
+		background: #F5BA3C;
 		color: #fff;
 	}
 

pages/riders/checkPage.vue

@@ -92,7 +92,7 @@
 		}
 		.tips_btn{
 			text-align: center;
-			background: #2772FB ;
+			background: #F5BA3C ;
 			width: 70%;
 			margin: 83rpx auto;
 			padding: 30rpx 0;

pages/riders/fleetInvitation.vue

@@ -238,7 +238,7 @@
 			}
 
 			.adopt {
-				background: #2772FB;
+				background: #F5BA3C;
 			}
 		}
 	}

pages/riders/fleetSee.vue

@@ -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="$u.throttle(confirmClick, 1000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			confirmColor='#F5BA3C' @confirm="$u.throttle(confirmClick, 1000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

pages/riders/inTeam.vue

@@ -53,7 +53,7 @@
 		<!-- </view> -->
 		<u-loadmore :status="status"  :nomore-text="nomoreText" />
 		<u-modal :show="auditShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			confirmColor='#F5BA3C' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
@@ -263,7 +263,7 @@
 				}
 
 				.btn2 {
-					background-color: #2772FB;
+					background-color: #F5BA3C;
 				}
 
 				.btn3 {

pages/riders/index.vue

@@ -128,7 +128,7 @@
 		</u-picker>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			confirmColor='#F5BA3C' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 		<u-modal :show="tipsShow" :content='tipsText' :confirmText="btnTips" @confirm="authentication"></u-modal>
 	</view>
 </template>
@@ -149,7 +149,7 @@
 		data() {
 			return {
 				actionStyle: {
-					"background": "#2772FB",
+					"background": "#F5BA3C",
 					"position": "absolute",
 					"right": "30rpx",
 					"borderRadius": "33px",
@@ -782,7 +782,7 @@
 				align-items: center;
 				border-radius: 35px;
 				color: #FFFFFF;
-				background: #2772FB;
+				background: #F5BA3C;
 				padding: 10rpx 30rpx;
 			}
 
@@ -817,7 +817,7 @@
 			}
 
 			.spot1 {
-				background: #2772FB;
+				background: #F5BA3C;
 			}
 
 			.spot2 {
@@ -860,7 +860,7 @@
 				}
 
 				.sign1 {
-					background: #2772FB;
+					background: #F5BA3C;
 				}
 
 				.sign2 {
@@ -909,7 +909,7 @@
 
 				.fleet_invite {
 					text-align: center;
-					background-color: #2772FB;
+					background-color: #F5BA3C;
 					width: 128rpx;
 					height: 60rpx;
 					line-height: 60rpx;
@@ -934,7 +934,7 @@
 						position: absolute;
 						right: 0rpx;
 						bottom: 0rpx;
-						color: #2772fb;
+						color: #F5BA3C;
 					}
 				}
 

pages/riders/report.vue

@@ -18,7 +18,7 @@
 	     	name="1" multiple :maxCount="1" style="z-index: 9999;"></u-upload>
 			<u-toast ref="uToast"></u-toast>
 			<u-modal :show="tipsShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-				confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+				confirmColor='#F5BA3C' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 			<u-button type="primary" text="提交" class="btn_css" @click="$u.throttle(submit, 1000)"></u-button> 
 	</view>
 </template>

pages/riders/setMember.vue

@@ -30,7 +30,7 @@
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="setShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
-			confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
+			confirmColor='#F5BA3C' @confirm="confirmClick" @close="cancelClick" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 

static/css/common.scss

@@ -104,14 +104,14 @@
 	background:yellow;
 }
 .btn-color{
-	background: #2772FB!important;
+	background: #F5BA3C!important;
 	color: white!important;
 }
 .h-color{
 	color: #FE6300;
 }
 .number-color{
-	color:#2772FB;
+	color:#F5BA3C;
 }
 // 颜色相关end
 // 文字相关start