taocan

@@ -35,6 +35,7 @@ Component({
       });
       });
     },
     },
     initListOrder(){
     initListOrder(){
+      if(!this.data.listOrder) return;
       let orderStatusStr={
       let orderStatusStr={
         1:{status:'未支付',info:''},
         1:{status:'未支付',info:''},
         2:{status:'待使用',info:'感谢您的支持，请您按尽快来店就餐呦'},
         2:{status:'待使用',info:'感谢您的支持，请您按尽快来店就餐呦'},

@@ -3,13 +3,13 @@ import util from '../../utils/util';
 import App from '../../utils/api';
 import App from '../../utils/api';
 //账单状态 1=初始化 2=交易成功(待使用) 3=已使用 4=退款中  5=已退款 6=已过期 7=支付失败
 //账单状态 1=初始化 2=交易成功(待使用) 3=已使用 4=退款中  5=已退款 6=已过期 7=支付失败
 const orderStatusStr={
 const orderStatusStr={
-  1:{status:'未支付',info:''},
-  2:{status:'待使用',info:'感谢您的支持，请您按尽快来店就餐呦'},
-  3:{status:'已使用',info:'感谢您的支持，满意的话记得常来呦'},
-  4:{status:'退款中',info:''},
-  5:{status:'已退款',info:'钱款已原路退还，请在微信账单查看呦'},
-  6:{status:'已过期',info:'您可以随时申请退款呦'},
-  7:{status:'支付失败',info:''},
+  1:{status:'未支付',info:'',optbut:''},
+  2:{status:'待使用',info:'感谢您的支持，请您按尽快来店就餐呦',optbut:'申请退款'},
+  3:{status:'已使用',info:'感谢您的支持，满意的话记得常来呦',optbut:''},
+  4:{status:'退款中',info:'',optbut:'退款进度'},
+  5:{status:'已退款',info:'钱款已原路退还，请在微信账单查看呦',optbut:'退款进度'},
+  6:{status:'已过期',info:'您可以随时申请退款呦',optbut:'申请退款'},
+  7:{status:'支付失败',info:'',optbut:''},
 }
 }
 Page({
 Page({
 
 

@@ -5,7 +5,7 @@
 <view class="view padding-lr padding-bottom-lg" style="position: relative">
 <view class="view padding-lr padding-bottom-lg" style="position: relative">
     <view class="text-white txt-40-h text-bold margin-top-sm">{{order_tips.status}}</view>
     <view class="text-white txt-40-h text-bold margin-top-sm">{{order_tips.status}}</view>
     <view class="text-white txt-28-h text-bold margin-bottom-lg" style="margin-top: 6rpx;">{{order_tips.info}}</view>
     <view class="text-white txt-28-h text-bold margin-bottom-lg" style="margin-top: 6rpx;">{{order_tips.info}}</view>
-    <subject foods_info="{{foods_info}}" order_info="{{order_info}}">
+    <subject foods_info="{{foods_info}}" order_info="{{order_info}}" wx:if="{{order_info}}">
         <view class="view flex flex-direction justify-center align-center margin-top-lg">
         <view class="view flex flex-direction justify-center align-center margin-top-lg">
             <view class="Medium txt-28-h {{order_info.status==2?'':'overline'}}">券码：{{order_info.id}}</view>
             <view class="Medium txt-28-h {{order_info.status==2?'':'overline'}}">券码：{{order_info.id}}</view>
             <image src="{{qrcode?qrcode:'http://nosqn.colorcun.com/taocan/1%20%2813%29.png'}}" mode="heightFix" style="height: 340rpx;"></image>
             <image src="{{qrcode?qrcode:'http://nosqn.colorcun.com/taocan/1%20%2813%29.png'}}" mode="heightFix" style="height: 340rpx;"></image>
@@ -50,7 +50,9 @@
     <view class="view card margin-top-sm padding-bottom-xs">
     <view class="view card margin-top-sm padding-bottom-xs">
         <view class="padding solid-bottom flex justify-between">
         <view class="padding solid-bottom flex justify-between">
             <view class="txt-30-h text-bold">订单信息</view>
             <view class="txt-30-h text-bold">订单信息</view>
-            <view class="text-gray">退款进度</view>
+            <view class="text-df order-opt-but order-opt-but{{order_info.status}} flex align-center justify-center" wx:if="{{order_tips.optbut}}">
+                {{order_tips.optbut}}
+            </view>
         </view>
         </view>
         <view class="view padding padding-lr-lg flex justify-between">
         <view class="view padding padding-lr-lg flex justify-between">
             <view class="text-gray txt-28-h">商品总价</view>
             <view class="text-gray txt-28-h">商品总价</view>

@@ -31,4 +31,14 @@
 }
 }
 .overline{
 .overline{
     text-decoration: line-through;
     text-decoration: line-through;
+}
+.order-opt-but{
+    width: 136rpx;
+    height: 48rpx;
+    border: 2rpx solid #CCCCCC;
+    color:#999999;
+}
+.order-opt-but6{
+    border: 2rpx solid #42A5FF;
+    color:#42A5FF;
 }
 }