明细

ghsApp/src/admin/billing/toPay.vue

@@ -58,7 +58,7 @@ export default {
       showQrCode:false,
       payQrCodeUrl:'',
       payWay:0,
-      isCashier:true,
+      isCashier:false,
       INT:null,
       orderInfo:{orderType:0}
     };

ghsApp/src/pagesOrder/detail.vue

@@ -49,17 +49,16 @@
 					<view>开单人员：</view>
 					<view>{{ detailInfo.shopAdminName }}</view>
 				</view>
-				<view class="order-info_box">
+				<view class="order-info_box" v-if="detailInfo.status != 1 && detailInfo.status!=5">
 					<view>客户下单：</view>
 					<view v-if="detailInfo.customShopAdminId == 0">--</view>
 					<view v-else>
 						<i class="iconfont icondagou" style="font-size:35upx;"></i>
 					</view>
 				</view>
-				<view class="order-info_box">
+				<view class="order-info_box" v-if="detailInfo.status != 1 && detailInfo.status!=5">
 					<view>支付方式：</view>
-					<view v-if="detailInfo.status != 1 && detailInfo.status!=5">{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'--' }}</view>
-					<view v-else>--</view>
+					<view>{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==2?'余额':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'--' }}</view>
 				</view>
 				<view class="order-info_box">
 					<view>订单状态：</view>
@@ -67,7 +66,7 @@
 				</view>
 				<view v-if="detailInfo.status==1" class="order-info_box">
 					<view>过期时间：</view>
-					<view>{{detailInfo.deadline}}</view>
+					<view>{{detailInfo.deadline?detailInfo.deadline.substr(5,11):''}}</view>
 				</view>
 				<view v-if="detailInfo.refund == 2" class="order-info_box">
 					<view>累计退款：</view>

hdApp/src/pagesPurchase/purDetails.vue

@@ -48,7 +48,7 @@
           <view>配送时间：</view>
           <view>{{ detailInfo.sendTimeWant }}</view>
         </view>
-        <view class="order-info_box">
+        <view class="order-info_box" v-if="detailInfo.status!=1 && detailInfo.status!=5">
           <view>支付方式：</view>
           <view>{{ detailInfo.payWay==0?'微信' :detailInfo.payWay==1?'支付宝' :detailInfo.payWay==2?'余额' :detailInfo.payWay==4?'现金' :detailInfo.payWay==5?'银行卡' :'--' }}</view>
         </view>
@@ -58,7 +58,7 @@
         </view>
         <view class="order-info_box">
           <view>订单状态：</view>
-          <view>{{ detailInfo.status==1?'待付款' :detailInfo.status==2?'待配送' :detailInfo.status==3?'配送中' :detailInfo.status==4?'已完成' :detailInfo.status==5?'已取消' :'已退款' }}</view>
+          <view>{{ detailInfo.status==1?'待付款' :detailInfo.status==2?'待配送' :detailInfo.status==3?'配送中' :detailInfo.status==4?'已完成' :detailInfo.status==5?'已取消' :'待付款' }}</view>
         </view>
 
         <view v-if="detailInfo.refund == 2" class="order-info_box">