前端小程序 sdy

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"
 		}]
 	]
 ];

main.js

@@ -164,10 +164,20 @@ const request = (_gp, _mt, data = {}, failCallback) => {
 						if (failCallback) {
 							failCallback(res.data)
 						} else {
-							uni.showToast({
-								title: res.data.errmsg,
-								icon: 'none'
-							})
+							if(res.data.errmsg){
+								uni.showToast({
+									title: res.data.errmsg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+							else{
+								uni.showToast({
+									title: "系统异常，请联系管理员",
+									icon: 'none',
+									duration: 2000
+								})
+							}
 						}
 					}
 				}

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({
@@ -319,11 +315,20 @@
 										}
 									})
 								.catch(res => {
-									uni.showToast({
-										title: res.errmsg,
-										icon: 'none',
-										duration: 2000
-									})
+									if(res.errmsg){
+										uni.showToast({
+											title: res.errmsg,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+									else{
+										uni.showToast({
+											title: "系统异常，请联系管理员",
+											icon: 'none',
+											duration: 2000
+										})
+									}
 								});
 						} else if (res.cancel) {
 

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('验证通过');
@@ -272,11 +270,20 @@
 											}
 										})
 										.catch(res => {
-											uni.showToast({
-												title: res.errmsg,
-												icon: 'none',
-												duration: 2000
-											})
+											if(res.errmsg){
+												uni.showToast({
+													title: res.errmsg,
+													icon: 'none',
+													duration: 2000
+												})
+											}
+											else{
+												uni.showToast({
+													title: "系统异常，请联系管理员",
+													icon: 'none',
+													duration: 2000
+												})
+											}
 										});
 								} else {
 									console.log('验证失败');
@@ -300,7 +307,6 @@
 
 						uploadImage(res.tempFilePaths[0], 'collectionScreenshot/',
 							result => {
-								debugger
 								this.goods.collectionScreenshot = result
 								uni.hideLoading();
 							}
@@ -365,7 +371,6 @@
 					cancelText: '取消',
 					confirmText: '确定',
 					success: res => {
-						debugger
 						if (res.confirm) {
 							this.goods.collectionScreenshot = ""
 						}

pageA/freightTransport/index.vue

@@ -60,7 +60,7 @@
 				status: 0,
 				listData: [],
 				searchData: {},
-				userInfo: {},
+				userinfo: {},
 				isShowNoData:false
 
 			}
@@ -83,8 +83,7 @@
 		},
 		methods: {
 			getUserInfo() {
-				debugger
-				this.userInfo = store.getters.getUserInfo
+				this.userinfo = store.getters.getUserInfo
 			},
 			addgoods() {
 				uni.navigateTo({
@@ -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/Identity_switching.vue

@@ -114,11 +114,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			checkBox(e,item){
@@ -142,11 +151,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			// adddriver(index) {

pageA/product/business_buy.vue

@@ -342,12 +342,20 @@
 										})
 									}
 								}).catch(res => {
-									console.log(res)
-									uni.showToast({
-										title: res.errMsg,
-										icon: 'none',
-										duration: 2000
-									})
+									if(res.errmsg){
+										uni.showToast({
+											title: res.errmsg,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+									else{
+										uni.showToast({
+											title: "系统异常，请联系管理员",
+											icon: 'none',
+											duration: 2000
+										})
+									}
 								})
 							}
 						}

pageA/product/buydetails.vue

@@ -231,7 +231,20 @@
 			that.$api.request('goods', 'getSaleDetailInfo', {
 				id: options.id
 			}, failres => {
-				that.$api.msg(failres.errmsg)
+				if(failres.errmsg){
+					uni.showToast({
+						title: failres.errmsg,
+						icon: 'none',
+						duration: 2000
+					})
+				}
+				else{
+					uni.showToast({
+						title: "系统异常，请联系管理员",
+						icon: 'none',
+						duration: 2000
+					})
+				}
 				uni.hideLoading()
 			}).then(res => {
 				console.log(res.data)
@@ -313,7 +326,20 @@
 					id: that.goods.id,
 					price:that.price
 				}, failres => {
-					that.$api.msg(failres.errmsg)
+					if(failres.errmsg){
+						uni.showToast({
+							title: failres.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 					uni.hideLoading()
 				}).then(res => {			
 					that.$api.msg('修改成功')
@@ -331,7 +357,20 @@
 					id: that.goods.id,
 					reason:that.reason
 				}, failres => {
-					that.$api.msg(failres.errmsg)
+					if(failres.errmsg){
+						uni.showToast({
+							title: failres.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 					uni.hideLoading()
 				}).then(res => {			
 					that.$api.msg('终止成功')

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>
@@ -354,7 +354,20 @@
 					id: that.goods.id,
 					price:that.price
 				}, failres => {
-					that.$api.msg(failres.errmsg)
+					if(failres.errmsg){
+						uni.showToast({
+							title: failres.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 					uni.hideLoading()
 				}).then(res => {			
 					that.$api.msg('修改成功')
@@ -406,7 +419,7 @@
 						}else if(res.data.code==11016){
 							uni.showModal({
 								    title: '温馨提示',
-								    content: '您还未认证粮商身份， 下单前请先完善您的身份信息',
+								    content: '您还未认证粮商身份， 下单前请先完善您的身份信息。',
 								    confirmText: "去认证",
 									confirmColor: '#22C572',
 									success: function (res) {
@@ -457,7 +470,20 @@
 					id: that.goods.id,
 					reason:that.reason
 				}, failres => {
-					that.$api.msg(failres.errmsg)
+					if(failres.errmsg){
+						uni.showToast({
+							title: failres.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 					uni.hideLoading()
 				}).then(res => {			
 					that.$api.msg('终止成功')

pageA/product/detail_upload.vue

@@ -192,7 +192,20 @@
 					carImg:that.carImg,
 					
 				}, failres => {
-					that.$api.msg(failres.errmsg)
+					if(failres.errmsg){
+						uni.showToast({
+							title: failres.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 					uni.hideLoading()
 				}).then(res => {			
 					uni.hideLoading()

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>
@@ -222,11 +222,20 @@
 				})
 				.catch(res => {
 					uni.hideLoading()
-					uni.showToast({
-						title: res.errmsg,
-						icon:'none',
-						duration: 2000
-					})
+					if(res.errmsg){
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 				});
 			},
 			emptysearch(){
@@ -242,11 +251,20 @@
 					this.hotKeywordList=res.data.data.records
 				})
 				.catch(res => {
-					uni.showToast({
-						title: res.errmsg,
-						icon:'none',
-						duration: 2000
-					})
+					if(res.errmsg){
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 				});
 			},
 			tabSelect(e) {
@@ -273,11 +291,20 @@
 					this.keywordList=res.data.data.records
 				})
 				.catch(res => {
-					uni.showToast({
-						title: res.errmsg,
-						icon:'none',
-						duration: 2000
-					})
+					if(res.errmsg){
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 				});
 			},
 			//加载默认搜索关键字
@@ -460,11 +487,20 @@
 					})
 					.catch(res => {
 						uni.hideLoading()
-						uni.showToast({
-							title: res.errmsg,
-							icon:'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			//保存关键字到历史记录

pageA/product/querylist.vue

@@ -194,7 +194,20 @@
 						page: this.pages,
 						limit:this.limit
 					}, failres => {
-						that.$api.msg(failres.errmsg)
+						if(failres.errmsg){
+							uni.showToast({
+								title: failres.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 						this.isLoadMore = false
 						this.loadStatus = 'nomore'
 						if(this.pages>1){this.pages=1}
@@ -216,7 +229,20 @@
 						page: this.pages,
 						limit:this.limit
 					}, failres => {
-						that.$api.msg(failres.errmsg)
+						if(failres.errmsg){
+							uni.showToast({
+								title: failres.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 						this.isLoadMore = false
 						this.loadStatus = 'nomore'
 						if(this.pages>1){this.pages=1}
@@ -238,7 +264,20 @@
 						page: this.pages,
 						limit:this.limit
 					}, failres => {
-						that.$api.msg(failres.errmsg)
+						if(failres.errmsg){
+							uni.showToast({
+								title: failres.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 						this.isLoadMore = false
 						this.loadStatus = 'nomore'
 						if(this.pages>1){this.pages=1}
@@ -261,7 +300,20 @@
 						page: this.pages,
 						limit:this.limit
 					}, failres => {
-						that.$api.msg(failres.errmsg)
+						if(failres.errmsg){
+							uni.showToast({
+								title: failres.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 						this.isLoadMore = false
 						this.loadStatus = 'nomore'
 						if(this.pages>1){this.pages=1}
@@ -328,7 +380,20 @@
 						page: pages,
 						limit:limit
 					},failres => {
-						that.$api.msg(failres.errmsg)
+						if(failres.errmsg){
+							uni.showToast({
+								title: failres.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 						that.isLoadMore=false
 						that.loadStatus = 'nomore'
 						if(that.pages>1){that.pages-=1}
@@ -353,11 +418,20 @@
 					currentPage:this.currentPage,keywords:this.keywords}).then(res => {
 									})
 									.catch(res => {
-										uni.showToast({
-											title: res.errmsg,
-											icon:'none',
-											duration: 2000
-										})
+										if(res.errmsg){
+											uni.showToast({
+												title: res.errmsg,
+												icon: 'none',
+												duration: 2000
+											})
+										}
+										else{
+											uni.showToast({
+												title: "系统异常，请联系管理员",
+												icon: 'none',
+												duration: 2000
+											})
+										}
 									});
 				}
 				else if(this.TabCur == 2){
@@ -366,7 +440,20 @@
 						page: pages,
 						limit:limit
 					},failres => {
-						that.$api.msg(failres.errmsg)
+						if(failres.errmsg){
+							uni.showToast({
+								title: failres.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 						that.isLoadMore=false
 						that.loadStatus = 'nomore'
 						if(that.pages>1){that.pages-=1}
@@ -392,7 +479,20 @@
 						page: pages,
 						limit:limit
 					},failres => {
-						that.$api.msg(failres.errmsg)
+						if(failres.errmsg){
+							uni.showToast({
+								title: failres.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 						that.isLoadMore=false
 						that.loadStatus = 'nomore'
 						if(that.pages>1){that.pages-=1}

pageA/product/sale_trade.vue

@@ -402,7 +402,20 @@
 					})
 					that.$api.request('trade', 'addTrade',that.tradeInfo, failres => {
 						uni.hideLoading()
-						that.$api.msg(failres.errmsg);
+						if(failres.errmsg){
+							uni.showToast({
+								title: failres.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 						
 					}).then(res => {
 						uni.hideLoading()

pageA/product/saledetails.vue

@@ -231,7 +231,20 @@
 			that.$api.request('goods', 'getSaleDetailInfo', {
 				id: options.id
 			}, failres => {
-				that.$api.msg(failres.errmsg)
+				if(failres.errmsg){
+					uni.showToast({
+						title: failres.errmsg,
+						icon: 'none',
+						duration: 2000
+					})
+				}
+				else{
+					uni.showToast({
+						title: "系统异常，请联系管理员",
+						icon: 'none',
+						duration: 2000
+					})
+				}
 				uni.hideLoading()
 			}).then(res => {
 				console.log(res.data)
@@ -313,7 +326,20 @@
 					id: that.goods.id,
 					price:that.price
 				}, failres => {
-					that.$api.msg(failres.errmsg)
+					if(failres.errmsg){
+						uni.showToast({
+							title: failres.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 					uni.hideLoading()
 				}).then(res => {			
 					that.$api.msg('修改成功')
@@ -331,7 +357,20 @@
 					id: that.goods.id,
 					reason:that.reason
 				}, failres => {
-					that.$api.msg(failres.errmsg)
+					if(failres.errmsg){
+						uni.showToast({
+							title: failres.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 					uni.hideLoading()
 				}).then(res => {			
 					that.$api.msg('终止成功')

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>
@@ -346,7 +346,20 @@
 					id: that.goods.id,
 					price:that.price
 				}, failres => {
-					that.$api.msg(failres.errmsg)
+					if(failres.errmsg){
+						uni.showToast({
+							title: failres.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 					uni.hideLoading()
 				}).then(res => {			
 					that.$api.msg('修改成功')
@@ -398,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) {
 								        }
@@ -449,7 +462,20 @@
 					id: that.goods.id,
 					reason:that.reason
 				}, failres => {
-					that.$api.msg(failres.errmsg)
+					if(failres.errmsg){
+						uni.showToast({
+							title: failres.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 					uni.hideLoading()
 				}).then(res => {			
 					that.$api.msg('终止成功')
@@ -523,7 +549,7 @@
 		position:absolute;
 		left:50%;
 		transform: translateX(-50%);
-		top: 40upx;
+		top: 80upx;
 		z-index:9999;
 		color:#fff;
 	}

pageB/car/mycar_detail.vue

@@ -61,7 +61,20 @@
 			that.$api.request('tran', 'getMyCarListByCarNo', {
 				carNo: options.carNo
 			}, failres => {
-				that.$api.msg(failres.errmsg)
+				if(failres.errmsg){
+					uni.showToast({
+						title: failres.errmsg,
+						icon: 'none',
+						duration: 2000
+					})
+				}
+				else{
+					uni.showToast({
+						title: "系统异常，请联系管理员",
+						icon: 'none',
+						duration: 2000
+					})
+				}
 				uni.hideLoading()
 			}).then(res => {			
 				that.carInfo = res.data

pageB/contract/collectLook.vue

@@ -181,11 +181,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			loaddata() {
@@ -197,11 +206,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			ViewImage(e) {
@@ -229,7 +247,20 @@
 					id: that.goods.id,
 					reason: that.reason
 				}, failres => {
-					that.$api.msg(failres.errmsg)
+					if(failres.errmsg){
+						uni.showToast({
+							title: failres.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 					uni.hideLoading()
 				}).then(res => {
 					that.$api.msg('终止成功')

pageB/contract/contract.vue

@@ -189,11 +189,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			someprice(item) {
@@ -275,11 +284,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 
@@ -581,7 +599,20 @@
 												that.$api.request('sale', 'addSale', that.saleInfo,
 													failres => {
 														uni.hideLoading()
-														that.$api.msg(failres.errmsg);
+														if(failres.errmsg){
+															uni.showToast({
+																title: failres.errmsg,
+																icon: 'none',
+																duration: 2000
+															})
+														}
+														else{
+															uni.showToast({
+																title: "系统异常，请联系管理员",
+																icon: 'none',
+																duration: 2000
+															})
+														}
 													}).then(res => {
 													uni.hideLoading()
 													uni.showModal({
@@ -600,7 +631,20 @@
 												that.$api.request('sale', 'addBuy', that.saleInfo,
 													failres => {
 														uni.hideLoading()
-														that.$api.msg(failres.errmsg);
+														if(failres.errmsg){
+															uni.showToast({
+																title: failres.errmsg,
+																icon: 'none',
+																duration: 2000
+															})
+														}
+														else{
+															uni.showToast({
+																title: "系统异常，请联系管理员",
+																icon: 'none',
+																duration: 2000
+															})
+														}
 													}).then(res => {
 													uni.hideLoading()
 													uni.showModal({
@@ -619,7 +663,20 @@
 												that.$api.request('tran', 'addTran', that.tran,
 													failres => {
 														uni.hideLoading()
-														that.$api.msg(failres.errmsg);
+														if(failres.errmsg){
+															uni.showToast({
+																title: failres.errmsg,
+																icon: 'none',
+																duration: 2000
+															})
+														}
+														else{
+															uni.showToast({
+																title: "系统异常，请联系管理员",
+																icon: 'none',
+																duration: 2000
+															})
+														}
 													}).then(res => {
 													uni.hideLoading()
 													uni.showModal({
@@ -638,7 +695,20 @@
 												that.$api.request('tran', 'addCarDriver', that.tran,
 													failres => {
 														uni.hideLoading()
-														that.$api.msg(failres.errmsg);
+														if(failres.errmsg){
+															uni.showToast({
+																title: failres.errmsg,
+																icon: 'none',
+																duration: 2000
+															})
+														}
+														else{
+															uni.showToast({
+																title: "系统异常，请联系管理员",
+																icon: 'none',
+																duration: 2000
+															})
+														}
 													}).then(res => {
 													uni.hideLoading()
 													uni.showModal({

pageB/contract/look.vue

@@ -199,11 +199,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			loaddata() {
@@ -215,11 +224,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			ViewImage(e) {
@@ -253,7 +271,20 @@
 					id: that.goods.id,
 					reason: that.reason
 				}, failres => {
-					that.$api.msg(failres.errmsg)
+					if(failres.errmsg){
+						uni.showToast({
+							title: failres.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 					uni.hideLoading()
 				}).then(res => {
 					that.$api.msg('终止成功')

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/companyIdentityEdit.vue

@@ -244,11 +244,20 @@
 					
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 				
 				
@@ -376,11 +385,20 @@
 		
 						})
 						.catch(res => {
-							uni.showToast({
-								title: res.errmsg,
-								icon: 'none',
-								duration: 2000
-							})
+							if(res.errmsg){
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+							else{
+								uni.showToast({
+									title: "系统异常，请联系管理员",
+									icon: 'none',
+									duration: 2000
+								})
+							}
 						});
 			},
 			consent(){

pageD/identity/companyIdentityLook.vue

@@ -165,11 +165,20 @@
 							}
 						})
 						.catch(res => {
-							uni.showToast({
-								title: res.errmsg,
-								icon: 'none',
-								duration: 2000
-							})
+							if(res.errmsg){
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+							else{
+								uni.showToast({
+									title: "系统异常，请联系管理员",
+									icon: 'none',
+									duration: 2000
+								})
+							}
 						});
 			},
 			consent(){

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

@@ -400,11 +400,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			commitEdit() {

pageD/identity/driverIdentityLook.vue

@@ -267,11 +267,20 @@
 						this.bankimg = this.procurementPlanInfos.driverPayeeInfoList.payeeAddressUrl.split(",")
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 

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;

pageD/myRelease/Identity_switching.vue

@@ -110,11 +110,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			checkBox(e,item){
@@ -131,11 +140,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			// adddriver(index) {

pageD/myRelease/buyDetails.vue

@@ -191,11 +191,20 @@
 					
 				})
 				.catch(res => {
-					uni.showToast({
-						title: res.errmsg,
-						icon:'none',
-						duration: 2000
-					})
+					if(res.errmsg){
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 				});
 			}
 		}

pageD/myRelease/buyEdit.vue

@@ -322,11 +322,20 @@
 					}
 				})
 				.catch(res => {
-					uni.showToast({
-						title: res.errmsg,
-						icon:'none',
-						duration: 2000
-					})
+					if(res.errmsg){
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 				});
 			},
 			yearpicker(e) {
@@ -631,11 +640,20 @@
 													}
 											})
 											.catch(res => {
-												uni.showToast({
-													title: res.errmsg,
-													icon: 'none',
-													duration: 2000
-												})
+												if(res.errmsg){
+													uni.showToast({
+														title: res.errmsg,
+														icon: 'none',
+														duration: 2000
+													})
+												}
+												else{
+													uni.showToast({
+														title: "系统异常，请联系管理员",
+														icon: 'none',
+														duration: 2000
+													})
+												}
 											});
 									} 
 									else if(res.data.code=='11003'){

pageD/myRelease/buyGrain.vue

@@ -605,11 +605,20 @@
 										}
 									})
 									.catch(res => {
-										uni.showToast({
-											title: res.errmsg,
-											icon: 'none',
-											duration: 2000
-										})
+										if(res.errmsg){
+											uni.showToast({
+												title: res.errmsg,
+												icon: 'none',
+												duration: 2000
+											})
+										}
+										else{
+											uni.showToast({
+												title: "系统异常，请联系管理员",
+												icon: 'none',
+												duration: 2000
+											})
+										}
 									});
 								} 
 								else if(res.data.code=='11003'){

pageD/myRelease/sellDetails.vue

@@ -235,11 +235,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			regionpicker(e) {

pageD/myRelease/sellEdit.vue

@@ -332,11 +332,20 @@
 
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			getcode() {
@@ -623,11 +632,20 @@
 												}
 											})
 											.catch(res => {
-												uni.showToast({
-													title: res.errmsg,
-													icon: 'none',
-													duration: 2000
-												})
+												if(res.errmsg){
+													uni.showToast({
+														title: res.errmsg,
+														icon: 'none',
+														duration: 2000
+													})
+												}
+												else{
+													uni.showToast({
+														title: "系统异常，请联系管理员",
+														icon: 'none',
+														duration: 2000
+													})
+												}
 											});
 									} else if (res.data.code == '11003') {
 										uni.showModal({

pageD/myRelease/sellGrain.vue

@@ -635,11 +635,20 @@
 
 								})
 								.catch(res => {
-									uni.showToast({
-										title: res.errmsg,
-										icon: 'none',
-										duration: 2000
-									})
+									if(res.errmsg){
+										uni.showToast({
+											title: res.errmsg,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+									else{
+										uni.showToast({
+											title: "系统异常，请联系管理员",
+											icon: 'none',
+											duration: 2000
+										})
+									}
 								});
 						} else if (res.data.code == '11003') {
 							uni.showModal({

pageD/warehousings/ex_warehouse.vue

@@ -365,11 +365,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 	 async warehouseChange3(id){

pageD/warehousings/ex_warehouse_detail.vue

@@ -188,11 +188,20 @@
 
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			}
 		}

pageD/warehousings/warehousingDetails.vue

@@ -182,11 +182,20 @@
 					
 				})
 				.catch(res => {
-					uni.showToast({
-						title: res.errmsg,
-						icon:'none',
-						duration: 2000
-					})
+					if(res.errmsg){
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 				});
 			}
 		}

pageD/warehousings/warehousings.vue

@@ -341,11 +341,20 @@ import upload from '@/components/upload.vue';
 					this.WarehouseInOutInfo.deductionAmount = Math.abs(res.data.data.deductionAmount) 
 				})
 				.catch(res => {
-					uni.showToast({
-						title: res.errmsg,
-						icon:'none',
-						duration: 2000
-					})
+					if(res.errmsg){
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					else{
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
 				});
 			},
 			warehouseChange(e){

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">
@@ -133,11 +133,20 @@
 										}
 									})
 									.catch(res => {
-										uni.showToast({
-											title: res.errmsg,
-											icon: 'none',
-											duration: 2000
-										})
+										if(res.errmsg){
+											uni.showToast({
+												title: res.errmsg,
+												icon: 'none',
+												duration: 2000
+											})
+										}
+										else{
+											uni.showToast({
+												title: "系统异常，请联系管理员",
+												icon: 'none',
+												duration: 2000
+											})
+										}
 									});
 							}
 							
@@ -182,11 +191,20 @@
 								}
 							})
 							.catch(res => {
-								uni.showToast({
-									title: res.errmsg,
-									icon: 'none',
-									duration: 2000
-								})
+								if(res.errmsg){
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+								else{
+									uni.showToast({
+										title: "系统异常，请联系管理员",
+										icon: 'none',
+										duration: 2000
+									})
+								}
 							});
 					},
 					fail: () => {},
@@ -213,11 +231,20 @@
 
 							})
 							.catch(res => {
-								uni.showToast({
-									title: res.errmsg,
-									icon: 'none',
-									duration: 2000
-								})
+								if(res.errmsg){
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+								else{
+									uni.showToast({
+										title: "系统异常，请联系管理员",
+										icon: 'none',
+										duration: 2000
+									})
+								}
 							});
 					},
 					fail: () => {},
@@ -238,11 +265,20 @@
 						}
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.message,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			adddriver(index) {

pages/attestation/indexThree.vue

@@ -111,6 +111,10 @@
 		onLoad() {
 			this.getList()
 		},
+		onPullDownRefresh() {
+			this.getList()
+			uni.stopPullDownRefresh()
+		},
 		methods: {
 			resend() {
 				
@@ -144,11 +148,20 @@
 						this.drivers = res.data.data.records
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			amendprice(item) {
@@ -343,11 +356,20 @@
 									}
 								})
 								.catch(res => {
-									uni.showToast({
-										title: res.errmsg,
-										icon: 'none',
-										duration: 2000
-									})
+									if(res.errmsg){
+										uni.showToast({
+											title: res.errmsg,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+									else{
+										uni.showToast({
+											title: "系统异常，请联系管理员",
+											icon: 'none',
+											duration: 2000
+										})
+									}
 								});
 						}
 						

pages/attestation/indexTwo.vue

@@ -156,11 +156,20 @@
 							this.getList()
 						})
 						.catch(res => {
-							uni.showToast({
-								title: res.errmsg,
-								icon: 'none',
-								duration: 2000
-							})
+							if(res.errmsg){
+								uni.showToast({
+									title: res.errmsg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+							else{
+								uni.showToast({
+									title: "系统异常，请联系管理员",
+									icon: 'none',
+									duration: 2000
+								})
+							}
 						});
 				} else {
 					this.$api.msg('已认证的身份才能设为默认！')
@@ -194,11 +203,20 @@
 
 					})
 					.catch(res => {
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			},
 			amendprice(item) {
@@ -387,11 +405,20 @@
 								}
 							})
 							.catch(res => {
-								uni.showToast({
-									title: res.errmsg,
-									icon: 'none',
-									duration: 2000
-								})
+								if(res.errmsg){
+									uni.showToast({
+										title: res.errmsg,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+								else{
+									uni.showToast({
+										title: "系统异常，请联系管理员",
+										icon: 'none',
+										duration: 2000
+									})
+								}
 							});
 						}
 					},

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">
@@ -251,11 +253,20 @@
 					})
 					.catch(res => {
 						uni.hideLoading()
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 				// that.$api.request(param1, param2, {
 				// 	page: 1,
@@ -360,11 +371,20 @@
 					})
 					.catch(res => {
 						uni.hideLoading()
-						uni.showToast({
-							title: res.errmsg,
-							icon: 'none',
-							duration: 2000
-						})
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					});
 			}
 
@@ -706,7 +726,9 @@
 			color: $base-color;
 		}
 	}
-
+	.introduce-section{
+		padding-top: 135px;
+	}
 	.introduce-section .title {
 		font-size: 17px;
 		font-weight: bold;
@@ -807,4 +829,9 @@
 			transition: left .3s ease, top .3s ease;
 		}
 	}
+	.top-style{
+		background: red;
+		position: fixed;
+		width: 100%;
+	}
 </style>

pages/public/reset.vue

@@ -118,11 +118,20 @@
 					}, 1000)
 					})
 					.catch(res => {
-					    uni.showToast({
-							title: res.errMsg,
-							icon:'none',
-							duration: 2000
-						})
+					    if(res.errmsg){
+					    	uni.showToast({
+					    		title: res.errmsg,
+					    		icon: 'none',
+					    		duration: 2000
+					    	})
+					    }
+					    else{
+					    	uni.showToast({
+					    		title: "系统异常，请联系管理员",
+					    		icon: 'none',
+					    		duration: 2000
+					    	})
+					    }
 					 });
 				}else{
 					uni.showToast({

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>

pages/user/set_nickname.vue

@@ -59,6 +59,12 @@
 														var _student = uni.getStorageSync('userInfo');
 														_student.userName = that.nickname;
 														uni.setStorageSync('userInfo', _student);
+														var name = 'userInfo';
+														var value = _student;
+														that.$store.commit('$uStore', {
+															name,
+															value
+														});
 														uni.navigateBack()
 													},2000)
 												}
@@ -66,11 +72,20 @@
 										}
 									})
 								.catch(res => {
-									uni.showToast({
-										title: res.errmsg,
-										icon: 'none',
-										duration: 2000
-									})
+									if(res.errmsg){
+										uni.showToast({
+											title: res.errmsg,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+									else{
+										uni.showToast({
+											title: "系统异常，请联系管理员",
+											icon: 'none',
+											duration: 2000
+										})
+									}
 								});
 
 						} else if (res.cancel) {

pages/user/set_picture.vue

@@ -134,6 +134,12 @@
 															var _student = uni.getStorageSync('userInfo');
 															_student.avatarUrl = that.identityUrl;
 															uni.setStorageSync('userInfo', _student);
+															var name = 'userInfo';
+															var value = _student;
+															that.$store.commit('$uStore', {
+																name,
+																value
+															});
 															// this.$api.msg('修改成功2！')
 															uni.navigateBack({
 																delta:1
@@ -145,11 +151,20 @@
 										}
 									})
 								.catch(res => {
-									uni.showToast({
-										title: res.data.errmsg,
-										icon: 'none',
-										duration: 2000
-									})
+									if(res.data.errmsg){
+										uni.showToast({
+											title: res.data.errmsg,
+											icon: 'none',
+											duration: 2000
+										})
+									}
+									else{
+										uni.showToast({
+											title: "系统异常，请联系管理员",
+											icon: 'none',
+											duration: 2000
+										})
+									}
 								});
 						} else if (res.cancel) {
 							// console.log('用户点击取消');

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] = ""
 		}

websocket_sdk.js

@@ -141,7 +141,6 @@ export default class Websocket {
                         uni.showModal({
                             title: '网络错误',
                             content: '请重新打开网络',
-                            showCancel: false,
                             success: function(res) {
                                 if (res.confirm) {
                                     console.log('用户点击确定')