订单

hdApp/src/admin/order/detail.vue

@@ -5,7 +5,7 @@
         <img :src="`${constant.imgUrl}/retail/order/bg.png`" mode="widthFix" />
       </view>
       <view class="page-top-det">
-        <view> <view class="page-status">{{ orderInfo.status | constantfilter('ORDER_STATUS') }}</view> </view>
+        <view> <view class="page-status">{{orderInfo.status == 1?'待付款':orderInfo.status==2?'待配送':orderInfo.status == 3?'配送中':orderInfo.status ==4?'已完成':orderInfo.status == 5?'已取消':'待付款'}}</view> </view>
       </view>
     </view>
     <view class="page-det">
@@ -59,7 +59,7 @@
       <view class="module-com order-msg">
         <view class="module-tit">
           <text>订单信息</text>
-          <text style="float:right;color: #3385ff;font-weight:normal;" @click.stop="goRefund()">发起退款</text>
+          <text style="float:right;color: #3385ff;font-weight:normal;" v-if="orderInfo.payStatus == 1 && orderInfo.onlinePay == 2" @click.stop="goRefund()">发起退款</text>
         </view>
         <view class="module-det">
           <view class="order-msg-blo">
@@ -71,6 +71,10 @@
               <view class="label">时间：</view>
               <view class="value">{{ orderInfo.addTime ? orderInfo.addTime.substr(5,11) : ''}}</view>
             </view>
+            <view class="msg-list" v-if="orderInfo.status == 1">
+              <view class="label">过期：</view>
+              <view class="value">{{ orderInfo.deadline?orderInfo.deadline:''}}</view>
+            </view>
             <view class="msg-list" v-if="Number(orderInfo.sendCost)>0">
               <view class="label">运费：</view>
               <view class="value">￥{{ orderInfo.sendCost ? parseFloat(orderInfo.sendCost) : 0 }}</view>
@@ -112,6 +116,7 @@ import AppCoupon from "@/components/app-coupon-sel";
 import ModalModule from "@/components/plugin/modal";
 import RateModule from "@/components/plugin/rate";
 import { getDetB} from "@/api/order";
+const commonUtil = require("@/utils/common.js");
 export default {
   name: "detail",
   components: { detailGoods, AppCoupon, ModalModule, RateModule,detailItem },
@@ -137,6 +142,7 @@ export default {
     getDetailInfo() {
       return getDetB({ id: this.option.id }).then(res => {
         this.orderInfo = res.data;
+        this.orderInfo.deadline = commonUtil.getFormatDate(this.orderInfo.deadline,'MM-dd hh:mm')
       });
     }
   }

mallApp/src/pages/callback/index.vue

@@ -36,20 +36,6 @@
             <span class="app-price">{{ payDiscountPrice }}元</span>
           </div>
         </block>
-        <!-- 评价成功 -->
-        <block v-else-if="pageStatus == 4">
-          <div class="app-color-2">谢谢您，我还会继续努力么么哒~</div>
-        </block>
-        <!-- 提交成功 -->
-        <block v-else-if="pageStatus == 6">
-          <div class="call-back-wrap">
-            <div class="qr-code-img">
-              <img :src="merchantInfo.smallWxQrCodeUrl" alt="二维码" mode="widthFix" />
-            </div>
-            <div class="app-color-2">最后一步</div>
-            <div class="app-color-2">识别二维码并关注公众号</div>
-          </div>
-        </block>
 
         <block v-if="pageStatus == 1 || pageStatus == 2">
           <div class="call-one-btn">
@@ -128,7 +114,6 @@ import { mapGetters } from "vuex";
 import ModalModule from "@/components/plugin/modal";
 import AlertModule from "@/components/plugin/alert";
 import wexinPay from "@/utils/pay/wxPay";
-import { getMerchantInfo } from "@/api/common";
 import { getShopUser } from "@/utils/auth";
 import { balancePay, wxPay } from "@/api/order";
 export default {
@@ -150,7 +135,6 @@ export default {
         payPassword: ""
       },
       payCallData: {},
-      merchantInfo: {},
       setPassModal: false,
       totalPrice:0
     };
@@ -171,9 +155,6 @@ export default {
       this.payDiscountType = this.option.payDiscountType;
       this.initClass(this.pageStatus);
       getShopUser(true);
-      getMerchantInfo().then(res => {
-        this.merchantInfo = res.data;
-      });
     },
     // 余额支付
     _balancePay() {