Merge branch 'feature/3.1.0-小区合伙人' of ssh://gogs.1hhd.com:10022/1hjz-3N/1hjz-h5

src/view/home.vue

@@ -402,8 +402,8 @@ export default {
         let districtArr = arr[2].split("&");
         this.districtId = districtArr[0];
         this.defaultDistrict = districtArr[1];
-        // this.merchantNo = cityNameArr[2];
-        this.merchantNo = 2;
+        this.merchantNo = arr[2].split("&")[2];
+        // this.merchantNo = 2;
       }
       if (!estateStr) {
       } else {