app

ghsApp/src/admin/billing/affirm.vue

@@ -80,7 +80,6 @@
             <view class="tui-title">结账方式</view>
             <button @click="form.hasPay = 0" class="admin-button-com mini-btn" :class="form.hasPay == 0 ? 'blue' : 'default'">待结账</button>
             <button @tap="form.hasPay = 1" class="admin-button-com mini-btn" :class="form.hasPay == 1 ? 'blue' : 'default'">已结账</button>
-            <button @tap="form.hasPay = 2" class="admin-button-com mini-btn" :class="form.hasPay == 2 ? 'blue' : 'default'">记欠款</button>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">

ghsApp/src/admin/clear/customInfo.vue

@@ -24,7 +24,7 @@
 
 				<view class="order-info_box">
 					<view>支付方式：</view>
-					<view>{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'' }}</view>
+					<view>{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'--' }}</view>
 				</view>
 
 				<view class="order-info_box">

ghsApp/src/pagesOrder/detail.vue

@@ -52,7 +52,7 @@
 				</view>
 				<view class="order-info_box">
 					<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-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>
 				<view class="order-info_box">

hdApp/src/pagesPurchase/purDetails.vue

@@ -18,7 +18,7 @@
       <view class="bills-info_box content-box">
         <view class="order-info_box">
           <view>订单日期：</view>
-          <view>{{ detailInfo.updateTime }}</view>
+          <view>{{ detailInfo.updateTime.substring(0, 16) }}</view>
         </view>
         <view class="order-info_box">
           <view>订单编号：</view>
@@ -27,7 +27,10 @@
             <button @click="copy(detailInfo.orderSn)" class="admin-button-com default">复制</button>
           </view>
         </view>
-
+        <view v-if="detailInfo.status==1" class="order-info_box">
+          <view>过期时间：</view>
+          <view>{{ detailInfo.deadline.substring(0, 16) }}</view>
+        </view>
         <view v-if="detailInfo.ghsShopAdminId != 0" class="order-info_box">
           <view>商家开单：</view>
           <view>
@@ -56,7 +59,6 @@
           <view>配送时间：</view>
           <view>{{ detailInfo.sendTimeWant }}</view>
         </view>
-
         <view class="order-info_box">
           <view>订单状态：</view>
           <view>{{

hdApp/src/pagesPurchase/wechatPay.vue

@@ -31,7 +31,7 @@
               <button class="button-com pay-wx" :class="[count >miniCount ? 'green':'default']" :disabled="count >miniCount ? false : true" v-if="Number(balance) >0" @click="balancePay">余额支付</button>
             </view>
 
-            <button class="button-com pay-wx" :class="[count >miniCount ? 'green':'default']" :disabled="count >miniCount ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">延期支付</button>
+            <button class="button-com pay-wx" :class="[count >miniCount ? 'green':'default']" :disabled="count >miniCount ? false : true" @click="debtPay" v-if="hasDebtPay === '1'">记欠款</button>
 
           </div>