From d78797e4389d2e6127da00a2904fec5aaadfedc0 Mon Sep 17 00:00:00 2001
From: mo-bai <1873032855@qq.com>
Date: Thu, 7 Apr 2022 12:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E4=B8=8B=E5=8D=95=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/commonApi.js                            |  11 +
 pages.json                                   |   8 +
 pages/complete-info/EnterpriseForm.vue       |   2 +-
 pages/enterprise-info-edit/index.vue         | 533 +++++++++++++++++++
 pages/for-comparison/index.vue               |   2 +
 pages/mall/index.vue                         |   7 +-
 pages/mine/index.vue                         |  28 +-
 pages/paper-details/index.vue                |  63 ++-
 static/imgs/enterpriseInfo/location-icon.png | Bin 0 -> 1537 bytes
 9 files changed, 617 insertions(+), 37 deletions(-)
 create mode 100644 pages/enterprise-info-edit/index.vue
 create mode 100644 static/imgs/enterpriseInfo/location-icon.png

diff --git a/apis/commonApi.js b/apis/commonApi.js
index b774cba..03ccc93 100644
--- a/apis/commonApi.js
+++ b/apis/commonApi.js
@@ -241,3 +241,14 @@ export function bindingReceiptCode(data = {}) {
     data: data
   })
 }
+
+/**
+ * 印包客注销账号
+ * @param {object} data
+ */
+export function cancelAccount(data = {}) {
+  return http.post({
+    url: '/uec/logoff',
+    data: data
+  })
+}
diff --git a/pages.json b/pages.json
index f713fab..d8f4d71 100644
--- a/pages.json
+++ b/pages.json
@@ -91,6 +91,14 @@
         "navigationStyle": "custom"
       }
     },
+    {
+      "path": "pages/enterprise-info-edit/index",
+      "style": {
+        "navigationBarTitleText": "企业完善",
+        "enablePullDownRefresh": false,
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/for-comparison/index",
       "style": {
diff --git a/pages/complete-info/EnterpriseForm.vue b/pages/complete-info/EnterpriseForm.vue
index dc03142..32733e6 100644
--- a/pages/complete-info/EnterpriseForm.vue
+++ b/pages/complete-info/EnterpriseForm.vue
@@ -101,8 +101,8 @@
         <text class="text_19">工厂视频(可选)</text>
       </view>
       <view class="video-area" v-if="video.fileUrl">
-        <image class="video__close-icon" @click="clearVideo" src="/static/imgs/general/close-icon.png"></image>
         <video :src="video.fileUrl" class="video"></video>
+        <cover-image class="video__close-icon" @click="clearVideo" src="/static/imgs/general/close-icon.png"></cover-image>
       </view>
       <view v-show="!video.fileUrl" class="flex-col items-center section_4" @click="selectVideo">
         <image src="/static/imgs/general/camera-icon.png" class="image_6" />
diff --git a/pages/enterprise-info-edit/index.vue b/pages/enterprise-info-edit/index.vue
new file mode 100644
index 0000000..6769368
--- /dev/null
+++ b/pages/enterprise-info-edit/index.vue
@@ -0,0 +1,533 @@
+<template>
+  <view class="content">
+    <uni-nav-bar left-icon="back" @clickLeft="back" statusBar fixed title="修改企业信息"></uni-nav-bar>
+    <view>
+      <qn-form-item label="基础信息" type="title"></qn-form-item>
+      <qn-form-item label="企业名称" required>
+        <qn-easyinput :maxlength="20" v-model="form.name" :inputBorder="false" text="right" placeholder="请输入企业名称"></qn-easyinput>
+      </qn-form-item>
+      <qn-form-item label="企业简称">
+        <qn-easyinput :maxlength="20" v-model="form.shortName" :inputBorder="false" text="right" placeholder="请输入企业简称"></qn-easyinput>
+      </qn-form-item>
+      <qn-form-item label="联系人">
+        <qn-easyinput :maxlength="20" v-model="form.contactName" :inputBorder="false" text="right" placeholder="请输入用户名称"></qn-easyinput>
+      </qn-form-item>
+      <qn-form-item label="联系手机">
+        <qn-easyinput
+          :maxlength="11"
+          type="number"
+          v-model="form.contactMobile"
+          :inputBorder="false"
+          text="right"
+          placeholder="请输入用户手机号"
+        ></qn-easyinput>
+      </qn-form-item>
+      <qn-form-item label="担任职务">
+        <qn-easyinput :maxlength="20" v-model="form.contactTitle" :inputBorder="false" text="right" placeholder="请输入用户职务"></qn-easyinput>
+      </qn-form-item>
+      <qn-form-item label="点击定位">
+        <image @click="showLocationList" style="width: 32rpx; height: 32rpx" src="/static/imgs/enterpriseInfo/location-icon.png"></image>
+      </qn-form-item>
+      <qn-form-item label="所在区域" required>
+        <qn-data-picker
+          :readonly="true"
+          text="right"
+          :border="false"
+          class="qn-picker"
+          placeholder="区域"
+          popup-title="请选择城市"
+          :map="{ text: 'name', value: 'id' }"
+          @change="onAreaChange"
+          :clear-icon="true"
+          :localdata="items"
+        >
+          <text v-if="form.locDistrictId">
+            {{ `${form.locProvinceName || ''}/${form.locCityName || ''}/${form.locDistrictName || ''}/${form.locStreetName || ''}` }}
+          </text>
+        </qn-data-picker>
+      </qn-form-item>
+      <qn-form-item label="详细地址" required>
+        <qn-easyinput
+          :maxlength="20"
+          :disabled="true"
+          :styles="{ disableColor: '#fff' }"
+          v-model="form.locDetail"
+          :inputBorder="false"
+          text="right"
+          placeholder="请定位详细地址"
+        ></qn-easyinput>
+      </qn-form-item>
+      <qn-form-item label="工商信息" type="title"></qn-form-item>
+      <qn-form-item label="信用代码" required>
+        <qn-easyinput
+          :maxlength="18"
+          :styles="{ disableColor: '#fff' }"
+          v-model="form.uniformSocialCreditCode"
+          :inputBorder="false"
+          text="right"
+          placeholder="请输入信用代码"
+        ></qn-easyinput>
+      </qn-form-item>
+      <qn-form-item label="法人身份证照片" size="large" required>
+        <view class="upload-area">
+          <image class="idCard" @click="selectedImage('legalPersonIdCardFrontImg')" :src="frontIDCard" />
+          <image class="idCard" @click="selectedImage('legalPersonIdCardBackImg')" :src="backIDCard" />
+        </view>
+      </qn-form-item>
+      <qn-form-item label="法人/实控人" required>
+        <qn-easyinput
+          :maxlength="20"
+          :styles="{ disableColor: '#fff' }"
+          v-model="form.legalPersonName"
+          :inputBorder="false"
+          text="right"
+          placeholder="请输入法人/实控人"
+        ></qn-easyinput>
+      </qn-form-item>
+      <qn-form-item label="法人/实控人手机" required>
+        <qn-easyinput
+          :maxlength="11"
+          type="number"
+          :styles="{ disableColor: '#fff' }"
+          v-model="form.legalPersonMobile"
+          :inputBorder="false"
+          text="right"
+          placeholder="请输入法人/实控人手机"
+        ></qn-easyinput>
+      </qn-form-item>
+      <qn-form-item label="法人/实控人身份证号" required>
+        <qn-easyinput
+          :maxlength="18"
+          :styles="{ disableColor: '#fff' }"
+          v-model="form.legalPersonIdCardNo"
+          :inputBorder="false"
+          text="right"
+          placeholder="请输入身份证号"
+        ></qn-easyinput>
+      </qn-form-item>
+      <qn-form-item label="营业执照" required>
+        <text v-if="!form.businessLicenseImg" @click="selectedImage('businessLicenseImg')" :style="`font-size: 28rpx; color: #007aff`">点击上传</text>
+        <text v-if="form.businessLicenseImg" @click="selectedImage('businessLicenseImg')" :style="`font-size: 28rpx;margin-right: 16rpx; color: #F5222D`">
+          重新上传
+        </text>
+        <text v-if="form.businessLicenseImg" @click="showImage()" style="font-size: 28rpx; color: #007aff">预览</text>
+      </qn-form-item>
+      <qn-form-item label="注册资本(万)" required>
+        <qn-easyinput
+          type="digit"
+          maxlength="10"
+          :styles="{ disableColor: '#fff' }"
+          v-model="form.registeredCapital"
+          :inputBorder="false"
+          text="right"
+          placeholder="请输入注册资本"
+        ></qn-easyinput>
+      </qn-form-item>
+      <qn-form-item label="成立日期" required>
+        <qn-datetime-picker v-model="form.foundDate" type="date" :border="false"></qn-datetime-picker>
+      </qn-form-item>
+    </view>
+    <uni-popup ref="locationPopup" type="bottom">
+      <view class="popup_modal">
+        <slot name="title">
+          <view class="popup_modal-title">可选择以下定位公司</view>
+        </slot>
+        <scroll-view scroll-y="true" class="popup_modal-scroll">
+          <view @click="selectLocation(item)" style="height: 100rpx" class="popup_modal-scroll-item" v-for="(item, index) in locationList" :key="index">
+            <view class="location-item">
+              <text class="title">{{ item.enterpriseName }}</text>
+              <text class="address">{{ `${item.provinceName}/${item.cityName}/${item.districtName}/${item.address}` }}</text>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </uni-popup>
+    <qn-footer fixed height="120rpx">
+      <view class="button-area">
+        <view class="button button__cancel" @click="cancel">
+          <text class="text">取消</text>
+        </view>
+        <view class="button button__submit" @click="saveInfo">
+          <text class="text" style="color: white">保存信息</text>
+        </view>
+      </view>
+    </qn-footer>
+  </view>
+</template>
+
+<script>
+import { back, uploadImage } from '@/utils/hook.js'
+import { getArea, getLicenseOcr, getFrontIdCardOcr } from '@/apis/commonApi.js'
+import { completeInfo, getCompanyInfoById, getCompanyLocationList } from '@/apis/enterpriseInfoApi.js'
+const validateFields = [
+  { field: 'name', label: '企业名称' },
+  { field: 'uniformSocialCreditCode', label: '信用代码' },
+  { field: 'legalPersonName', label: '法人姓名' },
+  { field: 'locProvinceId', label: '所在省' },
+  { field: 'locCityId', label: '所在市' },
+  { field: 'locDistrictId', label: '所在区' },
+  { field: 'locDetail', label: '企业详细地址' },
+  { field: 'legalPersonIdCardNo', label: '法人身份证号' },
+  { field: 'legalPersonMobile', label: '法人手机号' },
+  { field: 'legalPersonIdCardFrontImg', label: '法人正面照片' },
+  { field: 'legalPersonIdCardBackImg', label: '法人反面照片' },
+  { field: 'businessLicenseImg', label: '营业执照' },
+  { field: 'registeredCapital', label: '注册资本' },
+  { field: 'foundDate', label: '成立日期' }
+]
+export default {
+  data() {
+    return {
+      operation: 'add',
+      form: {
+        id: null,
+        name: null,
+        shortName: null,
+        contactName: null,
+        contactMobile: null,
+        contactTitle: null,
+        uniformSocialCreditCode: null,
+        locProvinceId: null,
+        locCityId: null,
+        locDistrictId: null,
+        locStreetId: null,
+        locProvinceName: null,
+        locCityName: null,
+        locDistrictName: null,
+        locStreetName: null,
+        locDetail: null,
+        regAddrLongitude: null,
+        regAddrLatitude: null,
+        legalPersonName: null,
+        legalPersonMobile: null,
+        legalPersonIdCardNo: null,
+        legalPersonIdCardFrontImg: null,
+        legalPersonIdCardBackImg: null,
+        businessLicenseImg: null,
+        registeredCapital: null,
+        foundDate: null
+      },
+      searchList: [],
+      locationList: [],
+      items: []
+    }
+  },
+  mounted() {
+    getArea().then((res) => {
+      if (res) {
+        this.items = res
+      }
+    })
+  },
+  created() {
+    const enterpriseId = this.$store.state.companyInfo.id
+    if (enterpriseId) {
+      getCompanyInfoById(enterpriseId).then((res) => {
+        if (res) {
+          this.form = res
+          this.form.id = enterpriseId
+        }
+      })
+    }
+  },
+  methods: {
+    back,
+    cancel() {
+      back()
+    },
+    showLocationList() {
+      if (!this.form.name || !this.form.name.trim()) {
+        uni.showToast({
+          title: '请先填写公司名称',
+          icon: 'none'
+        })
+        return
+      }
+      getCompanyLocationList({ enterpriseName: this.form.name }).then((res) => {
+        if (res && res.length > 0) {
+          this.locationList = res
+          this.$refs.locationPopup.open('bottom')
+        } else {
+          uni.showToast({
+            title: '暂无定位公司',
+            icon: 'error'
+          })
+        }
+      })
+    },
+    selectLocation(location) {
+      this.form.locProvinceId = location.provinceCode
+      this.form.locCityId = location.cityCode
+      this.form.locDistrictId = location.districtCode
+      this.form.locProvinceName = location.provinceName
+      this.form.locCityName = location.cityName
+      this.form.locDistrictName = location.districtName
+      this.form.locDetail = location.address
+      this.form.regAddrLongitude = location.longitude
+      this.form.regAddrLatitude = location.latitude
+      this.$refs.locationPopup.close()
+    },
+    onAreaChange(e) {
+      if (e.detail.value && e.detail.value.length > 0) {
+        const [province, city, district, street] = e.detail.value
+        this.form.locProvinceId = province.value
+        this.form.locProvinceName = province.text
+        this.form.locCityId = city.value
+        this.form.locCityName = city.text
+        this.form.locDistrictId = district.value
+        this.form.locDistrictName = district.text
+        this.form.locStreetId = street.value
+        this.form.locStreetName = street.text
+      } else {
+        this.form.locProvinceId = null
+        this.form.locProvinceName = null
+        this.form.locCityId = null
+        this.form.locCityName = null
+        this.form.locDistrictId = null
+        this.form.locDistrictName = null
+        this.form.locStreetId = null
+        this.form.locStreetName = null
+      }
+    },
+    selectedImage(type) {
+      uploadImage()
+        .then((urls) => {
+          if (urls) {
+            this.form[type] = urls[0]
+            // 营业执照OCR
+            if (type == 'businessLicenseImg') {
+              this.licenseOcr(urls[0])
+            }
+            if (type == 'legalPersonIdCardFrontImg') {
+              this.idCardFrontOcr(urls[0])
+            }
+          }
+        })
+        .catch((e) => {
+          uni.showToast({
+            title: '上传失败',
+            icon: 'fail'
+          })
+        })
+    },
+    // 营业执照OCR
+    licenseOcr(url) {
+      getLicenseOcr({ photoUrl: url }).then((res) => {
+        if (res) {
+          this.form.uniformSocialCreditCode = res.regNum
+          this.form.name = res.company
+          this.form.legalPersonName = res.legalPerson
+          const foundDateArr = res.establishDate.split(/[年月日]/)
+          this.form.foundDate = foundDateArr[0] + '-' + foundDateArr[1] + '-' + foundDateArr[2]
+          this.form.registeredCapital = /\d+/.exec(res.capital)[0]
+        }
+      })
+    },
+    idCardFrontOcr(url) {
+      getFrontIdCardOcr({ image: url }).then((res) => {
+        if (res && res.success) {
+          this.form.legalPersonIdCardNo = res.num
+          this.form.legalPersonName = res.name
+        }
+      })
+    },
+    showImage() {
+      uni.previewImage({
+        urls: [this.form.businessLicenseImg]
+      })
+    },
+    saveInfo() {
+      if (!this.form.id) {
+        for (let validateField of validateFields) {
+          if (this.form[validateField.field] === null || this.form[validateField.field] === '') {
+            uni.showToast({
+              title: `${validateField.label}不能为空`,
+              icon: 'none'
+            })
+            return
+          }
+        }
+        if (!/^1[3456789]\d{9}$/.test(this.form['legalPersonMobile'])) {
+          uni.showToast({
+            title: '请输入正确法人手机号',
+            icon: 'none'
+          })
+          return
+        }
+      }
+      if (this.form.contactMobile && !/^1[3456789]\d{9}$/.test(this.form['contactMobile'])) {
+        uni.showToast({
+          title: '请输入正确联系人手机号',
+          icon: 'none'
+        })
+        return
+      }
+      completeInfo(this.form).then((res) => {
+        if (res) {
+          uni.showToast({
+            title: '添加成功',
+            icon: 'success'
+          })
+          setTimeout(() => {
+            back()
+          }, 1000)
+        }
+      })
+    }
+  },
+  computed: {
+    frontIDCard() {
+      let url = 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/frontIDCard.png'
+      if (!this.form.legalPersonIdCardFrontImg) {
+        return url
+      }
+      return this.form.legalPersonIdCardFrontImg
+    },
+    backIDCard() {
+      let url = 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/backDCard.png'
+      if (!this.form.legalPersonIdCardBackImg) {
+        return url
+      }
+      return this.form.legalPersonIdCardBackImg
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.content {
+  width: 750rpx;
+  display: flex;
+  flex-direction: column;
+  background-color: #f7f8fa;
+}
+.qn-form-item {
+  width: 750rpx;
+  padding: 0rpx 32rpx;
+  background-color: #fff;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
+  min-height: 80rpx;
+  .label {
+    flex-grow: 0;
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+    margin-right: 20rpx;
+    .label__text {
+      font-size: 28rpx;
+      color: #000000;
+    }
+  }
+  .value {
+    flex-grow: 1;
+    flex-shrink: 1;
+    text-align: right;
+  }
+}
+.qn-form-item__title {
+  background-color: #f7f8fa;
+  padding: 20rpx 32rpx;
+  border: none;
+  .title {
+    font-size: 30rpx;
+    color: #888888;
+  }
+}
+.popup_modal {
+  width: 750rpx;
+  height: 600rpx;
+  background-color: #fff;
+  border-radius: 10px 10px 0 0;
+  .popup_modal-title {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    width: 750rpx;
+    height: 88rpx;
+    font-weight: 600;
+    border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
+  }
+  .popup_modal-scroll {
+    width: 750rpx;
+    height: 600rpx;
+    .popup_modal-scroll-item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: flex-start;
+      width: 750rpx;
+      height: 88rpx;
+      padding: 0rpx 32rpx;
+      border-bottom: 2rpx solid rgba(221, 221, 221, 0.5);
+    }
+  }
+}
+.upload-area {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 10rpx;
+  margin-bottom: 24rpx;
+  .idCard {
+    width: 324rpx;
+    height: 280rpx;
+    flex-grow: 0;
+    flex-shrink: 0;
+  }
+}
+.button-area {
+  width: 750rpx;
+  padding: 0 32rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  .button {
+    flex-grow: 0;
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 10rpx;
+    .text {
+      font-size: 30rpx;
+      font-weight: 500;
+      text-align: center;
+    }
+  }
+  .button__cancel {
+    width: 270rpx;
+    height: 88rpx;
+    border: 2rpx solid #979797;
+  }
+  .button__submit {
+    width: 400rpx;
+    height: 88rpx;
+    background: #007aff;
+  }
+}
+.location-item {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+  .title {
+    font-size: 32rpx;
+    color: #000000;
+    margin-bottom: 10rpx;
+  }
+  .address {
+    font-size: 24rpx;
+    color: #888888;
+    word-break: break-all;
+  }
+}
+</style>
diff --git a/pages/for-comparison/index.vue b/pages/for-comparison/index.vue
index 9f128a3..cd78b95 100644
--- a/pages/for-comparison/index.vue
+++ b/pages/for-comparison/index.vue
@@ -92,6 +92,7 @@
         <view class="label"><text class="label__text">交货时间</text></view>
         <view class="value">
           <qn-datetime-picker
+            :start="startTimeStamp"
             v-model="form.deliveryDay"
             type="datetime"
             :border="false"
@@ -155,6 +156,7 @@ const validateFields = ['categoryName', 'brandName', 'paperName', 'gramWeight',
 export default {
   data() {
     return {
+      startTimeStamp: new Date().getTime(),
       paperIndex: 0,
       categoryNameList: [],
       brandNameList: [],
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 68c7cd1..52a8994 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -30,12 +30,7 @@
             </view>
           </view>
           <view class="bottom-group_1 flex-row">
-            <view
-              class="paper-group flex-col"
-              v-for="paper in item.skuList"
-              :key="paper.productSkuId"
-              @click="go2('paper-details', { paperId: paper.productSkuId })"
-            >
+            <view class="paper-group flex-col" v-for="paper in item.skuList" :key="paper.productId" @click="go2('paper-details', { paperId: paper.productId })">
               <view class="top-group flex-col items-center">
                 <image :src="paper.litPicUrl || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'" class="image_4" />
                 <view class="flex-col text-wrapper">
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 1d199a3..60bb2f5 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -19,11 +19,8 @@
               <image v-if="userInfo.fddEnterpriseStatus === fddStatus.CERTIFIED_SUCCESS" class="image" src="/static/imgs/mine/certified-icon.png"></image>
               <image v-else class="image" @click="certifyCompany()" src="/static/imgs/mine/non-certified-icon.png"></image>
             </view>
-            <view style="margin-top: 16rpx">
-              <text
-                style="font-size: 26rpx; color: #fff; font-weight: 400; word-break: break-all"
-                @click="loginGo2(hasCompany ? 'enterprise-info-edit' : 'enterprise-info')"
-              >
+            <view style="margin-top: 16rpx; width: 380rpx">
+              <text style="font-size: 26rpx; color: #fff; font-weight: 400; word-break: break-all" @click="jumpEnterpriseEdit">
                 {{ hasCompany ? userInfo.companyName : '点击完善企业信息' }}
               </text>
             </view>
@@ -114,8 +111,8 @@
 
 <script>
 import { exit, go2, loginGo2 } from '@/utils/hook.js'
-import { fddEnterpriseStatus, fsAuditStatus, orderStatusEnum, VIP_URL, QN_APPID } from '@/enums/index.js'
-import { getVerifyUrl, getFsCredit, getBaseInfo, getFeisuanUrl } from '@/apis/commonApi.js'
+import { fddEnterpriseStatus, fsAuditStatus, orderStatusEnum, enterpriseType } from '@/enums/index.js'
+import { getVerifyUrl, getFsCredit, getBaseInfo, getFeisuanUrl, cancelAccount } from '@/apis/commonApi.js'
 
 export default {
   data() {
@@ -144,7 +141,11 @@ export default {
         cancelText: '取消',
         success: (res) => {
           if (res.confirm) {
-            this.logout()
+            cancelAccount().then((res) => {
+              if (res) {
+                this.logout()
+              }
+            })
           }
         }
       })
@@ -195,8 +196,16 @@ export default {
           // #endif
         }
       })
+    },
+    jumpEnterpriseEdit() {
+      if (!this.hasCompany) {
+        loginGo2('enterprise-info')
+      } else {
+        if (this.$store.state.companyInfo.enterpriseType === enterpriseType.PRINT_PACKAGE_FACTORY) {
+          loginGo2('enterprise-info-edit')
+        }
+      }
     }
-    // 获取纸盘商订单统计
   },
   computed: {
     vipExpireTime() {
@@ -281,6 +290,7 @@ export default {
     align-items: center;
     justify-content: space-between;
     .user {
+      max-width: 550rpx;
       z-index: 5;
       display: flex;
       flex-direction: row;
diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue
index 31d6cf0..844a060 100644
--- a/pages/paper-details/index.vue
+++ b/pages/paper-details/index.vue
@@ -140,8 +140,9 @@
 import { go2, back } from '@/utils/hook.js'
 import { getPaperDetail, createGoodsReserve, createShoppingCar } from '@/apis/paperDetailsApi.js'
 import { round } from '@/utils/index.js'
-import { fddEnterpriseStatus, paperUnitMap } from '@/enums/index.js'
+import { fddEnterpriseStatus, paperUnitMap, enterpriseType } from '@/enums/index.js'
 import { getVerifyUrl } from '@/apis/commonApi.js'
+import { getCompanyInfoById } from '@/apis/enterpriseInfoApi.js'
 const validateFields = [
   {
     value: 'length',
@@ -213,6 +214,9 @@ export default {
       shoppingCarType: 1, // 1：加购物车 2：订购
       info: {
         skuList: [{}]
+      },
+      companyInfo: {
+        legalPersonIdCardNo: null
       }
     }
   },
@@ -226,6 +230,12 @@ export default {
       this.params.productId = option.paperId
       if (this.hasLogin) {
         this.queryData()
+        // 获取企业信息
+        getCompanyInfoById({ enterpriseId: this.$store.state.companyInfo.id }).then((res) => {
+          if (res) {
+            this.companyInfo = res
+          }
+        })
       } else {
         this.$store.commit('setNextPage', { name: 'paper-details', data: { paperId: option.paperId } })
         go2('login', {}, true)
@@ -246,8 +256,18 @@ export default {
       num = round(this.buyPaperDto.gramWeight * this.buyPaperDto.width * this.buyPaperDto.length * this.buyPaperDto.pieceQuantity * 1e-12, 4)
       return num
     },
-    hasCompany() {
-      return this.$store.state.companyInfo.id != null
+    // 工厂是否完善企业信息
+    hasComplete() {
+      let type = this.$store.state.companyInfo.enterpriseType
+      // 个人用户
+      if (type == enterpriseType.PERSONAL) {
+        return true
+      }
+      // 工厂用户
+      if (type == enterpriseType.PRINT_PACKAGE_FACTORY) {
+        return this.companyInfo.legalPersonIdCardNo ? true : false
+      }
+      return true
     },
     hasLogin() {
       return this.$store.state.qnToken != ''
@@ -279,18 +299,11 @@ export default {
     shoppingCartTap() {
       go2('cart')
     },
-    // 立即订购
+    // 1:加购物车  2:立即订购
     addShoppingTap(type) {
-      if (!this.hasCompany) {
-        uni.showModal({
-          title: '提示',
-          content: '请先完善公司信息',
-          success: (res) => {
-            if (res.confirm) {
-              go2('enterprise-info')
-            }
-          }
-        })
+      if (!this.hasComplete) {
+        this.jumpEnterpriseEdit()
+
         return
       }
       if (this.$store.state.companyInfo.fddEnterpriseStatus != fddEnterpriseStatus.CERTIFIED_SUCCESS) {
@@ -331,18 +344,26 @@ export default {
       }
       this.$refs.popup.open('bottom')
     },
-
-    // 路由到实单询比价
+    // 路实单询比价
     inquiryTap() {
-      if (!this.hasCompany) {
-        uni.showToast({
-          title: '请先完善公司信息',
-          icon: 'none'
-        })
+      if (!this.hasComplete) {
+        this.jumpEnterpriseEdit()
         return
       }
       go2('for-comparison', { id: this.info.supplierId, productImg: this.info.imgList[0] })
     },
+    // 完善企业信息提示
+    jumpEnterpriseEdit() {
+      uni.showModal({
+        title: '提示',
+        content: '请先完善公司信息',
+        success: (res) => {
+          if (res.confirm) {
+            go2('enterprise-info-edit')
+          }
+        }
+      })
+    },
     closeTap() {
       this.$refs.popup.close()
     },
diff --git a/static/imgs/enterpriseInfo/location-icon.png b/static/imgs/enterpriseInfo/location-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5184a40173c679a06ed94c5eaac86cb9f9579884
GIT binary patch
literal 1537
zcmV+c2LAbpP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$^Ye_^wR9FecS8Hq(RTMtwZXdf-
zc~lfkeWb)_#2;cbqLGkbNJJ14XuCWl5Hyij2nMAOG5Q0<bPH;E_<&z36eHV35l}P+
z(L^IYF(zsxib13JtRg$p*Ua&|)4kK#?X<2);w0VkopZl)?wNDXy>m<SKR<jn^Cvet
zW5uJJg`|o|MiBAOkSB+gSx25(&42uxm_;X$+#@mXo6ft4y_F(#P4pz(ODu23SZzo*
zB;JbV<XekMAlcG=tt&mdNoZWY``{WA?<*gkxO4Xk?iief+6^_R$7)mASt8tq5?cY6
z`3ELBAjDrO=09N{Eh5)LPKB&6JZ3&ltZvUV#E%<Wp&T-SnihK^dvq9UUFJJ7f2WA=
zPdCJOBe)a>OFkjzd4JjUc&`Td#B)Ah$4V0u()aT3g?z0Kn!uuMGU`m${v2f=?Gu^b
zQHjLt^eX-(Dp1&#OxY7$k(Xf`)8|XCW*RG|hdBl-0}5sKjPrn*9BF<LPb8)nGr5kF
zZnWNKrWvS`qjfaxv}8-?Z5kIokqPLx7p4_H8KsWJXkptbK3(WMl#Vz4kc8J6jw{|n
z28U&20@-Zm45VGIiCCk3=`|G}g`G5()s&E>v`CiFT3Jq$@RkFXQ<cRx!}@E^_on1y
z_Qi#9A`?LPX@-bad%<8MWf}S+OUJN8&%(BWTzZ?9(e}b5(0F<Y_WOR=N?tEdH8G5g
zPC%&I5K7AVJ%a-&^a${kfv$nj-B`4lc{V8Mg}`6Lt1cXmPJrnmLv$tnlfi)$niSwL
zaA|T_)mRCgGB&JH5ZBlu6Tlv}4S{;PE(>r!_^}^`5Yvf}=0hPhEU*dp$ITfd6F}jD
zlglNU5CrH4t^F{E7;joeFBaN84pmD@5ZCY`6Hp|t83K00k^tub@1U1R(R`?%q02k)
zw;w%l3vZ?G!`x&uzLet4HMSCp9WvO+0b558EPh-@p6+%|VsgKHG3F!=mv-Y+tgKDh
z&G<Gn_VM}f-X?2Gp>Jdb^fw(<*k;JC(8fESluDx)BlU5NZF!&Jsu-^~I4mO*(1i0x
zS`VWazU?DRb=PTU?~?6O+NTfwJHJ)NxI`K3%@WPTk-W3LK5-<<YtRICEM*&m3*g+N
z9kDYe|JGsehzb(6E!ZN%yF2ZJSiVcN9sVcEhb8U_bHaGg1T?9=$$A$zoYlqw-`~Y`
zDSMOA3#FdC({Ww_Pu~sjuw7D8GJB{?Nn{iDIrsn8G-o$JTWc)L>S;ALzA`<BQR%)X
zxkWB?9s3YUb)B~0M%2wp&1`Rozn-H+ilP$Gp0&+(E0!TBC63qwma^vUtmka)rmm~R
zbq}EImus$`T*YW!y51UaF6i;_Q*;8_sV0?Ohc|pM6yQ@*s+Bzt$<YXH$C_tRp_+es
za}#4g0{Zaq*vTN^IF7}pWY&~_X~<gEHfNXP%e%#Ncz6s|IYo+RW$LY?#*TA<>sp-W
zu_bR*N-Zr+Y(Nvb<gAC&6qK_{Jg?3KGBVRt@f63@G-TdkY+6G9Bu;!ocyeu@lj^(_
z@o*YSwI^<y?iFn}PhJ9ZQ(faQu-qTiHzAS82FldO-zY8R@tAfixCe1FZc=5|#I{B&
z?<m%B(oKnz$nIl5rqBhR<81bE?k8^v^cM3({L>4Kv@6qOEew;-7SDaOdwg$i?+2(v
zDSE`URH6#ai~pvG{FBNA#yW*A88RAY`EzFMzer4u-X(pTu0j&AtT<Ny4@>~YBlz=g
zHE_5UeE{{`KB(*&ixbC8)Vv-TRhig|674aA=UQUD@n4jx(`Sc?o!0}#=-*y@)YV2m
nCsM?ztc)MUH^%?An3#V9^TXeh{9a+}00000NkvXXu0mjf%aXiO

literal 0
HcmV?d00001