From 017eba343132c7ff7ec8aea6dd6e2954c797170b Mon Sep 17 00:00:00 2001
From: dengxiongfei <dengxiongfei@qniao.cn>
Date: Thu, 27 Jan 2022 17:58:51 +0800
Subject: [PATCH] bug

---
 pages/enquiry-list/index.vue   | 10 +++++++++-
 pages/for-comparison/index.vue | 20 ++++++++++++--------
 pages/mine/index.vue           | 10 ++++++++--
 pages/order-make/index.vue     |  4 ++++
 pages/paper-details/index.vue  | 11 ++++++++---
 5 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/pages/enquiry-list/index.vue b/pages/enquiry-list/index.vue
index c1262fd..3a603dd 100644
--- a/pages/enquiry-list/index.vue
+++ b/pages/enquiry-list/index.vue
@@ -164,11 +164,19 @@ export default {
     },
     // 确认下单
     placeOrderTap(item, replyItemList) {
+      let supplierOtherFee = replyItemList.map((item) => {
+        return {
+          mallSupplierId: item.mallSupplierId,
+          otherFee: item.otherFee
+        }
+      })
+
       const params = {
         enquiryId: item.id,
         orderGoodsList: replyItemList,
         purchaserEnterpriseId: this.$store.state.companyInfo.id,
-        userId: this.$store.state.userInfo.userId
+        userId: this.$store.state.userInfo.userId,
+        supplierOtherFee
       }
       createByEnquiry(params).then((res) => {
         if (res) {
diff --git a/pages/for-comparison/index.vue b/pages/for-comparison/index.vue
index f9e9007..355e10c 100644
--- a/pages/for-comparison/index.vue
+++ b/pages/for-comparison/index.vue
@@ -92,7 +92,13 @@
       <view class="qn-form-item qn-form-item">
         <view class="label"><text class="label__text">交货时间</text></view>
         <view class="value">
-			 <qn-datetime-picker v-model="form.deliveryDay" type="datetime" :border="false" placeholder="交货时间"></qn-datetime-picker>
+          <qn-datetime-picker
+            v-model="form.deliveryDay"
+            type="datetime"
+            :border="false"
+            placeholder="交货时间"
+            @change="deliveryTimeChange"
+          ></qn-datetime-picker>
           <!-- <picker :value="paperIndex" :range="deliveryTimeList" @change="deliveryTimeChange">
             <view>
               <text class="uni-input">{{ form.deliveryDay }}</text>
@@ -283,13 +289,11 @@ export default {
       this.form.length = item.length
     },
     // 交货时间
-    deliveryTimeChange(e) {
-      this.form.deliveryDayIndex = e.target.value
-      // 0 当天 1明天
-      if (this.form.deliveryDayIndex == 0) {
-        this.form.deliveryDay = this.getDay(0, 3600000)
-      } else {
-        this.form.deliveryDay = this.getDay(1, 3600000)
+    deliveryTimeChange(datetime) {
+      if (datetime.length == 11) {
+        this.$nextTick(() => {
+          this.form.deliveryDay = datetime + '23:59:59'
+        })
       }
     },
     onAreaChange(e) {
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index cb3c815..4bd08e0 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -21,8 +21,11 @@
                 <image v-else class="image" @click="certifyCompany()" src="/static/imgs/mine/non-certified-icon.png"></image>
               </view>
               <view style="margin-top: 10rpx">
-                <text style="font-size: 26rpx; color: #fff; font-weight: 400; word-break: break-all">
-                  {{ userInfo.companyName }}
+                <text
+                  style="font-size: 26rpx; color: #fff; font-weight: 400; word-break: break-all"
+                  @click="loginGo2('enterprise-info', { operation: 'edit' })"
+                >
+                  {{ hasCompany ? userInfo.companyName : '点击完善企业信息' }}
                 </text>
               </view>
             </view>
@@ -203,6 +206,9 @@ export default {
         companyName: this.$store.state.companyInfo.name || '',
         fddEnterpriseStatus: this.$store.state.companyInfo.fddEnterpriseStatus || 1
       }
+    },
+    hasCompany() {
+      return this.$store.state.companyInfo.id != null
     }
   },
   onShow() {
diff --git a/pages/order-make/index.vue b/pages/order-make/index.vue
index 8063572..b11a892 100644
--- a/pages/order-make/index.vue
+++ b/pages/order-make/index.vue
@@ -56,6 +56,10 @@
             <text>小计(元):</text>
             <text>{{ order.subtotal }}</text>
           </view>
+          <view class="order-row">
+            <text>其他费用(元):</text>
+            <text>{{ item.otherFee }}</text>
+          </view>
           <view class="order-row">
             <qn-easyinput
               style="background-color: #f7f8fa; border-radius: 10rpx; padding: 8rpx 0rpx; font-size: 28rpx; color: #888888; height: 88rpx"
diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue
index abddf95..3bb9137 100644
--- a/pages/paper-details/index.vue
+++ b/pages/paper-details/index.vue
@@ -288,9 +288,14 @@ export default {
     // 立即订购
     addShoppingTap(type) {
       if (!this.hasCompany) {
-        uni.showToast({
-          title: '请先完善公司信息',
-          icon: 'none'
+        uni.showModal({
+          title: '提示',
+          content: '请先完善公司信息',
+          success: (res) => {
+            if (res.confirm) {
+              go2('enterprise-info')
+            }
+          }
         })
         return
       }