From 626d634278561e529f18d7eb9e11e4f9eff52aca Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Tue, 8 Aug 2023 17:12:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/axios.js |   3 +-
 src/views/edit.vue | 102 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 89 insertions(+), 16 deletions(-)

diff --git a/src/utils/axios.js b/src/utils/axios.js
index 2cd7179..3288605 100644
--- a/src/utils/axios.js
+++ b/src/utils/axios.js
@@ -14,7 +14,7 @@ axios.interceptors.request.use( //响应拦截
         showFullScreenLoading()
         // 开发时登录用的，可以直接替换小程序的 authorization
         // if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "x2mmnl9grt51bpplj2k6ioiuummzhnw3"
-        // if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "0h870ovk2xckoqfsh8a3t3sg4sg5z7eg"
+        if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "0h870ovk2xckoqfsh8a3t3sg4sg5z7eg"
         return config;
     },
     error => {
@@ -77,7 +77,6 @@ const $post = (url, params) => {
         axios.post(url, QS.stringify(params)).then(res => {
             resolve(res.data);
         }).catch(err => {
-            console.log("err", err.data);
             if (err.data.code == 401) {
                 resolve(err.data);
             } else reject(err.data)
diff --git a/src/views/edit.vue b/src/views/edit.vue
index d18b8ff..7010578 100644
--- a/src/views/edit.vue
+++ b/src/views/edit.vue
@@ -442,8 +442,7 @@
                         v-if="intermediary != 6 && (item.field == 'address' && info['location'])">
                         <div class="modeOne-item flexacenter"
                             :class="{ 'pitch': info['address'], 'disabled': verified == 1 && info['address'] }"
-                            style="width: 640px;"
-                            @click="verified == 1 && info['address'] ? '' : handleLocationData()">
+                            style="width: 640px;" @click="verified == 1 && info['address'] ? '' : handleLocationData()">
                             <div class="modeOne-text flexacenter" v-if="info['address']">{{ info['address'] }}</div>
                             <div class="modeOne-text flexacenter" v-else style="color: #AAAAAA;">请选择</div>
                             <img class="arrows-icon" src="@/assets/img/edit/arrows.svg" style="transform: rotate(0);" />
@@ -480,13 +479,13 @@
                 <div class="form-item" v-if="info['address'] && verified == 0">
                     <div class="form-title flexacenter">所属小区</div>
                     <div class="form-option modeOne flexacenter">
-                        <el-popover v-model:visible="residentialAreaState" placement="bottom"
-                            :width="640" :show-arrow="false" trigger="focus" popper-style="padding:0; border-radius:16px;"
-                            :disabled="verified == 1">
+                        <el-popover v-model:visible="residentialAreaState" placement="bottom" :width="640"
+                            :show-arrow="false" trigger="focus" popper-style="padding:0; border-radius:16px;"
+                            :disabled="verified == 1" :teleported="false">
                             <template #reference>
                                 <div ref="communityname" class="modeOne-item flexacenter"
                                     :class="{ 'pitch': info['communityname'], 'disabled': verified == 1 }"
-                                    style="width: 640px;border-color: rgb(170, 170, 170);" @click="handleResidentialArea()" v-if="!isCommunityListNoData">
+                                    style="width: 640px;" @click="handleResidentialArea()" v-if="!isCommunityListNoData">
                                     <div class="modeOne-text ellipsis flex1" v-if="info['communityname']"
                                         style="padding-right: 10px;">{{ info.communityname }}
                                     </div>
@@ -503,7 +502,11 @@
                                     @click="clickResidentialArea(item.id, item.name)">
                                     <div class="residential-dot"></div>
                                     <div class="residential-text flex1 flexacenter"
-                                        :class="{ 'pitchpitch': item.id == info['communityid'] }">{{ item.name }}</div>
+                                        :class="{ 'pitchpitch': item.id == info['communityid'] }">
+                                        <div class="">{{ item.name }}</div>
+                                        <img class="arrows-icon" v-if="item.id == info['communityid']"
+                                            src="@/assets/img/edit/blue-tick.svg" />
+                                    </div>
                                 </div>
                                 <div class="residential-item flexacenter">
                                     <div class="residential-dot"></div>
@@ -511,9 +514,12 @@
                                 </div>
                                 <div class="residential-item flexacenter">
                                     <div class="residential-dot" style="background-color: transparent;"></div>
-                                    <input class="residential-text residential-input flex1" maxlength="150"
-                                        @input="info['communityid'] = 0" v-model="info.communityname"
-                                        placeholder="请填写小区名称" />
+                                    <div class="residential-text residential-input flex1 flexflex"
+                                        style="padding-right: 0;">
+                                        <input class="flex1" maxlength="150" v-model="communitynameEle"
+                                            placeholder="请填写小区名称" />
+                                        <div class="btn flexcenter" @click="communitynameEleOk">OK</div>
+                                    </div>
                                 </div>
                             </div>
                         </el-popover>
@@ -765,7 +771,26 @@
         </div>
     </div>
     <div class="flexcenter pop-mask" v-if="succeedPopState == 3">
-        <div class="pop succeed-box shadow radius16 flexflex" style="padding-bottom: 58px;"
+        <div class="pop succeed-box shadow radius16 flexflex" style="padding-bottom: 99px;" @click.stop="">
+            <div class="pop-close" @click="skipDetails()" style="position: static;">
+                <img class="pop-close" src="@/assets/img/edit/close-icon.svg" />
+            </div>
+
+            <div class="succeed-title flexacenter">
+                <img class="succeed-icon" src="@/assets/img/edit/successfully-ticked.png" />发布成功
+            </div>
+
+            <div class="QRCode-box flexcenter">
+                <img class="QRCode-img" :src="qrcodeBase64" />
+            </div>
+
+            <div class="succeed-hint flexacenter" style="margin-bottom: 29px;">欢迎使用 <div class="bold">寄托港校租小程序</div>
+            </div>
+            <div class="succeed-examine" style="margin-bottom: 29px;" @click="skipUser()">管理我的房源</div>
+
+            <div class="succeed-examine" @click="skipDetails()">查看刚刚发布的求房源</div>
+        </div>
+        <div v-if="false" class="pop succeed-box shadow radius16 flexflex" style="padding-bottom: 58px;"
             :style="{ backgroundImage: `url(${require('@/assets/img/edit/succeed-pop-bj1.svg')})` }" @click.stop="">
             <div class="pop-close" @click="skipDetails()" style="position: static;">
                 <img class="pop-close" src="@/assets/img/edit/close-icon.svg" />
@@ -781,9 +806,12 @@
             <div class="succeed-hint flexacenter" style="margin-bottom: 27px;">欢迎使用 <div class="bold">寄托港校租小程序</div>
             </div>
             <div class="personage-hint-list" style="margin-bottom: 40px;">
-                <div class="personage-hint-item">一键“顶上去”，让房源马上靠前</div>
+                <!-- <div class="personage-hint-item">一键“顶上去”，让房源马上靠前</div>
                 <div class="personage-hint-item">一键切换房源上架/下架状态</div>
-                <div class="personage-hint-item">做房源认证，不占用普通房源发布数</div>
+                <div class="personage-hint-item">做房源认证，不占用普通房源发布数</div> -->
+                <!-- <div class="personage-hint-item"></div> -->
+                <div class="succeed-examine">管理我的房源</div>
+
             </div>
             <div class="succeed-examine" @click="skipDetails()">查看刚刚发布的{{ intermediary == 6 ? '求' : '' }}房源</div>
         </div>
@@ -903,6 +931,10 @@ export default {
 
             isCommunityListNoData: false, // 所属小区请求后是否是没有数据
 
+            communitynameEle: "", // 其他小区名称
+
+
+
             loading: null, // 加载
 
         }
@@ -1508,11 +1540,17 @@ export default {
                         return
                     }
                     let data = res.data
-                    this.residentialAreaState = true
                     this.communityList = data
                     this.isResidentialAreaUpdate = false
+
+                    this.$nextTick(() => {
+                        this.residentialAreaState = true
+
+                    })
                 })
             } else this.residentialAreaState = true
+
+            if (!this.info.communityid) this.communitynameEle = this.info.communityname
         },
 
         // 点击所属小区选项
@@ -1522,6 +1560,8 @@ export default {
             info['communityid'] = id
             info['communityname'] = name
 
+            this.communitynameEle = ""
+
             this.info = info
             this.residentialAreaState = false
         },
@@ -1540,6 +1580,10 @@ export default {
             this.$router.push(`/detail?id=${this.uniqid}`)
         },
 
+        skipUser(){
+            this.$router.push(`/user??tab=publish`)
+        },
+
         // 起租日期的不选中判断
         disabledDate(date) {
             var currentDate = new Date();
@@ -1554,6 +1598,17 @@ export default {
             return false;  // 返回 false 表示日期未被禁用
         },
 
+        // 其他所属小区的 其他按钮
+        communitynameEleOk() {
+            if (this.communitynameEle) {
+                this.info['communityid'] = 0
+                this.info['communityname'] = this.communitynameEle
+            }
+
+            this.residentialAreaState = false
+            this.communitynameEle = ""
+        },
+
 
     },
 
@@ -2916,10 +2971,19 @@ export default {
             height: 100%;
             color: #555;
             font-size: 16px;
+            justify-content: space-between;
 
             &.pitchpitch {
                 color: #62b1ff;
+            }
 
+            .btn {
+                width: 50px;
+                height: 100%;
+                background-color: #aaaaaa;
+                color: #fff;
+                font-size: 20px;
+                // border-radius: 0 10px 10px 0;
             }
 
             &.residential-input {
@@ -2928,6 +2992,16 @@ export default {
                 height: 50px;
                 padding: 0 20px;
                 outline: none;
+                overflow: hidden;
+
+                input {
+                    height: 100%;
+                    // background-color: #50e3c2;
+                    border: none;
+                    outline: none;
+                    font-size: 16px;
+                    // color: #aaa;
+                }
             }
         }