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

pages/hotel/list.vue

@@ -297,7 +297,7 @@
 			this.getSearchCondition();
 			this.getList();
 			this.getCity();
-			this.getDistrict(262);
+			//this.getDistrict(262);
 		},
 		methods: {
 			showCity() {
@@ -307,7 +307,7 @@
 				this.searchObj.City = val.ID;
 				this.showCityList = false;
 				this.city = val.Name;
-				this.getDistrict(val.ID);
+				//this.getDistrict(val.ID);
 				this.searchObj.District = 0;
 				this.searchObj.pageIndex = 1;
 				this.optionsTitle[1] = "区域";

pages/ticketCoupons/list.vue

@@ -240,7 +240,7 @@ export default {
         IsSameDayBuy: -1,
         IsWorryFreeRefund: -1,
         OrderBy: 1,
-        City: 262,
+        City: 0,
         District: 0,
       },
       page_count: 1,
@@ -296,7 +296,7 @@ export default {
     this.getScenicType(); // 获取景点类型
     this.getList(); // 获取景点门票类型
     this.getCity();
-    this.getDistrict(262);
+    //this.getDistrict(262);
   },
   created() {
     uni.setNavigationBarTitle({
@@ -445,7 +445,7 @@ export default {
       this.showCityList = false;
       this.msg.City = val.ID;
       this.city = val.Name;
-      this.getDistrict(val.ID);
+      //this.getDistrict(val.ID);
       this.msg.District = 0;
       this.optionsTitle[2] = "区域";
       this.msg.pageIndex = 1;