回退版本

dormitory-for-users/src/views/houseKeeping/ChargingSituation.vue

@@ -74,10 +74,6 @@ export default {
     showChargeDetailArea:function (id,name){
       axios.get('http://36.139.166.61:19261/user/caretaker/charge/detail?id='+(id+'')).then(response=>{
         this.detailItemName=name;
-        if(response.data.status!==1000){
-          alert("请求失败！请稍后再试！");
-          return;
-        }
         if (response.data.data.length===0){
           this.noDetailVisible=true;
           return;
@@ -151,15 +147,7 @@ export default {
     }
   },
   created() {
-<<<<<<< HEAD
-    axios.get('http://124.223.194.15:19261/user/caretaker/charge/items').then(response=>{
-      if(response.data.status!==1000){
-        alert("请求失败！请稍后再试！");
-        return;
-      }
-=======
     axios.get('http://36.139.166.61:19261/user/caretaker/charge/items').then(response=>{
->>>>>>> 59be6507222b919e23911153cc64ff90ad3057f8
       this.chargeItemList=response.data.data;
     })
   }

dormitory-for-users/src/views/houseKeeping/DormitoryInformation.vue

@@ -64,15 +64,7 @@ export default {
     }
   },
   created() {
-<<<<<<< HEAD
-    axios.get('http://124.223.194.15:19261/user/caretaker/dormitory/items').then(response=>{
-      if(response.data.status!==1000){
-        alert("请求失败！请稍后再试！");
-        return;
-      }
-=======
     axios.get('http://36.139.166.61:19261/user/caretaker/dormitory/items').then(response=>{
->>>>>>> 59be6507222b919e23911153cc64ff90ad3057f8
       if (response.data.data.length===0){
         this.noData=true;
         return;

dormitory-for-users/src/views/houseKeeping/MaintenanceReport.vue

@@ -280,15 +280,7 @@ export default {
     },
   },
   created() {
-<<<<<<< HEAD
-    axios.get('http://124.223.194.15:19261/user/caretaker/publicFacilitiesRepair/type').then(response=>{
-      if(response.data.status!==1000){
-        alert("请求失败！请稍后再试！");
-        return;
-      }
-=======
     axios.get('http://36.139.166.61:19261/user/caretaker/publicFacilitiesRepair/type').then(response=>{
->>>>>>> 59be6507222b919e23911153cc64ff90ad3057f8
       console.log(response);
       for (let item of response.data.data){
         this.typeNameList.push(item.name);

dormitory-for-users/src/views/houseKeeping/SignInSituation.vue

@@ -75,15 +75,7 @@ export default {
   },
   methods: {
     showDetail: function (id) {
-<<<<<<< HEAD
-      axios.get('http://124.223.194.15:19261/user/caretaker/signIn/detail?tid='+id).then(response=>{
-        if(response.data.status!==1000){
-          alert("请求失败！请稍后再试！");
-          return;
-        }
-=======
       axios.get('http://36.139.166.61:19261/user/caretaker/signIn/detail?tid='+id).then(response=>{
->>>>>>> 59be6507222b919e23911153cc64ff90ad3057f8
         if (response.data.data.length===0){
           this.noDetail=true;
           return;
@@ -111,15 +103,7 @@ export default {
     }
   },
   created() {
-<<<<<<< HEAD
-    axios.get('http://124.223.194.15:19261/user/caretaker/signIn/getTask').then(response=>{
-      if(response.data.status!==1000){
-        alert("请求失败！请稍后再试！");
-        return;
-      }
-=======
     axios.get('http://36.139.166.61:19261/user/caretaker/signIn/getTask').then(response=>{
->>>>>>> 59be6507222b919e23911153cc64ff90ad3057f8
       this.signInItem=response.data.data;
     });
   }

dormitory-for-users/src/views/student/PayList.vue

@@ -29,8 +29,8 @@
         <br/>
         <div class="aa">
 <!--          //'this.payUrl'-->
-          <mt-button style="margin: 0 auto" v-if="chargeItemList[checkDetailIndex].status==0" type="primary" size="big" @click="payFee" disabled="this.isEnd"> 立即缴费 </mt-button>
-
+<!--      <mt-button style="margin: 0 auto" v-if="chargeItemList[checkDetailIndex].status==0" type="primary" size="big" @click="payFee" disabled="this.isEnd"> 立即缴费 </mt-button>-->
+          <mt-button style="margin: 0 auto" v-if="chargeItemList[checkDetailIndex].status==0" type="primary" size="big" @click="payFee" > 立即缴费 </mt-button>
         </div>
     </mt-popup>
 
@@ -66,10 +66,10 @@ export default {
     showChargeDetailArea:function (index,name){
       this.checkDetailIndex=index;
       this.detailItemName=name;
-      if(this.chargeItemList[index].isEnd==0)
+     /* if(this.chargeItemList[index].isEnd==0)
         this.isEnd=false;
       else
-        this.isEnd=true;
+        this.isEnd=true;*/
       this.chargeItemDetailVisible=true;
 
     },