Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/components/pay/alipay.vue

@@ -98,7 +98,7 @@ export default {
         // 支付宝退款
         GetAliPayReturn(){
             this.apipost("GetAliPayReturn_post",{OrderNo:this.orderNo},r=>{
-                if(r.data.resultCode==1){
+                if(r.data.message=="退款成功"){
                     this.$message.success("退款成功")  
                 }else{
                     this.$message.error("退款失败")  

src/pages/ScenicSpotTicket/details.vue

@@ -892,7 +892,7 @@ export default {
         this.currentYM.str = time
         this.$refs.orderPreview.resetHandler()
       }
-      this.priceList = []
+      
       this.apipost(
         "b2c_get_GetTicketCouponsMonthPriceAll",
         { 
@@ -920,7 +920,10 @@ export default {
                   arr.push(dataObj)
                 }
             })
-            this.priceList = JSON.parse(JSON.stringify(arr))
+            if(arr.length>0){
+              this.priceList = []
+              this.priceList = JSON.parse(JSON.stringify(arr))
+            }
           }
           
         },null)

src/pages/Search.vue

@@ -1443,6 +1443,16 @@ export default {
   },
   created() {},
   mounted() {
+    // 支付宝退款 测试使用
+    // this.apipost("GetAliPayReturn_post",{OrderNo:'D202304121702420001'},r=>{
+    //     if(r.data.message=="退款成功"){
+    //         this.$message.success("退款成功")  
+    //     }else{
+    //         this.$message.error("退款失败")  
+    //     }
+    // },e=>{
+        
+    // })
     if (localStorage.baseifo) {
       var jObj = JSON.parse(localStorage.baseifo);
       this.areas = jObj.AreaList;

src/pages/detailsCar.vue

@@ -965,7 +965,7 @@ export default {
         this.currentYM.str = time
         this.$refs.orderPreview.resetHandler()
       }
-      this.priceList = []
+      
       this.apipost(
         "b2c_get_GetCarSingleProductMonthPrice",
         { 
@@ -1002,7 +1002,11 @@ export default {
               }
               arr.push(dataObj)
             }
-            this.priceList = JSON.parse(JSON.stringify(arr))
+            if(arr.length>0){
+              this.priceList = []
+              this.priceList = JSON.parse(JSON.stringify(arr))
+            }
+            
           }
           
         },null)

src/pages/pay/pay.vue

@@ -71,8 +71,7 @@
           />
         </div>
         <div class="rounded-borders q-pa-sm bg-grey-2 cursor-pointer" @click="showPayFormHandler('alipay')">
-          <!-- height:25px;max-width: 150px;min-width: 30px drop-shadow(0px 0px black)-->
-          <q-img  src="../../assets/img/pay/alipay.png" spinner-color="white" style="width: 80px;filter: invert(100%) hue-rotate(180deg);" />
+          <q-img  src="../../assets/img/pay/alipay.png" spinner-color="white" style="width: 80px;" />
         </div>
       </div>
       <div class="q-mt-md" v-if="showPay != ''">
@@ -132,6 +131,9 @@ export default {
   components: { wechatpay,alichatpay,NoneData },
   created() {
     this.checkParamsHandler()
+  },
+  mounted() {
+    
   },
   methods: {
     showPayFormHandler(payStr) {