From 9303c12ab54d95cfe03773d5fa90cba309b20ec1 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Wed, 26 Jul 2023 18:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/publicImage/arc-shadow.png  | Bin 0 -> 1292 bytes
 src/components/edit/fail-pop.vue           |   2 +-
 src/components/pageTopBar/pageTopBar.vue   |   2 +-
 src/components/public/public-list-item.vue |   7 ++-
 src/router/index.js                        |   5 +-
 src/views/apartmentDetail.vue              |  66 ++++++++++++++++-----
 src/views/edit.vue                         |  21 +++++--
 7 files changed, 78 insertions(+), 25 deletions(-)
 create mode 100644 src/assets/img/publicImage/arc-shadow.png

diff --git a/src/assets/img/publicImage/arc-shadow.png b/src/assets/img/publicImage/arc-shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ae546c62190d580f5a7423d613f4c2139e52af4
GIT binary patch
literal 1292
zcmYk6dsLEV9LG^nrygYHrD>^9=9IH`#ZIv>@iJdD&|V<ZBBZiHC#1nN5lubjiLHF6
zStqhV`l`K{?#$dgvZ1rqx*acJN%N9joC+kAN}2=Qdv^L`=Xajp@0{QBeV*U<`TX&m
zPGu(IJcB$j7z~aM#Di!>(4~FP4b69IxD99t6esKvvqXo*1^oOh4DFEUKo)_X%RiC@
zX7LZ5$h(`h9fQHP)8lFE!qJx#&vJ(|KDf;{$u0VIPjN;x?zk1YbU1xI<U_d;d}ZUf
z&*Kfs2R>)nMD>=u1FO|`TbS5q-za%|5l<NgGd8*wP%fV;9mgf%K^loh0-EY_h@2uS
z++p4XxFT3IvfH+c@W@Wk0~NH@=YSXCHSlOL9wKQ2!1Se>VeL*((8g?G;Su##GEF^2
zLC=w|4?_3C>JCqfKWUK~j03B`cz~SG5{Mj|H3CkWa{`<6G?Hn*BCo@;YKsE=wMKMH
zUBy04jV0Bx6?sQV`o_($I$Iu#I_j<p2kJ&JNDZE0-`nesG_*v(^4^e2b~qyLvmW(A
z)b$Mz$x-BoTGNf2b^-o7&`Gg80%u+=Vt}09cbDfBoMhkCH(H_>vB-$ol(?Gs-{41z
z)}9LXr9D=NRPrcJz0AQQ&(o-|ocFHL^v^f_q2=rcts&s%ZsYCgia}JB&9p+<cOx^r
zlU?8>Vf{iCk+X>UPrkO2-(Vqd@+YTDFo3@_vz(p0Xb%X*f)hFN^X_JpTK7-g^MT<2
zr@zbtoH+jILgXk-&E2^RkW@!f$fDxvRG?0`w6`<{keDJVF={U3-Fs|)mF(9nKk!z{
z{~E_zW(zHmp2%|)iQ<cd>V6#0fJKD3PA-a0y)CDwl8vxBuPwi*QTl@1(FL9IeUSTk
z!u?*ydXx^|AUHFKLq6X2kpv=1<ZqHg&l5N{zQ=zO>>QCp8fs5}b#W6QnNx^}oOwm)
z8le{~=Psb6`s37H&9l|#qVR~rturNK0Wzkja<9)<yn&3`d*3D&0d<sw`^m5Vd^qMF
zsp1+HRqPql(5gaJb&0@<(qDm$HuJ`VxGsO4%z1A3$2g)Scm*8JJtZ#H!lCB~6H9)w
z_Gc=rp`<J%XIlhKGg)h6wRMH+Wc5?ZY)24bB6`T^odlWPXWupz<j(QD;4#+~@C7|Y
zXYUMDLBiwmXpu(*JcgwR=S<~(seo$)d{P*MrdU!8(N(-wHlMcNe_){i6S%Y}iOX0!
z#Guw5nsD(%0$egO9ldF)5m|6dYbo_AUBgwqAk)UQlWU>F&h`iF#cAA#-Qf+m&h%-W
z1RI9h-`c$kw9=cJ6fEVX9g7z@tTX16S0ggB^+>v<LV7cd!L{sgs(e_~WtQAB*#BB2
z(^+L_hYi80wdDC@Q++3D$pN!`%6g~lny>atqx%Fk&CXP&{)dwaIB)Bqh;7Qm3a0w5
z7MCtJN?mmEs2eIZ0xwuUa0Qu?=ErIVS-&3nj&SBydi$4&OK$KnPjD--k_A0^-RbaW
z0={`?eVHv1pfU5j`;%(lfdSqQc(;aN|DAS}97Sa8n{n4GpynGkU19KtFu%1J<E#7Q
z=3roR8i5v6)}c&|X0BQ_4B%k+-!A7ef(_UXWz3tAuH7`sWsO&laOL%~aYiTmzQ_6T
zZ{<stR^GbtpEZFx1NTXia`IySQ$byc$EO&i<U-??d}crTy<zAH%=q@$%<_K$MRjNO

literal 0
HcmV?d00001

diff --git a/src/components/edit/fail-pop.vue b/src/components/edit/fail-pop.vue
index 80cf0b9..63844f2 100644
--- a/src/components/edit/fail-pop.vue
+++ b/src/components/edit/fail-pop.vue
@@ -7,7 +7,7 @@
             <div class="fail-text">已存为草稿</div>
             <div class="fail-hint">房源数量已达上限</div>
             <div class="fail-hint" style="margin-bottom: 57px;">下架旧房源，便可发布新房源</div>
-            <div class="fail-btn flexcenter">
+            <div class="fail-btn flexcenter" @click.stop="$router.push('/user')">
                 房源管理<img class="fail-btn-icon" src="@/assets/img/edit/fail-btn-icon.svg" />
             </div>
         </div>
diff --git a/src/components/pageTopBar/pageTopBar.vue b/src/components/pageTopBar/pageTopBar.vue
index a4fe996..e9a08de 100644
--- a/src/components/pageTopBar/pageTopBar.vue
+++ b/src/components/pageTopBar/pageTopBar.vue
@@ -39,7 +39,7 @@
           </el-carousel>
         </div>
       </div>
-      <div class="btm-seach-btn-box dis-f al-item jus-x" v-if="routePath !== '/seachPage'&&routePath !== '/detail'">
+      <div class="btm-seach-btn-box dis-f al-item jus-x" v-if="routePath !== '/seachPage'&&routePath !== '/detail'&&routePath !== '/apartmentDetail'&&routePath !== '/edit'">
         <div class="body-maxWidth dis-f" style="height:48px;">
           <div class="tab-btn dis-f al-item jus-x" :class="{ 'tab-btn-click': item.path === tabBtnType }"
             v-for="(item, i) in seachTab.data" :key="i" @click="changeTabBtnType(item)">
diff --git a/src/components/public/public-list-item.vue b/src/components/public/public-list-item.vue
index 224a480..1088fe1 100644
--- a/src/components/public/public-list-item.vue
+++ b/src/components/public/public-list-item.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="list-item" ref="list" @click="goDetail">
+    <div class="list-item" ref="list" @click="goDetail(data.status)">
         <div class="authentication-box dis-f al-item" v-if="data.verified == 1">
             <img src="../../assets/homeImage/authenticationLogo.png" class="logo" alt="">
             <img src="../../assets/homeImage/topAuthenticationBg.svg" class="bg" alt="">
@@ -190,7 +190,10 @@ watch(() => props.item.status, (newValue, oldValue) => {
 const cancelCollection = token => emit('cancelCollection', { token, index: props['index'] })
 
 // 点击跳转详情页
-const goDetail = () => router.push(`/detail?uniqid=${data.uniqid}`)
+const goDetail = status => {
+    console.log("status", status);
+    if (status == 1) router.push(`/detail?id=${data.uniqid}`)
+}
 
 // 跳转编辑页面
 const goEdit = () => router.push(`/edit?token=${data.token}`)
diff --git a/src/router/index.js b/src/router/index.js
index f2b1dab..d581c50 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -93,7 +93,10 @@ const routes = [
 const router = createRouter({
   history: createWebHistory(process.env.BASE_URL),
   mode: "history",
-  routes
+  routes,
+  scrollBehavior(to, from, savedPosition) {
+    return { top: 0 };
+  },
 })
 
 
diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue
index 498d2a1..4e219c7 100644
--- a/src/views/apartmentDetail.vue
+++ b/src/views/apartmentDetail.vue
@@ -8,14 +8,16 @@
                 <div class="brand-abstract">{{ info['propaganda'] }}</div>
             </div>
             <div class="header-content flexflex">
+                <img class="arc" src="@/assets/img/publicImage/arc-shadow.png">
                 <div class="header-left">
-                    <!-- <image-watch :show="imageShow" :close="cloaseImageShow" :list="allCarouselsData"></image-watch> -->
-                    <image-watch style="z-index: 1003;" :show="imageShow" :close="cloaseImageShow" :list="allCarouselsData"></image-watch>
+                    <image-watch style="z-index: 1003;" :show="imageShow" :close="cloaseImageShow"
+                        :list="imageList"></image-watch>
                     <div class="slideshow">
                         <el-carousel :autoplay="false" indicator-position="none" ref="remarkCaruselUp"
                             @change="carouselChange">
                             <el-carousel-item class="flexcenter" v-for="item in allCarouselsData">
-                                <img class="img" :src="item['image'] || item['imageurl']" @click="cloaseImageShow">
+                                <img class="img" :src="item['image'] || item['imageurl']"
+                                    @click="cloaseImageShow(allCarouselsData)">
                                 <!-- <img class="video-icon" src="@/assets/img/publicImage/video-icon.svg" alt=""> -->
                             </el-carousel-item>
                         </el-carousel>
@@ -128,11 +130,13 @@
                                         src="@/assets/img/publicImage/gray-arrow.svg" alt="">
                                 </div>
                                 <div class="media-list flexacenter no-scrollbar" :class="`element${index}`">
-                                    <div class="media-item flexcenter" v-for="it in item['videos']">
+                                    <div class="media-item flexcenter" v-for="it in item['videos']"
+                                        @click="cloaseImageShow([...item['videos'], ...item['images']])">
                                         <img class="media-img" :src="it['thumbnail']">
                                         <img class="media-icon" src="@/assets/img/apartmentDetail/media-icon.svg" />
                                     </div>
-                                    <div class="media-item flexcenter" v-for="it in item['images']">
+                                    <div class="media-item flexcenter" v-for="it in item['images']"
+                                        @click="cloaseImageShow([...item['videos'], ...item['images']])">
                                         <img class="media-img" :src="it['thumbnail']">
                                     </div>
                                 </div>
@@ -361,9 +365,14 @@ import footerpage from '@/components/footer/footer.vue'
 import viewMap from '@/components/public/viewMap.vue'
 import transmitBtn from '@/components/public/transmitBtn.vue'
 import imageWatch from '@/components/detail/imageWatch.vue';
+import { useRouter } from 'vue-router'
+let router = useRouter()
+
+
+let { uniqid } = router.currentRoute.value.query
 
 import { copyToClipboard } from '@/utils/util.js'
-const uniqid = "aWqSz58aKKvn"
+// const uniqid = "aWqSz58aKKvn"
 
 const { proxy } = getCurrentInstance()
 const store = useStore();
@@ -371,7 +380,13 @@ const store = useStore();
 const { wechat } = toRefs(store.state);
 
 let imageShow = ref(false)  // 查看大图弹窗的状态
-const cloaseImageShow = () => imageShow.value = !imageShow.value
+let imageList = ref([])  // 查看大图弹窗的状态
+const cloaseImageShow = (list) => {
+    if (list) imageList.value = list
+    imageShow.value = !imageShow.value
+}
+
+// allCarouselsData
 
 // 房间类型
 let roomList = ref([])
@@ -412,7 +427,14 @@ proxy.$get("/tenement/pc/api/apartment/details", { uniqid }).then(res => {
 
     handleAllCarouselsData()
 
-    handleNavData()
+
+    // setTimeout(() => {
+    nextTick(() => {
+        handleNavData()
+    })
+
+    // }, 2000)
+
     if (data.withsameapartments > 0) dualBrandData()
 
 })
@@ -494,9 +516,12 @@ let navTab = ref("roomEle")
 
 // 处理 navList 数据
 const handleNavData = () => {
+
     navconfig.forEach(element => {
-        if (info.value[element.value] && element.value != 'roomEle' && element.value != 'companyEle') navList.value.push(element)
-        else navList.value.push(element)
+        console.log("element", eval(element['value']).value);
+        if (eval(element['value']).value) navList.value.push(element)
+        // if (info.value[element.value] && element.value != 'roomEle' && element.value != 'companyEle') navList.value.push(element)
+        // else navList.value.push(element)
     })
 }
 
@@ -504,6 +529,7 @@ const handleNavData = () => {
 const handleClickNav = value => {
     let scrollTop = 0
 
+
     switch (value) {
         case "roomEle":
             scrollTop = roomEle.value.offsetTop - 110;
@@ -534,7 +560,7 @@ const handleClickNav = value => {
             break;
     }
 
-    navTab.value = value
+    if (value != 'eleseEle') navTab.value = value
 
     window.scrollTo({ top: scrollTop, behavior: 'smooth' });
 }
@@ -634,11 +660,14 @@ const slideshowType = type => slideshowItem(carouselsconfig.value[type].index)
 
 let detailsLeft = ref(null)
 
+
+
 </script>
 
 <style lang="less" scoped>
 .content {
-    margin: 0 auto;
+    margin: -36px auto 0;
+    position: relative;
     font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;
 
     .header {
@@ -676,7 +705,16 @@ let detailsLeft = ref(null)
             background-color: #fff;
             padding: 25px 30px;
             margin-top: -20px;
-            border-radius: 16px;
+            border-radius: 16px 0 16px 16px;
+            position: relative;
+
+            .arc {
+                position: absolute;
+                width: 12px;
+                height: 12px;
+                top: -12px;
+                right: 0;
+            }
 
             .header-left {
                 width: 511px;
@@ -1531,7 +1569,7 @@ let detailsLeft = ref(null)
     left: 0;
     width: 100vw;
     height: 100vh;
-    background-color: rgba(0, 0, 0, 0.7);
+    // background-color: rgba(0, 0, 0, 0.7);
     z-index: 1002;
 
     .add-customer-box {
diff --git a/src/views/edit.vue b/src/views/edit.vue
index 8f8774c..285e67b 100644
--- a/src/views/edit.vue
+++ b/src/views/edit.vue
@@ -1,5 +1,6 @@
 <template>
-    <header-nav :isNoTabList="true" :user="user"></header-nav>
+    <!-- <header-nav :isNoTabList="true" :user="user"></header-nav> -->
+    <page-top-bar></page-top-bar>
     <map-component v-if="mapComponentState" :info="info" @choosingLocation="choosingLocation" />
     <div class="content-box flexflex">
         <!-- 左边的信息盒子 -->
@@ -77,7 +78,7 @@
                     <!-- 月租 -->
                     <div v-if="item.field == 'rent' && intermediary != 6" ref="rent"
                         class="form-option modeFive flexacenter" :class="{ 'pitch': info.rent }">
-                        <input class="modeFive-input flex1" v-model="info.rent" type="number" step="1" min="0"
+                        <input class="modeFive-input flex1" v-model="info.rent" type="number" step="1" min="0" 
                             placeholder="请输入数字"
                             onkeyup="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''">
                         <div class="modeFive-unit">{{ item.unit }}</div>
@@ -667,7 +668,8 @@ import mapComponent from '@/components/edit/map.vue'
 import pageFooter from '@/components/footer/footer.vue'
 import how from '@/components/edit/how-pop.vue'
 import failPop from '@/components/edit/fail-pop.vue'
-import headerNav from '@/components/public/head.vue'
+// import headerNav from '@/components/public/head.vue'
+import pageTopBar from '@/components/pageTopBar/pageTopBar.vue'
 import userBox from '@/components/edit/user-box.vue'
 import { setSeoTitle } from '@/utils/util.js'
 
@@ -779,7 +781,8 @@ export default {
         pageFooter,
         how,
         failPop,
-        headerNav,
+        // headerNav,
+        pageTopBar,
         userBox,
     },
     methods: {
@@ -847,6 +850,10 @@ export default {
                 if (info['type']) this.typeValue = info['type'] >>> 0
 
                 let intermediary = data.intermediary
+                // rentalduration
+                if (data['type'] == "edit") {
+                    if (!info['rentalduration']) info['rentalduration'] = 0
+                }
 
                 if (intermediary == 6) {
                     if (info["rent"].length != 0) {
@@ -864,7 +871,6 @@ export default {
                     let arr = ["property", "floor", "sunshinearea"]
 
                     arr.forEach(element => {
-
                         if (info[element] && info[element].length == 1 && info[element][0] == 0) info[element] = []
 
                         if (info[element] && info[element].length != 0) {
@@ -1182,7 +1188,10 @@ export default {
 
                     return
                 } else {
-                    if (status == 0) return
+                    if (status == 0) {
+                        this.$router.push('/user')
+                        return
+                    }
                     this.qrcodeBase64 = data['qrcode']
                     this.skipUrl = data['url']