From 4c0e457f0f178df76bda8e0c85f3f51e6eccfce0 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Thu, 30 Nov 2023 22:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=91=E4=B9=85=E4=BF=A1?=
 =?UTF-8?q?=E5=AD=A6=E5=A0=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/enquiry/list.vue | 89 ++++++++++++++++++++++++++----------------
 1 file changed, 56 insertions(+), 33 deletions(-)

diff --git a/pages/enquiry/list.vue b/pages/enquiry/list.vue
index bfcbf5b..42bfa63 100644
--- a/pages/enquiry/list.vue
+++ b/pages/enquiry/list.vue
@@ -15,7 +15,7 @@
             <el-carousel height="170px">
                 <el-carousel-item v-for="item in 4" :key="item">
                     <image class="carousel-img"
-                           src="http://jyx.gxwebsoft.com/uploads/20210506/600fc93e6b85324b3ea1373ee264290d.jpg"
+                           src="/static/images/20210506/600fc93e6b85324b3ea1373ee264290d.jpg"
                            mode="aspectFill"></image>
                 </el-carousel-item>
             </el-carousel>
@@ -66,8 +66,8 @@
                                 {{ item.name }}
                             </text>
                         </template>
-<!--                        <text @click="showAllTexture = !showAllTexture" class="pointer mr-25" >查看更多-->
-<!--                        </text>-->
+                        <!--                        <text @click="showAllTexture = !showAllTexture" class="pointer mr-25" >查看更多-->
+                        <!--                        </text>-->
                     </view>
                 </el-form-item>
                 <el-form-item label="材质:" class="border-bottom pb-30">
@@ -82,7 +82,8 @@
                                 {{ item.name }}
                             </text>
                         </view>
-                        <text @click="showAllTexture = !showAllTexture" class="pointer mr-25" v-if="attributes.length > 10">查看更多
+                        <text @click="showAllTexture = !showAllTexture" class="pointer mr-25"
+                              v-if="attributes.length > 10">查看更多
                         </text>
                     </view>
                 </el-form-item>
@@ -98,7 +99,8 @@
                                 {{ item.name }}
                             </text>
                         </view>
-                        <text @click="showAllCompany = !showAllCompany" class="pointer mr-25" v-if="companyList.length > 10">查看更多
+                        <text @click="showAllCompany = !showAllCompany" class="pointer mr-25"
+                              v-if="companyList.length > 10">查看更多
                         </text>
                     </view>
                 </el-form-item>
@@ -124,6 +126,8 @@
 
 <script>
 import provinces from "@/uni_modules/vk-uview-ui/libs/address/provinces.json";
+import citys from "@/uni_modules/vk-uview-ui/libs/address/citys.json";
+import areas from "@/uni_modules/vk-uview-ui/libs/address/areas.json";
 
 export default {
     data() {
@@ -136,6 +140,8 @@ export default {
             showAllTexture: false,
             showAllCompany: false,
             provinceData: provinces,
+            cityData: citys,
+            areaData: areas,
             checkCategoryList: [],
             checkTextureList: [],
             checkCompanyList: [],
@@ -179,9 +185,8 @@ export default {
                         key: "productList",
                         title: "品名/材质",
                         type: "text",
-                        width: 280,
                         formatter: (val, row, column, index) => {
-                            console.log(val)
+                            // console.log(val)
                             return val.map(item => item.goodsName).join("/")
                         }
                     },
@@ -189,7 +194,6 @@ export default {
                         key: "productList",
                         title: "采购量",
                         type: "text",
-                        width: 280,
                         formatter: (val, row, column, index) => {
                             return val.map(item => item.procureNumber + item.procureUnit).join("/")
                         }
@@ -198,41 +202,58 @@ export default {
                         key: "productList",
                         title: "收货地",
                         type: "text",
-                        minWidth: 200,
                         formatter: (val, row, column, index) => {
-                            let str = ""
-                            try {
-                                str = val.map(item => {
-                                    const addressStr = item.address.region.province.name + "-" + item.address.region.city.name + "-" + item.address.region.area.name
-                                    return addressStr
-                                }).join("/")
-                            } catch (err) {
-                                str = ""
+                            let str = ''
+                            if (val.length > 0 && val[0].addressRegion.length > 0) {
+                                let provinceIndex = 0, cityIndex = 0, areaIndex = 0
+                                this.provinceData.forEach((item, index) => {
+                                    if (parseInt(val[0].addressRegion[0]) === parseInt(item.code)) {
+                                        provinceIndex = index
+                                        str = item.name
+                                    }
+                                })
+                                this.cityData[provinceIndex].forEach((item, index) => {
+                                    if (parseInt(val[0].addressRegion[1]) === parseInt(item.code)) {
+                                        cityIndex = index
+                                        str += item.name
+                                    }
+                                })
+                                this.areaData[provinceIndex][cityIndex].forEach((item, index) => {
+                                    if (parseInt(val[0].addressRegion[2]) === parseInt(item.code)) {
+                                        areaIndex = index
+                                        str += item.name
+                                    }
+                                })
+                                str += val[0].addressDetail
                             }
-
                             return str
                         }
                     },
                     {
                         key: "user",
-                        title: "采购单位",
+                        title: "采购企业",
                         type: "text",
-                        width: 280,
                         formatter: (val, row, column, index) => {
-                            if (val.accountType == 1) {
+                            if (val.accountType === 1) {
                                 return val.person.personName
                             } else {
                                 return val.company.companyName
                             }
                         }
-
                     },
-                    // {
-                    // 	key: "_add_time",
-                    // 	title: "添加时间",
-                    // 	type: "time",
-                    // 	width: 160
-                    // },
+                    {
+                        key: "",
+                        title: "报价情况",
+                        type: "text",
+                        formatter: (val, row, column, index) => {
+                            return `${val.quoteNum}家已报价`
+                        }
+                    },
+                    {
+                        key: "_add_time",
+                        title: "发布时间",
+                        type: "time",
+                    },
 
                 ],
                 // 多选框选中的值
@@ -293,9 +314,11 @@ export default {
                 url: '/pages/enquiry/my'
             })
         },
-        toRelease() {
-
-            if (!vk.getVuex('$user.userInfo.fadadaConfirm')) {
+        async toRelease() {
+            const {userInfo} = await vk.callFunction({
+                url: 'user/kh/getMyUserInfo'
+            })
+            if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) {
                 this.$confirm('您尚未认证, 是否前往认证?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
@@ -303,7 +326,7 @@ export default {
                 }).then(() => {
                     this.getCertUrl()
                 })
-            } else if (vk.pubfn.isNull(vk.getVuex('$user.userInfo.businessCard'))) {
+            } else if (vk.pubfn.isNull(userInfo.businessCard)) {
                 this.$confirm('请完善名片信息', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
@@ -360,7 +383,7 @@ export default {
                 }
             });
         },
-         getCompany() {
+        getCompany() {
             vk.callFunction({
                 url: 'client/user/pub/getCompany',
                 title: '请求中...',