From 4d3ff756219604183f39a4d1d083f6916915ec54 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Mon, 8 May 2023 14:25:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 img/apartment-icon.png           | Bin 0 -> 4203 bytes
 img/apartment-text.png           | Bin 0 -> 2142 bytes
 pages/askHousing/askHousing.js   |  12 ++-
 pages/askHousing/askHousing.wxml |   8 +-
 pages/common/common.wxml         |  25 +++---
 pages/edit/edit.wxss             |   4 +-
 pages/index/index.js             |  33 +++++++-
 pages/index/index.wxml           |  58 +++++++++++--
 pages/index/index.wxss           | 137 ++++++++++++++++++++++++++++++-
 project.config.json              |   2 +-
 utils/miucms.js                  |  46 +++++++++++
 11 files changed, 293 insertions(+), 32 deletions(-)
 create mode 100644 img/apartment-icon.png
 create mode 100644 img/apartment-text.png

diff --git a/img/apartment-icon.png b/img/apartment-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d320020349c507ca4230da1fda82f77b4d2ceee
GIT binary patch
literal 4203
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
aNEDWxG1s|n<{>VB^!2oiG%M8|BK{31MSofV

literal 0
HcmV?d00001

diff --git a/img/apartment-text.png b/img/apartment-text.png
new file mode 100644
index 0000000000000000000000000000000000000000..4915f6a85ddccfad6b56fa8d083aa48faf8fc7dc
GIT binary patch
literal 2142
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
UJ-b-$N&o-=07*qoM6N<$g34zOcK`qY

literal 0
HcmV?d00001

diff --git a/pages/askHousing/askHousing.js b/pages/askHousing/askHousing.js
index e1bbc45..70a53fb 100644
--- a/pages/askHousing/askHousing.js
+++ b/pages/askHousing/askHousing.js
@@ -2132,10 +2132,16 @@ Page({
                         url: '/pages/user/user?tab=publish',
                     })
                 } else {
-                    wx.redirectTo({
-                        // url: '/pages/show/show?uniqid=' + res.data.uniqid + '&cityid=' + this.data.newcity.id,
-                        url: '/pages/show/show?uniqid=' + res.data.uniqid
+                    this.setData({
+                        popUpIs: "succeed-pop"
                     })
+                    setTimeout(() => {
+                        wx.redirectTo({
+                            // url: '/pages/show/show?uniqid=' + res.data.uniqid + '&cityid=' + this.data.newcity.id,
+                            url: '/pages/show/show?uniqid=' + res.data.uniqid
+                        })
+                    }, 2000)
+
                 }
             }
             if (res.code == 201) {
diff --git a/pages/askHousing/askHousing.wxml b/pages/askHousing/askHousing.wxml
index 9a95d5f..afa4b68 100644
--- a/pages/askHousing/askHousing.wxml
+++ b/pages/askHousing/askHousing.wxml
@@ -52,7 +52,7 @@
     </block>
 
     <!-- 发布成功 -->
-    <!-- <template is="succeed-pop"></template> -->
+    <!-- <template is="succeed-pop" data="{{ popState:'ask' }}"></template> -->
 
     <!-- 发布失败 -->
     <!-- <template is="fail-pop"></template> -->
@@ -240,7 +240,7 @@
 
     <!-- 弹窗应该出现那个状态在这里处理-->
     <view class="pop-up-dispose">
-        <template is="{{ popUpIs }}" data="{{ item:popUpdate,fieldinfoNew,popUpSubtitle,leaseTimeValue,week, calculateOfDateList,calculateOfDateTime,popUpTitle,floorValue,popUpStepState,newinfo,nearSchoolList,contactInformationState,fieldinfo,imgs,videos,areaRegionIndex,newtype,newStatus,focustitle,pitchyear,pitchmonth,pitchday,focusState,locationObj }}"></template>
+        <template is="{{ popUpIs }}" data="{{ item:popUpdate,fieldinfoNew,popUpSubtitle,leaseTimeValue,week, calculateOfDateList,calculateOfDateTime,popUpTitle,floorValue,popUpStepState,newinfo,nearSchoolList,contactInformationState,fieldinfo,imgs,videos,areaRegionIndex,newtype,newStatus,focustitle,pitchyear,pitchmonth,pitchday,focusState,locationObj,popState:'ask' }}"></template>
     </view>
 
     <!-- 触发规则1时 重复发布 -->
@@ -253,7 +253,9 @@
     </block>
     <!-- 触发规则3时 提交失败 -->
     <block wx:elif="{{ triggerRules == 3 }}">
-        <template is="submitFailurethree"></template>
+        <!-- <template is="submitFailurethree"></template> -->
+        <template is="fail-pop"></template>
+
     </block>
 
     <!-- 触发规则4时 你的微信号有误 -->
diff --git a/pages/common/common.wxml b/pages/common/common.wxml
index 0de189e..0c10420 100644
--- a/pages/common/common.wxml
+++ b/pages/common/common.wxml
@@ -413,7 +413,12 @@
     <view class="succeed-box flexcenter">
       <image class="succeed-icom" src="/img/succeed-icon.png"></image>
       <view class="succeed-title">发布成功</view>
-      <block wx:if="{{ true }}">
+      <block wx:if="{{ popState == 'ask' }}">
+        <view class="automatically-skip">
+          2秒后自动跳转页面
+        </view>
+      </block>
+      <block wx:else>
         <block wx:if="{{ false }}">
           <view class="succeed-reminder">完成房源认证更快租出去</view>
 
@@ -434,19 +439,11 @@
           <view class="succeed-btn flexcenter">前往认证<image class="succeed-btn-icom" mode="widthFix" src="/img/arrows-right-black.png"></image>
           </view>
           <view class="succeed-btn-no flexcenter">暂不认证</view>
-
-
         </block>
 
-
-
-      </block>
-      <block wx:else>
-        <view class="automatically-skip">
-          2秒后自动跳转页面
-        </view>
       </block>
 
+
     </view>
   </view>
 
@@ -464,8 +461,12 @@
       <view class="fail-explain">房源数量已达上限</view>
       <view class="fail-explain">下架旧房源，便可发布新房源</view>
 
-      <view class="fail-btn flexcenter">房源管理<image class="fail-btn-icom" mode="widthFix" src="/img/arrows-right-white.png"></image>
-      </view>
+      <!-- <view class="fail-btn flexcenter">房源管理<image class="fail-btn-icom" mode="widthFix" src="/img/arrows-right-white.png"></image> -->
+      <!-- </view> -->
+
+      <navigator class="fail-btn flexcenter" hover-class="none" open-type="redirect" url="/pages/user/user?tab=publish">
+        房源管理<image class="fail-btn-icom" mode="widthFix" src="/img/arrows-right-white.png"></image>
+      </navigator>
     </view>
   </view>
 </template>
\ No newline at end of file
diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss
index f487d13..757a991 100644
--- a/pages/edit/edit.wxss
+++ b/pages/edit/edit.wxss
@@ -233,8 +233,8 @@
 }
 
 .footer-btn .submit {
-    /* flex: 1; */
-    width: 330rpx;
+    flex: 1;
+    /* width: 330rpx; */
     display: flex;
     justify-content: center;
     align-items: center;
diff --git a/pages/index/index.js b/pages/index/index.js
index ac7f3cf..b4f0a02 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -51,7 +51,7 @@ Page({
             title: "招室友",
             value: "attract",
             left: 436,
-        },],
+        }, ],
         tabValue: 0,
     },
 
@@ -91,6 +91,7 @@ Page({
         // if (app.globalData.code) {
         if (app.globalData.config && app.globalData.config.lists) {
             this.get_list();
+            this.getNewInit()
             this.setData({
                 initState: true
             })
@@ -100,6 +101,26 @@ Page({
             }, 10)
         }
     },
+    // 新初始化数据
+    getNewInit() {
+        miucms.wxget(`${app.globalData.baseURL}/tenement/v2/api/home`).then(res => {
+            let data = res.data
+            console.log(data);
+
+            let {
+                search,
+                apartment,
+                tabs
+            } = data
+
+            this.setData({
+                ...data
+            })
+
+            console.log("tabs", this.data.tabs);
+        })
+
+    },
 
     get_list() {
         var that = this;
@@ -198,4 +219,14 @@ Page({
             [key]: value
         })
     },
+
+    // 公共跳转
+    publicJumps(e) {
+        let url = e.currentTarget.dataset.url
+        wx.navigateTo({
+            url,
+        })
+
+    }
+
 })
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 1727486..f314c5e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -2,6 +2,11 @@
     <header-nav inner-text="Some text" isIndexPage="index">寄托香港租房</header-nav>
     <!-- swiper -->
     <head-swiper attachment="{{ banner }}" isInner="1"></head-swiper>
+    <view class="headSwiper">
+    
+    
+    </view>
+
     <!-- 搜索 -->
     <navigator url="/pages/search/search" class="search-btn" hover-class="hover">
         <!-- <image class='searchbtn' src="../../img/search-6.png" />搜索房源 -->
@@ -129,12 +134,15 @@
     <view class="apartment-block" wx:if="{{ envVersionState && false }}">
         <scroll-view scroll-x="{{ true }}" class="scroll">
             <view class="apartment-list flexflex">
-                <view class="apartment-item flexflex" wx:for="{{ 10 }}" wx:key="index">
-                    <view class="apartment-name">iRent佐敦二期公寓</view>
-                    <view class="apartment-introduce">油尖旺中心品质公寓</view>
+                <view class="apartment-item flexflex" wx:for="{{ apartment }}" wx:key="index" bindtap="publicJumps" data-url="/pages/irentDetail/irentDetail?uniqid={{ item.id }}">
+                    <view class="apartment-name">{{ item.title }}</view>
+                    <view class="apartment-introduce">{{ item.propaganda }}</view>
 
                     <view class="apartment-image-list flexacenter">
-                        <image class="apartment-image-item" wx:for="{{ 2 }}" wx:key="index" src="{{ images }}"></image>
+                        <block wx:for="{{ item.images }}" wx:key="index">
+                            <image class="apartment-image-item" wx:if="{{ index < 2}}" src="{{ item }}"></image>
+                        </block>
+
                     </view>
 
                 </view>
@@ -144,12 +152,46 @@
 
     <!-- 数据列表 tab 新 -->
     <view class="tab-list flexacenter" wx:if="{{ envVersionState && false }}">
-        <view class="tab-item {{ tabValue == index ? 'pitch' : '' }}" wx:for="{{ tabList }}" wx:key="index" bindtap="setValue" data-key="tabValue" data-value="{{ index }}">{{ item.title }}</view>
-        <view class="tab-green" style="left: {{ tabList[tabValue].left }}rpx;"></view>
+        <view class="tab-item {{ item.select ? 'pitch' : '' }}" wx:for="{{ recommendedTab }}" wx:key="index" bindtap="setValue" data-key="tabValue" data-value="{{ index }}">{{ item.name }}</view>
+        <!-- <view class="tab-green" style="left: {{ tabList[tabValue].left }}rpx;"></view> -->
     </view>
 
-    <view class="pinterest-list">
-        <view class="pinterest-list-item apartment"></view>
+    <view class="pinterest-list flexflex" wx:if="{{ envVersionState && false }}">
+        <!-- 广告 -->
+        <image class="pinterest-list-item" mode="widthFix" src="https://axure-file.lanhuapp.com/md516b251fb-9cfa-46fc-a9b6-2a41a7b4dc37__3e8c7ffd967c39e01538667fc12558ab.svg"></image>
+        <!-- 公寓 -->
+        <view class="pinterest-list-item apartment" wx:if="{{ false }}">
+            <view class="apartment-top flexcenter">
+                <image class="apartment-icon" mode="widthFix" src="/img/apartment-icon.png"></image>
+                <image class="apartment-text" mode="widthFix" src="/img/apartment-text.png"></image>
+            </view>
+            <image class="apartment-img" mode="widthFix" src="https://oss.gter.net/Zvt57TuJSUvkyhw-xG7Y2l-R-JIscHrqqsgFptxhXa6SWi2uePJ5Bg8cFLPIvsEG-4BUA27F7lfn5E55tXAL34gR30LsULxzarqa1zx17l80NDI5"></image>
+            <view class="apartment-name">iRent油麻地二期公寓</view>
+            <view class="apartment-introduce">年轻有活力且超有玩趣的公寓</view>
+            <view class="apartment-price">
+                <view class="apartment-price-item flexacenter" wx:for="{{ 2 }}" wx:key="index">
+                    <view class="apartment-price-name">单人套间</view>
+                    <view class="apartment-price-cost flex1 flexacenter">
+                        <view class="apartment-price-unit">HK$</view>
+                        <view class="apartment-price-number">7200</view>
+                        /月
+                    </view>
+                </view>
+            </view>
+            <view class="apartment-price-more flexcenter">更多</view>
+        </view>
+
+        <!-- 普通 -->
+        <view class="pinterest-list-item general">
+            <image class="general-img" mode="widthFix" src="https://oss.gter.net/Zvt57TuJSUvkyhw-xG7Y2l-T950rd3bqqsgFptxhXa6SWi2uePJ5Bg8VFrPIvsEG-4BUCm7F7lfn5E5jtX0K_tdQgQ_5bap6c_Ca1y466joQa7aoNKTjEaE0NDI5"></image>
+            <view class="general-name">
+                <view class="general-tag flexcenter">整租</view>
+                大学附近 | 中城浸教公大理公 两房一厅，设备齐全拎包入住
+            </view>
+        </view>
+
+
+        <view wx:for="{{ 3 }}" wx:key="index" class="pinterest-list-item apartment">2323</view>
     </view>
 
     <!-- 个人房源 -->
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 2d460dd..4e4ca8a 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -582,11 +582,22 @@
 .apartment-block .apartment-list .apartment-name {
     color: #000000;
     font-size: 24rpx;
+    width: 264rpx;
+    word-break: keep-all;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .apartment-block .apartment-list .apartment-introduce {
     color: #7f7f7f;
     font-size: 21rpx;
+    width: 264rpx;
+    word-break: keep-all;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-bottom: 8rpx;
 }
 
 .apartment-block .apartment-list .apartment-image-list {
@@ -610,7 +621,6 @@
 }
 
 .tab-list .tab-item {
-    /* margin-right: 48rpx; */
     padding: 0 24rpx;
 }
 
@@ -632,7 +642,7 @@
 .tab-list .tab-item.pitch::after {
     width: 30rpx;
     height: 30rpx;
-    /* content: ""; */
+    content: "";
     position: absolute;
     top: -9rpx;
     /* left: -4rpx; */
@@ -652,5 +662,128 @@
     border-radius: 50%;
     z-index: -1;
     transition: left 0.1s;
+}
 
+.pinterest-list {
+    padding: 0 30rpx;
+    justify-content: space-between;
+    flex-wrap: wrap;
+}
+
+.pinterest-list .pinterest-list-item {
+    width: 337.5rpx;
+    background-color: #fff;
+    border-radius: 24rpx 24rpx 14rpx 24rpx;
+    margin-bottom: 18rpx;
+}
+
+.pinterest-list .pinterest-list-item.apartment {
+    padding-bottom: 36rpx;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-top {
+    background: linear-gradient(-47.9699747981038deg, rgba(183, 220, 253, 1) -59%, rgba(213, 208, 239, 1) 29%, rgba(98, 177, 255, 1) 135%);
+    height: 45rpx;
+    border-radius: 24rpx 24rpx 0 0;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-icon {
+    width: 30rpx;
+    height: 30rpx;
+    margin-right: 8rpx;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-text {
+    width: 97.5rpx;
+    height: 31.5rpx;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-img {
+    width: 337.5rpx;
+    height: 125rpx;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-name {
+    font-size: 27rpx;
+    color: #000000;
+    font-weight: 650;
+    padding: 13.5rpx 15rpx;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-introduce {
+    color: #aaaaaa;
+    font-size: 21rpx;
+    padding: 0 15rpx;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-price {
+    margin-top: 6rpx;
+    margin-bottom: 18rpx;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-price-item {
+    justify-content: space-between;
+    padding: 16.5rpx 0;
+    margin: 0 15rpx;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-price-item:not(:last-of-type) {
+    border-bottom: 1rpx solid #ebebeb;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-price-name {
+    color: #000000;
+    font-size: 22.5rpx;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-price-cost {
+    font-size: 21rpx;
+    color: #555555;
+    justify-content: flex-end;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-price-unit {
+    font-weight: 900;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-price-number {
+    font-size: 24rpx;
+    color: #f95d5d;
+    font-weight: 900;
+    margin: 0 10rpx;
+}
+
+.pinterest-list .pinterest-list-item.apartment .apartment-price-more {
+    margin: 0 auto;
+    font-size: 21rpx;
+    background-color: rgba(253, 223, 109, 1);
+    border-radius: 30rpx;
+    width: 84rpx;
+    height: 36rpx;
+}
+
+.pinterest-list .pinterest-list-item.general {}
+
+.pinterest-list .pinterest-list-item.general .general-img {
+    width: 337.5rpx;
+    height: 253.5rpx;
+    border-radius: 24rpx 24rpx 0 0;
+}
+
+.pinterest-list .pinterest-list-item.general .general-name {
+    font-size: 27rpx;
+    color: #000000;
+    line-height: 48rpx;
+    padding: 0 15rpx;
+}
+
+.pinterest-list .pinterest-list-item.general .general-tag {
+    background-color: rgba(242, 242, 242, 1);
+    border: 1rpx solid rgba(235, 235, 235, 1);
+    border-radius: 8rpx;
+    height: 36rpx;
+    font-size: 21rpx;
+    color: #555555;
+    display: inline-flex;
+    margin-right: 15rpx;
 }
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index aee61c0..9661965 100644
--- a/project.config.json
+++ b/project.config.json
@@ -42,7 +42,7 @@
     },
     "compileType": "miniprogram",
     "libVersion": "2.31.1",
-    "appid": "wxcf0a799771cf2ae6",
+    "appid": "wx9c68fbf7886ea9c4",
     "projectname": "%E5%AF%84%E6%89%98%E7%A7%9F%E6%88%BF",
     "simulatorType": "wechat",
     "simulatorPluginLibVersion": {},
diff --git a/utils/miucms.js b/utils/miucms.js
index 841a0d6..46dbbc3 100644
--- a/utils/miucms.js
+++ b/utils/miucms.js
@@ -317,6 +317,51 @@ function request(url, data = {}, needGet = false) {
   })
 }
 
+const wxget = function (url, data = {}) {
+  return new Promise((resolve, reject) => {
+    var authorization = wx.getStorageSync('Authorization');
+    wx.request({
+      url: url,
+      data: data,
+      header: {
+        'Cookie': 'miucms_session=' + authorization,
+        Authorization: authorization
+      },
+      method: 'GET',
+      success: (res) => {
+        if (res.data.code == 200) {
+          resolve(res.data)
+        } else if (res.data.code == 401) {
+          // 需要授权
+          // console.log(app)
+          app.globalData.user.uid = 0;
+          wx.showToast({
+            icon: 'none',
+            title: res.data.message
+          })
+          reject(res)
+        } else {
+          wx.hideLoading()
+          wx.showModal({
+            title: '提示',
+            content: res.data.message,
+          })
+          reject(res.data)
+        }
+
+      },
+      fail(res) {
+        wx.showModal({
+          title: '提示',
+          content: res,
+        })
+        reject(res)
+      }
+    });
+  })
+
+}
+
 function closeAD(id) {
   // console.log(id)
   if (!app.globalData.config || !app.globalData.config.adv) {
@@ -344,6 +389,7 @@ module.exports = {
   copy,
   sendData,
   request,
+  wxget,
   closeAD,
   clickAD,
   count,