Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

pages/my/order/productList/productList.vue

@@ -163,11 +163,11 @@
 </template>
 
 <script>
-	import uPicker from "@/uview-ui/components/u-picker/u-picker.vue";
-	import uPopup from "@/uview-ui/components/u-popup/u-popup.vue";
-	import uToast from "@/uview-ui/components/u-toast/u-toast.vue";
-	import uModal from "@/uview-ui/components/u-modal/u-modal.vue";
-	export default {
+import uPicker from '@/uview-ui/components/u-picker/u-picker.vue'
+import uPopup from '@/uview-ui/components/u-popup/u-popup.vue'
+import uToast from '@/uview-ui/components/u-toast/u-toast.vue'
+import uModal from '@/uview-ui/components/u-modal/u-modal.vue'
+export default {
   filters:{
     orderType(i){//订单类型
       switch(i){
@@ -229,6 +229,9 @@
       case 11:
         return '已过期 '
         break
+      case 12:
+        return '退票审核中 '
+        break
       }
     },
     orderStatus2(i){//酒店订单状态
@@ -394,8 +397,8 @@
     }
   },
   onLoad(option) {
-			//this.openId = uni.getStorageSync("openid")
-			this.openId = "oh2UV1lyYABHMZ1rMlgjhVHyyYDQ"
+    this.openId = uni.getStorageSync('openid')
+    //this.openId = 'oh2UV1lyYABHMZ1rMlgjhVHyyYDQ'
     this.ifyukuaiCode = option.ifyukuaiCode||''
     this.getData(1)
   },
@@ -493,7 +496,7 @@
               if(flag==1){//第一次加载
                 this.lists = []
               }
-							if(ret.data.length>0){
+              if(ret.data.list.length>0){
                 this.dataLengthType = true
               }else{
                 this.dataLengthType = false
@@ -569,7 +572,7 @@
             var ret = res
             if(ret.code=='00'){
               this.$refs.uToast.show({
-								title: "订单取消成功",
+                title: '订单取消成功',
                 type: 'success',
               })
               //this.$store.commit('showLoading')
@@ -596,7 +599,7 @@
             var ret = res
             if(ret.code=='00'){
               this.$refs.uToast.show({
-								title: "订单删除成功",
+                title: '订单删除成功',
                 type: 'success',
               })
               //this.$store.commit('showLoading')
@@ -631,10 +634,10 @@
     },
   },
   onReachBottom(){//上拉加载
-			this.pageIndex++;
-			this.getData(2);
+    this.pageIndex++
+    this.getData(2)
   },
-	}
+}
 </script>
 
 <style scoped lang="scss">