前端

App.vue

@@ -217,7 +217,7 @@
 			console.log(type)
 			if (type == "android") {
 				console.log(111111111111111111111111111111111111111111111111111)
-				appUpdate()
+				// appUpdate()
 			}
 			// var that = this
 			// plus.push.getClientInfoAsync((info) => {

common/helper.js

@@ -14,6 +14,23 @@ const imgTypeList = [{
 		name: '拍照',
 	}
 ]
+// 当前日期是否超过今天（校验有效期）
+const periodOfValidity=function(year1,month1,day1){
+	let nowDate = new Date();
+	let year = nowDate.getFullYear()
+	let month = nowDate.getMonth() + 1
+	let day = nowDate.getDate()
+	if(year1<year){
+		return false
+	}
+	if(year1==year&&month1<month){
+		return false
+	}
+	if(year1==year&&month1==month&&day1<=day){
+		return false
+	}
+	return true
+}
 const makeValidityPeriod = function(type, name) {
 	//获取当前年
 	let nowDate = new Date();
@@ -314,6 +331,7 @@ export default {
 	ossUploadUrl,
 	contactCustomerService,
 	chooseImage,
+	periodOfValidity,
 	imgType,
 	imgTypeList,
 	makeValidityPeriod,

components/itmister-address-picker/city_other.json

@@ -5,7 +5,6 @@
 { "name": "天津", "city":[{"name":"天津", "area":["全市","和平区","河东区","河西区","南开区","河北区","红桥区","塘沽区","汉沽区","大港区","东丽区","西青区","津南区","北辰区","武清区","宝坻区","宁河县","静海县","蓟  县"]}]},
 
 { "name": "河北", "city":[
-         {"name":"全省", "area":[]},
          {"name":"石家庄", "area":["全市","长安区","桥东区","桥西区","新华区","郊  区","井陉矿区","井陉县","正定县","栾城县","行唐县","灵寿县","高邑县","深泽县","赞皇县","无极县","平山县","元氏县","赵  县","辛集市","藁","晋州市","新乐市","鹿泉市"]},
 
          {"name":"唐山", "area":["全市","路南区","路北区","古冶区","开平区","新  区","丰润县","滦  县","滦南县","乐亭县","迁西县","玉田县","唐海县","遵化市","丰南市","迁安市"]},
@@ -31,7 +30,6 @@
       ]},
 
 { "name": "山西", "city":[
-     {"name":"全省", "area":[]},
      {"name":"太原", "area":["全市","小店区","迎泽区","杏花岭区","尖草坪区","万柏林区","晋源区","清徐县","阳曲县","娄烦县","古交市"]},
 
      {"name":"大同", "area":["全市","城  区","矿  区","南郊区","新荣区","阳高县","天镇县","广灵县","灵丘县","浑源县","左云县","大同县"]},
@@ -57,7 +55,6 @@
 ]},
 
 { "name": "内蒙古", "city":[
-   {"name":"全省", "area":[]},
    {"name":"呼和浩特", "area":["全市","新城区","回民区","玉泉区","郊  区","土默特左旗","托克托县","和林格尔县","清水河县","武川县"]},
 
    {"name":"包头", "area":["全市","东河区","昆都伦区","青山区","石拐矿区","白云矿区","郊  区","土默特右旗","固阳县","达尔罕茂明安联合旗"]},
@@ -85,7 +82,6 @@
 ]},
 
 { "name": "辽宁", "city":[
-{"name":"全省", "area":[]},
 {"name":"沈阳", "area":["全市","沈河区","皇姑区","和平区","大东区","铁西区","苏家屯区","东陵区","于洪区","新民市","法库县","辽中县","康平县","新城子区","其他"]},
 
 {"name":"大连", "area":["全市","西岗区","中山区","沙河口区","甘井子区","旅顺口区","金州区","瓦房店市","普兰店市","庄河市","长海县","其他"]},
@@ -118,7 +114,6 @@
 ]},
 
 { "name": "吉林", "city":[
-{"name":"全省", "area":[]},
 {"name":"长春", "area":["全市","朝阳区","宽城区","二道区","南关区","绿园区","双阳区","九台市","榆树市","德惠市","农安县","其他"]},
 
 {"name":"吉林", "area":["全市","船营区","昌邑区","龙潭区","丰满区","舒兰市","桦甸市","蛟河市","磐石市","永吉县","其他"]},
@@ -140,7 +135,6 @@
 ]},
 
 { "name": "黑龙江", "city":[
-{"name":"全省", "area":[]},
 {"name":"哈尔滨", "area":["全市","松北区","道里区","南岗区","平房区","香坊区","道外区","呼兰区","阿城区","双城市","尚志市","五常市","宾县","方正县","通河县","巴彦县","延寿县","木兰县","依兰县","其他"]},
 
 {"name":"齐齐哈尔", "area":["全市","龙沙区","昂昂溪区","铁锋区","建华区","富拉尔基区","碾子山区","梅里斯达斡尔族区","讷河市","富裕县","拜泉县","甘南县","依安县","克山县","泰来县","克东县","龙江县","其他"]},
@@ -176,7 +170,6 @@
 ]},
 
 { "name": "江苏", "city":[
-{"name":"全省", "area":[]},
 {"name":"南京", "area":["全市","玄武区","白下区","秦淮区","建邺区","鼓楼区","下关区","栖霞区","雨花台区","浦口区","江宁区","六合区","溧水县","高淳县","其他"]},
 
 {"name":"苏州", "area":["全市","金阊区","平江区","沧浪区","虎丘区","吴中区","相城区","常熟市","张家港市","昆山市","吴江市","太仓市","其他"]},
@@ -206,7 +199,6 @@
 ]},
 
 { "name": "浙江", "city":[
-{"name":"全省", "area":[]},
 {"name":"杭州", "area":["全市","拱墅区","西湖区","上城区","下城区","江干区","滨江区","余杭区","萧山区","建德市","富阳市","临安市","桐庐县","淳安县","其他"]},
 
 {"name":"宁波", "area":["全市","海曙区","江东区","江北区","镇海区","北仑区","鄞州区","余姚市","慈溪市","奉化市","宁海县","象山县","其他"]},
@@ -232,7 +224,6 @@
 ]},
 
 { "name": "安徽", "city":[
-{"name":"全省", "area":[]},
 {"name":"合肥", "area":["全市","庐阳区","瑶海区","蜀山区","包河区","长丰县","肥东县","肥西县","其他"]},
 
 {"name":"芜湖", "area":["全市","镜湖区","弋江区","鸠江区","三山区","芜湖县","南陵县","繁昌县","其他"]},
@@ -270,7 +261,6 @@
 ]},
 
 { "name": "福建", "city":[
-{"name":"全省", "area":[]},
 {"name":"福州", "area":["全市","鼓楼区","台江区","仓山区","马尾区","晋安区","福清市","长乐市","闽侯县","闽清县","永泰县","连江县","罗源县","平潭县","其他"]},
 
 {"name":"厦门", "area":["全市","思明区","海沧区","湖里区","集美区","同安区","翔安区","其他"]},
@@ -292,7 +282,6 @@
 ]},
 
 { "name": "江西", "city":[
-{"name":"全省", "area":[]},
 {"name":"南昌", "area":["全市","东湖区","西湖区","青云谱区","湾里区","青山湖区","新建县","南昌县","进贤县","安义县","其他"]},
 
 {"name":"景德镇", "area":["全市","珠山区","昌江区","乐平市","浮梁县","其他"]},
@@ -318,7 +307,6 @@
 ]},
 
 { "name": "山东", "city":[
-{"name":"全省", "area":[]},
 {"name":"济南", "area":["全市","市中区","历下区","天桥区","槐荫区","历城区","长清区","章丘市","平阴县","济阳县","商河县","其他"]},
 
 {"name":"青岛", "area":["全市","市南区","市北区","城阳区","四方区","李沧区","黄岛区","崂山区","胶南市","胶州市","平度市","莱西市","即墨市","其他"]},
@@ -356,7 +344,6 @@
 ]},
 
 { "name": "河南", "city":[
-{"name":"全省", "area":[]},
 {"name":"郑州", "area":["全市","中原区","金水区","二七区","管城回族区","上街区","惠济区","巩义市","新郑市","新密市","登封市","荥阳市","中牟县","其他"]},
 
 {"name":"开封", "area":["全市","鼓楼区","龙亭区","顺河回族区","禹王台区","金明区","开封县","尉氏县","兰考县","杞县","通许县","其他"]},
@@ -396,7 +383,6 @@
 ]},
 
 { "name": "湖北", "city":[
-{"name":"全省", "area":[]},
 {"name":"武汉", "area":["全市","江岸区","武昌区","江汉区","硚口区","汉阳区","青山区","洪山区","东西湖区","汉南区","蔡甸区","江夏区","黄陂区","新洲区","其他"]},
 
 {"name":"黄石", "area":["全市","黄石港区","西塞山区","下陆区","铁山区","大冶市","阳新县","其他"]},
@@ -434,7 +420,6 @@
 ]},
 
 { "name": "湖南", "city":[
-{"name":"全省", "area":[]},
 {"name":"长沙", "area":["全市","岳麓区","芙蓉区","天心区","开福区","雨花区","浏阳市","长沙县","望城县","宁乡县","其他"]},
 
 {"name":"株洲", "area":["全市","天元区","荷塘区","芦淞区","石峰区","醴陵市","株洲县","炎陵县","茶陵县","攸县","其他"]},
@@ -466,7 +451,6 @@
 ]},
 
 { "name": "广东", "city":[
-{"name":"全省", "area":[]},
 {"name":"广州", "area":["全市","越秀区","荔湾区","海珠区","天河区","白云区","黄埔区","番禺区","花都区","南沙区","萝岗区","增城市","从化市","其他"]},
 
 {"name":"深圳", "area":["全市","福田区","罗湖区","南山区","宝安区","龙岗区","盐田区","其他"]},
@@ -512,7 +496,6 @@
 ]},
 
 { "name": "广西", "city":[
-{"name":"全省", "area":[]},
 {"name":"南宁", "area":["全市","青秀区","兴宁区","西乡塘区","良庆区","江南区","邕宁区","武鸣县","隆安县","马山县","上林县","宾阳县","横县","其他"]},
 
 {"name":"柳州", "area":["全市","城中区","鱼峰区","柳北区","柳南区","柳江县","柳城县","鹿寨县","融安县","融水苗族自治县","三江侗族自治县","其他"]},
@@ -544,7 +527,6 @@
 ]},
 
 { "name": "海南", "city":[
-{"name":"全省", "area":[]},
 {"name":"海口", "area":["全市","龙华区","秀英区","琼山区","美兰区","其他"]},
 
 {"name":"三亚", "area":["全市","三亚市","其他"]},
@@ -590,7 +572,6 @@
 ]},
 
 { "name": "四川", "city":[
-{"name":"全省", "area":[]},
 {"name":"成都", "area":["全市","青羊区","锦江区","金牛区","武侯区","成华区","龙泉驿区","青白江区","新都区","温江区","都江堰市","彭州市","邛崃市","崇州市","金堂县","郫县","新津县","双流县","蒲江县","大邑县","其他"]},
 
 {"name":"自贡", "area":["全市","大安区","自流井区","贡井区","沿滩区","荣县","富顺县","其他"]},
@@ -636,7 +617,6 @@
 ]},
 
 { "name": "贵州", "city":[
-{"name":"全省", "area":[]},
 {"name":"贵阳", "area":["全市","南明区","云岩区","花溪区","乌当区","白云区","小河区","清镇市","开阳县","修文县","息烽县","其他"]},
 
 {"name":"六盘水", "area":["全市","钟山区","水城县","盘县","六枝特区","其他"]},
@@ -658,7 +638,6 @@
 ]},
 
 { "name": "云南", "city":[
-{"name":"全省", "area":[]},
 {"name":"昆明", "area":["全市","盘龙区","五华区","官渡区","西山区","东川区","安宁市","呈贡县","晋宁县","富民县","宜良县","嵩明县","石林彝族自治县","禄劝彝族苗族自治县","寻甸回族彝族自治县","其他"]},
 
 {"name":"曲靖", "area":["全市","麒麟区","宣威市","马龙县","沾益县","富源县","罗平县","师宗县","陆良县","会泽县","其他"]},
@@ -694,7 +673,6 @@
 ]},
 
 { "name": "西藏", "city":[
-{"name":"全省", "area":[]},
 {"name":"拉萨", "area":["全市","城关区","林周县","当雄县","尼木县","曲水县","堆龙德庆县","达孜县","墨竹工卡县","其他"]},
 
 {"name":"那曲地区", "area":["全市","那曲县","嘉黎县","比如县","聂荣县","安多县","申扎县","索县","班戈县","巴青县","尼玛县","其他"]},
@@ -712,7 +690,6 @@
 ]},
 
 { "name": "陕西", "city":[
-{"name":"全省", "area":[]},
 {"name":"西安", "area":["全市","莲湖区","新城区","碑林区","雁塔区","灞桥区","未央区","阎良区","临潼区","长安区","高陵县","蓝田县","户县","周至县","其他"]},
 
 {"name":"铜川", "area":["全市","耀州区","王益区","印台区","宜君县","其他"]},
@@ -736,7 +713,6 @@
 ]},
 
 { "name": "甘肃", "city":[
-{"name":"全省", "area":[]},
 {"name":"兰州", "area":["全市","城关区","七里河区","西固区","安宁区","红古区","永登县","皋兰县","榆中县","其他"]},
 
 {"name":"嘉峪关", "area":["全市","嘉峪关市","其他"]},
@@ -768,7 +744,6 @@
 ]},
 
 { "name": "青海", "city":[
-{"name":"全省", "area":[]},
 {"name":"西宁", "area":["全市","城中区","城东区","城西区","城北区","湟源县","湟中县","大通回族土族自治县","其他"]},
 
 {"name":"海东地区", "area":["全市","平安县","乐都县","民和回族土族自治县","互助土族自治县","化隆回族自治县","循化撒拉族自治县","其他"]},
@@ -788,7 +763,6 @@
 ]},
 
 { "name": "宁夏", "city":[
-{"name":"全省", "area":[]},
 {"name":"银川", "area":["全市","兴庆区","西夏区","金凤区","灵武市","永宁县","贺兰县","其他"]},
 
 {"name":"石嘴山", "area":["全市","大武口区","惠农区","平罗县","其他"]},
@@ -802,7 +776,6 @@
 ]}, 
 
 { "name": "新疆", "city":[
-{"name":"全省", "area":[]},
 {"name":"乌鲁木齐", "area":["全市","天山区","沙依巴克区","新市区","水磨沟区","头屯河区","达坂城区","东山区","乌鲁木齐县","其他"]},
 
 {"name":"克拉玛依", "area":["全市","克拉玛依区","独山子区","白碱滩区","乌尔禾区","其他"]},

components/itmister-date-picker/itmister-date-picker.nvue

@@ -162,12 +162,59 @@
 				year,
 				month,
 				day,
-				value: year=='长期'||year=='随时'?[0,0,0]:[Number(year - this.startYear+1), month , day], // 默认选中当天
+				value: this.dateStatus==0?[Number(year - this.startYear), month-1 , day]:year=='长期'||year=='随时'?[0,0,0]:[Number(year - this.startYear+1), month , day], // 默认选中当天
 				visible: true,
 				indicatorStyle: `height: ${Math.round(uni.getSystemInfoSync().screenWidth/(750/100))}px;`
 			}
 		},
 		methods: {
+			setYearList(){
+				const date = new Date();
+				let years = [],months = [];
+				if(this.dateStatus==1){
+					years = ['长期'];
+					months = [''];
+				}
+				if(this.dateStatus==2){
+					years = ['随时'];
+					months = [''];
+				}
+				const currectyear = date.getFullYear()
+				const currectmonth = date.getMonth() + 1
+				const currectday = date.getDate()
+				// console.log(this.checkYear)
+				// const month = date.getMonth() + 1
+				// const day = date.getDate();
+				
+				// 传截止日期设置起始年份和终止年份
+				if(JSON.stringify(this.endDate)!='{}'){
+					if(this.endDate.year&&this.endDate.year<currectyear){
+						this.showtoast('截止日期年份必须大于等于当前年份')
+						return
+					}
+					if(this.endDate.year&&this.endDate.year==currectyear&&this.endDate.month&&this.endDate.month<currectmonth){
+						this.showtoast('截止日期月份必须大于等于当前月份')
+						return
+					}
+					if(this.endDate.year&&this.endDate.year==currectyear&&this.endDate.month&&this.endDate.month==currectmonth&&this.endDate.day&&this.endDate.day<currectday){
+						this.showtoast('截止日期必须大于等于今天')
+						return
+					}
+					var obj=this.createExpirationDate()
+					// console.log(obj)
+					years=obj.years
+				}
+				
+				// console.log(year,month,day)
+				// 未传截止日期设置起始年份和终止年份
+				if(JSON.stringify(this.endDate)=='{}'){
+					for (let i = this.startYear; i <= currectyear + this.futureYear; i++) {
+						years.push(i);
+					}
+				}
+				// console.log(years,2222222)
+				this.years=years
+			},
 			createExpirationDate(){
 				let years = [],months = [];
 				if(this.dateStatus==1){
@@ -222,6 +269,7 @@
 			},
 			setValue(){
 				var val=[]
+				console.log(this.days)
 				for (let i = 0; i < this.years.length; i++) {
 					if(this.year==this.years[i]){
 						val[0]=i
@@ -342,6 +390,15 @@
 					})
 				}
 			},
+			'dateStatus':{
+				handler(val){
+					this.dateStatus=val
+					this.setYearList()
+					// console.log(this.years,3333333)
+				},
+				deep: true,
+				immediate: true
+			},
 			"endDate":{
 				handler(val){
 					this.endDate=val
@@ -480,7 +537,7 @@
 						this.days = [''];
 					}else{
 						const months = [''];
-						console.log(this.endDate)
+						// console.log(this.endDate)
 						if(this.endDate.year&&val===this.endDate.year&&this.endDate.month){
 							for (let i = 1; i <= this.endDate.month; i++) {
 								months.push(i);

pages.json

@@ -412,6 +412,10 @@
 			"style": {
 				"navigationBarTitleText": "地址簿",
 				"enablePullDownRefresh": false
+				// "app-plus":{ 
+				//                     // 将回弹属性关掉
+				//                     "bounce":"none"
+				//                 }
 			}
 
 		}, {

pages/carSource/driverSee.vue

@@ -68,7 +68,7 @@
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
 				class="mescroll">
 				<view class="flex flex-space-between">
-					<view :class="haoType == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{ping.haoPing+ping.chaPing}})</view>
+					<view :class="haoType == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{total}})</view>
 					<!-- <view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新(1)</view> -->
 					<view :class="haoType == 1 ? 'btn-active':'btn'" @click="btnChange(1)">好评({{ping.haoPing}})</view>
 					<view :class="haoType == 2 ? 'btn-active':'btn'" @click="btnChange(2)">差评({{ping.chaPing}})</view>
@@ -136,6 +136,7 @@
 	import {
 		mapState
 	} from 'vuex';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import start from '../../common/components/uni-rate.vue'
 	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	export default {
@@ -175,6 +176,7 @@
 			this.show = true
 		},
 		onLoad(options) {
+			this.get_camera_permission()
 			this.commonId=options.commonId
 			console.log(options )
 			// this.dataObj =JSON.parse(options.driver) 
@@ -190,6 +192,23 @@
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		methods: {
+			async get_camera_permission() {
+				var phone = await permision.requestAndroidPermission("android.permission.CALL_PHONE")
+				if (phone == false) {
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭拨打电话权限,去设置',
+						success: function(res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+								// plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				}
+			},
 			confirmBtn(e) {
 				console.log(this.driverList)
 				if (e.value == '投诉') {

pages/mine/cargoowner/editpersonalinformation.vue

@@ -82,9 +82,8 @@
 					<view :style="{'color':dataDetails.cardValidityDate ? '#000':'#C6CBD5'}">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证截止日期'}}
 					</view>
-					<view>
-						<u-icon name="arrow-right" color="#7E7E7E" size="10"></u-icon>
-					</view>
+					<image class='right' src="@/static/mine/right.png" mode=""></image>
+					<!-- <u-icon name="arrow-right" color="#7E7E7E" size="16"></u-icon> -->
 				</view>
 			</view>
 			<view class="bz">注：个人信息审核通过后自动认证成为个人货主。</view>
@@ -347,6 +346,17 @@
 					})
 					return true
 				}
+				
+				if(this.dataDetails.cardValidityDate!='长期'){
+					var arr=this.dataDetails.cardValidityDate.split('-')
+					if(!this.$helper.periodOfValidity(arr[0],arr[1],arr[2])){
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "身份证已过期！",
+						})
+						return true
+					}
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.cardNumber)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -702,4 +712,9 @@
 	.bz {
 		font-size: 28rpx;
 	}
+	.right{
+		width:16px;height:16px;
+		position:relative;
+		top:1px;
+	}
 </style>

pages/mine/company/editcompany.vue

@@ -471,11 +471,13 @@
 						id: this.dataDetails.id
 					}).then(res => {
 						uni.hideLoading()
-						_this.dataDetails = res.data
-						if(_this.dataDetails.advanceFreightService==1){
-							this.value=true
-						}else{
-							this.value=false
+						if(res.data){
+							_this.dataDetails = res.data
+							if(_this.dataDetails.advanceFreightService==1){
+								this.value=true
+							}else{
+								this.value=false
+							}	
 						}
 					})
 					.catch(res => {

pages/mine/manageBankCards/addBankCard.vue

@@ -40,12 +40,12 @@
 				<view class="flex align-center" v-if="!isShowManualInput">
 					<!-- 	<u--input  @click="selectZhbank" placeholder="选择开户支行" inputAlign='left' border="none" disabled>
 					</u--input> -->
-					<u--input class="select-bankzh point" placeholder="选择开户支行" inputAlign='left' border="none"
+					<!-- <u--input class="select-bankzh point" placeholder="选择开户支行" inputAlign='left' border="none"
 						v-model="dataDetails.bankDepositBranch">
-					</u--input>
-				<!-- 	<view class="select-bankzh" @click="selectZhbank">
+					</u--input> -->
+					<view :style="{'color':dataDetails.bankDepositBranch?'#000':'#C6CBD5'}" style='font-size:15px;' class="select-bankzh" @click="selectZhbank">
 						{{dataDetails.bankDepositBranch?dataDetails.bankDepositBranch:'选择开户支行'}}
-					</view> -->
+					</view>
 					<view @click="manualInput" class="type">手动输入</view>
 				</view>
 
@@ -251,6 +251,7 @@
 				// });
 			},
 			uploadImg() {
+				this.dataDetails.bankDepositBranch=''
 				this.imgTypeSelect()
 				// this.isShowimgType = true
 			},
@@ -323,6 +324,7 @@
 			},
 
 			imgTypeSelect(val) {
+				
 				console.log(val)
 				// if (val.name == '相册') {
 					uni.chooseImage({

pages/mine/set.vue

@@ -56,7 +56,7 @@
 		</view>
 		<u-modal :show="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#2772FB' confirm-text='确定' :title='title'
-			:showCancelButton='false' :content="content" @confirm="logout" @cancel="cancelClick"></u-modal>
+			:showCancelButton='true' :content="content" @confirm="logout" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 
@@ -229,7 +229,6 @@
 		padding:0 20px;
 		height: calc(100vh - 7vh);
 	}
-
 	.pictures {
 		justify-content: flex-end;
 		width: 35px;
@@ -237,7 +236,6 @@
 		background-color: #E0FAF6;
 		border-radius: 18px;
 	}
-
 	.picture {
 		width: 60px;
 		height: 60px;

pages/mine/settings/editPassword.vue

@@ -20,7 +20,7 @@
 					@end="disabled1 = false">
 				</u-code>
 			</u--form>
-			<button class="code-style reset" @click="$u.throttle(reset, 5000)">重置密码</button>
+			<button class="code-style reset" @click="$u.throttle(reset, 1000)">重置密码</button>
 		</view>
 	</view>
 </template>

pages/order/driverDetail.vue

@@ -68,7 +68,7 @@
 				</view>
 			</view>
 				<view class="flex flex-space-between">
-					<view :class="haoType == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{ping.haoPing+ping.chaPing}})</view>
+					<view :class="haoType == '' ? 'btn-active':'btn'" @click="btnChange('')">全部({{total}})</view>
 					<!-- <view :class="btnData == 2 ? 'btn-active':'btn'" @click="btnChange(2)">最新(1)</view> -->
 					<view :class="haoType == 1 ? 'btn-active':'btn'" @click="btnChange(1)">好评({{ping.haoPing}})</view>
 					<view :class="haoType == 2 ? 'btn-active':'btn'" @click="btnChange(2)">差评({{ping.chaPing}})</view>
@@ -138,6 +138,7 @@
 	import {
 		mapState
 	} from 'vuex';
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import start from '../../common/components/uni-rate.vue'
 	import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
 	export default {
@@ -193,6 +194,7 @@
 					}, 2000)
 				},
 		onLoad(options) {
+			this.get_camera_permission()
 			this.dataObj =JSON.parse(options.driver) 
 			console.log(this.dataObj)
 			that = this
@@ -207,6 +209,23 @@
 			...mapState(['hasLogin', 'userInfo', 'firstAuthentication'])
 		},
 		methods: {
+			async get_camera_permission() {
+				var phone = await permision.requestAndroidPermission("android.permission.CALL_PHONE")
+				if (phone == false) {
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭拨打电话权限,去设置',
+						success: function(res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+								// plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				}
+			},
 			toPhone(){
 				console.log(this.driverList.driverPhone)
 				var that=this

pages/order/orderDetails.vue

@@ -234,7 +234,7 @@
 			<view class='row-between'>
 				<view class="row-left-text gray">运费尾款</view>
 				<view class="row-right-text">
-					{{dataObj.freightInfo.ownerFreightBalance?dataObj.freightInfo.ownerFreightBalance:"未支付"}}
+					{{dataObj.freightInfo.ownerFreightBalanceDate?dataObj.freightInfo.ownerFreightBalance:"未支付"}}
 				</view>
 			</view>
 			<view class='flex flex-end'>
@@ -242,7 +242,7 @@
 			</view>
 			<view style='flex-wrap: wrap;' class='flex mx row-left-text'>
 				<!-- 明细：预付{{dataObj.advanceCharge}}元，服务费{{dataObj.freightInfo.driverServiceCharge}}元，尾款{{dataObj.freightInfo.ownerFreightBalance}}元，合计{{dataObj.freightInfo.totalPayment}}元。 -->
-				明细：预付{{dataObj.advanceCharge}}元，工本费：{{dataObj.freightInfo.ownerServiceCharge}}元，<text v-if="dataObj.freightInfo.ownerFreightBalance">尾款：{{dataObj.freightInfo.ownerFreightBalance}}元，</text>合计：{{dataObj.freightInfo.totalPayment}}元。</view>
+				明细：预付{{dataObj.advanceCharge}}元，工本费{{dataObj.freightInfo.ownerServiceCharge}}元，<text v-if="dataObj.freightInfo.ownerFreightBalance">尾款{{dataObj.freightInfo.ownerFreightBalance}}元，</text>合计{{dataObj.freightInfo.totalPayment}}元。</view>
 			</view>
 		<!-- v-if="status3" -->
 		<view class="content4" v-if="status3">
@@ -355,6 +355,7 @@
 
 <script>
 	var that;
+	import permision from "@/js_sdk/wa-permission/permission.js"
 	import uniPopup from '@/components/uni-popup/uni-popup.vue'
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
@@ -419,6 +420,7 @@
 		onLoad(options) {
 			that = this
 			this.id = options.id
+			this.get_camera_permission()
 			// this.ctx = uni.createCanvasContext("handWriting");
 			// this.$nextTick(() => {
 			// 	uni.createSelectorQuery().select('.handCenter').boundingClientRect(rect => {
@@ -434,6 +436,23 @@
 			this.getList()
 		},
 		methods: {
+			async get_camera_permission() {
+				var phone = await permision.requestAndroidPermission("android.permission.CALL_PHONE")
+				if (phone == false) {
+					uni.showModal({
+						title: '提示',
+						content: '您已经关闭拨打电话权限,去设置',
+						success: function(res) {
+							if (res.confirm) {
+								permision.gotoAppPermissionSetting()
+								// plus.runtime.openURL("app-settings:");
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+					});
+				}
+			},
 			moneyClick(){
 				this.moneyShow = false
 				if(this.dataObj.cargoOwnerStatus == "司机驳回运费信息"){

pages/public/register.vue

@@ -268,9 +268,9 @@
 						identification: 2,
 						avatarUrl: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/appData/165672849620975.png" //司机默认头像
 					}).then(res => {
-						if (res.code == '11002') {
+						if (res.code == '11003') {
 							uni.showToast({
-								title: '验证码错误或过期，请重新获取',
+								title: res.message,
 								icon: 'none',
 								duration: 2000
 							})

pages/release/editAddress.vue

@@ -17,7 +17,7 @@
 
 						<view style='width:100%;flex-direction:row-reverse;' class='flex align-center' @click='toMap'>
 							<image src="../../static/right.png" style="width: 22rpx;height: 22rpx;"></image>
-							{{addressInfo.area?(addressInfo.province?addressInfo.province:''+addressInfo.city+addressInfo.area):'选择所属区域 '}}
+							{{addressInfo.area?((addressInfo.province?addressInfo.province:'')+addressInfo.city+addressInfo.area):'选择所属区域 '}}
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>

pages/release/record.vue

@@ -7,7 +7,29 @@
 				<u-search placeholder="可按编号、货主、收发地查找" v-model="searchKeyWord" @search="search" @custom="search"
 					bgColor='#F5F6FA'></u-search>
 			</view>
-
+			<!-- <u-tabs
+			        :list="list1"
+			        lineWidth="30"
+			        lineColor="#f56c6c"
+			        :activeStyle="{
+			            color: '#303133',
+			            fontWeight: 'bold',
+			            transform: 'scale(1.05)'
+			        }"
+			        :inactiveStyle="{
+			            color: '#606266',
+			            transform: 'scale(1)'
+			        }"
+			        itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;"
+			    >
+			    </u-tabs> -->
+				<view class='tab-nav'>
+					<view class='tab-item' v-for='item in list1' @click='statuschange(item)' :class='{active:item.status==searchType}'>
+						{{item.name}} {{item.num}}	
+					</view>
+				</view>
+			
+			<!-- <u-tabs  :list="list1" @click="click"></u-tabs> -->
 			<view :id="'good'+good.id" class="good-list" v-for="good in goods" :key="good.id"
 				@click="toDetail(good.id)">
 				<view style="padding: 0 35rpx 20rpx 35rpx;">
@@ -62,7 +84,7 @@
 							<view class="flex align-center">
 								<view class="">运距约 {{good.distance}}km</view>
 								<view v-if='good.weight' class="sline"></view>
-								<view v-if='good.weight' class=" ">{{good.weight}}吨</view>
+								<view v-if='good.weight' class="">{{good.weight}}吨</view>
 							</view>
 						</view>
 					</view>
@@ -115,12 +137,30 @@
 				mescroll: null,
 				id: '',
 				confirmText: '确定',
+				searchType:'2',
 				alertTitle: '',
 				alertContent: "",
 				isShowAlert: false,
 				goods: [], // 数据列表
 				delOrShowHidden: '',
 				rowObj: {},
+				 list1: [{
+				    name: '审核中',
+					status:'1',
+					num:0,
+					}, {
+				    name: '已通过',
+					status:'2',
+					num:0,
+				    }, {
+				    name: '未通过',
+					status:'3',
+					num:0,
+				    }, {
+				    name: '已过期',
+					status:'4',
+					num:0,
+				    }],
 				upOption: {
 					page: {
 						size: 10 // 每页数据的数量,默认10
@@ -148,6 +188,7 @@
 			//#endif
 		},
 		onLoad() {
+			
 			// let _isHave = this.$utils.getRoles('aaa')
 			// console.log(_isHave)
 
@@ -179,6 +220,13 @@
 
 		// },
 		methods: {
+			statuschange(item){
+				this.searchType=item.status
+				this.upCallback({
+					size: 10,
+					num: 1
+				})
+			},
 			mescrollInit(mescroll) {
 				this.mescroll = mescroll;
 			},
@@ -341,6 +389,18 @@
 					mask: true,
 					title: '加载中...'
 				})
+				this.$request.baseRequest('get', '/publishTaskInfo/selectNum', {
+						commonId: this.userInfo.id,
+					}).then(res => {
+						this.list1[0].num=res.data.examieNum
+						this.list1[1].num=res.data.noNum
+						this.list1[2].num=res.data.passNum
+						this.list1[3].num=res.data.overdueNum
+						console.log(res)
+					})
+					.catch(res => {
+						uni.$u.toast(res.message);
+					});
 				this.$request.baseRequest('get', '/publishTaskInfo/selectTask', {
 						commonId: this.userInfo.id,
 						searchKeyWord: this.searchKeyWord,
@@ -366,7 +426,7 @@
 <style scoped lang="scss">
 	.content {
 		padding-top: var(--status-bar-height);
-		background: white;
+		// background: white;
 
 		.top {
 			display: flex;
@@ -631,4 +691,35 @@
 	/deep/.u-modal__content {
 		flex-direction: column;
 	}
+	.tab-nav{
+		width:100%;
+		background: white;
+		display:flex;
+	}
+	.tab-item{
+		width:25%;
+		display:block;
+		position:relative;
+		text-align:center;
+		padding:10px 0;
+		box-sizing: border-box;
+		color:#7D8087;
+		font-size:14px;
+	}
+	.tab-item.active{
+		color:#000;
+		font-size:16px;
+	}
+	.tab-item.active:after{
+		position:absolute;
+		content:'';
+		display:block;
+		width:50%;
+		left:50%;
+		transform: translate(-50%);
+		height:4px;
+		bottom:0;
+		background:#2772FB;
+		border-radius: 2px;
+	}
 </style>

pages/release/release.vue

@@ -844,44 +844,68 @@
 							type: 'success',
 							message: "发布成功",
 							complete() {
-								_this.dataObj = {
-									commonId: '',
-									cargoOwner: '',
-									sendPrivate: '',
-									sendCity: '',
-									sendArea: '',
-									sendDetailedAddress: '',
-									unloadPrivate: '',
-									unloadCity: '',
-									unloadArea: '',
-									unloadDetailedAddress: '',
-									distance: '',
-									goodsName: '',
-									billingMethod: '元/吨',
-									freightPrice: '',
-									freightAdvance: true,
-									sender: '',
-									senderPhone: '',
-									receiver: '',
-									receiverPhone: '',
-									weight: '',
-									loadingDateStart: '',
-									loadingDateEnd: '',
-									carLengthSmall: '',
-									carLength: '',
-									loadWeightSmall: '',
-									loadWeight: '',
-									carModel: '',
-									taskDescription: '',
-									taskValidity: '',
-									sendLongitude: '',
-									receiverIdcard:'',
-									sendLatitude: '',
-									receiverCreditCode:'',
-									unsendLongitude: '',
-									unsendLatitude: '',
-								}
-								_this.checkboxValue1 = ['不限']
+								// _this.dataObj = {
+								// 	commonId: '',
+								// 	cargoOwner: '',
+								// 	sendPrivate: '',
+								// 	sendCity: '',
+								// 	sendArea: '',
+								// 	sendDetailedAddress: '',
+								// 	unloadPrivate: '',
+								// 	unloadCity: '',
+								// 	unloadArea: '',
+								// 	unloadDetailedAddress: '',
+								// 	distance: '',
+								// 	goodsName: '',
+								// 	billingMethod: '元/吨',
+								// 	freightPrice: '',
+								// 	freightAdvance: true,
+								// 	sender: '',
+								// 	senderPhone: '',
+								// 	receiver: '',
+								// 	receiverPhone: '',
+								// 	weight: '',
+								// 	loadingDateStart: '',
+								// 	loadingDateEnd: '',
+								// 	carLengthSmall: '',
+								// 	carLength: '',
+								// 	loadWeightSmall: '',
+								// 	loadWeight: '',
+								// 	carModel: '',
+								// 	taskDescription: '',
+								// 	taskValidity: '',
+								// 	sendLongitude: '',
+								// 	receiverIdcard:'',
+								// 	sendLatitude: '',
+								// 	receiverCreditCode:'',
+								// 	unsendLongitude: '',
+								// 	unsendLatitude: '',
+								// }
+								// _this.checkboxValue1 = ['不限']
+								 // _this.queryGoodsList() // 查询货物类别
+								 // let goods = uni.getStorageSync("goodsType")
+								 // if(goods){
+								 // 	_this.dataObj.goodsType = goods.name
+								 // 	_this.dataObj.goodsTypeKey = goods.key
+								 // }
+								  // const pages = getCurrentPages()
+								  // console.log(pages)
+								         // 声明一个pages使用getCurrentPages方法
+								         // const curPage = pages[pages.length - 1]
+								         // 声明一个当前页面
+								        // curPage.$vm.$options.onLoad[1].bind(curPage.$vm); // 传入参数
+										// curPage.$vm.$options.onShow[1].bind(curPage.$vm); // curPage.onShow()
+								  //       curPage.$vm.$options.onReady[1].bind(curPage.$vm);
+										 // curPage.onReady()
+										 // uni.switchTab({
+										 // 	url: '/pages/mine/index'
+										 // })
+										 // uni.switchTab({
+										 // 	url: '/pages/mine/index'
+										 // })
+								 uni.redirectTo({url:"/pages/release/release"})
+								 // uni.reLaunch({url:"/pages/release/release"})
+								 // uni.redirectTo("/pages/release/record")
 								// uni.$u.route("/pages/release/record")
 							}
 						})
@@ -987,7 +1011,22 @@
 							// console.log(this.qyList[i].compStatus,this.dataObj.compId)
 							uni.setStorageSync('releasecompId', this.dataObj.compId)
 						}else{
-							this.freightAdvance=false
+							this.$request.baseRequest('get', '/hyCargoOwnerPayeeInfo/selectPayee', {
+									commonId: this.userInfo.id,
+									pageSize: 10,
+									currentPage: 1,
+								}).then(res => {
+									if (res.code == '200') {
+										if(res.data.records.length==0){
+											this.$refs.uToast.show({
+												type: 'error',
+												message: "未绑定银行卡"})
+											this.dataObj.cargoOwner=''
+												return
+										}
+										this.freightAdvance=false
+									}
+								})
 						}
 						this.freightAdvance= this.qyList[i].advanceFreightService == 1 ? true : false
 						this.dataObj.freightAdvance = this.qyList[i].advanceFreightService == 1 ? true : false
@@ -1223,6 +1262,9 @@
 			font-size: 36rpx;
 			font-weight: 700;
 			color: #171717;
+			width:90%;
+			justify-content: flex-start;
+			// text-align:left;
 		}
 
 		.collect {
@@ -1231,6 +1273,7 @@
 			line-height: 40rpx;
 			background: #2772FB;
 			color: white;
+			// font-size:1px;
 			padding: 6rpx;
 			border-radius: 50%;
 			text-align: center;

pages/release/selectAddress.vue

@@ -348,6 +348,7 @@
 
 	.content {
 		height: 100vh;
+		overflow:scroll;
 	}
 
 	.content2-wrap {