Merge remote-tracking branch 'origin/master'

src/projects/business/views/Master/Mine/Bill/Pay.vue

@@ -203,10 +203,17 @@
 				}
 
 
-			},asynCallBack(){},
+			},asynCallBack(){
+                if(this.$route.query.exchange){
+                    this.getDetail();
+                }
+			},
 		},
 		mounted() {
-            this.getDetail();
+           if(!this.$route.query.exchange){
+               this.getDetail();
+		   }
+
 		},
 		destroyed() {
 

src/projects/business/views/Master/Property/Car/Apply.vue

@@ -78,7 +78,9 @@
             <form class="mui-input-group">
                 <div class="mui-input-row">
                     <label>选择车位</label>
-                    <button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%" @click="selectCar" v-text="carName">请选择</button>
+                    <button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%;color: red" v-if="!number" @click="selectCar" >暂无车位</button>
+
+                    <button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%" @click="selectCar" v-if="number" v-text="carName">请选择</button>
                 </div>
                 <div class="mui-input-row">
                     <label>开始时间</label>
@@ -133,11 +135,10 @@
 
                 <template v-for="m in map.get(cen)">
 
-                    <li class="mui-table-view-cell " @click="ckbtn(m,i,cen)" v-if="m.enableLease" :class="m.show?'mui-selected':''">
+                    <li class="mui-table-view-cell " @click="ckbtn(m,i,cen)" v-if="m.enableLease&&(m.number==null||m.number!=0)" :class="m.show?'mui-selected':''">
                         <span v-show="false">{{tempi=1}}</span>
-                        <a>
-                            {{m.parkingName}}
-                        </a>
+                        <a>{{m.parkingName}}</a>
+                        <span v-if="m.number" style="font-size: 1px;color: red;position: relative;top: -30px;left: 27px;">({{m.number}})</span>
                     </li>
 
                 </template>
@@ -204,6 +205,7 @@ export default {
             listcenindex: 0,
             selectName: '',
             parkingId: '',
+            number:0,
 
         }
     },
@@ -320,11 +322,25 @@ export default {
         },
         //选择停车位
         selectCar() {
-            this.step = 2;
-            if (!this.picList) {
-                this.getPic();
+            if(!this.number){
+                var _this =this;
+                var btnArray = ['返回', '联系物业'];
+                 mui.confirm('抱歉！您的小区当前暂无车位可供租用，如有疑问请联系物业', '提示', btnArray, function(e) {
+                    if (e.index == 1) {
+                        _this.$router.push({
+                            name: 'MasterPropertyContact',
+                            query: {
+
+                            }
+                        })
+                    }
+                })
+            }else{
+                this.step = 2;
+                if (!this.picList) {
+                    this.getPic();
+                }
             }
-
         },
         //获取详情
         getPic() {
@@ -389,6 +405,7 @@ export default {
             API.parkingUnit().then(response => {
 
                 this.isLoading = false;
+                this.number=response.number
                 if (response.id) {
                     this.issubmit = false;
                     this.isLoading = true;

src/projects/business/views/Master/Property/Car/Info.vue

@@ -205,8 +205,8 @@
 					})
 				}
 				if(this.payType ==2){
-				    var url = window.location.href.split("#")[0];
-                    this.detail.url=url+"#/master/mine/bill/pay?id=";
+				   // var url = window.location.href.split("#")[0];
+                    this.detail.url="/master/mine/bill/pay?id=";
 					API.ParkingApplicationSendOrder(this.detail).then(res => {
 						mui.toast("操作成功");
 						this.getDetail()