Merge branch 'master' of http://gitlab.oytour.com/zk123/jz_travel

pages/guidecar/index.vue

@@ -177,7 +177,7 @@
 			return {
 				info: {},
 				contentHeight: 0,
-				navs:[{Name:'城际专车'},{Name:'定制专车'}],
+				navs:[{Name:'司导专车'},{Name:'景区专车'}],
 				active:0,
 				mainColor: '',
 				scrollTop: 0,

pages/guidecar/pickcarcity2.vue

@@ -124,6 +124,7 @@
 						}
 						this.indexList.push(obj)
 					})
+					this.indexList = this.unique(this.indexList)
 					this.indexList.forEach(x=>{
 						x.children=[];
 						this.cityList.forEach(j=>{
@@ -134,12 +135,23 @@
 						})
 						
 					})
-				
+					
+					
 					 uni.hideLoading();
 				  }
 				);
 			},
-		
+			 unique(arr){//数组去重
+			     var res = [];
+			     var obj = {};
+			     for(var i=0; i<arr.length; i++){
+			        if( !obj[arr[i]] ){
+			             obj[arr[i]] = 1;
+			             res.push(arr[i]);
+			         }
+			     } 
+			  return res;
+			 },
 			onPageScroll(e) {
 				this.scrollTop = e.scrollTop;
 			},