Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

# Conflicts:
#	pageD/identity/driverIdentityEdit.vue

components/uview-ui/libs/util/area.js

@@ -7239,6 +7239,9 @@ var areaData = [
 			"value": "451081"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "451101"
+		},{
 			"label": "八步区",
 			"value": "451102"
 		}, {
@@ -7255,6 +7258,9 @@ var areaData = [
 			"value": "451123"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "451201"
+		},{
 			"label": "金城江区",
 			"value": "451202"
 		}, {
@@ -7289,6 +7295,9 @@ var areaData = [
 			"value": "451229"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "451101"
+		},{
 			"label": "兴宾区",
 			"value": "451302"
 		}, {
@@ -7308,6 +7317,9 @@ var areaData = [
 			"value": "451381"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "451401"
+		},{
 			"label": "江州区",
 			"value": "451402"
 		}, {
@@ -7332,6 +7344,9 @@ var areaData = [
 	],
 	[
 		[{
+			"label": "市辖区",
+			"value": "460101"
+		},{
 			"label": "秀英区",
 			"value": "460105"
 		}, {
@@ -7345,6 +7360,9 @@ var areaData = [
 			"value": "460108"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "460201"
+		},{
 			"label": "海棠区",
 			"value": "460202"
 		}, {
@@ -7368,8 +7386,59 @@ var areaData = [
 			"value": "460323"
 		}],
 		[{
-			"label": "儋州市",
-			"value": "460400"
+			"label": "那大镇",
+			"value": "460400100"
+		}, {
+			"label": "和庆镇",
+			"value": "460400101"
+		}, {
+			"label": "南丰镇",
+			"value": "460400102"
+		},{
+			"label": "大成镇",
+			"value": "460400103"
+		}, {
+			"label": "雅星镇",
+			"value": "460400104"
+		}, {
+			"label": "兰洋镇",
+			"value": "460400105"
+		},{
+			"label": "光村镇",
+			"value": "460400106"
+		}, {
+			"label": "木棠镇",
+			"value": "460400108"
+		}, {
+			"label": "海头镇",
+			"value": "460400109"
+		},{
+			"label": "峨蔓镇",
+			"value": "460400103"
+		}, {
+			"label": "王五镇",
+			"value": "460400111"
+		}, {
+			"label": "白马井镇",
+			"value": "460400112"
+		},{
+			"label": "中和镇",
+			"value": "460400113"
+		}, {
+			"label": "排浦镇",
+			"value": "460400114"
+		}, {
+			"label": "东成镇",
+			"value": "460400115"
+		},{
+			"label": "新州镇",
+			"value": "460400116"
+		}, {
+			"label": "洋浦经济开发区",
+			"value": "460400499"
+		}, {
+			"label": "华南热作学院",
+			"value": "460400500"
 		}],
 		[{
 			"label": "五指山市",
@@ -7538,6 +7607,9 @@ var areaData = [
 	],
 	[
 		[{
+			"label": "市辖区",
+			"value": "510101"
+		},{
 			"label": "锦江区",
 			"value": "510104"
 		}, {
@@ -7599,6 +7671,9 @@ var areaData = [
 			"value": "510185"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "510301"
+		},{
 			"label": "自流井区",
 			"value": "510302"
 		}, {
@@ -7618,6 +7693,9 @@ var areaData = [
 			"value": "510322"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "510401"
+		},{
 			"label": "东区",
 			"value": "510402"
 		}, {
@@ -7634,6 +7712,9 @@ var areaData = [
 			"value": "510422"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "510501"
+		},{
 			"label": "江阳区",
 			"value": "510502"
 		}, {
@@ -7656,6 +7737,9 @@ var areaData = [
 			"value": "510525"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "510601"
+		},{
 			"label": "旌阳区",
 			"value": "510603"
 		}, {
@@ -7675,6 +7759,9 @@ var areaData = [
 			"value": "510683"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "510701"
+		},{
 			"label": "涪城区",
 			"value": "510703"
 		}, {
@@ -7703,6 +7790,9 @@ var areaData = [
 			"value": "510781"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "510801"
+		},{
 			"label": "利州区",
 			"value": "510802"
 		}, {
@@ -7725,6 +7815,9 @@ var areaData = [
 			"value": "510824"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "510901"
+		},{
 			"label": "船山区",
 			"value": "510903"
 		}, {
@@ -7733,14 +7826,17 @@ var areaData = [
 		}, {
 			"label": "蓬溪县",
 			"value": "510921"
-		}, {
-			"label": "射洪县",
-			"value": "510922"
 		}, {
 			"label": "大英县",
 			"value": "510923"
-		}],
+		},{
+			"label": "射洪市",
+			"value": "510981"
+		} ],
 		[{
+			"label": "市辖区",
+			"value": "511001"
+		},{
 			"label": "市中区",
 			"value": "511002"
 		}, {
@@ -7760,6 +7856,9 @@ var areaData = [
 			"value": "511083"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "511101"
+		},{
 			"label": "市中区",
 			"value": "511102"
 		}, {
@@ -7794,6 +7893,9 @@ var areaData = [
 			"value": "511181"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "511301"
+		},{
 			"label": "顺庆区",
 			"value": "511302"
 		}, {
@@ -7822,6 +7924,9 @@ var areaData = [
 			"value": "511381"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "511401"
+		},{
 			"label": "东坡区",
 			"value": "511402"
 		}, {
@@ -7841,14 +7946,17 @@ var areaData = [
 			"value": "511425"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "511501"
+		},{
 			"label": "翠屏区",
 			"value": "511502"
 		}, {
 			"label": "南溪区",
 			"value": "511503"
 		}, {
-			"label": "宜宾县",
-			"value": "511521"
+			"label": "叙州区",
+			"value": "511504"
 		}, {
 			"label": "江安县",
 			"value": "511523"
@@ -7872,6 +7980,9 @@ var areaData = [
 			"value": "511529"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "511601"
+		},{
 			"label": "广安区",
 			"value": "511602"
 		}, {
@@ -7891,6 +8002,9 @@ var areaData = [
 			"value": "511681"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "511701"
+		},{
 			"label": "通川区",
 			"value": "511702"
 		}, {
@@ -7916,6 +8030,9 @@ var areaData = [
 			"value": "511781"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "511801"
+		},{
 			"label": "雨城区",
 			"value": "511802"
 		}, {
@@ -7941,6 +8058,9 @@ var areaData = [
 			"value": "511827"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "511901"
+		},{
 			"label": "巴州区",
 			"value": "511902"
 		}, {
@@ -7960,6 +8080,9 @@ var areaData = [
 			"value": "511971"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "512001"
+		},{
 			"label": "雁江区",
 			"value": "512002"
 		}, {
@@ -8119,6 +8242,9 @@ var areaData = [
 	],
 	[
 		[{
+			"label": "市辖区",
+			"value": "520101"
+		}, {
 			"label": "南明区",
 			"value": "520102"
 		}, {
@@ -8163,6 +8289,9 @@ var areaData = [
 			"value": "520281"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "520301"
+		},{
 			"label": "红花岗区",
 			"value": "520302"
 		}, {
@@ -8206,6 +8335,9 @@ var areaData = [
 			"value": "520382"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "520401"
+		},{
 			"label": "西秀区",
 			"value": "520402"
 		}, {
@@ -8225,6 +8357,9 @@ var areaData = [
 			"value": "520425"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "520501"
+		},{
 			"label": "七星关区",
 			"value": "520502"
 		}, {
@@ -8250,6 +8385,9 @@ var areaData = [
 			"value": "520527"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "520601"
+		},{
 			"label": "碧江区",
 			"value": "520602"
 		}, {
@@ -8394,6 +8532,9 @@ var areaData = [
 	],
 	[
 		[{
+			"label": "市辖区",
+			"value": "530101"
+		}, {
 			"label": "五华区",
 			"value": "530102"
 		}, {
@@ -8437,14 +8578,17 @@ var areaData = [
 			"value": "530181"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "530301"
+		}, {
 			"label": "麒麟区",
 			"value": "530302"
 		}, {
 			"label": "沾益区",
 			"value": "530303"
 		}, {
-			"label": "马龙县",
-			"value": "530321"
+			"label": "马龙区",
+			"value": "530304"
 		}, {
 			"label": "陆良县",
 			"value": "530322"
@@ -8465,6 +8609,9 @@ var areaData = [
 			"value": "530381"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "530401"
+		}, {
 			"label": "红塔区",
 			"value": "530402"
 		}, {
@@ -8493,6 +8640,9 @@ var areaData = [
 			"value": "530428"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "530501"
+		}, {
 			"label": "隆阳区",
 			"value": "530502"
 		}, {
@@ -8509,6 +8659,9 @@ var areaData = [
 			"value": "530581"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "530601"
+		}, {
 			"label": "昭阳区",
 			"value": "530602"
 		}, {
@@ -8543,6 +8696,9 @@ var areaData = [
 			"value": "530630"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "530701"
+		}, {
 			"label": "古城区",
 			"value": "530702"
 		}, {
@@ -8559,6 +8715,9 @@ var areaData = [
 			"value": "530724"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "530801"
+		}, {
 			"label": "思茅区",
 			"value": "530802"
 		}, {
@@ -8590,6 +8749,9 @@ var areaData = [
 			"value": "530829"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "530901"
+		}, {
 			"label": "临翔区",
 			"value": "530902"
 		}, {
@@ -8799,12 +8961,18 @@ var areaData = [
 	],
 	[
 		[{
+			"label": "市辖区",
+			"value": "540101"
+		}, {
 			"label": "城关区",
 			"value": "540102"
 		}, {
 			"label": "堆龙德庆区",
 			"value": "540103"
-		}, {
+		},{
+			"label": "达孜区",
+			"value": "540104"
+		},  {
 			"label": "林周县",
 			"value": "540121"
 		}, {
@@ -8816,9 +8984,6 @@ var areaData = [
 		}, {
 			"label": "曲水县",
 			"value": "540124"
-		}, {
-			"label": "达孜县",
-			"value": "540126"
 		}, {
 			"label": "墨竹工卡县",
 			"value": "540127"
@@ -8947,6 +9112,9 @@ var areaData = [
 			"value": "540426"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "540501"
+		}, {
 			"label": "乃东区",
 			"value": "540502"
 		}, {
@@ -8984,8 +9152,8 @@ var areaData = [
 			"value": "540531"
 		}],
 		[{
-			"label": "那曲县",
-			"value": "542421"
+			"label": "色尼区",
+			"value": "542602"
 		}, {
 			"label": "嘉黎县",
 			"value": "542422"
@@ -9042,6 +9210,9 @@ var areaData = [
 	],
 	[
 		[{
+			"label": "市辖区",
+			"value": "610101"
+		}, {
 			"label": "新城区",
 			"value": "610102"
 		}, {
@@ -9082,6 +9253,9 @@ var areaData = [
 			"value": "610124"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "610201"
+		}, {
 			"label": "王益区",
 			"value": "610202"
 		}, {
@@ -9095,6 +9269,9 @@ var areaData = [
 			"value": "610222"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "610301"
+		}, {
 			"label": "渭滨区",
 			"value": "610302"
 		}, {
@@ -9132,6 +9309,9 @@ var areaData = [
 			"value": "610331"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "610401"
+		}, {
 			"label": "秦都区",
 			"value": "610402"
 		}, {
@@ -9155,10 +9335,7 @@ var areaData = [
 		}, {
 			"label": "永寿县",
 			"value": "610426"
-		}, {
-			"label": "彬县",
-			"value": "610427"
-		}, {
+		},  {
 			"label": "长武县",
 			"value": "610428"
 		}, {
@@ -9173,8 +9350,14 @@ var areaData = [
 		}, {
 			"label": "兴平市",
 			"value": "610481"
+		},{
+			"label": "彬州市",
+			"value": "610482"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "610501"
+		}, {
 			"label": "临渭区",
 			"value": "610502"
 		}, {
@@ -9209,6 +9392,9 @@ var areaData = [
 			"value": "610582"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "610601"
+		},{
 			"label": "宝塔区",
 			"value": "610602"
 		}, {
@@ -9220,10 +9406,7 @@ var areaData = [
 		}, {
 			"label": "延川县",
 			"value": "610622"
-		}, {
-			"label": "子长县",
-			"value": "610623"
-		}, {
+		},  {
 			"label": "志丹县",
 			"value": "610625"
 		}, {
@@ -9247,8 +9430,14 @@ var areaData = [
 		}, {
 			"label": "黄陵县",
 			"value": "610632"
+		},{
+			"label": "子长市",
+			"value": "610681"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "610701"
+		},{
 			"label": "汉台区",
 			"value": "610702"
 		}, {
@@ -9283,6 +9472,9 @@ var areaData = [
 			"value": "610730"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "610801"
+		},{
 			"label": "榆阳区",
 			"value": "610802"
 		}, {
@@ -9320,6 +9512,9 @@ var areaData = [
 			"value": "610881"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "610901"
+		},{
 			"label": "汉滨区",
 			"value": "610902"
 		}, {
@@ -9351,6 +9546,9 @@ var areaData = [
 			"value": "610929"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "611001"
+		},{
 			"label": "商州区",
 			"value": "611002"
 		}, {
@@ -9375,6 +9573,9 @@ var areaData = [
 	],
 	[
 		[{
+			"label": "市辖区",
+			"value": "620101"
+		}, {
 			"label": "城关区",
 			"value": "620102"
 		}, {
@@ -9403,10 +9604,13 @@ var areaData = [
 			"value": "620171"
 		}],
 		[{
-			"label": "嘉峪关市",
+			"label": "市辖区",
 			"value": "620201"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "620301"
+		}, {
 			"label": "金川区",
 			"value": "620302"
 		}, {
@@ -9414,6 +9618,9 @@ var areaData = [
 			"value": "620321"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "620401"
+		}, {
 			"label": "白银区",
 			"value": "620402"
 		}, {
@@ -9430,6 +9637,9 @@ var areaData = [
 			"value": "620423"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "620501"
+		}, {
 			"label": "秦州区",
 			"value": "620502"
 		}, {
@@ -9452,6 +9662,9 @@ var areaData = [
 			"value": "620525"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "620601"
+		}, {
 			"label": "凉州区",
 			"value": "620602"
 		}, {
@@ -9465,6 +9678,9 @@ var areaData = [
 			"value": "620623"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "620701"
+		}, {
 			"label": "甘州区",
 			"value": "620702"
 		}, {
@@ -9484,6 +9700,9 @@ var areaData = [
 			"value": "620725"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "620801"
+		}, {
 			"label": "崆峒区",
 			"value": "620802"
 		}, {
@@ -9495,20 +9714,20 @@ var areaData = [
 		}, {
 			"label": "崇信县",
 			"value": "620823"
-		}, {
-			"label": "华亭县",
-			"value": "620824"
 		}, {
 			"label": "庄浪县",
 			"value": "620825"
 		}, {
 			"label": "静宁县",
 			"value": "620826"
-		}, {
-			"label": "平凉工业园区",
-			"value": "620871"
+		},  {
+			"label": "华亭市",
+			"value": "620881"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "620901"
+		}, {
 			"label": "肃州区",
 			"value": "620902"
 		}, {
@@ -9531,6 +9750,9 @@ var areaData = [
 			"value": "620982"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "621001"
+		}, {
 			"label": "西峰区",
 			"value": "621002"
 		}, {
@@ -9556,6 +9778,9 @@ var areaData = [
 			"value": "621027"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "621101"
+		},{
 			"label": "安定区",
 			"value": "621102"
 		}, {
@@ -9578,6 +9803,9 @@ var areaData = [
 			"value": "621126"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "621201"
+		},{
 			"label": "武都区",
 			"value": "621202"
 		}, {
@@ -9658,6 +9886,9 @@ var areaData = [
 	],
 	[
 		[{
+			"label": "市辖区",
+			"value": "630101"
+		}, {
 			"label": "城东区",
 			"value": "630102"
 		}, {
@@ -9784,6 +10015,9 @@ var areaData = [
 		}, {
 			"label": "德令哈市",
 			"value": "632802"
+		},{
+			"label": "茫崖市",
+			"value": "632803"
 		}, {
 			"label": "乌兰县",
 			"value": "632821"
@@ -9796,16 +10030,13 @@ var areaData = [
 		}, {
 			"label": "大柴旦行政委员会",
 			"value": "632857"
-		}, {
-			"label": "冷湖行政委员会",
-			"value": "632858"
-		}, {
-			"label": "茫崖行政委员会",
-			"value": "632859"
 		}]
 	],
 	[
 		[{
+			"label": "市辖区",
+			"value": "640101"
+		}, {
 			"label": "兴庆区",
 			"value": "640104"
 		}, {
@@ -9825,6 +10056,9 @@ var areaData = [
 			"value": "640181"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "640201"
+		}, {
 			"label": "大武口区",
 			"value": "640202"
 		}, {
@@ -9835,6 +10069,9 @@ var areaData = [
 			"value": "640221"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "640301"
+		}, {
 			"label": "利通区",
 			"value": "640302"
 		}, {
@@ -9851,6 +10088,9 @@ var areaData = [
 			"value": "640381"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "640401"
+		}, {
 			"label": "原州区",
 			"value": "640402"
 		}, {
@@ -9867,6 +10107,9 @@ var areaData = [
 			"value": "640425"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "640501"
+		}, {
 			"label": "沙坡头区",
 			"value": "640502"
 		}, {
@@ -9879,6 +10122,9 @@ var areaData = [
 	],
 	[
 		[{
+			"label": "市辖区",
+			"value": "650101"
+		}, {
 			"label": "天山区",
 			"value": "650102"
 		}, {
@@ -9902,14 +10148,11 @@ var areaData = [
 		}, {
 			"label": "乌鲁木齐县",
 			"value": "650121"
-		}, {
-			"label": "乌鲁木齐经济技术开发区",
-			"value": "650171"
-		}, {
-			"label": "乌鲁木齐高新技术产业开发区",
-			"value": "650172"
 		}],
 		[{
+			"label": "市辖区",
+			"value": "650201"
+		}, {
 			"label": "独山子区",
 			"value": "650202"
 		}, {
@@ -10208,104 +10451,291 @@ var areaData = [
 	],
 	[
 		[{
-			"label": "台北",
-			"value": "660101"
+			"label": "内湖区",
+			"value": "710101"
+		},
+		{
+			"label": "南港区",
+			"value": "710102"
+		},
+		{
+			"label": "中正区",
+			"value": "710103"
+		},
+		{
+			"label": "松山区",
+			"value": "710104"
+		},{
+			"label": "信义区",
+			"value": "710105"
+		},
+		{
+			"label": "大安区",
+			"value": "710106"
+		},
+		{
+			"label": "中山区",
+			"value": "710107"
+		},
+		{
+			"label": "文山区",
+			"value": "710108"
+		},{
+			"label": "大同区",
+			"value": "710109"
+		},
+		{
+			"label": "万华区",
+			"value": "710110"
+		},
+		{
+			"label": "士林区",
+			"value": "710111"
+		},
+		{
+			"label": "北投区",
+			"value": "710112"
+		}],
+		[{
+			"label": "新兴区",
+			"value": "710201"
+		},
+		{
+			"label": "前金区",
+			"value": "710202"
+		},
+		{
+			"label": "芩雅区",
+			"value": "710203"
+		},
+		{
+			"label": "盐埕区",
+			"value": "710204"
+		},{
+			"label": "鼓山区",
+			"value": "710205"
+		},
+		{
+			"label": "旗津区",
+			"value": "710206"
+		},
+		{
+			"label": "前镇区",
+			"value": "710207"
+		},
+		{
+			"label": "三民区",
+			"value": "710208"
+		},{
+			"label": "左营区",
+			"value": "710209"
+		},
+		{
+			"label": "楠梓区",
+			"value": "710210"
+		},
+		{
+			"label": "小港区",
+			"value": "710211"
+		}],
+		[{
+			"label": "仁爱区",
+			"value": "710301"
+		},
+		{
+			"label": "信义区",
+			"value": "710302"
+		},
+		{
+			"label": "中正区",
+			"value": "710303"
+		},
+		{
+			"label": "暖暖区",
+			"value": "710304"
+		},{
+			"label": "安乐区",
+			"value": "710305"
+		},
+		{
+			"label": "七堵区",
+			"value": "710307"
+		}],
+		[{
+			"label": "中区",
+			"value": "710401"
+		},
+		{
+			"label": "东区",
+			"value": "710402"
+		},
+		{
+			"label": "南区",
+			"value": "710403"
+		},{
+			"label": "西区",
+			"value": "710404"
+		},
+		{
+			"label": "北区",
+			"value": "710405"
+		},
+		{
+			"label": "北屯区",
+			"value": "710406"
+		},
+		{
+			"label": "西屯区",
+			"value": "710407"
+		},{
+			"label": "南屯区",
+			"value": "710408"
+		}],
+		[{
+			"label": "中西区",
+			"value": "710501"
+		},
+		{
+			"label": "东区",
+			"value": "710502"
+		},
+		{
+			"label": "南区",
+			"value": "710503"
+		},
+		{
+			"label": "北区",
+			"value": "710504"
+		},
+		{
+			"label": "安平区",
+			"value": "710505"
+		},
+		{
+			"label": "安南区",
+			"value": "710506"
+		}],
+		[
+		{
+			"label": "东区",
+			"value": "710601"
+		},
+		{
+			"label": "北区",
+			"value": "710602"
+		},
+		{
+			"label": "香山区",
+			"value": "710603"
 		}],
+		[
+		{
+			"label": "东区",
+			"value": "710701"
+		},
+		{
+			"label": "西区",
+			"value": "710702"
+		}],
+	],
+	[
 		[{
-			"label": "高雄",
-			"value": "660201"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "基隆",
-			"value": "660301"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "台中",
-			"value": "660401"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "台南",
-			"value": "660501"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "新竹",
-			"value": "660601"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "嘉义",
-			"value": "660701"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "宜兰",
-			"value": "660801"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "桃园",
-			"value": "660901"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "苗栗",
-			"value": "661001"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "彰化",
-			"value": "661101"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "南投",
-			"value": "661201"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "云林",
-			"value": "661301"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "屏东",
-			"value": "661401"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "台东",
-			"value": "661501"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "花莲",
-			"value": "661601"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "澎湖",
-			"value": "661701"
-		}]
+			"label": "",
+			"value": "710702"
+		}],
 	],
 	[
 		[{
-			"label": "香港岛",
-			"value": "670101"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "九龙",
-			"value": "670201"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "新界",
-			"value": "670301"
-		}]
-	],
-	[
+			"label": "",
+			"value": "710702"
+		}],
+		[{
+			"label": "",
+			"value": "710702"
+		}],
 		[{
-			"label": "澳门半岛",
-			"value": "680101"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "氹仔岛",
-			"value": "680201"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "路环岛",
-			"value": "680301"
+			"label": "",
+			"value": "710702"
 		}],
 		[{
-			"label": "路氹城",
-			"value": "680401"
+			"label": "",
+			"value": "710702"
 		}]
 	]
 ];

pageA/freightTransport/addpaygoods.vue

@@ -99,7 +99,6 @@
 			this.$refs.uForm.setRules(this.rules);
 		},
 		onLoad(option) {
-			debugger
 			this.userInfo.infoId = option.id;
 			this.getDetail(option.id);
 
@@ -107,7 +106,6 @@
 		methods: {
 			// 手机号重复校验
 			checkMobile(val) {
-				debugger
 				let _data = this.dataList.receivingUsers;
 				if (_data == null || _data.length == 0) return false
 				for (let i = 0; i < _data.length; i++) {
@@ -139,21 +137,18 @@
 				})
 			},
 			submit() {
-				debugger
 				let that = this
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						that.$api.doRequest('post', '/freightReceivingDispatching/api/insertReceivingUser', this
 							.userInfo).then(res => {
-							debugger
 							if (res.data.code == 200) {
 								uni.showToast({
 									title: '提交成功',
 									icon: 'none',
 									duration: 2000,
 									success: function() {
-										debugger
-
+										
 									}
 								})
 
@@ -182,7 +177,6 @@
 
 			},
 			del(val) {
-				debugger
 				let that = this
 				uni.showModal({
 					content: '确定删除该收货人？',

pageA/freightTransport/addsendgoods.vue

@@ -133,7 +133,7 @@
 		onShow() {
 
 		},
-		onLoad(options) {debugger
+		onLoad(options) {
 			this.phone = options.phone
 		},
 		onPageScroll(e) {
@@ -149,7 +149,6 @@
 				this.packingIndex = event.detail.value;
 			},
 			commit() {
-				debugger
 				this.purchaseOrder.accountNumber= this.phone
 				this.$api.doRequest('post', '/freightReceivingDispatching/api/insertFreightReceivingDispatching',this.purchaseOrder).then(res => {debugger
 					// if(res.data.code=='200'){

pageA/freightTransport/confirmpaygoods.vue

@@ -194,7 +194,6 @@
 			this.$refs.uForm.setRules(this.rules);
 		},
 		onLoad(option) {
-			debugger
 			this.goods = JSON.parse(option.toINfo)
 			this.id = options.id
 			this.goods.reciveCollectionScreenshot = this.goods.reciveCollectionScreenshot == null ? '' : this.goods
@@ -236,7 +235,6 @@
 
 						uploadImage(res.tempFilePaths[0], 'reciveCollectionScreenshot/',
 							result => {
-								debugger
 								this.goods.reciveCollectionScreenshot = result
 								uni.hideLoading();
 							}
@@ -251,7 +249,6 @@
 					cancelText: '取消',
 					confirmText: '确定',
 					success: res => {
-						debugger
 						if (res.confirm) {
 							this.goods.reciveCollectionScreenshot = ""
 						}
@@ -259,7 +256,6 @@
 				})
 			},
 			getList() {
-				debugger
 				this.utils.nullToString(this.goods)
 				var that = this
 				uni.showModal({

pageA/freightTransport/contract_detail.vue

@@ -191,7 +191,6 @@
 			this.$refs.uForm.setRules(this.rules);
 		},
 		onLoad(option) {
-			debugger
 			this.goods.dispatchingDate = this.time;
 			this.goods.batch = option.id;
 
@@ -227,7 +226,6 @@
 					content: '确定提交发车信息？',
 					success: function(res) {
 						if (res.confirm) {
-							debugger
 							that.$refs.uForm.validate(valid => {
 								if (valid) {
 									console.log('验证通过');
@@ -309,7 +307,6 @@
 
 						uploadImage(res.tempFilePaths[0], 'collectionScreenshot/',
 							result => {
-								debugger
 								this.goods.collectionScreenshot = result
 								uni.hideLoading();
 							}
@@ -374,7 +371,6 @@
 					cancelText: '取消',
 					confirmText: '确定',
 					success: res => {
-						debugger
 						if (res.confirm) {
 							this.goods.collectionScreenshot = ""
 						}

pageA/freightTransport/index.vue

@@ -83,7 +83,6 @@
 		},
 		methods: {
 			getUserInfo() {
-				debugger
 				this.userinfo = store.getters.getUserInfo
 			},
 			addgoods() {
@@ -107,7 +106,6 @@
 				this.getListData(0)
 			},
 			getListData(state, type) {
-				debugger
 				let _data = {}
 				if (state == "searchKeyWord") {
 					_data = {
@@ -127,8 +125,7 @@
 				let that = this
 				this.$api.doRequest('get', '/freightReceivingDispatching/selectFreightReceivingDispatchingPage', _data)
 					.then(res => {
-						if (res.data.code == 200) {
-							debugger
+						if (res.data.code == 200) {				
 							that.listData = res.data.data.records;
 							for (let i = 0; i < that.listData.length; i++) {
 								that.utils.nullToString(that.listData[i])
@@ -162,7 +159,6 @@
 			},
 			//删除
 			delRow(val) {
-				debugger
 				this.$api.doRequest('post', 'freightReceivingDispatching/api/deleteFreightReceivingDispatching', {
 					"id": val.id
 				}).then(res => {

pageA/freightTransport/record/index.js

@@ -21,7 +21,6 @@ export function getDetail(id, that) {
 	})
 }
 export function makeData(val,that) {
-	debugger
 	//累加净重收发
 	let _goodsPrice = val.goodsPrice;
 	let _freightUnitPrice = val.freightUnitPrice

pageA/freightTransport/record/payrecord.vue

@@ -370,7 +370,6 @@
 				}
 			},
 			confirmFreight(flag, val) {
-				debugger
 				if (flag == 1) {
 					val.money = parseInt(this.money);
 				}
@@ -379,7 +378,6 @@
 				val.flag = flag
 				this.$api.doRequest('post', 'freightReceivingDispatching/api/paymentAndDeductionfreight', val).then(
 					res => {
-						debugger
 						if (res.data.code == 200) {
 							location.reload()
 						}
@@ -389,7 +387,6 @@
 				})
 			},
 			inputWatch(e) {
-				debugger
 				let _val = this.checkVal(e, "freight");
 				if (_val) {
 					this.isShowFreightTip = true
@@ -426,7 +423,6 @@
 			},
 			// 扣运费
 			freightDeduction(item) {
-				debugger
 				this.freightAlert = true;
 				this.freightDeductionAmount = 0
 				// this.cleanVal(item,"freightDeductionAmount")
@@ -486,12 +482,10 @@
 				this.paymentAlert = false;
 			},
 			confirmeductPayment(val) {
-				debugger
 				console.log(val)
 				val.goodsDeductionAmount = parseInt(this.ductPayment);
 				this.$api.doRequest('post', 'freightReceivingDispatching/api/PaymentDeduction', val).then(
 					res => {
-						debugger
 						if (res.data.code == 200) {
 							uni.showToast({
 								title: "扣款成功！",

pageA/freightTransport/record/sendrecord.vue

@@ -254,7 +254,6 @@
 
 		},
 		onLoad(options) {
-			debugger
 			getDetail(options.id, this)
 			this.id = options.id
 		},
@@ -283,7 +282,6 @@
 				}
 			},
 			confirmFreight(flag, val) {
-				debugger
 				if (flag == 1) {
 					val.money = parseInt(val.money);
 				} else {
@@ -293,7 +291,6 @@
 				val.flag = flag
 				this.$api.doRequest('post', 'freightReceivingDispatching/api/paymentAndDeductionfreight', val).then(
 					res => {
-						debugger
 						if (res.data.code == 200) {
 							location.reload()
 						}
@@ -303,7 +300,6 @@
 				})
 			},
 			inputWatch(e) {
-				debugger
 				let _val = this.checkVal(e, "freight");
 				if (_val) {
 					this.isShowFreightTip = true
@@ -329,7 +325,6 @@
 			},
 			// 扣运费
 			freightDeduction(item) {
-				debugger
 				this.freightAlert = true;
 				item.freightDeductionAmount = ""
 				console.log("扣运费")
@@ -342,8 +337,6 @@
 
 			//判断输入值
 			checkVal(e, state, item) {
-				debugger
-				debugger
 				console.log(e)
 				let _val;
 				let _val1 = this.utils.isEmpty(e)

pageA/product/detail.vue

@@ -136,7 +136,7 @@
 					</view>
 				</view>
 				<view class="c-row">
-					<text class="tit">容重（g/L）{{'<='}}</text>
+					<text class="tit">容重（g/L）{{'>='}}</text>
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 					</view>
@@ -419,7 +419,7 @@
 						}else if(res.data.code==11016){
 							uni.showModal({
 								    title: '温馨提示',
-								    content: '您还未认证粮商身份， 下单前请先完善您的身份信息',
+								    content: '您还未认证粮商身份， 下单前请先完善您的身份信息。',
 								    confirmText: "去认证",
 									confirmColor: '#22C572',
 									success: function (res) {

pageA/product/lookup.vue

@@ -4,7 +4,7 @@
 			<view style='background:#fff;display:flex;' class="cu-bar search">
 			<view style='flex:6;' class="search-form round" >
 				<text style='color: #ccc;text-indent:6px;' class="cuIcon-search"></text>
-				<input type="text" v-model="searchKeyWord" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
+				<input type="text" maxlength="20" v-model="searchKeyWord" @input='search' placeholder="请输入货名或标题" confirm-type="search"></input>
 				
 			</view>
 			<view @click='doSearch()' style="width:4%;flex:1;">搜索</view>

pageA/product/sales_detail.vue

@@ -136,7 +136,7 @@
 					</view>
 				</view>
 				<view class="c-row">
-					<text class="tit">容重（g/L）{{'<='}}</text>
+					<text class="tit">容重（g/L）{{'>='}}</text>
 					<view class="con-list">
 						<text>{{goods.bulkDensity}}</text>
 					</view>
@@ -411,13 +411,13 @@
 						}else if(res.data.code==11016){
 							uni.showModal({
 								    title: '温馨提示',
-								    content: '您还未认证粮商身份， 下单前请先完善您的身份信息',
+								    content: '您还未认证粮商身份， 下单前请先完善您的身份信息。',
 								    confirmText: "去认证",
 									confirmColor: '#22C572',
 									success: function (res) {
 								        if (res.confirm) {
 											uni.navigateTo({//跳转页面
-												url:"../index/index"
+												url:'/pages/attestation/index'
 											})
 								        } else if (res.cancel) {
 								        }
@@ -549,7 +549,7 @@
 		position:absolute;
 		left:50%;
 		transform: translateX(-50%);
-		top: 40upx;
+		top: 80upx;
 		z-index:9999;
 		color:#fff;
 	}

pageB/contract/contract_detail.vue

@@ -1,60 +1,62 @@
 <template>
 	<view class="container">
 		<view class="information">
-		<!-- <block v-if="TabCur==2"> -->
-		<view class="c-row">
-			<view class="title1">发车信息</view>
-			
-		</view>
+			<!-- <block v-if="TabCur==2"> -->
+			<view class="c-row">
+				<view class="title1">发车信息</view>
+
+			</view>
 			<view class="c-row b-b">
 				<view class="title">派车编号</view>
 				<view class="con-list">
-					<input disabled  name="input" v-model="goods.tranCarNo"></input>
+					<input disabled name="input" v-model="goods.tranCarNo"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<view class="title">车牌号</view>
 				<view class="con-list">
-				<input maxlength='7' placeholder="请输入车牌号" name="input" v-model="goods.carNo"></input>
+					<input maxlength='7' placeholder="请输入车牌号" name="input" v-model="goods.carNo"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
 				<view class="title">司机手机号</view>
 				<view class="con-list">
-				<input  maxlength='11' placeholder="请输入司机手机号" name="input" v-model="goods.driverPhone"></input>
-			  </view>
+					<input maxlength='11' placeholder="请输入司机手机号" name="input" v-model="goods.driverPhone"></input>
+				</view>
 			</view>
 			<view class="c-row b-b">
 				<view class="title">毛重(吨)</view>
 				<view class="con-list">
-				<input placeholder="请输入毛重" type="mobile" name="input"  @input="grossWeightchange" v-model="goods.grossWeight"></input>
-			</view>
+					<input placeholder="请输入毛重" type="mobile" name="input" @input="grossWeightchange"
+						v-model="goods.grossWeight"></input>
+				</view>
 			</view>
 			<view class="c-row b-b">
 				<view class="title">皮重(吨)</view>
 				<view class="con-list">
-				<input placeholder="请输入皮重" type="mobile" name="input"  @input="tarechange" v-model="goods.tare"></input>
-			</view>
+					<input placeholder="请输入皮重" type="mobile" name="input" @input="tarechange"
+						v-model="goods.tare"></input>
+				</view>
 			</view>
 			<view class="c-row b-b">
 				<view class="title">净重(吨)</view>
 				<view class="con-list">
-				<view class="con-list">
-				<input placeholder="自动计算" type="mobile" name="input" v-model="goods.loadNetWeight"></input>
+					<view class="con-list">
+						<input placeholder="自动计算" type="mobile" name="input" v-model="goods.loadNetWeight"
+							disabled="disabled"></input>
+					</view>
 				</view>
 			</view>
-			</view>
 			<view class="c-row ">
 				<view class="title">发货日期</view>
 				<view class="con-list">
-				<view @click="show = true">{{goods.sendDateStart!=''?goods.sendDateStart:time}}</view>
-				<u-picker  :params='params' :default-time='time' @confirm="DateChange" v-model="show" mode="time"></u-picker>
-			</view>
-			</view>
-			
-				
+					<view @click="show = true">{{goods.sendDateStart!=''?goods.sendDateStart:time}}</view>
+					<u-picker :params='params' :default-time='time' @confirm="DateChange" v-model="show" mode="time">
+					</u-picker>
+				</view>
 			</view>
-			<view class="information">
+		</view>
+		<view class="information">
 			<view class="c-row">
 				<view class="action">
 					上传磅单照片
@@ -62,8 +64,9 @@
 			</view>
 			<view class="c-row">
 				<view class="grid col-4 grid-square flex-sub">
-					<view class="bg-img" v-if="goods.loadPoundImg != ''" @tap="ViewImage" :data-url="goods.loadPoundImg">
-					 <image :src="goods.loadPoundImg" mode="aspectFit"></image>
+					<view class="bg-img" v-if="goods.loadPoundImg != ''" @tap="ViewImage"
+						:data-url="goods.loadPoundImg">
+						<image :src="goods.loadPoundImg" mode="aspectFit"></image>
 						<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="0">
 							<text class='cuIcon-close'></text>
 						</view>
@@ -73,10 +76,10 @@
 					</view>
 				</view>
 			</view>
-			</view>
-			
-				<button class="btn btns" @click="getList">提交</button>
-			
+		</view>
+
+		<button class="btn btns" @click="getList">提交</button>
+
 		<!-- </block> -->
 	</view>
 </template>
@@ -87,367 +90,365 @@
 		mapState
 	} from 'vuex';
 	export default {
-			name: "trust",
-			data() {
-				return {
-					goods: {
-						tranCarNo:'',
-						carNo:'',
-						grossWeight:'',
-						tare:'',
-						loadNetWeight:'',
-						loadPoundImg:'',
-						 contractNo:'',
-						 goodsName:'',
-						 sendDateStart:''
-						
-					},
-					params:{
-						year: true,
-						month: true,
-						day: true,
-					},
-					carNo:'',
-					PageCur: "trust",
-					TabCur: 0,
-					priceTypeIndex:-1,
-					priceType: ['库内价', '到库价', '到港价'],
-					unitPrice:0,
-					price:'',
-					seller:'',
-					sellerPhone:'',
-					minSale:'',
-					exsitCount:0,
-					origin:'',
-					stock:'',
-					show:false,
-					goodsName:'',
-					verifyCode:'',
-					sendText0:'获取验证码',
-					sendText1:'获取验证码',
-					sendText2:'获取验证码',
-					sendText3:'获取验证码',
-					sendDisabled0: false,
-					sendDisabled1: false,
-					sendDisabled2: false,
-					sendDisabled3: false,
-					buyer:'',
-					buyerPhone:'',
-					level:'',
-					sender:'',
-					senderPhone:'',
-					receiver:'',
-					receiverPhone:'',
-					total:0,
-					startPlace:'',
-					endPlace:'',
-					driver:'',
-					driverPhone:'',
-					carNo:'',
-					personNoImg:'',
-					personNoImg1:'',
-					driverNoImg:'',
-					driverNoImg1:'',
-					carNoImg:'',
-					carNoImg1:'',
-					goodsName:'',
-					showTran:true
-				};
+		name: "trust",
+		data() {
+			return {
+				goods: {
+					tranCarNo: '',
+					carNo: '',
+					grossWeight: '',
+					tare: '',
+					loadNetWeight: '',
+					loadPoundImg: '',
+					contractNo: '',
+					goodsName: '',
+					sendDateStart: ''
+
+				},
+				params: {
+					year: true,
+					month: true,
+					day: true,
+				},
+				carNo: '',
+				PageCur: "trust",
+				TabCur: 0,
+				priceTypeIndex: -1,
+				priceType: ['库内价', '到库价', '到港价'],
+				unitPrice: 0,
+				price: '',
+				seller: '',
+				sellerPhone: '',
+				minSale: '',
+				exsitCount: 0,
+				origin: '',
+				stock: '',
+				show: false,
+				goodsName: '',
+				verifyCode: '',
+				sendText0: '获取验证码',
+				sendText1: '获取验证码',
+				sendText2: '获取验证码',
+				sendText3: '获取验证码',
+				sendDisabled0: false,
+				sendDisabled1: false,
+				sendDisabled2: false,
+				sendDisabled3: false,
+				buyer: '',
+				buyerPhone: '',
+				level: '',
+				sender: '',
+				senderPhone: '',
+				receiver: '',
+				receiverPhone: '',
+				total: 0,
+				startPlace: '',
+				endPlace: '',
+				driver: '',
+				driverPhone: '',
+				carNo: '',
+				personNoImg: '',
+				personNoImg1: '',
+				driverNoImg: '',
+				driverNoImg1: '',
+				carNoImg: '',
+				carNoImg1: '',
+				goodsName: '',
+				showTran: true
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+			time() {
+				var date = new Date()
+				var year = date.getFullYear()
+				var month = date.getMonth()
+				var date1 = date.getDate()
+				if (month + 1 < 10) {
+					month = "0" + (month + 1)
+				}
+				if (date1 + 1 < 10) {
+					date1 = "0" + date1
+				}
+				return year + '-' + month + "-" + date1
 			},
-			computed: {
-				...mapState(['hasLogin','userInfo']),
-					time() {
-						var date=new Date()
-						var year=date.getFullYear()
-						var month=date.getMonth()
-						var date1=date.getDate()
-						if(month+1<10){
-							month="0"+(month+1)
-						}
-						if(date1+1<10){
-							date1="0"+date1
-						}
-						return year+'-'+month+"-"+date1
-					},
-					startDate() {
-					//限制开始时间;
-					//也可以直接限定为当天日期 var date= new Date(); return date
-						return new Date(new Date(new Date().toLocaleDateString()).getTime()-(1*60*60*1000))
-					},
-					endDate() {
-						return new Date()
-					}
-				},	
-			// onShow() {
-			// },
-			onLoad(option) {
-				this.goods.planId = option.planId
-				this.goodsName = option.goodsName
-				this.contractNo = option.contractNo
-				this.goods.goodsName = option.goodsName
-				this.goods.contractNo = option.contractNo
-				this.goods.tranCarNo = option.tranCarNo
+			startDate() {
+				//限制开始时间;
+				//也可以直接限定为当天日期 var date= new Date(); return date
+				return new Date(new Date(new Date().toLocaleDateString()).getTime() - (1 * 60 * 60 * 1000))
 			},
-			methods: {
-				 DateChange(e) {
-					 this.goods.sendDateStart=e.year+'-'+e.month+'-'+e.day
-				 	// this.goods.sendDateStart = e.detail.value
-				 },
-				commit1(item){
-					uni.navigateTo({				
-						url: `/pageB/contract/look?id=${item.id}&netWeight=${item.netWeight}&carNo=${item.carNo}&sendDateStart=${item.sendDateStart}`
-					})
-				},
-				grossWeightchange(e) {
-				      if (this.goods.grossWeight && this.goods.tare) {
-				        this.goods.loadNetWeight = Number(
-				          this.goods.grossWeight - this.goods.tare
-				        )
-				      }
-				    },
-				tarechange(e) {
-				      if (this.goods.grossWeight && this.goods.tare) {
-				        this.goods.loadNetWeight = Number(
-				          this.goods.grossWeight - this.goods.tare
-				        )
-				      }
-				    },
-				getList(){
-					// tranCarNo:'',
-					// carNo:'',
-					// grossWeight:'',
-					// tare:'',
-					// loadNetWeight:'',
-					// loadPoundImg:'',
-					//  contractNo:'',
-					//  goodsName:'',
-					if(this.goods.carNo.length==0){
-						this.$api.msg('车牌号不能为空')
-						return
-					}
-					if(this.goods.carNo.length!=7){
-						this.$api.msg('车牌号输入错误')
-						return
-					}
-					if(this.goods.driverPhone.length==0){
-						this.$api.msg('手机号不能为空')
-						return
-					}
-					if(this.goods.driverPhone.length!=11){
-						this.$api.msg('司机手机号输入错误')
-						return
-					}
-					if(this.goods.grossWeight==''){
-						this.$api.msg('毛重不能为空')
-						return
-					}
-					if(this.goods.tare==''){
-						this.$api.msg('皮重不能为空')
-						return
-					}
-					if(this.goods.grossWeight>100){
-						this.$api.msg('毛重输入错误')
-						return
-					}
-					if(this.goods.tare>50){
-						this.$api.msg('皮重输入错误')
-						return
-					}
-					var that=this
-					uni.showModal({
-						content: '确定提交发车信息？',
-						success: function (res) {
-							if (res.confirm) {
-								that.$api.doRequest('post','/tranCarInfo/api/addTranTask',that.goods).then(res => {
-								    if(res.data.code==200){
-										console.log(that.goods)
-										uni.showModal({
-											content: '提交成功！',
-											success: function (res) {
-												if (res.confirm) {
-													var result = that.goods.tranCarNo.substr(that.goods.tranCarNo.indexOf("C") + 1,that.goods.tranCarNo.length);
-												    var num=Number(result)+1
-													if(num<=9){
-														num='C00'+num
-													}else if(num<100&&num>9){
-														num='C0'+num
-													}else  if(num<1000&&num>99){
-														num='C'+num
+			endDate() {
+				return new Date()
+			}
+		},
+		// onShow() {
+		// },
+		onLoad(option) {
+			this.goods.planId = option.planId
+			this.goodsName = option.goodsName
+			this.contractNo = option.contractNo
+			this.goods.goodsName = option.goodsName
+			this.goods.contractNo = option.contractNo
+			this.goods.tranCarNo = option.tranCarNo
+		},
+		methods: {
+			DateChange(e) {
+				this.goods.sendDateStart = e.year + '-' + e.month + '-' + e.day
+				// this.goods.sendDateStart = e.detail.value
+			},
+			commit1(item) {
+				uni.navigateTo({
+					url: `/pageB/contract/look?id=${item.id}&netWeight=${item.netWeight}&carNo=${item.carNo}&sendDateStart=${item.sendDateStart}`
+				})
+			},
+			grossWeightchange(e) {
+				if (this.goods.grossWeight && this.goods.tare) {
+					this.goods.loadNetWeight = Number(
+						this.goods.grossWeight - this.goods.tare
+					)
+				}
+			},
+			tarechange(e) {
+				if (this.goods.grossWeight && this.goods.tare) {
+					this.goods.loadNetWeight = Number(
+						this.goods.grossWeight - this.goods.tare
+					)
+				}
+			},
+			getList() {
+				// tranCarNo:'',
+				// carNo:'',
+				// grossWeight:'',
+				// tare:'',
+				// loadNetWeight:'',
+				// loadPoundImg:'',
+				//  contractNo:'',
+				//  goodsName:'',
+				if (this.goods.carNo.length == 0) {
+					this.$api.msg('车牌号不能为空')
+					return
+				}
+				if (this.goods.carNo.length != 7) {
+					this.$api.msg('车牌号输入错误')
+					return
+				}
+				if (this.goods.driverPhone.length == 0) {
+					this.$api.msg('手机号不能为空')
+					return
+				}
+				if (this.goods.driverPhone.length != 11) {
+					this.$api.msg('司机手机号输入错误')
+					return
+				}
+				if (this.goods.grossWeight == '') {
+					this.$api.msg('毛重不能为空')
+					return
+				}
+				if (this.goods.tare == '') {
+					this.$api.msg('皮重不能为空')
+					return
+				}
+				if (this.goods.grossWeight > 100) {
+					this.$api.msg('毛重输入错误')
+					return
+				}
+				if (this.goods.tare > 50) {
+					this.$api.msg('皮重输入错误')
+					return
+				}
+				var that = this
+				uni.showModal({
+					content: '确定提交发车信息？',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/tranCarInfo/api/addTranTask', that.goods).then(
+								res => {
+									if (res.data.code == 200) {
+										uni.showToast({
+											title: '提交成功！',
+											icon: 'success',
+											duration: 2000,
+											success: function(res) {
+												setTimeout(() => {
+													var result = that.goods.tranCarNo
+														.substr(that.goods.tranCarNo
+															.indexOf("C") + 1, that
+															.goods.tranCarNo.length);
+													var num = Number(result) + 1
+													if (num <= 9) {
+														num = 'C00' + num
+													} else if (num < 100 && num > 9) {
+														num = 'C0' + num
+													} else if (num < 1000 && num >
+														99) {
+														num = 'C' + num
 													}
-													that.goods={
-														tranCarNo:num,
-														carNo:'',
-														grossWeight:'',
-														tare:'',
-														loadNetWeight:'',
-														loadPoundImg:'',
-														 contractNo:that.contractNo,
-														 goodsName:that.goodsName,
-														 sendDateStart:''	
+													that.goods = {
+														tranCarNo: num,
+														carNo: '',
+														grossWeight: '',
+														tare: '',
+														loadNetWeight: '',
+														loadPoundImg: '',
+														contractNo: that
+															.contractNo,
+														goodsName: that.goodsName,
+														sendDateStart: ''
 													}
-												}else if (res.cancel) {
-													uni.navigateBack();
-												}
+													uni.navigateBack({
+														delta: 1
+													});
+												}, 2000)
 											}
-										});
-									}else if(res.data.code==11015){
+										})
+									} else if (res.data.code == 11015) {
 										uni.showToast({
-										 title: '该司机未认证身份，请司机认证后再操作',
-										 icon:'none',
-										 duration: 2000
+											title: '该司机未认证身份，请司机认证后再操作',
+											icon: 'none',
+											duration: 2000
 										})
 									}
-								    })
-								    .catch(res => {
-										 if(res.errmsg){
-										 	uni.showToast({
-										 		title: res.errmsg,
-										 		icon: 'none',
-										 		duration: 2000
-										 	})
-										 }
-										 else{
-										 	uni.showToast({
-										 		title: "系统异常，请联系管理员",
-										 		icon: 'none',
-										 		duration: 2000
-										 	})
-										 }
-								    });
-							} else if (res.cancel) {
-							
+								})
+								.catch(res => {
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								});
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			ChooseImagePerson() {
+				uni.chooseImage({
+					count: 1, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album', 'camera'], //从相册选择
+					success: (res) => {
+						//上传图片
+						//图片路径可自行修改
+
+						uploadImage(res.tempFilePaths[0], 'loadPoundImg/',
+							result => {
+
+								this.goods.loadPoundImg = result
+								uni.hideLoading();
 							}
-						}
-					});
-				},
-				ChooseImagePerson() {
-					uni.chooseImage({
-						count: 1, //默认9
-						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-						sourceType: ['album','camera'], //从相册选择
-						success: (res) => {
-							//上传图片
-							//图片路径可自行修改
-							
-							uploadImage(res.tempFilePaths[0], 'loadPoundImg/',
-								result => {
-	
-								 	this.goods.loadPoundImg = result
-								 uni.hideLoading();
-								}
-							)
-						}
-					});
-				},
-				ChooseImageDriver() {
-					uni.chooseImage({
-						count: 1, //默认9
-						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-						sourceType: ['album','camera'], //从相册选择
-						success: (res) => {
-							//上传图片
-							//图片路径可自行修改
-							uploadImage(res.tempFilePaths[0], 'driverNoImg/',
-								result => {
-									if (this.driverNoImg.length != 0) {
-										this.driverNoImg1 = result
-									} else {
-										this.driverNoImg = result
-									}
-									uni.hideLoading();
-								}
-							)
-						}
-					});
-				},
-				ChooseImageCar() {
-					uni.chooseImage({
-						count: 1, //默认9
-						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-						sourceType: ['album','camera'], //从相册选择
-						success: (res) => {
-							//上传图片
-							//图片路径可自行修改
-							uploadImage(res.tempFilePaths[0], 'carNoImg/',
-								result => {
-									if (this.carNoImg.length != 0) {
-										this.carNoImg1 = result
-									} else {
-										this.carNoImg = result
-									}
-									uni.hideLoading();
-								}
-							)
-						}
-					});
-				},
-				ViewImage(e) {
-					var img = [];
-					img = e.currentTarget.dataset.url.split(' ')
-					uni.previewImage({
-						current:0,
-						urls: img
-					});
-				},
-				DelImg(e) {
-					uni.showModal({
-						title: '提示',
-						content: '确定要删除该照片吗？',
-						cancelText: '取消',
-						confirmText: '确定',
-						success: res => {
-							if (res.confirm) {
-								if(e.currentTarget.dataset.index == 0){
-									this.personNoImg = "";
-								}
-								else if(e.currentTarget.dataset.index == 1){
-									this.personNoImg1 = "";
-								}
-								else if(e.currentTarget.dataset.index == 2){
-									this.driverNoImg = "";
-								}
-								else if(e.currentTarget.dataset.index == 3){
-									this.driverNoImg1 = "";
-								}
-								else if(e.currentTarget.dataset.index == 4){
-									this.carNoImg = "";
+						)
+					}
+				});
+			},
+			ChooseImageDriver() {
+				uni.chooseImage({
+					count: 1, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album', 'camera'], //从相册选择
+					success: (res) => {
+						//上传图片
+						//图片路径可自行修改
+						uploadImage(res.tempFilePaths[0], 'driverNoImg/',
+							result => {
+								if (this.driverNoImg.length != 0) {
+									this.driverNoImg1 = result
+								} else {
+									this.driverNoImg = result
 								}
-								else if(e.currentTarget.dataset.index == 5){
-									this.carNoImg1 = "";
+								uni.hideLoading();
+							}
+						)
+					}
+				});
+			},
+			ChooseImageCar() {
+				uni.chooseImage({
+					count: 1, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album', 'camera'], //从相册选择
+					success: (res) => {
+						//上传图片
+						//图片路径可自行修改
+						uploadImage(res.tempFilePaths[0], 'carNoImg/',
+							result => {
+								if (this.carNoImg.length != 0) {
+									this.carNoImg1 = result
+								} else {
+									this.carNoImg = result
 								}
-								
+								uni.hideLoading();
 							}
+						)
+					}
+				});
+			},
+			ViewImage(e) {
+				var img = [];
+				img = e.currentTarget.dataset.url.split(' ')
+				uni.previewImage({
+					current: 0,
+					urls: img
+				});
+			},
+			DelImg(e) {
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除该照片吗？',
+					cancelText: '取消',
+					confirmText: '确定',
+					success: res => {
+						if (res.confirm) {
+							if (e.currentTarget.dataset.index == 0) {
+								this.personNoImg = "";
+							} else if (e.currentTarget.dataset.index == 1) {
+								this.personNoImg1 = "";
+							} else if (e.currentTarget.dataset.index == 2) {
+								this.driverNoImg = "";
+							} else if (e.currentTarget.dataset.index == 3) {
+								this.driverNoImg1 = "";
+							} else if (e.currentTarget.dataset.index == 4) {
+								this.carNoImg = "";
+							} else if (e.currentTarget.dataset.index == 5) {
+								this.carNoImg1 = "";
+							}
+
 						}
-					})
-				},
+					}
+				})
 			},
-		}
+		},
+	}
 </script>
 
 <style scoped>
-	.container{
+	.container {
 		padding: 10px 10px;
 		background-color: #F5F6FA;
 	}
-	.title1{
+
+	.title1 {
 		font-size: 18px;
 		font-weight: 600;
-		}
+	}
+
 	.cu-form-group input {
 		text-align: right;
 	}
-	.text-white text{
+
+	.text-white text {
 		background: linear-gradient(45deg, #3DC146, #B2D612);
-		padding:5px 10px;
+		padding: 5px 10px;
 		border-radius: 38rpx;
 	}
+
 	.cu-form-group textarea {
 		text-align: right;
 	}
-	.commit{
+
+	.commit {
 		background: linear-gradient(45deg, #DF331C, #DA611A);
-		color:#fff;
+		color: #fff;
 	}
+
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -458,6 +459,7 @@
 		padding: 20rpx 30rpx;
 		position: relative;
 	}
+
 	.con-list {
 		-webkit-box-flex: 1;
 		-webkit-flex: 1;
@@ -475,12 +477,14 @@
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
-	.information{
+
+	.information {
 		background-color: #FFFFFF;
 		border-radius: 20px;
 		margin-top: 10px;
 	}
-	.btn{
+
+	.btn {
 		margin-top: 10px;
 		border-radius: 25px;
 		background-color: #22C572;

pageB/contract/look.vue

@@ -25,7 +25,7 @@
 			</view>
 			<view v-for="(item , index) in carlist" :Key="index" class="forxinxi">
 				<view class="c-row carNos">
-					<text>{{item.carNo}}</text>
+					<text>{{item.carNo}} ({{item.tranCarNo}})</text>
 					<view class="con-list">
 						<text>{{item.sendDateStart}}<text class="hair">发</text></text>
 					</view>
@@ -67,15 +67,15 @@
 						<image :src="item.unloadPoundImg" mode="" class="poundlist"></image>
 					</view>
 				</view>
-				<button v-if='item.confirmFlag!=3' class=" btn btns unload" style="background-color: #22C572; color: #FFFFFF ;width:80%;"
+				<button v-if='item.confirmFlag != 3 && item.status == "已送达"' class=" btn btns unload" style="background-color: #22C572; color: #FFFFFF ;width:80%;"
 					@click="confirmunload(item)" >确认卸货</button>
 			</view>
 		</view>
-		<view class="c-list">
-				<button class=" btn btns" style="background-color: #FFFFFF;"
+		<view class="addcarwrap">
+				<view class="addcar" style="background-color: #FFFFFF;"
 					@click="commit1(goods)">
-					<image src="../../static/img/jiaoyi/ic_fabu@2x.png" style="width: 24px; height: 24px;top: 7px;"></image>
-					添加发车信息</button>
+					+
+					添加发车信息</view>
 		</view>
 		<view v-if='imgstatus' class='shade'>
 			<view class='shade-content'>
@@ -335,6 +335,7 @@
 	.center {
 		padding: 10px 20px;
 		background-color: #F5F6FA;
+		margin-bottom: 50px;
 	}
 
 	page {
@@ -1064,4 +1065,17 @@
 	.unload{
 		
 	}
+	.addcarwrap{
+		position:fixed;bottom:0;
+		width:100%;
+		left:0;
+		z-index:9999;
+	}
+	.addcarwrap .addcar{
+		text-align:center;
+		margin: 0 auto;
+		height:46px;
+		line-height:46px;
+		color:#00C265;
+	}
 </style>

pageD/identity/companyIdentity.vue

@@ -55,7 +55,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="padding flex flex-direction"> -->
 		<button class="btns btn" @click="jumpUrl">下一步</button>
 
 	</view>

pageD/identity/companyIdentityThree.vue

@@ -66,13 +66,13 @@
 		<view class="c-row b-b">
 			<text class="tit">手机号</text>
 			<view class="con-list">
-				<input placeholder="请填写手机号" @input='phoneinput' v-model="identityAuthenticationInfo.customerPhone"></input>
+				<input placeholder="请填写手机号" @input='phoneinput' type="number" maxlength="11" v-model="identityAuthenticationInfo.customerPhone"></input>
 			</view>
 		</view>
 		<view style='width:100%;border-bottom:1px solid #E8E9ED;padding:10px;' class="flex">
 			<button :class='codestatus&&!sendDisabled?"active":""' @click='obtain' class='getcode'>{{sendText}}</button>
 			<view  class="con-list" style='position:relative;'>
-				<input style='text-align:right;' v-model='verifyCode' placeholder="请输入验证码" type="number">
+				<input style='text-align:right;' v-model='verifyCode' placeholder="请输入验证码" type="number" maxlength="6">
 			</view>
 		</view>
 		<view class="c-row b-b" v-if="identityAuthenticationInfo.customerTypeFlag == 2">

pageD/identity/driverIdentity.vue

@@ -39,14 +39,14 @@
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
-					<input placeholder="请填写手机号" maxlength = "11" @input='phoneinput' name="input" v-model="DriverViewInfo.driverPhone"></input>
+					<input placeholder="请填写手机号" type="number" maxlength = "11" @input='phoneinput' name="input" v-model="DriverViewInfo.driverPhone"></input>
 				</view>
 			</view>
 			<view style='padding:10px;' class="c-row b-b">
 				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
 					class='getcode'>{{sendText}}</button>
 					<view class="con-list">
-						<input v-model='verifyCode' maxlength = "6"  placeholder="请输入验证码" type="text">
+						<input v-model='verifyCode'  maxlength = "6"  placeholder="请输入验证码" type="number">
 					</view>
 			</view>
 			<view class="c-row ">
@@ -127,6 +127,8 @@
 				this.region = e.province.label + '-' + e.city.label
 				this.DriverViewInfo.residentCityProvincial = e.province.label + e.city.label
 			},
+			//achao
+			//此处加载较慢，判断过多，获取验证码修改未异步，待修改
 			jumpUrl() {
 				if (this.id[0] == "" || this.id[0] == null) {
 					this.$api.msg('请上传身份证正面！')
@@ -528,6 +530,7 @@
 
 	.btns {
 		background-color: #22C572;
+		color: white;
 	}
 	.words{
 		font-size: 18px;

pageD/identity/driverIdentityEdit.vue

@@ -3,53 +3,54 @@
 		<view>
 
 			<view>
-				<view style="margin: 0 auto;" v-if="id != ''"  @click="idUp">
-					<image v-bind:src = "id1" class="picture"></image>
+				<view style="margin: 0 auto;" v-if="id != ''" @click="idUp">
+					<image v-bind:src="id1" class="picture"></image>
 				</view>
-	
+
 				<view style="margin: 0 auto;" v-if="id2 != ''" @click="idLow">
-					<image v-bind:src = "id2" class="picture"></image>
+					<image v-bind:src="id2" class="picture"></image>
 				</view>
 			</view>
 			<view class="personalcss">
-				
-			
-			<view class="c-row b-b">
-				<text class="tit">姓名</text>
-				<view class="con-list">
-					<input placeholder="请填写姓名" name="input" v-model="DriverViewInfo.driverName"></input>
+
+
+				<view class="c-row b-b">
+					<text class="tit">姓名</text>
+					<view class="con-list">
+						<input placeholder="请填写姓名" name="input" v-model="DriverViewInfo.driverName"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">身份证号</text>
-				<view class="con-list">
-					<input placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
+				<view class="c-row b-b">
+					<text class="tit">身份证号</text>
+					<view class="con-list">
+						<input placeholder="请填写身份证号" name="input" v-model="DriverViewInfo.numberCard"></input>
+					</view>
 				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">手机号</text>
-				<view class="con-list">
-					<input placeholder="请填写手机号" name="input" v-model="DriverViewInfo.driverPhone"></input>
+				<view class="c-row b-b">
+					<text class="tit">手机号</text>
+					<view class="con-list">
+						<input placeholder="请填写手机号" name="input" v-model="DriverViewInfo.driverPhone"></input>
+					</view>
 				</view>
-			</view>
-			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
-				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
-					class='getcode'>{{sendText}}</button>
-				<view style='width:70%;position:relative;margin-left: 200px;'>
-				<view class="con-list">
-					<!-- style='width:70%;position:relative;margin-left: 200px;' -->
-					<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+				<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
+					<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode'
+						class='getcode'>{{sendText}}</button>
+					<view style='width:70%;position:relative;margin-left: 200px;'>
+						<view class="con-list">
+							<!-- style='width:70%;position:relative;margin-left: 200px;' -->
+							<input v-model='verifyCode' placeholder="请输入验证码" type="text">
+						</view>
+
+					</view>
 				</view>
-			
-			</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">常驻城市</text>
-				<view class="con-list">
-					<input placeholder="请填写常驻城市" name="input" v-model="DriverViewInfo.residentCityProvincial"></input>
+				<view class="c-row b-b">
+					<text class="tit">常驻城市</text>
+					<view class="con-list">
+						<input placeholder="请填写常驻城市" name="input"
+							v-model="DriverViewInfo.residentCityProvincial"></input>
+					</view>
 				</view>
 			</view>
-			</view>
 
 
 		</view>
@@ -58,7 +59,7 @@
 			<view class="c-row">
 				<text class="tit" style="line-height: 36px;">货车信息</text>
 				<view class="con-list">
-					<image v-bind:src="opencar" class="open" opencarboolean @click="opencarclick" ></image>
+					<image v-bind:src="opencar" class="open" opencarboolean @click="opencarclick"></image>
 				</view>
 			</view>
 		</view>
@@ -67,7 +68,8 @@
 			<view class="c-row ">
 				<text class="tit">车辆 -{{index+1}}</text>
 				<view class="con-list">
-					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate" @click="carDel(index)" ></image>
+					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate" @click="carDel(index)">
+					</image>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -87,11 +89,19 @@
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">不含车头车长（米）</text>
-				<picker @change="carLongChange" :value="carLongIndex" :range="carLongType" class="con-list">
+				<picker @change="carLongChange" :value="carLongIndex" :range="carLongType" class="con-list"
+					v-if="carchength">
 					<view class="picker" v-model="item.carLength">
 						{{carLongIndex>-1?carLongType[carLongIndex]:'请选择车长'}}
 					</view>
 				</picker>
+
+
+				<view v-else class="con-list">
+					<input placeholder="请填写车长(米)" name="input" v-model="item.carLength"></input>
+				</view>
+				<button v-if="carchength" class='cu-btn bg-green shadow' @click="changeCarChength">填写</button>
+				<button v-else class='cu-btn bg-green shadow' @click="changeCarChength">选择</button>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">载重（吨）</text>
@@ -102,14 +112,17 @@
 			<view class="c-row ">
 				<text class="tit">出厂年份</text>
 				<view class="con-list">
-					<input placeholder="请填写出厂年份" name="input" v-model="item.yearManufacture"></input>
+					<view @click='yearchange'>{{item.yearManufacture == null?"请选择出厂年份":item.yearManufacture}}</view>
+					<u-picker :params='params' @confirm='yearpicker($event,index)' v-model="show" mode="time"
+						:start-year="startData" :end-year="endData">
+					</u-picker>
 				</view>
 			</view>
 		</view>
 		<button class="btn" v-if="opencarboolean == true" @click="carAdd">
-				 <image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image> 
-				 <texe>添加车辆</texe>
-				 </button>
+			<image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image>
+			<texe>添加车辆</texe>
+		</button>
 		<!-- 账户信息 -->
 		<view class="information">
 			<view class="c-row">
@@ -119,14 +132,15 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<view class="informations" v-if="openuserboolean == true" v-for="(items , index) in driverPayeeInfoList"
 			:Key="index">
 			<!-- <view class="labels"> 账户 -？</view> -->
 			<view class="c-row ">
 				<text class="tit">账户 -{{index+1}}</text>
 				<view class="con-list">
-					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate" @click="userDel(index)"></image>
+					<image src="../../static/img/jiaoyi/shanchu@2x.png" class="eliminate" @click="userDel(index)">
+					</image>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -135,15 +149,15 @@
 					<input placeholder="请填写账户类型" name="input" v-model="items.accountType"></input>
 				</view>
 			</view>
-			<view class="c-row b-b"> 
+			<view class="c-row b-b">
 				<text class="tit">银行卡照片（可选）</text>
 				<view class="con-list">
 					<!-- <input placeholder="请上传照片" name="input" v-model="items.payeeAddressUrl" @clisk="bankimg(items)"></input> -->
-					<view  v-if="bankimg == ''"  @click="bankimgs(index)">请上传照片</view>
-					<view  v-if="bankimg != ''" @click="bankimgs(index)">
+					<view v-if="bankimg == ''" @click="bankimgs(index)">请上传照片</view>
+					<view v-if="bankimg != ''" @click="bankimgs(index)">
 						<image v-bind:src="bankimg" style="width: 40px; height: 40px;"></image>
 					</view>
-					
+
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -154,19 +168,19 @@
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户行</text>
-				
+
 				<view class="con-list">
 					<input placeholder="请输入开户行" name="input" v-model="items.bankDeposit"></input>
 				</view>
-			
+
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">开户支行</text>
 				<picker @change="bankChange" :value="bankIndex" :range="bankType" class="con-list">
-				<view class="con-list">
-					{{bankIndex>-1?bankType[bankIndex]:'请选择开户支行'}}
-				</view>
-					</picker>
+					<view class="con-list">
+						{{bankIndex>-1?bankType[bankIndex]:'请选择开户支行'}}
+					</view>
+				</picker>
 			</view>
 			<view class="c-row b-b">
 				<text class="tit">收款人姓名</text>
@@ -182,34 +196,34 @@
 			</view>
 		</view>
 		<button class="btn" v-if="openuserboolean == true" @click="userAdd()">
-			 <image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image> 
+			<image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image>
 			<text style="margin-top: -2px;">添加账户</text>
-			</button>
-		<view  class="fujians" v-if="travels != ''" @click="travel">
+		</button>
+		<view class="fujians" v-if="travels != ''" @click="travel">
 			<view class="c-row b-b">
-				<text class="picturebiaoti">行驶证</text>			
+				<text class="picturebiaoti">行驶证</text>
 			</view>
 			<image v-bind:src="travels" class="picture"></image>
-		</view>	
-		<view  class="fujians" v-if="drives != ''" @click="drive">
+		</view>
+		<view class="fujians" v-if="drives != ''" @click="drive">
 			<view class="c-row b-b">
-				<text class="picturebiaoti">驾驶证</text>			
+				<text class="picturebiaoti">驾驶证</text>
 			</view>
 			<image v-bind:src="drives" class="picture"></image>
-		</view>	
-		<view  class="fujians" v-if="operates != ''" @click="operate">
+		</view>
+		<view class="fujians" v-if="operates != ''" @click="operate">
 			<view class="c-row b-b">
-				<text class="picturebiaoti">道路运营证</text>			
+				<text class="picturebiaoti">道路运营证</text>
 			</view>
 			<image v-bind:src="operates" class="picture"></image>
-		</view>	
-		<view  class="fujians" v-if="practices != ''" @click="practice">
+		</view>
+		<view class="fujians" v-if="practices != ''" @click="practice">
 			<view class="c-row b-b">
-				<text class="picturebiaoti">从业资格证</text>			
+				<text class="picturebiaoti">从业资格证</text>
 			</view>
 			<image v-bind:src="practices" class="picture"></image>
-		</view>	
-			<button class="btn btns" @click="commitEdit">修改</button>
+		</view>
+		<button class="btn btns" @click="commitEdit">修改</button>
 
 	</view>
 	</view>
@@ -217,63 +231,89 @@
 
 <script>
 	import {
-	    mapState 
+		mapState
 	} from 'vuex';
 	export default {
 		data() {
 			return {
-				goods:{},
-				ModelIndex:'高栏',
-				Model:'',
-				ModelType:["高栏","集装箱","自卸车"],
-				carLong:'',
-				carLongType:['13','9.6','8.2','8.7','11.7','12.5','13.7','15','16','17.5'],
-				id:[],
-				id1:"",
-				id2:"",
-				travels:"",
-				drives:"",
-				operates:"",
-				practices:"",
+				goods: {},
+				ModelIndex: '高栏',
+				Model: '',
+				ModelType: ["高栏", "集装箱", "自卸车"],
+				carLong: '',
+				carLongType: ['13', '9.6', '8.2', '8.7', '11.7', '12.5', '13.7', '15', '16', '17.5'],
+				id: [],
+				id1: "",
+				id2: "",
+				travels: "",
+				drives: "",
+				operates: "",
+				practices: "",
 				// bank1:"",
 				// bank2:"",
 				// bankid:[],
 				sendText: '获取验证码',
-                sendDisabled: false,
+				sendDisabled: false,
 				sendText: '获取验证码',
 				ModelIndex: '高栏',
 				Model: '',
 				ModelType: ["高栏", "集装箱", "自卸车"],
 				carLong: '',
-				carLongIndex:0,
+				carLongIndex: 0,
 				carLongType: ['13', '9.6', '8.2', '8.7', '11.7', '12.5', '13.7', '15', '16', '17.5'],
 				driverCarInfoList: [],
 				driverPayeeInfoList: [],
 				DriverViewInfo: {
 					driverCarInfoList: [],
-					driverPayeeInfoList: [],	
+					driverPayeeInfoList: [],
+				},
+				params: {
+					year: true,
 				},
-				verifyCode:"",
-				codestatus:false,
+				verifyCode: "",
+				codestatus: false,
 				customerPhone: '',
-				addressUrl:[],
-				opencarboolean:false,
-				openuserboolean:false,
+				addressUrl: [],
+				opencarboolean: false,
+				openuserboolean: false,
+				carchength: true,
+				show: false,
 				opencar: "../../static/img/authentication/down2@3x.png",
-					openuser: "../../static/img/authentication/down2@3x.png",
-					bankimg:"",
-					bankImgs1:{},
-					bankIndex:-1,
-					bankType:[],
+				openuser: "../../static/img/authentication/down2@3x.png",
+				bankimg: "",
+				bankImgs1: {},
+				bankIndex: -1,
+				bankType: [],
+				year:[],
 			}
 		},
 		computed: {
-			...mapState(['hasLogin','userInfo'])
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		computed:{
+			yearchange() {
+				this.show = true
+			},
+			startData(){
+				var data = new Date()
+				return data.getFullYear() - 30
+			},
+			endData(){
+				var data = new Date()
+				return data.getFullYear()
+			}
 		},
-		onLoad(option){
+		onLoad(option) {
 			this.getList(option.id)
 		},
 		methods: {
+			yearpicker(e, index) {
+				this.year[index] = e.year
+				this.driverCarInfoList[index].yearManufacture = e.year
+			},
+			changeCarChength() {
+				this.carchength = !this.carchength
+			},
 			carAdd() {
 				this.driverCarInfoList.push({
 					carNumber: '',
@@ -285,13 +325,13 @@
 			},
 			userAdd() {
 				this.driverPayeeInfoList.push({
-					accountType:"",
-					cardAddressUrl:"",
-					bankCard:"",
-					bankDeposit:"",
-					bankDepositBranch:"",
-					payeeName:"",
-					payeeNumberCard:"",
+					accountType: "",
+					cardAddressUrl: "",
+					bankCard: "",
+					bankDeposit: "",
+					bankDepositBranch: "",
+					payeeName: "",
+					payeeNumberCard: "",
 				})
 			},
 			carDel(index) {
@@ -322,7 +362,7 @@
 					this.openuser = "../../static/img/authentication/down2@3x.png"
 				}
 			},
-			openfujianclick(){
+			openfujianclick() {
 				if (this.openfujianboolean == false) {
 					this.openfujianboolean = true;
 					this.openfujian = "../../static/img/authentication/up2%20(3).png"
@@ -332,27 +372,24 @@
 				}
 			},
 			bankChange(e) {
-				console.log(e,"e是神恶魔")
 				this.bankIndex = e.detail.value
-				this.Model = this.bankType[this.bankIndex];	
+				this.Model = this.bankType[this.bankIndex];
 				this.driverPayeeInfoList[index].bankDepositBranch = this.bankType[this.bankIndex];
 			},
 			getList(ids) {
 				this.$api.doRequest('get', '/driverViewInfo/getDriver', {
 						id: ids
 					}, 'application/json;charset=UTF-8').then(res => {
-						console.log("成功连接")
 						this.procurementPlanInfos = res.data.data
 						this.DriverViewInfo = res.data.data
 						this.driverCarInfoList = this.DriverViewInfo.driverCarInfoList
 						this.driverPayeeInfoList = this.DriverViewInfo.driverPayeeInfoList
-						this.addressUrl =this.DriverViewInfo.addressUrl.split(",")
-						console.log(this.driverPayeeInfoList,"dsfds")
+						this.addressUrl = this.DriverViewInfo.addressUrl.split(",")
 						this.drivers = res.data.data
 						if (this.drivers.cardAddressUrl != "") {
 							this.id = this.drivers.cardAddressUrl.split(","),
 								this.id1 = this.id[0]
-							    this.id2 = this.id[1]
+							this.id2 = this.id[1]
 						}
 						if (this.drivers.addressUrl != "") {
 							this.address = this.drivers.addressUrl.split(","),
@@ -380,27 +417,27 @@
 					});
 			},
 			commitEdit() {
-				console.log(this.addressUrl,"数组")
+				console.log(this.addressUrl, "数组")
 				this.DriverViewInfo.addressUrl = this.addressUrl.toString()
-				console.log(this.DriverViewInfo.addressUrl,"字符串")
-				
+				console.log(this.DriverViewInfo.addressUrl, "字符串")
+
 				this.DriverViewInfo.driverCarInfoList = this.driverCarInfoList
 				this.DriverViewInfo.driverPayeeInfoList = this.driverPayeeInfoList
 				this.DriverViewInfo.commonId = this.userInfo.id
 				this.DriverViewInfo.cardAddressUrl = this.id.toString()
 				this.DriverViewInfo.pcFlag = 0
 				this.DriverViewInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
-				console.log(this.DriverViewInfo,"司机对象")
-				this.$api.doRequest('post', '/driverViewInfo/api/editInfo', this.DriverViewInfo).then(res => {
-				}).catch(res => {
-					uni.showToast({
-						title: res.data.message,
-						icon: 'none',
-						duration: 2000
+				console.log(this.DriverViewInfo, "司机对象")
+				this.$api.doRequest('post', '/driverViewInfo/api/editInfo', this.DriverViewInfo).then(res => {}).catch(
+					res => {
+						uni.showToast({
+							title: res.data.message,
+							icon: 'none',
+							duration: 2000
+						})
 					})
-				})
 			},
-			bankimgs(items){
+			bankimgs(items) {
 				console.log(items)
 				var that = this
 				uni.chooseImage({
@@ -414,12 +451,15 @@
 								var strToObj = JSON.parse(data)
 								// that.id[0] = strToObj.url
 								that.bankimg = strToObj.url
-								 that.bankImgs1.bankImg = strToObj.url
-								that.$api.doRequest('get', '/driverViewInfo/bankShibie', that.bankImgs1).then(res => {
+								that.bankImgs1.bankImg = strToObj.url
+								that.$api.doRequest('get', '/driverViewInfo/bankShibie', that
+									.bankImgs1).then(res => {
 									console.log(res)
-									that.$set(that.driverPayeeInfoList[items],'bankCard',res.data.data.bankNo)
-									that.$set(that.driverPayeeInfoList[items],'bankDeposit',res.data.data.bankName)
-					
+									that.$set(that.driverPayeeInfoList[items], 'bankCard', res
+										.data.data.bankNo)
+									that.$set(that.driverPayeeInfoList[items], 'bankDeposit',
+										res.data.data.bankName)
+
 									that.bankType = res.data.data.bankNameZhihang
 									console.log(that.ban)
 								}).catch(res => {
@@ -432,9 +472,9 @@
 							}
 						})
 					}
-				})	
+				})
 			},
-			idUp(){
+			idUp() {
 				var that = this
 				uni.chooseImage({
 					success: function(res) {
@@ -444,7 +484,7 @@
 							name: 'file',
 							success(res) {
 								var data = res.data
-								var strToObj = JSON.parse(data)			
+								var strToObj = JSON.parse(data)
 								that.id[0] = strToObj.url
 								that.id1 = strToObj.url
 							}
@@ -452,7 +492,7 @@
 					}
 				})
 			},
-			idLow(){
+			idLow() {
 				var that = this
 				uni.chooseImage({
 					success: function(res) {
@@ -462,7 +502,7 @@
 							name: 'file',
 							success(res) {
 								var data = res.data
-								var strToObj = JSON.parse(data)			
+								var strToObj = JSON.parse(data)
 								that.id[1] = strToObj.url
 								that.id2 = strToObj.url
 							}
@@ -470,7 +510,7 @@
 					}
 				})
 			},
-			travel(){
+			travel() {
 				var that = this
 				uni.chooseImage({
 					success: function(res) {
@@ -480,7 +520,7 @@
 							name: 'file',
 							success(res) {
 								var data = res.data
-								var strToObj = JSON.parse(data)			
+								var strToObj = JSON.parse(data)
 								that.travels = strToObj.url
 								that.addressUrl[0] = strToObj.url
 								console.log(that.addressUrl)
@@ -488,67 +528,65 @@
 						})
 					}
 				})
-				},
-				drive(){
-					var that = this
-					uni.chooseImage({
-						success: function(res) {
-							uni.uploadFile({
-								url: 'https://www.zthymaoyi.com/upload/admin',
-								filePath: res.tempFilePaths[0],
-								name: 'file',
-								success(res) {
-									var data = res.data
-									var strToObj = JSON.parse(data)			
-									that.drives = strToObj.url
-									that.addressUrl[1] = strToObj.url
-										console.log(that.addressUrl)
-								}
-							})
-						}
-					})
-					},
-					operate(){
-						var that = this
-						uni.chooseImage({
-							success: function(res) {
-								uni.uploadFile({
-									url: 'https://www.zthymaoyi.com/upload/admin',
-									filePath: res.tempFilePaths[0],
-									name: 'file',
-									success(res) {
-										var data = res.data
-										var strToObj = JSON.parse(data)			
-										that.operates = strToObj.url
-										that.addressUrl[2] = strToObj.url
-										console.log(that.addressUrl)
-									}
-								})
+			},
+			drive(){
+				var that = this
+				uni.chooseImage({
+					success: function(res) {
+						uni.uploadFile({
+							url: 'https://www.zthymaoyi.com/upload/admin',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							success(res) {
+								var data = res.data
+								var strToObj = JSON.parse(data)			
+								that.drives = strToObj.url
+								that.addressUrl[1] = strToObj.url
+									console.log(that.addressUrl)
 							}
 						})
-					},
-					practice(){
-						var that = this
-						uni.chooseImage({
-							success: function(res) {
-								uni.uploadFile({
-									url: 'https://www.zthymaoyi.com/upload/admin',
-									filePath: res.tempFilePaths[0],
-									name: 'file',
-									success(res) {
-										var data = res.data
-										var strToObj = JSON.parse(data)			
-										that.practices = strToObj.url
-										that.addressUrl[3] = strToObj.url
-										console.log(that.addressUrl)
-									}
-								})
+					}
+				})
+			},
+			operate(){
+				var that = this
+				uni.chooseImage({
+					success: function(res) {
+						uni.uploadFile({
+							url: 'https://www.zthymaoyi.com/upload/admin',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							success(res) {
+								var data = res.data
+								var strToObj = JSON.parse(data)			
+								that.operates = strToObj.url
+								that.addressUrl[2] = strToObj.url
+								console.log(that.addressUrl)
 							}
 						})
-					},
+					}
+				})
+			},
+			practice(){
+				var that = this
+				uni.chooseImage({
+					success: function(res) {
+						uni.uploadFile({
+							url: 'https://www.zthymaoyi.com/upload/admin',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							success(res) {
+								var data = res.data
+								var strToObj = JSON.parse(data)			
+								that.practices = strToObj.url
+								that.addressUrl[3] = strToObj.url
+								console.log(that.addressUrl)
+							}
+						})
+			},
 			getcode() {
 				var that = this
-					console.log(that.DriverViewInfo.driverPhone)
+				console.log(that.DriverViewInfo.driverPhone)
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(that.DriverViewInfo.driverPhone)) {
 					this.$api.doRequest('get', '/commonUser/sendVerifyCode', {
 							customerPhone: that.DriverViewInfo.driverPhone
@@ -597,7 +635,7 @@
 				this.carLongIndex = e.detail.value
 				this.carLong = this.carLongType[this.carLongIndex];
 			},
-			
+
 		}
 	}
 </script>
@@ -605,61 +643,68 @@
 <style>
 	.center {
 		padding: 10px 20px;
-		}
-		.labels{
-			font-size: 16px;
-			font-weight: 400;
-		}
-		.c-row {
-		    display: -webkit-box;
-		    display: -webkit-flex;
-		    display: flex;
-		    -webkit-box-align: center;
-		    -webkit-align-items: center;
-		    align-items: center;
-		    padding: 20rpx 30rpx;
-		    position: relative;
-		}
-		.con-list {
-		    -webkit-box-flex: 1;
-		    -webkit-flex: 1;
-		    flex: 1;
-		    display: -webkit-box;
-		    display: -webkit-flex;
-		    display: flex;
-		    -webkit-box-orient: vertical;
-		    -webkit-box-direction: normal;
-		    -webkit-flex-direction: column;
-		    flex-direction: column;
-		    color: #303133;
-		    line-height: 40rpx;
-		    text-align: right;
-		    padding-right: 20rpx;
-			font-size: 14px;
-		}
-		.getcode {
-			font-size: 14px;
-			position: absolute;
-			top: 50%;
-			transform: translateY(-50%);
-			color: #AFB3BF;
-			background: #F5F6F9;
-			height: 30px;
-			line-height: 30px;
-		}
-		.getcode.active {
-			border: none;
-		}
-		.uni-navigator{
-			display:inline-block;
-			color:#22C572;
-		}
-		.getcode.active {
-			background: #22C572;
-			color: #fff;
-		}
+	}
+
+	.labels {
+		font-size: 16px;
+		font-weight: 400;
+	}
+
+	.c-row {
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 20rpx 30rpx;
+		position: relative;
+	}
+
+	.con-list {
+		-webkit-box-flex: 1;
+		-webkit-flex: 1;
+		flex: 1;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		flex-direction: column;
+		color: #303133;
+		line-height: 40rpx;
+		text-align: right;
+		padding-right: 20rpx;
+		font-size: 14px;
+	}
+
+	.getcode {
+		font-size: 14px;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		color: #AFB3BF;
+		background: #F5F6F9;
+		height: 30px;
+		line-height: 30px;
+	}
+
+	.getcode.active {
+		border: none;
+	}
+
+	.uni-navigator {
+		display: inline-block;
+		color: #22C572;
+	}
+
+	.getcode.active {
+		background: #22C572;
+		color: #fff;
+	}
+
 
-	
 
 	.labels {
 		font-size: 16px;
@@ -694,6 +739,7 @@
 		padding-right: 20rpx;
 		font-size: 14px;
 	}
+
 	.verificationCode {
 		margin-top: 20px;
 		background: #F5F6F9;
@@ -730,29 +776,33 @@
 		background: #22C572;
 		color: #fff;
 	}
+
 	.picture {
 		width: 100%;
 		height: 220px;
 		text-align: center;
 		margin-top: 10px;
 	}
-	.fujians{
+
+	.fujians {
 		margin: 0 auto;
 		background-color: #FFFFFF;
 		margin-top: 30px;
 		border-radius: 20px;
 		padding: 10px 10px;
 	}
+
 	.btn {
 		margin-top: 10px;
 		background-color: #FFFFFF;
 		border-radius: 25px;
 		border: none;
 	}
-	
+
 	.btns {
 		background-color: #22C572;
 	}
+
 	.information {
 		margin-top: 10px;
 		width: 100%;
@@ -760,16 +810,19 @@
 		background-color: #FFFFFF;
 		border-radius: 16px;
 	}
+
 	.informations {
 		margin-top: 10px;
 		background-color: #FFFFFF;
 		border-radius: 20px;
 	}
-	.personalcss{
+
+	.personalcss {
 		background-color: #FFFFFF;
 		border-radius: 20px;
 		margin-top: 10px;
 	}
+
 	.open {
 		width: 30px;
 		height: 20px;
@@ -777,19 +830,21 @@
 		right: 20px;
 		margin-top: -10px;
 	}
-	
-	.add{
+
+	.add {
 		width: 26px;
 		height: 26px;
 		/* background-image: url(../../static/img/jiaoyi/ic_fabu@3x.png); */
 	}
+
 	/* 清除 */
 	.eliminate {
 		width: 20px;
 		height: 20px;
 		float: right;
 	}
-	.bankImg{
+
+	.bankImg {
 		width: 20px;
 		height: 20px;
 	}

pageD/identity/driverIdentityTwo.vue

@@ -21,7 +21,7 @@
 			<view class="c-row b-b">
 				<text class="tit">车牌号</text>
 				<view class="con-list">
-					<input placeholder="请填写车牌号" name="input" v-model="item.carNumber"></input>
+					<input placeholder="请填写车牌号" maxlength = "7" name="input" v-model="item.carNumber"></input>
 				</view>
 			</view>
 			<view class="c-row b-b">
@@ -63,7 +63,7 @@
 		</view>
 		<button class="btn" v-if="opencarboolean == true" @click="carAdd">
 			<image src="../../static/img/jiaoyi/ic_fabu@3x.png" class="add" style="top: 8px;"></image>
-			<texe>添加车辆</texe>
+			<text>添加车辆</text>
 		</button>
 		<!-- 账户信息 -->
 		<view class="information">
@@ -500,8 +500,8 @@
 	}
 
 	.open {
-		width: 30px;
-		height: 20px;
+		width: 30rpx;
+		height: 20rpx;
 		position: absolute;
 		right: 20px;
 		margin-top: -10px;

pages.json

@@ -22,12 +22,6 @@
 				"selectedIconPath": "static/img/jiaoyi_check.png",
 				"text": "交易"
 			},
-			// {
-			// 	"pagePath": "pages/home/home",
-			// 	"iconPath": "static/img/liangxin.png",
-			// 	"selectedIconPath": "static/img/liangxin_check.png",
-			// 	"text": "粮信"
-			// },
 			{
 				"pagePath": "pages/tran/tran",
 				"iconPath": "static/img/wuliu.png",
@@ -63,28 +57,22 @@
 		{
 			"path": "pages/sale/plant",
 			"style": {
-				// #ifdef MP 
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "工厂价格"
-				// #endif 
 			}
 		},
 		{
 			"path": "pages/sale/portprice",
 			"style": {
-				// #ifdef MP 
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "港口价格"
-				// #endif 
 			}
 		},
 		{
 			"path": "pages/sale/newsinfo",
 			"style": {
-				// #ifdef MP 
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "行业新闻"
-				// #endif 
 			}
 		},
 		{

pages/attestation/index.vue

@@ -2,7 +2,7 @@
 	<view class="center">
 		<view class="homePage">
 			<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
-			<view class="title">
+			<view class="title" @click="liangShang">
 				粮商身份
 			</view>
 			<view class="arrows1" @click="liangShang">
@@ -14,7 +14,7 @@
 
 		<view class="homePage1">
 			<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
-			<view class="title">
+			<view class="title" @click="siJi">
 				司机身份
 			</view>
 			<view class="arrows1" @click="siJi">

pages/attestation/indexThree.vue

@@ -111,6 +111,10 @@
 		onLoad() {
 			this.getList()
 		},
+		onPullDownRefresh() {
+			this.getList()
+			uni.stopPullDownRefresh()
+		},
 		methods: {
 			resend() {
 				

pages/business/business.vue

@@ -1,34 +1,36 @@
 <template>
 	<view>
-		<view style='background:#fff;border-bottom:1px solid #EEE;padding-bottom:10px;'>
-			<view class="cu-bar search">
-				<view style='position:absolute;left:30px;top:50%;transform: translateY(-50%);'>
-					<picker style='display:inline-block;' @change="locationChange" :value="location"
-						:range="locationType">
-						<view class="picker">
-							{{location>-1?locationType[location]:'请选择'}}
-						</view>
-					</picker>
-					<image style='width:10px;height:6px;margin-left:4px;position:relative;top:-2px;'
-						src='../../static/img/jiaoyi/down.png'></image>
+		<view class="top-style">
+			<view style='background:#fff;border-bottom:1px solid #EEE;padding-bottom:10px;'>
+				<view class="cu-bar search">
+					<view style='position:absolute;left:30px;top:50%;transform: translateY(-50%);'>
+						<picker style='display:inline-block;' @change="locationChange" :value="location"
+							:range="locationType">
+							<view class="picker">
+								{{location>-1?locationType[location]:'请选择'}}
+							</view>
+						</picker>
+						<image style='width:10px;height:6px;margin-left:4px;position:relative;top:-2px;'
+							src='../../static/img/jiaoyi/down.png'></image>
+					</view>
+					<view class="search-form round" @click="naviageToPage('/pageA/product/lookup?TabCur=')">
+						<text style='color: #ccc;text-indent:56px;' class="cuIcon-search"></text>
+						<input type="text" placeholder="请输入货名或标题" confirm-type="search"></input>
+					</view>
 				</view>
-				<view class="search-form round" @click="naviageToPage('/pageA/product/lookup?TabCur=')">
-					<text style='color: #ccc;text-indent:56px;' class="cuIcon-search"></text>
-					<input type="text" placeholder="请输入货名或标题" confirm-type="search"></input>
+				<view style='margin:0 15px;'>
+					<view class='tag radius line-pink' @click="sousuo('玉米')">玉米</view>
+					<view class='tag radius line-pink' @click="sousuo('大豆')">大豆</view>
+					<view class='tag radius line-pink' @click="sousuo('小麦')">小麦</view>
+					<view class='tag radius line-pink' @click="sousuo('水稻')">水稻</view>
+					<view class='tag radius line-pink' @click="sousuo('高粱')">高粱</view>
 				</view>
 			</view>
-			<view style='margin:0 15px;'>
-				<view class='tag radius line-pink' @click="sousuo('玉米')">玉米</view>
-				<view class='tag radius line-pink' @click="sousuo('大豆')">大豆</view>
-				<view class='tag radius line-pink' @click="sousuo('小麦')">小麦</view>
-				<view class='tag radius line-pink' @click="sousuo('水稻')">水稻</view>
-				<view class='tag radius line-pink' @click="sousuo('高粱')">高粱</view>
+			<view style='background:#fff;padding:0 15px;'>
+				<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>采购</view>
+				<view @click='tabcarchange(1)' class='line' :class='TabCur==1?"active":""'>销售</view>
 			</view>
 		</view>
-		<view style='background:#fff;padding:0 15px;'>
-			<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>采购</view>
-			<view @click='tabcarchange(1)' class='line' :class='TabCur==1?"active":""'>销售</view>
-		</view>
 		<view v-if='buyInfo.length>0' class="introduce-section">
 			<view v-for="(item, index) in buyInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="price-box">
@@ -724,7 +726,9 @@
 			color: $base-color;
 		}
 	}
-
+	.introduce-section{
+		padding-top: 135px;
+	}
 	.introduce-section .title {
 		font-size: 17px;
 		font-weight: bold;
@@ -825,4 +829,9 @@
 			transition: left .3s ease, top .3s ease;
 		}
 	}
+	.top-style{
+		background: red;
+		position: fixed;
+		width: 100%;
+	}
 </style>

pages/release/release.vue

@@ -283,7 +283,7 @@
 
 <style>
 	.center {
-		padding: 10px 20px;
+		padding: 10px 20px 150rpx 20px;
 		background-color: #F5F6FA;
 	}
 
@@ -397,6 +397,9 @@
 		width: 100%;
 		border-radius: 20px;
 		background-color: #22C572;
-		margin-top: 10px;
+		/* margin-top: 10px; */
+		position: fixed;
+		bottom: 30rpx;
+		width: 90%;
 	}
 </style>

util/util.js

@@ -399,7 +399,7 @@ const utils = {
 		}
 	},
 	// null赋值空字符串
-	nullToString:function(obj){debugger
+	nullToString:function(obj){
 		for(key in obj){
 			if(obj[key]==null) obj[key] = ""
 		}