shish 5 лет назад
Родитель
Сommit
a047e1cb01
2 измененных файлов с 16 добавлено и 19 удалено
  1. 2 2
      hdApp/src/pagesPurchase/orderItem.vue
  2. 14 17
      hdApp/src/pagesPurchase/purDetails.vue

+ 2 - 2
hdApp/src/pagesPurchase/orderItem.vue

@@ -4,11 +4,11 @@
       <view class="title">
         <image
           class="icon"
-          :src="info.supplierAvatar"
+          :src="info.ghsAvatar"
           alt=""
         />
         <text class="name">
-          {{ info.supplierName}}
+          {{ info.ghsName}}
         </text>
       </view>
       <view class="status">{{ getStatusName }} </view>

+ 14 - 17
hdApp/src/pagesPurchase/purDetails.vue

@@ -24,7 +24,7 @@
           <view>{{ detailInfo.updateTime }}</view>
         </view>
         <view class="order-info_box">
-          <view>订单编:</view>
+          <view>订单编:</view>
           <view>{{ detailInfo.orderSn }}</view>
           <view class="price">
             <button
@@ -36,13 +36,20 @@
           </view>
         </view>
         <view class="order-info_box">
-          <view>业务员:</view>
+          <view>采购员:</view>
           <view>{{ detailInfo.adminName }}</view>
         </view>
+
+        <view v-if="detailInfo.ghsShopAdminId != 0" class="order-info_box">
+          <view>商家下单:</view>
+          <view>✔</view>
+        </view>
+
         <view class="order-info_box">
-          <view>进货日期:</view>
-          <view>{{ detailInfo.addTime }}</view>
+          <view>支付方式:</view>
+          <view>{{ detailInfo.payWay }}</view>
         </view>
+
         <view class="order-info_box">
           <view>状态:</view>
           <view>{{
@@ -77,7 +84,7 @@
               <image
                 class="item-icon"
                 :src="s.cover"
-                alt="商品图片"
+                alt=""
               />
 
               <view class="item-info">
@@ -147,8 +154,7 @@
       class="footer_bar"
       v-if="status === '1'"
     >
-      <!-- <view @click="postponePay">延期付</view> -->
-      <view @click="_weixinPay">付款</view>
+      <view v-if="detailInfo.ghsShopAdminId == 0" @click="toPay">付款</view>
     </view>
     <kd-entrance></kd-entrance>
   </view>
@@ -158,7 +164,6 @@
 
 import { purchaseDetail, purchaseClearWxPay, purchaseDebtPay, purchaseWxPay } from "@/api/purchase/index";
 import TuiListCell from "@/components/plugin/list-cell";
-import wexinPay from "@/utils/pay/wxPay";
 export default {
   name: "info",
   components: {
@@ -205,10 +210,6 @@ export default {
       });
     },
     async initData () {
-      // const { orderSn } = this.option;
-      // if (!orderSn) {
-      //   return;
-      // }
       const { data } = await purchaseDetail({ id: this.id });
       console.log('data==>', data)
       this.detailInfo = data;
@@ -217,14 +218,10 @@ export default {
     editFlr () {
 
     },
-    _weixinPay () {
+    toPay () {
       uni.navigateTo({
         url: `/pagesPurchase/wechatPay?type=2&orderSn=${this.detailInfo.orderSn}&actPrice=${this.detailInfo.actPrice}`
       })
-      // purchaseWxPay({ orderSn: this.detailInfo.orderSn }).then(res => {
-      //   console.log(res)
-      //   wexinPay(res.data, this.getSuccess, this.getError)
-      // }).catch(err => { console.log(err) })
     },
     getError () {
       this.$msg("支付失败!");