Ver código fonte

feat:frist commit

jinx 4 anos atrás
pai
commit
c7d6999270
100 arquivos alterados com 1317 adições e 2180 exclusões
  1. 6 3
      app.js
  2. 35 30
      app.json
  3. 30 0
      component/roomItem/roomItem.js
  4. 0 0
      component/roomItem/roomItem.json
  5. 46 0
      component/roomItem/roomItem.wxml
  6. 124 0
      component/roomItem/roomItem.wxss
  7. 188 0
      pages/city/city.js
  8. 5 0
      pages/city/city.json
  9. 36 0
      pages/city/city.wxml
  10. 119 0
      pages/city/city.wxss
  11. 116 0
      pages/city/json/cites.js
  12. 74 285
      pages/index/index.js
  13. 6 2
      pages/index/index.json
  14. 64 86
      pages/index/index.wxml
  15. 286 499
      pages/index/index.wxss
  16. 1 2
      pages/share.js
  17. 5 0
      pages/searchRoom/searchRoom.json
  18. 16 0
      pages/searchRoom/searchRoom.wxml
  19. 50 0
      pages/searchRoom/searchRoom.wxss
  20. 0 2
      pages/share.wxml
  21. 0 1
      pages/share.wxss
  22. 66 0
      pages/store/store.js
  23. 3 0
      pages/store/store.json
  24. 8 0
      pages/store/store.wxml
  25. 33 0
      pages/store/store.wxss
  26. 0 215
      pages/webview/index.js
  27. 0 3
      pages/webview/index.json
  28. 0 254
      pages/webview/index.wxml
  29. 0 798
      pages/webview/index.wxss
  30. BIN
      static/images/address-bg-bd.png
  31. BIN
      static/images/btab_cart@2x.png
  32. BIN
      static/images/btab_classify@2x.png
  33. BIN
      static/images/btab_home@2x.png
  34. BIN
      static/images/btab_my@2x.png
  35. BIN
      static/images/btab_view@2x.png
  36. BIN
      static/images/btab_view_active@2x.png
  37. BIN
      static/images/c_setting.png
  38. BIN
      static/images/cb1.png
  39. BIN
      static/images/cb2.png
  40. BIN
      static/images/cb3.png
  41. BIN
      static/images/cb4.png
  42. BIN
      static/images/cb5.png
  43. BIN
      static/images/cb6.png
  44. BIN
      static/images/checkbox.png
  45. BIN
      static/images/clear_input.png
  46. BIN
      static/images/con-normal_no.png
  47. BIN
      static/images/coupon_bky.png
  48. BIN
      static/images/coupon_gq.png
  49. BIN
      static/images/coupon_ksy.png
  50. BIN
      static/images/coupon_ysy.png
  51. BIN
      static/images/ct1.png
  52. BIN
      static/images/ct2.png
  53. BIN
      static/images/ct3.png
  54. BIN
      static/images/ct4.png
  55. BIN
      static/images/ct5.png
  56. BIN
      static/images/del-address.png
  57. BIN
      static/images/detail_back.png
  58. BIN
      static/images/detail_kefu.png
  59. BIN
      static/images/gesture_roam.png
  60. BIN
      static/images/go.png
  61. BIN
      static/images/hbtab_cart@2x.png
  62. BIN
      static/images/hbtab_classify@2x.png
  63. BIN
      static/images/hbtab_home@2x.png
  64. BIN
      static/images/hbtab_my@2x.png
  65. BIN
      static/images/ic_menu_choice_nor.png
  66. BIN
      static/images/ic_menu_choice_pressed.png
  67. BIN
      static/images/ic_menu_me_nor.png
  68. BIN
      static/images/ic_menu_me_pressed.png
  69. BIN
      static/images/ic_menu_shoping_nor.png
  70. BIN
      static/images/ic_menu_shoping_pressed.png
  71. BIN
      static/images/ic_menu_sort_nor.png
  72. BIN
      static/images/ic_menu_sort_pressed.png
  73. BIN
      static/images/ic_menu_topic_nor.png
  74. BIN
      static/images/ic_menu_topic_pressed.png
  75. BIN
      static/images/icon-normal_arrow-right1.png
  76. BIN
      static/images/icon-normal_arrowDown.png
  77. BIN
      static/images/icon-normal_checkbox-checked.png
  78. BIN
      static/images/icon-normal_checkbox.png
  79. BIN
      static/images/icon-normal_detailTagArrow.png
  80. BIN
      static/images/icon-normal_down.png
  81. BIN
      static/images/icon-normal_no.png
  82. BIN
      static/images/icon-normal_search2.png
  83. BIN
      static/images/icon-normal_up.png
  84. BIN
      static/images/icon/apartments@2x.png
  85. BIN
      static/images/icon/b&b@2x.png
  86. BIN
      static/images/icon/community@2x.png
  87. BIN
      static/images/icon/home_normal@2x.png
  88. BIN
      static/images/icon/home_selected@2x.png
  89. BIN
      static/images/icon/house@2x.png
  90. BIN
      static/images/icon/me_normal@2x.png
  91. BIN
      static/images/icon/me_selected.png
  92. BIN
      static/images/icon/merchants_normal@2x.png
  93. BIN
      static/images/icon/merchants_selected@2x.png
  94. BIN
      static/images/icon/search@2x.png
  95. BIN
      static/images/icon/second_hand@2x.png
  96. BIN
      static/images/icon/vr@2x.png
  97. BIN
      static/images/icon_collect.png
  98. BIN
      static/images/icon_collect_checked.png
  99. BIN
      static/images/icon_cus_chose_allow@2x.png
  100. 0 0
      static/images/icon_error.png

+ 6 - 3
app.js

@@ -7,7 +7,7 @@ const api = require('./config/api');
     Page = function (pageConfig) {
         // 设置全局默认分享
         let tempShare = pageConfig.onShareAppMessage
-        pageConfig.onShareAppMessage = function(...args) {
+        pageConfig.onShareAppMessage = function (...args) {
             let pages = getCurrentPages()
             let path = pages[pages.length - 1].route;
             let defconfig = {
@@ -30,7 +30,7 @@ const api = require('./config/api');
         }
 
         let onShow = pageConfig.onShow
-        pageConfig.onShow = function(...args) {
+        pageConfig.onShow = function (...args) {
             getApp().setLoginProps(true)
 
             return onShow.call(this, ...args)
@@ -94,6 +94,7 @@ App({
         this.onGetSysInfo()
     },
     globalData: {
+        city:  wx.getStorageSync('city') ||'珠海',
         voiceProps,
         loginProps,
         userInfo: {
@@ -105,7 +106,9 @@ App({
         userCoupon: 'NO_USE_COUPON', //默认不适用优惠券
         courseCouponCode: {}, //购买课程的时候优惠券信息
         isiPhoneX: false,
-        isLogin: false
+        isLogin: false,
+        // 头部的自定义的高度
+        statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'],
     },
 
     addVoicePropsListener(cb) {

+ 35 - 30
app.json

@@ -1,11 +1,15 @@
 {
   "pages": [
+
     "pages/index/index",
+    "pages/city/city",
+
+    "pages/store/store",
     "pages/user/user",
-    "pages/webview/index",
     "pages/discover/discover",
     "pages/ncategory/category",
     "pages/ucenter/index/index",
+    "pages/searchRoom/searchRoom",
     "pages/catalog/catalog",
     "pages/coupon/coupon",
     "pages/offline/offline",
@@ -46,10 +50,11 @@
     "pages/auth/btnAuth/btnAuth",
     "pages/logistics/index",
     "pages/shared/shared",
-    "pages/share",
     "pages/godis/godis",
     "component/auth/auth",
     "pages/user/imageCropper"
+
+
   ],
   "window": {
     "backgroundTextStyle": "dark",
@@ -58,43 +63,43 @@
     "navigationBarTextStyle": "black",
     "enablePullDownRefresh": true
   },
-  "subpackages": [
-    {
-      "root": "dataReport",
-      "pages": [
-        "pages/data-report/data-report"
-      ],
-      "plugins": {
-        "ykfchat": {
-          "version": "2.0.7",
-          "provider": "wx1fdc8c9f3a3a05e4"
-        }
-      },
-      "independent": false
-    }
-  ],
+  "subpackages": [{
+    "root": "dataReport",
+    "pages": [
+      "pages/data-report/data-report"
+
+
+
+    ],
+    "plugins": {
+      "ykfchat": {
+        "version": "2.0.7",
+        "provider": "wx1fdc8c9f3a3a05e4"
+      }
+    },
+    "independent": false
+  }],
   "tabBar": {
     "backgroundColor": "#fff",
-    "borderStyle": "black",
-    "selectedColor": "#ED5D18",
-    "color": "#666C7D",
-    "list": [
-      {
+    "borderStyle": "white",
+    "selectedColor": "#333333",
+    "color": "AFAFAF",
+    "list": [{
         "pagePath": "pages/index/index",
-        "iconPath": "static/images/hbtab_home@2x.png",
-        "selectedIconPath": "static/images/btab_home@2x.png",
+        "iconPath": "static/images/icon/home_normal@2x.png",
+        "selectedIconPath": "static/images/icon/home_selected@2x.png",
         "text": "首页"
       },
       {
-        "pagePath": "pages/cart/cart",
-        "iconPath": "static/images/hbtab_cart@2x.png",
-        "selectedIconPath": "static/images/btab_cart@2x.png",
-        "text": "购物车"
+        "pagePath": "pages/store/store",
+        "iconPath": "static/images/icon/merchants_normal@2x.png",
+        "selectedIconPath": "static/images/icon/merchants_selected@2x.png",
+        "text": "商家"
       },
       {
         "pagePath": "pages/ucenter/index/index",
-        "iconPath": "static/images/hbtab_my@2x.png",
-        "selectedIconPath": "static/images/btab_my@2x.png",
+        "iconPath": "static/images/icon/me_normal@2x.png",
+        "selectedIconPath": "static/images/icon/me_selected.png",
         "text": "我的"
       }
     ]

+ 30 - 0
component/roomItem/roomItem.js

@@ -0,0 +1,30 @@
+// components/house-item/house-item.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    room: Object
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    // toDetail () {
+    //   getApp().autoSubcrebe && getApp().autoSubcrebe()
+    //   getApp().globalData.lastHouse = this.properties.house
+    //   console.log(this.properties.house)
+    //   wx.navigateTo({
+    //     url: `/pages/detail/detail?house_id=${this.properties.house.house_id}`
+    //   })
+    // }
+  }
+})

pages/share.json → component/roomItem/roomItem.json


+ 46 - 0
component/roomItem/roomItem.wxml

@@ -0,0 +1,46 @@
+<view class="tj_listItem">
+				<view class="tj_listItemCover">
+					<image mode="heightFix"
+						src="https://m4.publicimg.browser.qq.com/publicimg/pcqb/ewtab_yunying/477_266_datu_20210802.jpg"></image>
+				</view>
+				<view class="tj_listItemMsg">
+					<p class="tj_listItemTitle">
+						格力海岸第三期3室2厅如果这个名字超级长就这样
+					</p>
+					<view class="tj_listItemTip">
+						<view>
+							<text>香洲区</text>
+							<text> | </text>
+						</view>
+						<view>
+							<text>唐家湾镇</text>
+							<text> | </text>
+						</view>
+						<view>
+							<text>格力海岸</text>
+						</view>
+					</view>
+
+
+					<view class="tj_listItemTag">
+						<view class="tagVr">
+							<view class="tagItemIcon">
+								<image mode="heightFix" src="../../static/images/icon/vr@2x.png"></image>
+							</view>
+							<view class="tip">
+								房源
+							</view>
+
+						</view>
+						<view class="tagItem">VR看房</view>
+						<view class="tagItem">随时可看</view>
+					</view>
+
+
+					<view class="tj_listItemPrice">
+							<text class="unitPrice">平均43,388元/平</text>
+							<text class="totalPrice">525万</text>
+
+					</view>
+				</view>
+			</view>

+ 124 - 0
component/roomItem/roomItem.wxss

@@ -0,0 +1,124 @@
+/* component/roomItem/roomItem.wxss */
+.tj_listItem {
+  display: flex;
+  align-items: flex-start;
+  justify-content: flex-start;
+  padding: 20rpx 0;
+  border-bottom: 2rpx solid #EDEDED;
+}
+
+.tj_listItem .tj_listItemCover {
+  width: 210rpx;
+  height: 210rpx;
+  border-radius: 8px;
+  overflow: hidden;
+}
+
+.tj_listItem .tj_listItemCover image {
+  width: 210rpx;
+  height: 210rpx;
+}
+
+.tj_listItemMsg {
+  width: 456rpx;
+  margin-left: 20rpx;
+}
+
+.tj_listItemMsg .tj_listItemTitle {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 30rpx;
+  font-weight: bold;
+  overflow: hidden; 
+  text-overflow: ellipsis; 
+  display: -webkit-box;
+  -webkit-line-clamp: 2; 
+  -webkit-box-orient: vertical;
+}
+
+.tj_listItemMsg .tj_listItemTip {
+  display: flex;
+  align-items: center;
+  height: 28rpx;
+  margin: 5rpx 0 ;
+}
+
+.tj_listItemMsg .tj_listItemTip text {
+  font-size: 20rpx;
+  color: #666;
+}
+
+.tj_listItemMsg .tj_listItemTag {
+  display: flex;
+  align-items: center;
+  margin: 14rpx 0 24rpx 0;
+}
+
+.tj_listItemMsg .tj_listItemTag .tagItem {
+  font-size: 20rpx;
+  color: #0075DC;
+  padding: 2rpx 8rpx;
+  background: rgba(0, 117, 220, 0.2);
+  border-radius: 4rpx;
+  margin-right: 8rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4rpx;
+}
+
+.tj_listItemMsg .tj_listItemTag .tagVr {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 8rpx;
+  width: 104rpx;
+  height: 32rpx;
+  border: 1px solid #0075DC;
+  box-sizing: border-box;
+  border-radius: 4rpx;
+}
+
+.tj_listItemMsg .tj_listItemTag .tagVr .tagItemIcon {
+  background: #0075DC;
+  width: 52rpx;
+  height: 32rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.tj_listItemMsg .tj_listItemTag .tagVr .tagItemIcon image {
+  width: 28rpx;
+  height: 18rpx;
+}
+
+.tj_listItemMsg .tj_listItemTag .tagVr .tip {
+  width: 52rpx;
+  height: 32rpx;
+  color: #0075DC;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  /* padding: 2rpx 8rpx; */
+  background: rgba(0, 117, 220, 0.2);
+  font-size: 20rpx;
+}
+
+.tj_listItemMsg .tj_listItemPrice {
+  display: flex;
+  align-items: center;
+  height: 28rpx;
+  justify-content: space-between;
+}
+
+.tj_listItemMsg .tj_listItemPrice .unitPrice {
+  font-size: 20rpx;
+  color: #666;
+}
+.tj_listItemMsg .tj_listItemPrice  .totalPrice{
+  font-size: 28rpx;
+  color: #0075DC;
+  font-weight: bold;
+}

+ 188 - 0
pages/city/city.js

@@ -0,0 +1,188 @@
+// pages/city/city.js
+import {
+  cities
+} from './json/cites' // 你的路径
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    citys: cities,
+    apl_index: 0,
+    offTop: 0,
+    searchCity: '',
+    searchCityList: []
+  },
+  jumpTo: function (e) {
+    // 获取标签元素上自定义的 data-opt 属性的值
+    let target = e.currentTarget.dataset.opt;
+    let index = e.currentTarget.dataset.index;
+    this.setData({
+      toView: target,
+      apl_index: index
+    })
+
+  },
+  getAplPos() {
+    this.setData({
+      apl_index: 0
+    })
+    wx.createSelectorQuery().select('.scrollBox').boundingClientRect((res) => {
+
+
+      console.log(res)
+      this.setData({
+        offTop: res.top
+      })
+
+      let tab = this.data.citys
+      let arr = []
+
+      for (let i = 0; i < tab.length; i++) {
+        wx.createSelectorQuery().select('#item' + i).boundingClientRect((res_i) => {
+          // console.log(res_i)
+          tab[i].top = res_i.top - this.data.offTop;
+          this.setData({
+            citys: tab,
+            // apl_posArr: arr
+          })
+
+        }).exec()
+      }
+
+
+    }).exec()
+
+
+  },
+  onPageScroll(e) {
+    //创建节点选择器
+    let query = wx.createSelectorQuery();
+    //选择id
+    query.select('.scrollBox').boundingClientRect((rect) => {
+      let scrollTop = e.detail.scrollTop
+      let tabs = this.data.citys
+      wx.showToast({
+        title: tabs[this.data.apl_index].title,
+        duration: 300,
+        icon: 'none'
+      })
+      for (let i = 0; i < tabs.length; i++) {
+        if (scrollTop > tabs[i].top && scrollTop < tabs[i + 1].top) {
+          this.setData({
+            apl_index: i
+          })
+        } else if (scrollTop >= tabs[tabs.length - 1].top) {
+          // console.log(1)
+          this.setData({
+            apl_index: tabs.length - 1
+          })
+          return
+        }
+      }
+    }).exec();
+  },
+  search() {
+    if (this.data.searchCity != '') {
+      // console.log(this.data.searchCity)
+      let arr = []
+      for (let i = 0; i < this.data.citys.length; i++) {
+        this.data.citys[i].lists.filter((res) => {
+          if (res.includes(this.data.searchCity)) {
+            arr.push(res);
+            this.setData({
+              searchCityList: arr
+            })
+          }
+        })
+      }
+      if (arr.length == 0) {
+        wx.showToast({
+          title: '查无此城市',
+          icon: 'none'
+        })
+      } else {
+
+      }
+    } else {
+      this.setData({
+        searchCityList: []
+      })
+      if (this.data.searchCityList.length == 0) {
+        wx.showToast({
+          title: '请输入城市名称',
+          icon: 'none'
+        })
+      }
+
+    }
+
+  },
+  inputChange(e) {
+    this.setData({
+      searchCity: e.detail.value,
+    });
+  },
+  changeCity(e) {
+    let city = e.target.dataset.city
+    wx.setStorageSync('city', city)
+    getApp().globalData.city = city
+    wx.navigateBack()
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    // console.log(cities)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    this.getAplPos()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 5 - 0
pages/city/city.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "选择城市",
+  "enablePullDownRefresh": false
+}

+ 36 - 0
pages/city/city.wxml

@@ -0,0 +1,36 @@
+<!-- <view> -->
+<view class="storeContent">
+  <view class="storeSearch">
+    <image src="../../static/images/icon/search@2x.png"></image>
+    <input type="text" bindinput="inputChange" placeholder="请输入城市名称" placeholder-class="placeholderStyle" />
+  </view>
+  <view class="searchBtn" bindtap="search">搜索</view>
+</view>
+<view style="height: 90rpx;"></view>
+<view class="scrollBox" wx:if="{{searchCityList.length==0}}">
+  <scroll-view class="jump_list" bindscroll="onPageScroll" scroll-into-view="{{toView}}" scroll-y="true"
+    scroll-with-animation="true">
+    <view class='city_box'>
+      <view wx:for="{{citys}}" wx:key="{{item}}" id="item{{index}}">
+        <view class="cityTitle">{{item.title}}</view>
+        <view data-city="{{item}}" bindtap="changeCity" wx:for="{{item.lists}}" class="cityItem">
+          {{item}}
+        </view>
+      </view>
+    </view>
+  </scroll-view>
+  <view class="btn_jump">
+    <view class="btn_item {{apl_index ==index ?'active':''}}" wx:for="{{citys}}" data-index="{{index}}" bindtap='jumpTo'
+      data-opt="item{{index}}">{{item.title}}</view>
+
+  </view>
+</view>
+<view wx:else>
+  <view wx:for="{{searchCityList}}" data-city="{{item}}" bindtap="changeCity" class="cityItem">
+    {{item}}
+  </view>
+</view>
+
+
+
+<!-- </view> -->

+ 119 - 0
pages/city/city.wxss

@@ -0,0 +1,119 @@
+/* pages/city/city.wxss */
+.storeContent {
+  width: 100%;
+  height: 90rpx;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #fff;
+  z-index: 100;
+}
+
+.storeSearch {
+  width: 614rpx;
+  height: 64rpx;
+  background: #F6F6F6;
+  border-radius: 32rpx;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  margin-right: 10rpx;
+}
+
+.storeSearch image {
+  width: 24rpx;
+  height: 24rpx;
+}
+
+.storeSearch input {
+  font-size: 24rpx;
+  color: #333;
+  margin-left: 8rpx;
+  width: 80%;
+}
+
+.storeSearch .placeholderStyle {
+  font-size: 24rpx;
+  color: #B2B2B2;
+}
+
+.searchBtn {
+  color: #0075DC;
+  font-size: 28rpx;
+  width: 60rpx;
+}
+
+.resulst {
+  padding: 10rpx 32rpx;
+  box-sizing: border-box;
+}
+
+page {
+  height: 100%;
+  background: #F6F6F6;
+}
+
+.scrollBox {
+  height: calc(100vh - 74rpx);
+}
+
+.btn_jump {
+  position: fixed;
+  z-index: 9;
+  top: 40%;
+  right: 10rpx;
+  transform: translateY(-50%);
+}
+
+.btn_jump .btn_item {
+  font-size: 20rpx;
+  color: #666666;
+  margin: 10rpx 0;
+}
+
+.btn_jump .btn_item.active {
+  color: #0075DC;
+}
+
+.jump_list {
+  position: relative;
+  height: 100%;
+}
+
+.list_item {
+  height: 80rpx;
+}
+
+.list_item:nth-of-type(even) {
+  background: #f8f8f8;
+}
+
+.cityTitle {
+  background: #F6F6F6;
+  color: #666666;
+  font-size: 24rpx;
+  height: 64rpx;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+}
+
+.cityItem {
+  background: #fff;
+  color: #333333;
+  font-size: 28rpx;
+  height: 88rpx;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  border-bottom: 2rpx solid #EDEDED;
+}

Diferenças do arquivo suprimidas por serem muito extensas
+ 116 - 0
pages/city/json/cites.js


+ 74 - 285
pages/index/index.js

@@ -5,328 +5,117 @@ import header from './data'
 import {
   Router
 } from '../../utils/router.js'
-
+const app = getApp()
 //获取应用实例
 Router({
   data: {
-    currentBanner: 0,
-    banners: [],
-    showSearch: false,
-    activeType: -1,
-    header: [],
-    noRecord: '',
-    hideMask: false,
-    keyword: '',
-    url: 'https://www.4dkankan.com/eShopMobile.html?m=',
-    totalPages: 1,
-    currentPage: 1,
-    size: 10,
-    loading: false,
-    brandList: []
-  },
-  swiperChange(e) {
-    this.setData({
-      currentBanner: e.detail.current
-    })
+    // 头部导航栏的高度
+    statusBarHeight: app.globalData.statusBarHeight,
+    classifyList: [{
+        id: 1,
+        title: '新房',
+        icon: "../../static/images/icon/house@2x.png",
+      },
+      {
+        id: 2,
+        title: '二手房',
+        icon: "../../static/images/icon/second_hand@2x.png",
+      },
+
+      {
+        id: 3,
+        title: '公寓',
+        icon: "../../static/images/icon/apartments@2x.png",
+      },
+      {
+        id: 4,
+        title: '民宿',
+        icon: "../../static/images/icon/b&b@2x.png",
+      },
+      {
+        id: 5,
+        title: '社区',
+        icon: "../../static/images/icon/community@2x.png",
+      },
+    ],
+    middleTabList: [{
+        id: 1,
+        title: '新上房源'
+      },
+      {
+        id: 2,
+        title: '热门房源'
+      },
+      {
+        id: 3,
+        title: '热门企业'
+      },
+    ],
+    middleType: 1,
+    city: app.globalData.city,
+    fetcherData: {
+      city:'',
+      page_num: 1,
+      page_size:20
+    }
+
   },
+
   onShareAppMessage: function () {
     return {
       path: '/pages/index/index'
     }
   },
-  getImgHeight() {
-    const aw = 750
-    const ah = 480
-    this.setData({
-      imgHeight: ah * wx.getSystemInfoSync().windowWidth / aw
-    })
 
-    this.navTop = this.data.imgHeight * 0.87
-    this.bgTop = this.data.imgHeight * 0.6
-    this.setData({
-      navTop: this.bgTop
-    })
-    wx.createSelectorQuery().select('#index-nav').boundingClientRect( (rect) => {
-      console.error(rect.top)
-      this.setData({
-        navPosTop: rect.top
-      })
-    }).exec()
-    // console.log(this.navTop, this.bgTop)
-  },
-  onPageScroll(e) {
-    if (e.scrollTop < 0) return;
-    this.setData({
-      bgTop: e.scrollTop > this.bgTop ? this.bgTop : e.scrollTop,
-      bgIsTop: e.scrollTop > this.navTop,
-      isFixed: e.scrollTop > this.data.navPosTop
-    })
-  },
   onPullDownRefresh() {
-    this.setData({
-      brandList: this.data.brandList.slice(0, 10),
-      currentPage: 1
-    });
-    this.getBrandList(1, false, true);
-    getApp().onPullDownRefresh()
-  },
-
-  onReachBottom() {
-    if (!this.data.loading) {
-      this.loadMore();
-      console.log('reach down')
-    }
-  },
-
-  clickSwiper() {
+    // this.setData({
+    //   brandList: this.data.brandList.slice(0, 10),
+    //   currentPage: 1
+    // });
+    // this.getBrandList(1, false, true);
+    app.onPullDownRefresh()
+  },
+  inputFocus: function () {},
+  toCity() {
     wx.navigateTo({
-      url: this.data.banners[this.data.currentBanner].redirectUrl,
+      url: `/pages/city/city`
     })
   },
-  loadMore: function () {
-    if (this.data.currentPage < this.data.totalPages) {
-      console.log(this.data.currentPage + 1)
-      this.getBrandList(this.data.currentPage + 1);
-    } else {
-      return;
-    }
-  },
-
-  getBrandList(page, isSearch = false, refresh = false) {
-    this.setData({
-      loading: true
-    })
-    let tempContent = this.data.brandList ?
-      this.data.brandList : [];
-    let {
-      activeType,
-      size,
-      keyword,
-    } = this.data
-
-    util.request(api.IndexList, {
-        type: activeType,
-        page,
-        name: keyword,
-        size
-      })
-      .then(res => {
-        res.data.data = res.data.data.map(item => {
-          if (item.pvTotalNum) {
-            item.pvTotalNum = item.pvTotalNum >= 10000 ?
-              (
-                item.pvTotalNum > 990000 ? 99 + 'W+' :
-                (item.pvTotalNum / 10000).toFixed(1) + 'W'
-              ) :
-              item.pvTotalNum
-          } else {
-            item.pvTotalNum = 0
-          }
-          return item
-        })
-        if (isSearch) {
-          // if (res.data.data.length <= 0) {
-          //   this.setData({
-          //     noRecord: true
-          //   });
-          // }
-          // else {
-          wx.pageScrollTo({
-            scrollTop: 0
-          })
-          this.setData({
-            brandList: res.data.data,
-            currentPage: res.data.currentPage,
-            totalPages: res.data.totalPages,
-            loading: false,
-            noRecord: false,
-            showSearch: false
-          });
-          // }
-        } else if (refresh) {
-          this.setData({
-            brandList: res.data.data,
-            currentPage: res.data.currentPage,
-            totalPages: res.data.totalPages,
-            loading: false
-          });
-        } else {
-          this.setData({
-            brandList: tempContent.concat(res.data.data),
-            currentPage: res.data.currentPage,
-            totalPages: res.data.totalPages,
-            loading: false
-          });
-        }
-
-
-
-      });
-  },
-
-  inputChange: function (e) {
-    let val = e.detail.value
-    this.setData({
-      keyword: val,
-      noRecord: false
-    })
-
-    this.search()
-  },
-
-  handleScroll(ev) {
-    this.setData({
-      isFixed: ev.detail.isFixed
-    })
-  },
-  search: function () {
-    let {
-      keyword
-    } = this.data
-
-    this.getBrandList(1, true)
-    // if (this.brandList.length <= 0) {
-    //   this.setData({
-    //     noRecord: true
-    //   })
-    // }
-    // else {
-    //   this.setData({
-    //     activeType: -1,
-    //     noRecord: false,
-    //     showSearch: false
-    //   })
-    // }
-  },
-
-  inputFocus: function () {
-
-  },
-  gotoCateg() {
+  toSearch(e) {
+    var id = e.currentTarget.dataset.id
     wx.navigateTo({
-      url: '/pages/ncategory/category?id=search',
-    })
-  },
-
-  tapHeaderBar(e) {
-    // let { id } = e.currentTarget.dataset
-    // wx.navigateTo({
-    //   url: '/pages/ncategory/category?id=' + id,
-    // })
-    let {
-      id
-    } = e.currentTarget.dataset
-    this.setData({
-      activeType: id,
-      showSearch: false,
-      keyword: '',
-      brandList: [],
-      currentPage: 1
-    })
-
-    this.getBrandList(1)
-  },
-
-  tabShow() {
-    this.setData({
-      showSearch: true
+      url: `/pages/searchRoom/searchRoom?id=` + id
     })
   },
+  onLoad: async function (options) {
 
-
-  tabHide() {
-    this.setData({
-      showSearch: false,
-      noRecord: false,
-      keyword: ''
-    })
   },
 
 
 
 
-  onLoad: async function (options) {
-    getApp().checkNetStatu();
-    // this.checkNetStatu()
-    this.setData({
-      imgServer: util.imgServer
-    })
-    this.getBrandList(1)
-    this.getBanner()
-    this.getType()
-    this.getImgHeight()
-
-    // wx.setBackgroundColor({
-    //   backgroundColor: '#ff7701'
-    // })
-  },
-
-  async getBanner() {
-    let {
-      data
-    } = await util.request(api.HomeBanner)
-    this.setData({
-      banners: data
-    })
-  },
-
-  async getType() {
-    let {
-      data
-    } = await util.request(api.IndexTypeList)
-    let items = [{
-      name: '推荐',
-      id: -1
-    }]
-    data.forEach(item => {
-      Object.keys(item).forEach(key => {
-        items.push({
-          name: key,
-          id: item[key]
-        })
-      })
-    })
-    this.setData({
-      header: items
-    })
-  },
 
   onReady: function () {
     // 页面渲染完成
   },
 
   onShow: function (options) {
-    if (global.type) {
-      this.tapHeaderBar({
-        currentTarget: {
-          dataset: this.data.header[0]
-        }
-      })
-      global.type = null
-    }
-    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
-      this.getTabBar().setData({
-        selected: 0
+
+    console.log(app.globalData.city)
+    // 页面显示
+    let city = app.globalData.city
+    if (city != this.data.city) {
+      this.setData({
+        'city': app.globalData.city,
       })
     }
 
-    getApp().updateCardCount()
-    // 页面显示
+
   },
   onHide: function () {
     // 页面隐藏
   },
   onUnload: function () {
     // 页面关闭
-  },
-  gotoWV: function (event) {
-    let {
-      id
-    } = event.currentTarget.dataset
-
-    wx.navigateTo({
-      url: `/pages/webview/index?id=${id}`,
-      // url: `/pages/share/share?id=${id}`,
-    })
   }
 })

+ 6 - 2
pages/index/index.json

@@ -1,3 +1,7 @@
 {
-  "navigationBarTitleText": "指房宝"
-}
+  "navigationBarTitleText": "指房宝",
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "roomItem": "../../component/roomItem/roomItem"
+  }
+}

+ 64 - 86
pages/index/index.wxml

@@ -1,106 +1,84 @@
 <view>
-	<auth bindlogin="onShow" />
-	
-	<view class="container">
+	<!-- 自定义的导航栏 -->
+	<view style="background: #fff;">
+		<view class="custom flex_center" style="padding-top:{{statusBarHeight}}px">
+			<view class="headerNav">
+				<view class='navInput'>
+					<view class="currentCity" bindtap="toCity">
+						<view class="city_text">{{city}}</view>
+						<view class="icon"></view>
+
+					</view>
+					<input placeholder='请输入VR场景名称' placeholder-class='none'
+						placeholder-style='color:#b3b3b3;font-size:22rpx;'></input>
+				</view>
+			</view>
 
-		<view class="search">
-			<input placeholder="VR找房、看车、逛店,就上指房宝!" value="{{keyword}}" bindinput="inputChange" bindconfirm="search" confirm-type="search" type="text"></input>
-			<image wx:if="{{imgServer}}" src="{{imgServer + '/search.png'}}"></image>
 		</view>
+		<view class="empty_custom" style="padding-top:{{statusBarHeight}}px"></view>
+		<view class="paddingBox"></view>
+	</view>
 
-		<view class="banner" wx:if="{{banners.length}}">
-			<swiper indicator-dots="{{false}}" bindchange="swiperChange" autoplay="{{true}}" interval="{{2000}}" duration="{{500}}">
-				<block wx:for="{{banners}}" wx:key="{{item.coverImage}}">
-					<swiper-item>
-						<view class="swiper-item" bindtap="clickSwiper">
-							<image src="{{item.coverImage}}"></image>
-						</view>
-					</swiper-item>
-				</block>
-			</swiper>
+	<!-- 头图 -->
+	<view class="headerImage">
+		<image mode="widthFix"
+			src="https://m4.publicimg.browser.qq.com/publicimg/pcqb/ewtab_yunying/477_266_datu_20210802.jpg"></image>
+	</view>
 
-			<view class="dots">
-				<view class="dot{{index == currentBanner ? 'active' : ''}}" wx:for="{{banners}}"></view>
+	<!-- 分类 -->
+	<view class="fl_content">
+		<view class="fl_list">
+			<view class="fl_item" wx:for="{{classifyList}}" data-id='{{item.id}}' bindtap="toSearch">
+				<image wx:if='{{item.icon}}' src="{{item.icon}}"></image>
+				<text class="fl_name">{{item.title}}</text>
 			</view>
 		</view>
+	</view>
 
-
-		<view>
-				<view class="header " id="index-nav">
-					<view class="ul nav">
-						<view bindtap="tapHeaderBar" wx:for="{{header}}" wx:key="{{item.type}}" data-id='{{item.id}}' class="li {{item.id==activeType?'active':''}}">
-							<text>{{item.name}}</text>
-						</view>
-					</view>
+	<!-- 中间tab -->
+	<view>
+		<view class="middleTab">
+			<view class="middletabContent">
+				<view class="middleTabItem {{middleType==item.id?'active':''}}" wx:for="{{middleTabList}}">
+					<text>{{item.title}}</text>
 				</view>
+			</view>
 		</view>
 
-		<view class="body" id="tab-con">
-			<view class="ul" wx:if="{{loading || brandList.length}}">
-				<view bindtap="gotoWV" data-img="{{item.img}}" data-id="{{item.id}}" class="li" wx:for='{{brandList}}' wx:key="id">
-					<view class="b-image">
-						<image wx:if="{{imgServer}}" class="cover" mode="aspectFill" src="{{item.appListPicUrl}}"></image>
-						<!-- <image class="icon" src="/static/images/img_shop_scene@2x.png"></image> -->
-						
-						<view class="scene-icon">
-							<view class="brick brick-1 enter">
-								<view class="brick-top face"></view>
-								<view class="brick-bottom face"></view>
-								<view class="brick-left face"></view>
-								<view class="brick-right face"></view>
-								<view class="brick-front face"></view>
-								<view class="brick-back face"></view>
-							</view>
-							<view class="brick brick-2 enter">
-								<view class="brick-top face"></view>
-								<view class="brick-bottom face"></view>
-								<view class="brick-left face"></view>
-								<view class="brick-right face"></view>
-								<view class="brick-front face"></view>
-								<view class="brick-back face"></view>
-							</view>
-							<view class="brick brick-3 enter">
-								<view class="brick-top face"></view>
-								<view class="brick-bottom face"></view>
-								<view class="brick-left face"></view>
-								<view class="brick-right face"></view>
-								<view class="brick-front face"></view>
-								<view class="brick-back face"></view>
-							</view>
-						</view>
-
-					</view>
-					
-					<view class="b-content">
-						<view class="b-title">{{item.name}}</view>
-						<view class="b-addres">
-							{{item.address || ''}}
-							<text class="user-motto" decode="{{true}}">&nbsp;</text>
-						</view>
-						<view class="b-maker">
-							<text>VR看房</text>
-							<text>随时可看</text>
-						</view>
-						<view class="b-money">
-							<text>{{item.retailPrice ? item.retailPrice + '万': ''}}</text>
-							<text>{{item.averagePrice ? item.averagePrice + '元/平' : ''}}</text>
-						</view>
-					</view>
+		<view class="middleList">
+			<view class="middleList_item" wx:for="{{3}}">
+				<view class="middleList_cover">
+					<image mode="heightFix"
+						src="https://m4.publicimg.browser.qq.com/publicimg/pcqb/ewtab_yunying/477_266_datu_20210802.jpg"></image>
 				</view>
+				<text class="middleList_title">华发水岸</text>
 			</view>
-			<view wx:else class="unbrand">
-				<image src="/static/images/img_noshop@3x.png"></image>
-				<view class="text">暂无相关店铺</view>
+		</view>
+	</view>
+
+	<!-- 为您推荐 -->
+	<view class="tj_content">
+		<view class="tj_header">
+			<view class="tj_title">为您推荐</view>
+			<view class="tj_tabbar">
+				<view class="tj_tabItem active">
+					<text>新房</text>
+				</view>
+				<view class="tj_tabItem">
+					<text>二手房</text>
+				</view>
+				<view class="tj_tabItem">
+					<text>公寓</text>
+				</view>
 			</view>
 		</view>
 
-		<view class="linear-mask {{hideMask? '': 'mask-hidden'}}"></view>
-		<view bindtap="tabHide" class="search-con" wx:if="{{showSearch}}">
-			<view class="sc-con" catchtap>
-				<input focus="true" value="{{keyword}}" bindinput="inputChange" bindconfirm="search" confirm-type="search" type="text"></input>
-				<image wx:if="{{imgServer}}" src="{{imgServer + '/fangdajing.png'}}"></image>
+		<view class="tj_list">
+			<view wx:for="{{10}}" wx:key class="house-list">
+				<roomItem house="{{item}}"></roomItem>
 			</view>
-			<view class="no-record" wx:if="{{noRecord}}">未搜索到相关内容</view>
 		</view>
 	</view>
+
+
 </view>

+ 286 - 499
pages/index/index.wxss

@@ -1,622 +1,409 @@
-.container {
-  overflow: hidden;
-  background: #fff;
-}
-
-.ul::-webkit-scrollbar{
-  display: none;
-}
-
-.linear-mask{
+/* 自定义导航栏开始 */
+.custom {
   position: fixed;
-  bottom: 0;
-  right: 0;
   width: 100%;
-  height: 50%;
-  background: linear-gradient(to top, rgba(0,0,0,1),rgba(0,0,0,0));
-  pointer-events: none;
-  opacity: 1;
-  transition: ease all 0.3s;
-  z-index: 2;
-}
-
-.mask-hidden{
-  opacity: 0;
-}
-.mall-logo{
-  position: fixed;
-  bottom: 15px;
-  right: 25px;
-  width: 80px;
-  height: auto;
-  pointer-events: none;
+  /* height: 64rpx; */
+  top: 0;
+  left: 0;
+  height: 45px;
   z-index: 999;
+  background: #fff;
+  box-sizing: border-box;
 }
 
-.search-con{
-  position: fixed;
-  bottom: 0;
-  right: 0;
+.headerNav {
   width: 100%;
-  height: 100%;
-  background: rgba(255,255,255,0.8);
-  z-index: 9999;
+  padding-left: 32rpx;
+  background: #fff;
+  box-sizing: border-box;
+  height: 90rpx;
+  display: flex;
+  align-items: center;
+  justify-content: start;
 }
 
-.no-record{
-  width: calc(100% - 80rpx);
-  margin: 40rpx 0 0 60rpx;
+.navInput {
+  /* float: left; */
+  /* margin-top: 8rpx; */
+  width: 498rpx;
+  height: 64rpx;
+  overflow: hidden;
+  box-sizing: border-box;
+  background: #eeeeee;
+  border-radius: 40rpx;
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
-.sc-con{
-  width: calc(100% - 80rpx);
-  line-height: 60rpx;
-  height: 60rpx;
-  border: 1px solid #808080;
-  border-radius: 30rpx;
-  margin: 20rpx 0 0 40rpx;
-  background: #fff;
+.currentCity {
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
   position: relative;
+  padding: 0 20rpx;
+}
+
+.currentCity:after {
+  content: '';
+  width: 2rpx;
+  height: 20rpx;
+  background: #CCCCCC;
+  border-radius: 1rpx;
+  position: absolute;
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
 }
 
-.sc-con input{
-  width: 90%;
-  background: none;
-  border: none;
-  padding-left: 30rpx;
+.currentCity .city_text {
   font-size: 24rpx;
-  color: #000;
-  line-height: 40rpx;
-  height: 56rpx;
+  color: #333;
+  margin-right: 3rpx;
+  display: block;
+  white-space: nowrap;
 }
 
-.sc-con image{
-  width: 40rpx;
-  height: 40rpx;
-  display: inline-block;
+.currentCity .icon {
+  width: 0px;
+  height: 8rpx;
+  border: 4rpx solid;
+  border-color: #666 transparent transparent transparent;
   position: absolute;
+  right: 7%;
   top: 50%;
   transform: translateY(-50%);
-  right: 20rpx;
 }
 
-
-.header {
-  /* background-color: #fff; */
-  /* padding-left: 46rpx;
-  padding-right: 46rpx; */
-  margin-top: 0;
-  padding: 12rpx 30rpx 22rpx;
-  /* left: 30rpx; */
-  position: relative;
+.navInput input {
+  width: 100%;
+  height: 58rpx;
+  background: #eeeeee;
+  font-size: 22rpx;
+  padding: 0 12rpx;
+  box-sizing: border-box;
 }
 
-.fixed {
-  position: fixed;
-  padding-left: 30rpx;
-  padding-right: 30rpx;
-  left: 0;
-  width: 100vw;
-  z-index: 999;
-}
+/* .custom text {
+  display: inline-block;
+  color: #fff;
+  font-size: 34rpx;
+  font-weight: 500;
+  max-width: 280rpx;
+} */
 
-.header .ul{
-  display: flex;
-  /* justify-content: space-between; */
-  align-items: baseline;
-  height: 40rpx;
+.empty_custom {
+  height: 45px;
+  width: 100%;
+  background: #fff;
 }
 
-.header .ul .li {
-  flex: 0 0 auto;
-  text-align: center;
-  margin-right: 40rpx;
+.paddingBox {
+  padding-top: 90rpx;
+  background: #fff;
+  position: relative;
+  z-index: 10;
 }
 
-.header .ul .li text {
-  color: #131D34;
-  font-size: 30rpx;
-  font-weight: bold;
-  padding: 10rpx;
-}
 
-.header .ul .li image {
-  width: 80rpx;
-  height: 80rpx;
-  margin-bottom: 14rpx;
-  display: block;
-}
 
-.header .ul .active {
-  position: relative;
+/* 自定义导航栏结束 */
+.headerImage {
+  width: 100%;
+  height: 408rpx;
+  overflow: hidden;
 }
 
-.header .ul .active text {
-  font-size: 36rpx;
-  z-index: 2;
-  position: relative;
-  color: #ED5D18;
+.headerImage image {
+  width: 100%;
+  height: 100%;
 }
 
-.header .ul .active::after {
-  content: '';
-  position: absolute;
-  bottom: -2px;
-  left: 25%;
-  right: 25%;
-  height: 2px;
-  background: #ED5D18;
-  border-radius: 10px;
-  z-index: 1;
+.fl_content {
+  width: 100%;
+  height: auto;
+  margin-top: 20rpx;
 }
 
+.fl_content .fl_list {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 40rpx;
+  box-sizing: border-box;
 
-.search{
-  position: relative;
-  z-index: 99;
-  height: 80rpx;
-  border: 1px solid rgba(0,0,0,0.1);
-  border-radius: 4px;
-  background: #fff;
-  margin: 0 30rpx 46rpx;
 }
 
-.search view{
-  background: none;
-  width: 80%;
-  border: none;
-  padding-left: 20rpx;
-  font-size: 24rpx;
-  color: #fff;
-  line-height: 24rpx;
-  vertical-align: middle;
+.fl_list .fl_item {
+  width: 96rpx;
+  height: auto;
+  margin-right: 54rpx;
 }
 
-.search input{
-  color:rgba(0,0,0,0.3);
-  height: 100%;
-  width: 100%;
-  padding: 0 28rpx 0 70rpx;
-  position: relative;
-  z-index: 999;
-  border-radius: 4px;
-  font-size: 14px;
-  border: none;
+.fl_list .fl_item:last-of-type {
+  margin-right: 0;
 }
 
-.search image{
-  width: 28rpx;
-  height: 28rpx;
-  display: inline-block;
-  position: absolute;
-  top: 50%;
-  transform: translateY(-50%);
-  left: 28rpx;
+.fl_list .fl_item image {
+  width: 96rpx;
+  height: 96rpx;
 }
 
-.body{
-  z-index: 11;
-  position: relative;
-  padding: 0 30rpx 22rpx;
-  overflow: hidden;
+.fl_list .fl_item .fl_name {
   width: 100%;
-  font-size: 0;
-  min-height: calc(100vh - 80rpx);
-  border-top: 5px solid rgb(245,245,245);
+  display: block;
+  text-align: center;
+  font-size: 24rpx;
+  color: #666;
 }
 
-.body::-webkit-scrollbar {display:none}
-
-.body .ul {
-  position: relative;
+.middleTab {
   width: 100%;
-  font-size: 0;
-  z-index: 1;
-  overflow: hidden;
-  margin-top: 10rpx;
+  height: auto;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  margin-top: 40rpx;
 }
 
-.body .li {
-  position: relative;
-  overflow: hidden;
-  padding: 26rpx 0;
-  width: 100%;
-  border-radius: 4px;
-  background-color: #fff;
-  border-bottom: 1px solid rgba(0,0,0,0.1);
+.middletabContent {
+  border-bottom: 2rpx solid #EDEDED;
   display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
-.body .li > .b-image{
-  width: 210rpx;
-  height: 160rpx;
-  border-radius: 2px;
-  overflow: hidden;
+.middletabContent .middleTabItem {
+  margin-right: 100rpx;
+  color: #999;
+  font-size: 32rpx;
+  padding-bottom: 16rpx;
   position: relative;
-  flex: 0 0 auto;
 }
 
-.body .li > .b-image .cover {
-  width: 100%;
-  height: 100%;
+.middletabContent .middleTabItem.active::after {
+  content: '';
+  position: absolute;
+  width: 40rpx;
+  height: 4rpx;
+  background: #0075DC;
+  border-radius: 2rpx;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
 }
 
-.body .li > .b-image .icon {
-  position: absolute;
-  left: 3px;
-  bottom: 1px;
-  width: 46rpx;
-  z-index: 2;
-  height: 54rpx;
+.middletabContent .middleTabItem.active text {
+  color: #0075DC;
 }
 
-.body .li .b-content {
-  margin-left: 20rpx;
+.middletabContent .middleTabItem:last-of-type {
+  margin-right: 0;
+}
+
+.middleList {
+  width: 100%;
+  min-height: 212rpx;
   display: flex;
-  flex-direction: column;
+  align-items: center;
   justify-content: center;
+  margin: 40rpx 0;
 }
 
-.body .li .b-title {
-  font-size: 30rpx;
-  color: #131D34;
-  font-weight: bold;
-  display: -webkit-box;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  word-wrap: break-word;
-  white-space: normal !important;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-  margin-bottom: 2rpx;
+.middleList_item {
+  margin-right: 16rpx;
 }
 
-
-.body .li .b-addres {
-  font-size: 22rpx;
-  font-family: PingFang SC;
-  font-weight: 400;
-  color: #131D34;
-  opacity: 1;
-  margin-bottom: 6rpx;
+.middleList_item:last-of-type {
+  margin-right: 0;
 }
 
-.body .li .b-maker {
-  opacity: 1;
-  margin-bottom: 6rpx;
+.middleList_item .middleList_cover {
+  width: 218rpx;
+  height: 160rpx;
+  overflow: hidden;
+  border-radius: 8px;
 }
 
-.body .li .b-maker text{
-  display: inline-block;
-  font-size: 22rpx;
-  font-family: PingFang SC;
-  font-weight: 400;
-  padding: 4rpx;
-  background: linear-gradient(180deg, #FCEDE5 0%, #FBFDFD 100%);
-  margin-right: 14rpx;
-  color: #666C7D;
-  border-radius: 2px;
+.middleList_item .middleList_cover image {
+  width: 218rpx;
+  height: 160rpx;
 }
 
-.body .li .b-money text:nth-child(1){
-  color: #ED5D18;
+.middleList_item .middleList_title {
   font-size: 28rpx;
-  font-weight: bold;
-  margin-right: 7px;
+  color: #333;
+  width: 100%;
+  display: block;
+  text-align: center;
+  margin-top: 10rpx;
 }
 
-.body .li .b-money text:nth-child(2){
-  color: #999999;
-  font-size: 24rpx;
-  margin-right: 7px;
+.tj_content {
+  width: 100%;
+  height: 44rpx;
+  padding: 0 32rpx;
+  box-sizing: border-box;
 }
 
-.unbrand {
-  margin-top: 180rpx;
-  text-align: center;
+.tj_header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 
-.unbrand image {
-  display: inline-block;
-  width: 250rpx;
-  height: 274rpx;
+.tj_header .tj_title {
+  color: #333333;
+  font-size: 32rpx;
 }
 
-.unbrand .text {
-  color: #666C7D;
-  font-size: 30rpx;
-  margin-top: 40rpx;
+.tj_header .tj_tabbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 
-.banner {
-  margin: 16rpx 0 38rpx;
-  position: relative;
+.tj_header .tj_tabbar .tj_tabItem {
+  margin-left: 32rpx;
 }
 
-.banner swiper {
-  height: 296rpx;
+.tj_tabItem text {
+  font-size: 24rpx;
+  color: #999;
 }
 
-.banner .swiper-item image,
-.banner .swiper-item {
-  width: 100%;
-  height: 100%;
+.tj_header .tj_tabbar .tj_tabItem.active text {
+  color: #0075DC;
 }
 
-.banner .swiper-item {
-  border-radius: 4px;
-  overflow: hidden
-  
-}
-.dots {
-  position: absolute;
-  bottom: 8rpx;
-  left: 50%;
-  transform: translateX(-50%);
-  z-index: 2;
+.tj_list {
+  width: 100%;
+  height: auto;
+  box-sizing: border-box;
 }
 
-.dots view {
-  display: inline-block;
-  width: 4px;
-  height: 4px;
-  background: #FFFFFF;
-  border-radius: 2px;
-  opacity: 0.5;
-  margin: 0 4rpx
+.tj_listItem {
+  display: flex;
+  align-items: flex-start;
+  justify-content: flex-start;
+  padding: 20rpx 0;
+  border-bottom: 2rpx solid #EDEDED;
 }
 
-.dots view.dotactive {
-  width: 8px;
-  opacity: 1;
+.tj_listItem .tj_listItemCover {
+  width: 210rpx;
+  height: 210rpx;
+  border-radius: 8px;
+  overflow: hidden;
 }
 
-.hotcateg {
-  margin-bottom: 40rpx;
+.tj_listItem .tj_listItemCover image {
+  width: 210rpx;
+  height: 210rpx;
 }
 
-.hotcateg .title {
-  font-size: 30rpx;
-  font-weight: bold;
-  line-height: 44rpx;
-  color: #131D34;
-  margin-bottom: 14rpx;
-  padding: 0 46rpx;
+.tj_listItemMsg {
+  width: 456rpx;
+  margin-left: 20rpx;
 }
 
-.hotcateg .swiper-item {
-  margin: 0 10rpx;
-  position: relative;
-  border-radius: 4px;
+.tj_listItemMsg .tj_listItemTitle {
+  font-size: 28rpx;
+  color: #333;
+  line-height: 30rpx;
+  font-weight: bold;
   overflow: hidden;
-  width: calc(100% - 20rpx);
-  height: 100%;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
 }
 
-.hotcateg .swiper-item image {
-  width: 100%;
-  height: 100%;
+.tj_listItemMsg .tj_listItemTip {
+  display: flex;
+  align-items: center;
+  height: 28rpx;
+  margin: 5rpx 0;
 }
 
-.hotcateg .swiper-item view {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  padding: 8rpx 24rpx;
-  font-size: 22rpx;
-  color: #fff;
-  background-color: rgba(0,0,0,0.4);
-  text-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+.tj_listItemMsg .tj_listItemTip text {
+  font-size: 20rpx;
+  color: #666;
 }
 
-
-.bgimg {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100vw;
-  height: 480rpx;
-  z-index: 0;
+.tj_listItemMsg .tj_listItemTag {
+  display: flex;
+  align-items: center;
+  margin: 14rpx 0 24rpx 0;
 }
 
-.bgimg image {
-  width: 100%;
-  height: 100%;
+.tj_listItemMsg .tj_listItemTag .tagItem {
+  font-size: 20rpx;
+  color: #0075DC;
+  padding: 2rpx 8rpx;
+  background: rgba(0, 117, 220, 0.2);
+  border-radius: 4rpx;
+  margin-right: 8rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4rpx;
 }
 
-.page-title {
-  padding: 110rpx 32rpx 20rpx;
-  font-size: 32rpx;
-  z-index: 9999;
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100vw;
-  overflow: hidden;
-  background: #fff;
-}
-.page-title image {
-  width: 100%;
-  position: absolute;
-  left: 0;
-  top: 0;
-  height: 480rpx;
-}
-.page-title text {
+.tj_listItemMsg .tj_listItemTag .tagVr {
   position: relative;
-  color: #000;
-  z-index: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 8rpx;
+  width: 104rpx;
+  height: 32rpx;
+  border: 1px solid #0075DC;
+  box-sizing: border-box;
+  border-radius: 4rpx;
+}
+
+.tj_listItemMsg .tj_listItemTag .tagVr .tagItemIcon {
+  background: #0075DC;
+  width: 52rpx;
+  height: 32rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
-.zwf {
-  height: 183rpx;
+.tj_listItemMsg .tj_listItemTag .tagVr .tagItemIcon image {
+  width: 28rpx;
+  height: 18rpx;
 }
 
-
-
-
-
-
-
-
-.scene-icon {
-  --width: 14px;
-  --height: 5px;
-  padding: calc(var(--height) * 1) calc(var(--width) * 0.3);
-  position: absolute;
-  left: 4px;
-  bottom: 2px;
-  width: calc(--width);
-  height: calc(--height);
-  z-index: 3;
+.tj_listItemMsg .tj_listItemTag .tagVr .tip {
+  width: 52rpx;
+  height: 32rpx;
+  color: #0075DC;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  /* padding: 2rpx 8rpx; */
+  background: rgba(0, 117, 220, 0.2);
+  font-size: 20rpx;
 }
 
-
-
-
-
-.brick {
-  text-align:center;
-  position:relative;
-  width: var(--width);
-  height: var(--height);
-  transform-style:preserve-3d;
-  transform-origin: calc(var(--width) / 2) calc(var(--height) / 2);
-  margin: 0 auto calc(var(--width) / 12);
-}
-.brick-1 {
-  animation: rorate 2s 1s  infinite linear;
-  transform: rotateX(-30deg) rotateY(45deg) translateZ(30px);
-}
-.brick-2 {
-  animation: rorate 2s 0.75s  infinite linear;
-  transform: rotateX(-30deg) rotateY(45deg) translateZ(20px);
-}
-.brick-3 {
-  animation: rorate 2s 0.5s  infinite linear;
-  transform: rotateX(-30deg) rotateY(45deg) translateZ(10px);
-}
-.face {
-  width:var(--width);
-  height: var(--height);
-  overflow:hidden;
-  position:absolute;
-  background: rgba(255,255,255,0.4);
-  opacity: 0;
-}
-.brick.enter {
-  transition: 0.5s  all;
-  transform: rotateX(-30deg) rotateY(45deg);
-}
-.brick.enter .face {
-  transition: 0.5s  all;
-  opacity: 1;
-}
-.brick-2 .face {
-  background: rgba(255,255,255,0.3);
-}
-.brick-2 .brick-front, .brick-back {
-  background: rgba(255,255,255,0.4);
-}
-.brick-3 .face {
-    background: rgba(255,255,255,0.2);
-}
-.brick-3 .brick-front, .brick-back {
-    background: rgba(255,255,255,0.1);
-}
-.brick-front {
-  transform:translate3d(0,0, calc(var(--width) / 2));
-  background: rgba(255,255,255,0.6);
-}
-.brick-top {
-  width:var(--width);
-  height:var(--width);
-  transform:rotateX(90deg) translate3d(0,0, calc(var(--width) / 2));
-  background-color: rgba(255,255,255,0.8);
-}
-.brick-bottom {
-  width:var(--width);
-  height:var(--width);
-  transform: rotateX(-90deg) translate3d(0,0, calc(var(--height) / 2));
-  background-color: rgba(255,255,255,0.8);
-}
-.brick-left {
-  transform:rotateY(-90deg) translate3d(0,0,calc(var(--width) / 2));
-  background: rgba(255,255,255,0.5);
-}
-.brick-right {
-  transform:rotateY(90deg) translate3d(0,0,calc(var(--width) / 2));
-  background: rgba(255,255,255,0.5);
-}
-.brick-back {
-  transform:rotateY(180deg) translate3d(0,0,calc(var(--width) / 2));
-  background: rgba(255,255,255,0.6);
+.tj_listItemMsg .tj_listItemPrice {
+  display: flex;
+  align-items: center;
+  height: 28rpx;
+  justify-content: space-between;
 }
 
-
-.brick {
-  width: var(--width);
-  height: var(--height);
-  transform-origin: calc(var(--width) / 2) calc(var(--height) / 2);
-  margin: 0 auto calc(var(--width) / 12);
-}
-.brick.enter {
-  transition: 0.5s all;
-  transform: rotateX(-30deg) rotateY(45deg);
-}
-.brick.enter .face {
-  transition: 0.5s all;
-  opacity: 1;
-}
-.brick-1 {
-  animation: rorate 2s 1s  infinite linear;
-  transform: rotateX(-30deg) rotateY(45deg) translateZ(30px);
-}
-.brick-2 {
-  animation: rorate 2s 0.75s  infinite linear;
-  transform: rotateX(-30deg) rotateY(45deg) translateZ(20px);
-}
-.brick-3 {
-  animation: rorate 2s 0.5s  infinite linear;
-  transform: rotateX(-30deg) rotateY(45deg) translateZ(10px);
-}
-.face {
-  width:var(--width);
-  height: var(--height);
-}
-.brick-front {
-  transform:translate3d(0,0, calc(var(--width) / 2));
-}
-.brick-top {
-  width:var(--width);
-  height:var(--width);
-  transform:rotateX(90deg) translate3d(0,0, calc(var(--width) / 2));
-}
-.brick-bottom {
-  width:var(--width);
-  height:var(--width);
-  transform: rotateX(-90deg) translate3d(0,0, calc(var(--height) / -2));
-}
-.brick-left {
-  transform:rotateY(-90deg) translate3d(0,0,calc(var(--width) / 2));
-}
-.brick-right {
-  transform:rotateY(90deg) translate3d(0,0,calc(var(--width) / 2));
-}
-.brick-back {
-  transform:rotateY(180deg) translate3d(0,0,calc(var(--width) / 2));
+.tj_listItemMsg .tj_listItemPrice .unitPrice {
+  font-size: 20rpx;
+  color: #666;
 }
 
-
-@keyframes rorate {
-  0% {
-      transform:  rotateX(-30deg) rotateY(-45deg) ;
-  }
-  50% {
-      transform:  rotateX(-30deg) rotateY(-315deg) ;
-  }
-  100%{
-      transform:  rotateX(-30deg) rotateY(-315deg) ;
-  }
+.tj_listItemMsg .tj_listItemPrice .totalPrice {
+  font-size: 28rpx;
+  color: #0075DC;
+  font-weight: bold;
 }

+ 1 - 2
pages/share.js

@@ -1,4 +1,4 @@
-// pages/share.js
+// pages/searchRoom/searchRoom.js
 Page({
 
   /**
@@ -47,7 +47,6 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-    getApp().onPullDownRefresh()
 
   },
 

+ 5 - 0
pages/searchRoom/searchRoom.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "roomItem": "../../component/roomItem/roomItem"
+  }
+}

+ 16 - 0
pages/searchRoom/searchRoom.wxml

@@ -0,0 +1,16 @@
+<view>
+  <view class="storeContent">
+    <view class="storeSearch">
+      <image src="../../static/images/icon/search@2x.png"></image>
+      <input type="text" placeholder="请输入VR场景名称" placeholder-class="placeholderStyle" />
+    </view>
+    <view class="searchBtn">搜索</view>
+  </view>
+  <view style="height: 64rpx;"></view>
+  <view class="resulst">
+    <view wx:for="{{10}}" wx:key class="house-list">
+      <roomItem house="{{item}}"></roomItem>
+    </view>
+
+  </view>
+</view>

+ 50 - 0
pages/searchRoom/searchRoom.wxss

@@ -0,0 +1,50 @@
+/* pages/searchRoom/searchRoom.wxss */
+.storeContent {
+  width: 100%;
+  padding: 0 32rpx 10rpx;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #fff;
+  z-index: 100;
+}
+
+.storeSearch {
+  width: 614rpx;
+  height: 64rpx;
+  background: #F6F6F6;
+  border-radius: 32rpx;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  margin-right: 10rpx;
+}
+.storeSearch image{
+  width: 24rpx;
+  height: 24rpx;
+}
+.storeSearch input{
+  font-size: 24rpx;
+  color: #333;
+  margin-left: 4rpx;
+  width: 80%;
+}
+.storeSearch .placeholderStyle{
+  font-size: 24rpx;
+  color: #B2B2B2;
+}
+.searchBtn{
+  color: #0075DC;
+  font-size: 28rpx;
+  width: 60rpx;
+}
+.resulst{
+  padding: 10rpx 32rpx;
+  box-sizing: border-box;
+}

+ 0 - 2
pages/share.wxml

@@ -1,2 +0,0 @@
-<!--pages/share.wxml-->
-<text>pages/share.wxml</text>

+ 0 - 1
pages/share.wxss

@@ -1 +0,0 @@
-/* pages/share.wxss */

+ 66 - 0
pages/store/store.js

@@ -0,0 +1,66 @@
+// pages/store/store.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

+ 3 - 0
pages/store/store.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "商家"
+}

+ 8 - 0
pages/store/store.wxml

@@ -0,0 +1,8 @@
+<view>
+  <view class="storeContent">
+    <view class="storeSearch">
+      <image src="../../static/images/icon/search@2x.png"></image>
+      <input type="text" placeholder="请输入VR场景名称"  placeholder-class="placeholderStyle"/>
+    </view>
+  </view>
+</view>

+ 33 - 0
pages/store/store.wxss

@@ -0,0 +1,33 @@
+/* pages/store/store.wxss */
+.storeContent {
+  width: 100%;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+
+}
+
+.storeSearch {
+  width: 100%;
+  height: 64rpx;
+  background: #F6F6F6;
+  border-radius: 32rpx;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+}
+.storeSearch image{
+  width: 24rpx;
+  height: 24rpx;
+}
+.storeSearch input{
+  font-size: 24rpx;
+  color: #333;
+  margin-left: 4rpx;
+  width: 100%;
+}
+.storeSearch .placeholderStyle{
+  font-size: 24rpx;
+  color: #B2B2B2;
+}

+ 0 - 215
pages/webview/index.js

@@ -1,215 +0,0 @@
-// pages/webview/index.js
-const api = require('../../config/api.js');
-const util = require('../../utils/util.js');
-import socketApi from '../../socket'
-
-const URL = 'https://www.4dkankan.com/mallscene.html?m='
-
-Page({
-
-  ...socketApi,
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    sendShare: false,
-    loadUrl: false,
-    goodsCount: 0,
-    canIUse: wx.canIUse('button.open-type.getUserInfo'),
-    rnd:'',
-    temp:'',
-    live_base_url: 'rtmp://120.24.85.77:1935/hls',
-    peopleCount: 5,
-    surplus: 5
-    // url: 'https://www.4dkankan.com/showProPC.html?m=vroMUXdx&origin=4Dplaza&sid=1046051&room_id=1596785144930&user_id=44'
-  },
-
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: async function (options) {
-    getApp().checkNetStatu();
-
-    
-    // setTimeout(() => this.login(), 3000)
-    this.setData({
-      join: false,
-      imgServer: util.imgServer,
-      showGuide: false,
-      showCommodity: false,
-      showInvitation: false,
-      showEnd: false,
-      showAlert: false,
-      sendShare: false,
-      showPacked: false,
-      showIsEnd: false,
-      showCoupon: false,
-      showContact: false,
-      showCommodityCtrl: false,
-      recordStatus: 0,
-      commoditys: [],
-      coupons: [],
-      userAuth: false,
-      count: 0,
-      goodsList: [],
-      page: 1,
-      size: 1000
-    })
-    
-    // console.log(options)
-    // options.id = '1046098'
-
-    if (this.options.roomId) {
-      this.data.join = true
-    }
-
-    if (this.data.join) {
-      this.role = 'customer'
-    } else {
-      this.role = 'leader'
-    }
-
-    if (options.many !== void 0) {
-      this.data.many = options.many
-    }
-
-    socketApi.onShow.call(this)
-    this.urlPj = '&brandId=' + this.options.id
-  },
-
-  async init() {
-    let options = this.options
-
-    let {url: base, obj: m } = await new Promise(r => this.getBrandDetail(options.id, (url, obj)  => r({url, obj})))
-
-    this.getBrand(options.id, m)
-    this.mcode = m
-    let socketOptions = await this.socketStart({sceneId: this.mcode, roomId: options.roomId})
-    let url = this.getUrl(base, socketOptions, this.data.join) + this.urlPj
-
-    this.base = base
-
-    this.setData({urlTemp: url.split('').join(' ')})
-    this.setData({ url, loadUrl: true, socketOptions, reload: true, hideWebView: false })
-    this.recorderManager = wx.getRecorderManager()
-
-    this.brandId = options.id
-    this.joinUrl()
-    // this.mic()
-  },
-
-  hideInvitation() {
-    this.setData({ showInvitation: false })
-    this.exit()
-  },
-
-  hideGuide() {
-    this.setData({ showGuide: false })
-  },
-
-  hideEnd() {
-    this.setData({ showEnd: false })
-  },
-
-  hideAlert() {
-    this.setData({ showAlert: false })
-  },
-
-  // exit() {
-  //   this.stopCall()
-  //   this.socketStop && this.socketStop()
-  //   wx.navigateBack()
-  // },
-  
-  hidePacked() {
-    this.setData({ showPacked: false })
-  },
-  
-  hideIsEnd() {
-    this.setData({ showIsEnd: false })
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-    
-  },
-
-  
-
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: async function () {
-    getApp().updateCardCount()
-
-    
-    
-    // this.options.join = true
-    // this.getCartList()
-    
-    let userInfo = wx.getStorageSync('userInfo');
-    let token = wx.getStorageSync('token');
-
-    if (!(userInfo && userInfo.userId && token)) {
-      return;
-      // return wx.navigateTo({
-      //   url: '/pages/auth/btnAuth/btnAuth',
-      // })
-      if (this.options.join) {
-        getApp().setLoginProps(false)
-      } else {
-        this.socketStop && this.socketStop()
-        this.init()
-      }
-    } else if (this.token !== wx.getStorageSync('token')) {
-      if (this.data.join) {
-        let res = await util.request(api.UserInfo)
-        if (res.errno === 401) {
-          return getApp().setLoginProps(false)
-        }
-      }
-      this.token = wx.getStorageSync('token')
-      if (this.socketStop) {
-        this.socketStop()
-        this.setData({
-          hideWebView: true,
-          webviewUrl: null
-        })
-        setTimeout(() => {
-          this.setData({ hideWebView: false })
-          this.init()
-        }, 500)
-      } else {
-        this.init()
-      }
-    } else {
-      socketApi.onShow.call(this)
-    }
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-    socketApi.onHide.call(this)
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-    getApp().onPullDownRefresh()
-  },
-
-  
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  }
-})

+ 0 - 3
pages/webview/index.json

@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "指房宝"
-}

+ 0 - 254
pages/webview/index.wxml

@@ -1,254 +0,0 @@
-<view class="web-view">
-	<lip-sync />
-	<auth bindlogin="onShow" />
-	
-	<!-- {{url}} -->
-	<!-- -->
-	<block wx:if="{{!hideWebView}}">
-		<web-view src="{{webviewUrl}}" bindmessage="webmessage"></web-view>
-	</block>
-	<cover-view class="mo" bindtap="hideCS" wx:if="{{showCoupon || showContact}}"></cover-view>
-
-	<cover-view class="bgd" wx:if="{{sendShare}}"></cover-view>
-
-	<cover-view class="dialog guide-view" wx:if="{{showGuide}}">
-		<cover-view class="title">操作提示</cover-view>
-		<cover-view class="content">
-			<cover-view class="guide-item">
-				<cover-image wx:if="{{imgServer}}" src="../../static/images/gesture_roam.png"></cover-image>
-				<cover-view>
-					<cover-view class="text">行走</cover-view>
-					<cover-view class="text">点击任意方向移动</cover-view>
-				</cover-view>
-			</cover-view>
-			<cover-view class="guide-item">
-				<cover-image wx:if="{{imgServer}}" src="../../static/images/gesture_roam.png"></cover-image>
-				<cover-view>
-					<cover-view class="text">旋转视角</cover-view>
-					<cover-view class="text">左右滑动屏幕,旋转视觉</cover-view>
-				</cover-view>
-			</cover-view>
-			<cover-view class="guide-item">
-				<cover-image wx:if="{{imgServer}}" src="../../static/images/gesture_roam.png"></cover-image>
-				<cover-view>
-					<cover-view class="text">缩放</cover-view>
-					<cover-view class="text">双指滑动放大或缩小视图</cover-view>
-				</cover-view>
-			</cover-view>
-		</cover-view>
-		<cover-view class="button">
-			<button bindtap="hideGuide" class="btn">我知道了</button>
-		</cover-view>
-	</cover-view>
-
-
-	<cover-view class="commodity-ctrl" bindtap="showCommodityFn" wx:if="{{!showCommodity && showCommodityCtrl && goodsCount > 0}}">
-		<cover-image src="../../static/images/scene_listbg@3x.png" class="bg"></cover-image>
-		<cover-image src="../../static/images/scene_shop_list.png" class="ig"></cover-image>
-		<cover-view>商品({{goodsCount > 100 ? '99+' : goodsCount}})</cover-view>
-		<!-- <cover-view>商品({{goodsCount < 100 ? '99+' : goodsCount}})</cover-view> -->
-	</cover-view>
-
-	<!-- <cover-view class="bottom-dialog commodity-view" wx:if="{{!showCommodity}}">
-		<cover-view class="title">
-			<cover-view class="text">店铺中的商品</cover-view>
-			<cover-view class="icon" bindtap="hideComodity">
-				<cover-image src="../../static/images/list_close.png"></cover-image>
-			</cover-view>
-		</cover-view>
-		<cover-view class="content">
-			<cover-view class="tabs">
-				<cover-view style="width: {{ comWidth }}px">
-					<cover-view style="width: {{item.width }}px" wx:for="{{thumComtypes ? thumComtypes : comtypes}}" wx:key="item.category_id" class="text {{currTypeId == item.category_id ? 'active': ''}}" data-item="{{item}}" bindtap="selectType">
-						{{item.name}}{{'('+item.num+')'}}
-						<cover-view></cover-view>
-					</cover-view>
-				</cover-view>
-
-				<block wx:if="{{thumComtypes}}">
-					<cover-view class="tabctrl" bindtap="changeShowComtypesAllTab" data-show="{{true}}">
-						<cover-image src="/static/images/shoplist_open@3x.png"></cover-image>
-					</cover-view>
-				</block>
-			</cover-view>
-
-			<block wx:if="{{thumComtypes && showComtypesAllTab}}">
-        <cover-view class="zz" bindtap="changeShowComtypesAllTab" data-show="{{false}}"></cover-view>
-				<cover-view class="dialog-layer">
-					<cover-view class="dialog-tabs">
-						<cover-view wx:for="{{comtypes}}" wx:key="item.category_id" class="text {{currTypeId == item.category_id ? 'active': ''}}" data-item="{{item}}" bindtap="selectType">
-							{{item.name}}{{'('+item.num+')'}}
-							<cover-view></cover-view>
-						</cover-view>
-					</cover-view>
-					<cover-view class="tabctrl"  bindtap="changeShowComtypesAllTab" data-show="{{false}}">
-						<cover-image src="/static/images/shoplist_retract@3x.png"></cover-image>
-					</cover-view>
-				</cover-view>
-			</block>
-			<cover-view class="commoditys">
-				<cover-view class="commodity-item" wx:for="{{goodsList}}" key="{{item.id}}" bindtap="gotoGoods" data-item="{{item}}">
-					<cover-image class="cover" src="{{item.list_pic_url}}"></cover-image>
-					<cover-image class="scene-icon" src="/static/images/img_shop_scene@2x.png"></cover-image>
-					<cover-view class="item-content">
-						<cover-view class="desc">{{item.name}}</cover-view>
-						<cover-view class="item-info">
-							<cover-view class="money">
-								<cover-view class="text">¥</cover-view>
-								<cover-view class="text">{{item.retail_price}}</cover-view>
-							</cover-view>
-							<cover-view class="oper">
-								<cover-view class="oper-btn" catchtap="addCard" data-id="{{item.id}}">加入购物车</cover-view>
-								<cover-view class="oper-btn" catchtap="buyGoods" data-id="{{item.id}}">立即购买</cover-view>
-							</cover-view>
-						</cover-view>
-					</cover-view>
-				</cover-view>
-			</cover-view>
-		</cover-view>
-	</cover-view> -->
-
-	<cover-view class="bottom-dialog coupon-view" wx:if="{{showCoupon}}">
-		<cover-view class="title">
-			<cover-view class="text">店铺中的优惠券</cover-view>
-			<cover-view class="icon" bindtap="hideCoupon">
-				<cover-image src="../../static/images/list_close.png"></cover-image>
-			</cover-view>
-		</cover-view>
-		<cover-view class="layer">
-			<cover-view class="content">
-				<cover-view wx:if="{{coupons.length !== 0}}">
-					<cover-view wx:for="{{coupons}}" wx:key="{{item.id}}" class="{{item.hasReceived ? 'coupon-item' : item.number <= item.receiveNumber ? 'coupon-item diswan' : 'coupon-item'}}">
-						<cover-view class="item-before"></cover-view>
-						<cover-view class="item-after"></cover-view>
-						<cover-view class="info-before"></cover-view>
-						<cover-view class="info-after"></cover-view>
-
-						<cover-view class="{{item.hasReceived ? 'used' : ''}} "></cover-view>
-						<cover-view class="money">
-							<cover-view class="poa" style="{{'font-size:' + item.fontSize }}">
-								<cover-view class="money-before">¥</cover-view>
-								{{item.typeMoney}}
-								<!-- <cover-view class="money-after"></cover-view> -->
-							</cover-view>
-						</cover-view>
-						<cover-view class="info">
-							<cover-view class="full">{{item.name}}</cover-view>
-							<button>
-								{{
-                  item.sendType == 0 ? '全场赠券' : 
-                  item.sendType == 1 ? '会员赠券' : 
-                  item.sendType == 2 ? '购物赠券' : 
-                  item.sendType == 3 ? '注册赠' : ''
-                }}
-							</button>
-							<cover-view class="date">{{item.useStartDate}}-{{item.useEndDate}}</cover-view>
-						</cover-view>
-						<cover-view class="oper">
-							<cover-image class="dotted" src="/static/images/img_cpline@3x.png"></cover-image>
-							<cover-image src="/static/images/img_tabs_lack.png" wx:if="{{!item.hasReceived && item.number <= item.receiveNumber}}" class="lack"></cover-image>
-
-							<cover-view wx:else bindtap="receive" data-item="{{item}}">{{item.hasReceived ? '已领取'  : item.number <= item.receiveNumber ? '' : '立即领取'}}</cover-view>
-						</cover-view>
-					</cover-view>
-				</cover-view>
-				<cover-view wx:else class="un-content">
-					<cover-view class="lay">
-						<cover-image src="/static/images/img_nocoupon@2x.png"></cover-image>
-						<cover-view class="text">暂无优惠券</cover-view>
-					</cover-view>
-				</cover-view>
-			</cover-view>
-		</cover-view>
-	</cover-view>
-
-	<cover-view class="dialog invitation-view" wx:if="{{showInvitation}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">
-			{{surplus ? '邀请好友一起逛,最多可邀请'+surplus+'位好友哦' : '邀请好友已达到上线哦'}}</cover-view>
-		<cover-view class="btns">
-			<button class="btn" wx:if="surplus">微信邀请</button>
-			<button class="cancel btn" bindtap="hideInvitation">取消</button>
-		</cover-view>
-	</cover-view>
-
-	<cover-view class="dialog invitation-view" wx:if="{{showEnd}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">确定要结束“一起逛”吗?</cover-view>
-		<cover-view class="btns">
-			<button class="btn" bindtap="hideEnd">继续逛</button>
-			<button class="cancel btn">结束</button>
-		</cover-view>
-	</cover-view>
-
-	<cover-view class="dialog invitation-view" wx:if="{{showAlert}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">发起人已结束一起逛模式,房间即将关闭</cover-view>
-		<cover-view class="btns">
-			<button class="btn" bindtap="hideAlert">确定</button>
-		</cover-view>
-	</cover-view>
-
-	<cover-view class="dialog invitation-view" wx:if="{{showPacked}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">一起逛房间已满人,是否继续逛</cover-view>
-		<cover-view class="btns">
-			<button class="btn" bindtap="hidePacked">继续逛</button>
-			<button class="cancel btn">取消</button>
-		</cover-view>
-	</cover-view>
-
-	<cover-view class="dialog invitation-view" wx:if="{{showIsEnd}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">一起逛已结束了,是否继续逛</cover-view>
-		<cover-view class="btns">
-			<button class="btn" bindtap="hideIsEnd">继续逛</button>
-			<button class="cancel btn">取消</button>
-		</cover-view>
-	</cover-view>
-
-	<cover-view class="dialog concat-view" wx:if="{{showContact}}">
-		<cover-view class="icon" bindtap="hideContact">
-			<cover-image src="../../static/images/list_close.png"></cover-image>
-		</cover-view>
-
-		<cover-view class="title ">联系我们</cover-view>
-		<cover-view class="item" wx:if="{{contractPhone}}">
-			<button class="btn call-phone" bindtap="callPhone">拨打电话</button>
-			<!-- <cover-view class="desc">服务时间:09:00 - 21:00</cover-view> -->
-		</cover-view>
-		<cover-view class="item">
-			<button class="cancel btn" open-type="contact" bindtap="contactKf">联系在线客服</button>
-			<cover-view class="desc tp10">联系指房宝在线客服</cover-view>
-			<!-- <cover-view class="desc tp10">服务时间:24小时</cover-view> -->
-		</cover-view>
-	</cover-view>
-
-	<cover-view class="dialog invitation-view" wx:if="{{sendShare}}">
-		<cover-view class="title">温馨提示</cover-view>
-		<cover-view class="content">{{surplus ? '邀请好友一起逛,最多可邀请'+surplus+'位好友哦' : '邀请好友已达到上线哦'}}</cover-view>
-		<cover-view class="btns" wx:if="{{surplus}}">
-			<button class="btn" open-type="share">微信邀请</button>
-			<button class="cancel btn" bindtap="calcShare">取消</button>
-		</cover-view>
-		<cover-view class="btns" wx:if="{{!surplus}}">
-			<button class="btn" bindtap="calcShare">确定</button>
-		</cover-view>
-	</cover-view>
-
-	<cover-view class="auth-user" wx:if="{{userAuth}}">
-		<cover-view class="layer">
-			<cover-view class="title">授权登录</cover-view>
-			<cover-image class="logo" src="../../static/images/img_empower_logo@2x.png"></cover-image>
-			<cover-view class="desc">四维时代网络科技有限公司申请获取以下权限</cover-view>
-			<cover-view class="content">·获得您的公开信息(昵称、头像等)</cover-view>
-			<button open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" wx:if="{{canIUse}}">授权登录</button>
-			<cover-view wx:else>请升级微信版本</cover-view>
-		</cover-view>
-	</cover-view>
-	
-	<cover-view style="position: fixed; background-color: rgba(0,0,0,0.5); color: #fff;white-space:pre-wrap;z-index:989999" wx:if="{{debugerInfo}}">
-    {{debugerInfo}}
-		<cover-view bindtap="clearDebuger">清除</cover-view>
-  </cover-view>
-</view>

+ 0 - 798
pages/webview/index.wxss

@@ -1,798 +0,0 @@
-/* pages/webview/index.wxss */
-.web-view {
-  /* background-color: #000; */
-}
-
-.bgd {
-  position: fixed;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-  z-index: 0;
-}
-
-.btn {
-  width: 100%;
-  background-color: #fff;
-  border-radius: 4px;
-  height: 90rpx;
-  line-height: 90rpx;
-  font-size: 36rpx;
-  color: #131D34;
-  text-align: center;
-  padding: 0;
-}
-
-.call-phone {
-  background-color: rgb(237,93,24);
-  color: #fff;
-}
-
-.dialog {
-  position: fixed;
-  left: 10%;
-  right: 10%;
-  background-color: rgba(0, 0, 0, 1);
-  opacity: .9;
-  color: #fff;
-  z-index: 9999;
-  border-radius: 5px;
-  padding: 70rpx;
-}
-
-
-.guide-view {
-  top: 10%;
-  bottom: 20%;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-}
-
-.guide-view .title {
-  font-size: 36rpx;
-  color: rgba(255, 255, 255, 0.88);
-  text-align: center;
-}
-
-.guide-view .content {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  justify-content: space-around;
-}
-
-.guide-item {
-  padding-left: 100rpx;
-  position: relative;
-}
-
-.guide-item cover-image {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 77rpx;
-  height: 96rpx;
-}
-
-.guide-item .text {
-  line-height: 48rpx;
-  font-size: 30rpx;
-  display: block;
-  color: #fff;
-}
-
-.guide-view .title,
-.guide-view .button {
-  max-height: 300rpx;
-}
-
-.bottom-dialog {
-  position: fixed;
-  top: 23%;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 99;
-  background-color: #fff;
-  border-radius: 14px 14px 0 0;
-  display: flex;
-  flex-direction: column;
-}
-
-.bottom-dialog .title {
-  flex: 0 0 auto;
-  padding: 36rpx 32rpx;
-  border-bottom: 1px solid rgb(236, 236, 236);
-  position: relative;
-}
-
-.bottom-dialog .title .text {
-  font-size: 32rpx;
-  color: #131D34;
-  font-weight: bold;
-}
-
-.bottom-dialog .icon {
-  position: absolute;
-  top: 50%;
-  transform: translateY(-50%);
-  width: 27rpx;
-  height: 27rpx;
-  padding: 32rpx;
-  right: 0;
-}
-
-
-.commodity-view {
-  position: fixed;
-  top: 23%;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 99;
-  background-color: #fff;
-  border-radius: 14px 14px 0 0;
-  display: flex;
-  flex-direction: column;
-}
-
-.commodity-view .content {
-  flex: 1;
-  padding: 0 32rpx;
-  position: relative;
-  /* display: flex;
-  flex-direction: column; */
-}
-
-.commodity-view .scene-icon {
-  position: absolute;
-  left: 2rpx;
-  bottom: 2rpx;
-  width: 40rpx;
-  height: 40rpx;
-  z-index: 3;
-}
-
-
-.commodity-view .tabs {
-  flex: 0 0 auto;
-  height: 76rpx;
-  width: 100%;
-  overflow-x: scroll;
-  padding-bottom: 4px;
-  position: relative;
-}
-
-.commodity-view .tabs .text {
-  float: left;
-  height: 76rpx;
-  line-height: 76rpx;
-  color: #131D34;
-  font-size: 16px;
-  margin-right: 10px;
-  text-align: center;
-}
-
-.commodity-view .tabs .text.active {
-  color: #ED5D18;
-  font-size: 16px;
-  position: relative;
-}
-
-.commodity-view .tabs .text.active cover-view {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 4rpx;
-  background-color: #ED5D18;
-  margin: 0 20rpx;
-}
-
-.commodity-view .current-tab {
-  flex: 0 0 auto;
-  height: 60rpx;
-  margin-left: -32rpx;
-  width: calc(100% + 64rpx);
-  background-color: #F8F8F8;
-  padding: 0 32rpx;
-  line-height: 60rpx;
-  font-size: 26rpx;
-  color: #999999;
-}
-
-.commoditys {
-  position: absolute;
-  left: 32rpx;
-  right: 32rpx;
-  top: 76rpx;
-  bottom: 0;
-  height: calc(100% - 100rpx);
-  overflow-y: scroll;
-}
-
-.commodity-item {
-  margin-top: 34rpx;
-  display: flex;
-  align-items: center;
-  position: relative;
-}
-
-.commodity-view .cover {
-  flex: 0 0 auto;
-  width: 180rpx;
-  height: 180rpx;
-}
-
-.commodity-view .item-content {
-  flex: 1;
-  margin-left: 28rpx;
-}
-
-.commodity-view .item-content .desc {
-  font-size: 14px;
-  color: #131D34;
-  line-height: 40rpx;
-  white-space: pre-wrap;
-}
-
-.commodity-view .item-info {
-  margin-top: 32rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: 54rpx;
-}
-
-.commodity-view .item-info>.money {
-  flex: 0 0 auto;
-}
-
-.commodity-view .item-info>.oper {
-  flex: 1;
-  text-align: right;
-  position: relative;
-}
-
-.oper .lack {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-  width: 200rpx;
-  height: 200rpx;
-}
-
-.commodity-view .money .text {
-  display: inline;
-  color: #ED5D18;
-}
-
-.commodity-view .money .text:nth-child(1),
-.money .text:nth-child(3) {
-  font-size: 24rpx;
-  margin-right: 10rpx;
-  vertical-align: baseline;
-}
-
-.commodity-view .money .text:nth-child(2) {
-  font-size: 36rpx;
-  vertical-align: baseline;
-}
-
-.oper-btn {
-  display: inline-block;
-  border-radius: 4px;
-  height: 52rpx;
-  line-height: 52rpx;
-  padding: 0 16rpx !important;
-  color: #fff;
-  font-size: 24rpx;
-}
-
-.commodity-view .oper {
-  height: 54rpx;
-  display: flex;
-}
-
-.commodity-view .oper-btn:nth-child(1) {
-  background-color: #FFCD3C;
-  margin-right: 10rpx;
-}
-
-.commodity-view .oper-btn:nth-child(2) {
-  background-color: #ED5D18;
-}
-
-
-.invitation-view {
-  top: 50%;
-  transform: translateY(-50%);
-  color: rgba(255, 255, 255, 0.88);
-  /* height: 420rpx; */
-}
-
-.invitation-view .title {
-  font-size: 36rpx;
-  font-weight: bold;
-  margin-bottom: 40rpx;
-}
-
-.invitation-view .content {
-  font-size: 30rpx;
-  line-height: 36rpx;
-  margin-bottom: 40rpx;
-  white-space: pre-wrap;
-}
-
-.invitation-view .btns {
-  text-align: center;
-  height: 200rpx;
-}
-
-.cancel {
-  line-height: 86rpx;
-  margin-top: 20rpx;
-  background-color: rgba(0, 0, 0, 0);
-  color: #fff;
-  border: 1px solid #fff;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-
-
-.coupon-view .layer {
-  flex: 1;
-  overflow-y: scroll;
-}
-
-.coupon-view .content {
-  padding: 0 34rpx;
-}
-
-.coupon-item {
-  height: 185rpx;
-  padding-right: 30rpx;
-  background: #EF9B3A;
-  border-radius: 4px;
-  margin-top: 34rpx;
-  display: flex;
-  position: relative;
-  align-items: center;
-}
-
-.coupon-item .item-before,
-.coupon-item .item-after {
-  position: absolute;
-  border-radius: 50%;
-  background-color: rgba(255, 255, 255, 0.16);
-  z-index: 1;
-}
-
-.coupon-item .item-before {
-  width: 88rpx;
-  height: 106rpx;
-  left: 0;
-  top: 0;
-  transform: translate(-50%, -50%);
-}
-
-.coupon-item .item-after {
-  width: 140rpx;
-  height: 186rpx;
-  right: 0;
-  bottom: 0;
-  transform: translate(40%, 50%);
-}
-
-.coupon-item .info-before,
-.coupon-item .info-after {
-  position: absolute;
-  background-color: #fff;
-  z-index: 99;
-  width: 40rpx;
-  height: 40rpx;
-  border-radius: 50%;
-  right: 196rpx;
-  transform: translateX(50%);
-}
-
-.coupon-item .info-before {
-  top: 0;
-  margin-top: -20rpx;
-}
-
-.coupon-item .info-after {
-  bottom: 0;
-  margin-bottom: -20rpx;
-}
-
-.coupon-item .money {
-  flex: 0 0 auto;
-  width: 230rpx;
-  font-size: 138rpx;
-  color: #fff;
-  font-weight: bold;
-  position: relative;
-  /* height: 130rpx;
-  line-height: 138rpx; */
-  text-align: center;
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  overflow: auto;
-  height: 138rpx;
-}
-
-.poa {
-  width: 100%;
-  text-align: center;
-  font-size: 26rpx;
-}
-
-
-.coupon-item .used {
-  position: absolute;
-  z-index: 99;
-  background-color: rgba(255, 255, 255, 0.6);
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
-}
-
-.coupon-item .money-before {
-  display: inline;
-  font-size: 26rpx;
-  /* width: 40rpx;
-  height: 40rpx;
-  text-align: center;
-  line-height: 40rpx;
-  border: 1px solid #EF9B3A;
-  color:#EF9B3A;
-  border-radius: 50%;
-  position: absolute;
-  bottom: 0;
-  right: 0rpx;
-  font-size: 26rpx;
-  background-color: #fff; */
-}
-
-.coupon-item .info {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  padding: 25rpx 10rpx 10rpx;
-  height: 92rpx;
-}
-
-.coupon-item .info .full {
-  font-size: 30rpx;
-  color: #fff;
-  width: 100%;
-  height: 52rpx;
-  margin: 0;
-  line-height: 32rpx;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.coupon-item .info button {
-  width: 168rpx;
-  color: #EF533A;
-  text-align: center;
-  height: 38rpx;
-  line-height: 32rpx;
-  border-radius: 19rpx;
-  font-size: 22rpx;
-  margin: 10rpx 0;
-}
-
-.coupon-item .info .date {
-  height: 28rpx;
-  font-size: 16rpx;
-  color: #fff;
-  margin: 0;
-  line-height: 22rpx;
-  width: 100%;
-}
-
-.coupon-item .oper {
-  flex: 0 0 auto;
-  font-size: 34rpx;
-  color: #fff;
-  width: 166rpx;
-  text-align: right;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-  position: relative;
-}
-
-.coupon-item .oper .dotted {
-  position: absolute;
-  width: 1px;
-  left: 0;
-  top: 20%;
-  height: 60%;
-  z-index: 9999999;
-}
-
-.coupon-item .oper cover-view {
-  z-index: 2;
-}
-
-
-
-.concat-view {
-  top: 20%;
-}
-
-
-.concat-view .icon {
-  position: absolute;
-  right: 6rpx;
-  top: 6rpx;
-  width: 27rpx;
-  height: 27rpx;
-  padding: 30rpx;
-}
-
-.concat-view .title {
-  font-size: 36rpx;
-  font-weight: bold;
-  margin-bottom: 40rpx;
-}
-
-.concat-view .item:nth-last-child(1) {
-  margin-top: 34rpx;
-}
-
-.concat-view .item .desc {
-  line-height: 40rpx;
-  text-align: center;
-  font-size: 24rpx;
-}
-
-.commodity-ctrl {
-  position: fixed;
-  bottom: 218rpx;
-  right: 40rpx;
-  width: 140rpx;
-  height: 140rpx;
-  border-radius: 50%;
-  /* background:rgba(237,93,24,1);
-  box-shadow:0px 1px 6px rgba(0,0,0,0.16); */
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-.commodity-ctrl .bg {
-  width: 130rpx;
-  height: 130rpx;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  z-index: -1;
-  transform: translate(-50%, -50%);
-}
-
-.commodity-ctrl .ig {
-  width: 18px;
-  height: 18px;
-}
-
-.commodity-ctrl cover-view {
-  font-size: 20rpx;
-  color: rgba(255, 255, 255, 0.88);
-  line-height: 26rpx;
-  width: 100%;
-  text-align: center;
-}
-
-.auth-user {
-  position: fixed;
-  left: 0;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 8;
-  background-color: rgba(0, 0, 0, 0.3);
-}
-
-.auth-user .layer {
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  background-color: #fff;
-  border-radius: 8px 8px 0 0;
-  padding: 52rpx 36rpx;
-}
-
-.auth-user .layer .title {
-  font-size: 24rpx;
-  color: #131D34;
-  font-size: 30rpx;
-  line-height: 42rpx;
-  color: #111111;
-}
-
-.auth-user .layer .logo {
-  display: block;
-  width: 165rpx;
-  height: 120rpx;
-  margin: 0 auto;
-}
-
-.auth-user .layer .desc {
-  text-align: center;
-  color: #111111;
-  font-size: 26rpx;
-  padding: 28rpx 0 36rpx;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-}
-
-.auth-user .layer .content {
-  text-align: center;
-  padding: 32rpx 0 86rpx;
-  font-size: 26rpx;
-  color: #79868F;
-}
-
-.auth-user .layer button {
-  color: #fff;
-  width: 100%;
-  font-size: 30rpx;
-  height: 80rpx;
-  line-height: 80rpx;
-  background-color: #ED5D18;
-}
-
-
-.aaaaa {
-  position: fixed;
-  z-index: 999;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-  color: #fff;
-  background-color: rgba(0, 0, 0, 0.7);
-  z-index: 99999;
-}
-
-.test {
-  z-index: 999;
-  background-color: #000;
-  color: #fff;
-  white-space: pre-wrap;
-}
-
-.tp10 {
-  margin-top: 15rpx;
-}
-
-
-.mo {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background-color: rgba(0, 0, 0, 0.6);
-  z-index: 5;
-}
-
-.content .diswan {
-  background: #EBEBEB;
-}
-
-.content .diswan .money {
-  color: #999999;
-}
-
-.content .diswan .info .full {
-  color: #999999
-}
-
-.content .diswan .info button {
-  opacity: 0.7;
-  color: #999;
-}
-
-.content .diswan .info .date {
-  color: #999;
-}
-
-.un-content {
-  width: 100%;
-  height: 100%;
-  text-align: center;
-}
-
-.lay {
-  margin-top: 180rpx;
-}
-
-.un-content cover-image {
-  display: inline-block;
-  width: 250rpx;
-  height: 274rpx;
-}
-
-.un-content .text {
-  color: #666C7D;
-  font-size: 30rpx;
-  margin-top: 40rpx;
-}
-
-.commodity-view .zz {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.6);
-  z-index: 999;
-}
-
-.commodity-view .dialog-layer {
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: 100%;
-  padding: 0 32rpx 10rpx;
-  box-sizing: border-box;
-  background-color: #fff;
-  z-index: 9999;
-}
-
-.commodity-view .dialog-layer .tabctrl {
-  right: 32rpx;
-}
-
-.commodity-view .dialog-layer .dialog-tabs {
-  padding-right: 86rpx;
-  overflow: hidden;
-}
-
-.commodity-view .dialog-layer .dialog-tabs .text {
-  float: left;
-  width: calc(33% - 10rpx);
-  text-align: center;
-  padding: 14rpx 0;
-  font-size: 24rpx;
-  color: #131D34;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  border-radius: 4px;
-  margin: 10rpx 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.commodity-view .dialog-layer .dialog-tabs .text.active {
-  background-color: rgba(237, 93, 24, 1);
-  border-color: rgba(237, 93, 24, 1);
-  color: #fff;
-}
-
-.commodity-view .dialog-layer .dialog-tabs .text:nth-child(3n-1) {
-  margin: 10rpx;
-}
-
-.commodity-view .tabctrl {
-  position: absolute;
-  right: 0;
-  top: 0;
-  height: 76rpx;
-  width: 76rpx;
-  color: #000;
-}

BIN
static/images/address-bg-bd.png


BIN
static/images/btab_cart@2x.png


BIN
static/images/btab_classify@2x.png


BIN
static/images/btab_home@2x.png


BIN
static/images/btab_my@2x.png


BIN
static/images/btab_view@2x.png


BIN
static/images/btab_view_active@2x.png


BIN
static/images/c_setting.png


BIN
static/images/cb1.png


BIN
static/images/cb2.png


BIN
static/images/cb3.png


BIN
static/images/cb4.png


BIN
static/images/cb5.png


BIN
static/images/cb6.png


BIN
static/images/checkbox.png


BIN
static/images/clear_input.png


BIN
static/images/con-normal_no.png


BIN
static/images/coupon_bky.png


BIN
static/images/coupon_gq.png


BIN
static/images/coupon_ksy.png


BIN
static/images/coupon_ysy.png


BIN
static/images/ct1.png


BIN
static/images/ct2.png


BIN
static/images/ct3.png


BIN
static/images/ct4.png


BIN
static/images/ct5.png


BIN
static/images/del-address.png


BIN
static/images/detail_back.png


BIN
static/images/detail_kefu.png


BIN
static/images/gesture_roam.png


BIN
static/images/go.png


BIN
static/images/hbtab_cart@2x.png


BIN
static/images/hbtab_classify@2x.png


BIN
static/images/hbtab_home@2x.png


BIN
static/images/hbtab_my@2x.png


BIN
static/images/ic_menu_choice_nor.png


BIN
static/images/ic_menu_choice_pressed.png


BIN
static/images/ic_menu_me_nor.png


BIN
static/images/ic_menu_me_pressed.png


BIN
static/images/ic_menu_shoping_nor.png


BIN
static/images/ic_menu_shoping_pressed.png


BIN
static/images/ic_menu_sort_nor.png


BIN
static/images/ic_menu_sort_pressed.png


BIN
static/images/ic_menu_topic_nor.png


BIN
static/images/ic_menu_topic_pressed.png


BIN
static/images/icon-normal_arrow-right1.png


BIN
static/images/icon-normal_arrowDown.png


BIN
static/images/icon-normal_checkbox-checked.png


BIN
static/images/icon-normal_checkbox.png


BIN
static/images/icon-normal_detailTagArrow.png


BIN
static/images/icon-normal_down.png


BIN
static/images/icon-normal_no.png


BIN
static/images/icon-normal_search2.png


BIN
static/images/icon-normal_up.png


BIN
static/images/icon/apartments@2x.png


BIN
static/images/icon/b&b@2x.png


BIN
static/images/icon/community@2x.png


BIN
static/images/icon/home_normal@2x.png


BIN
static/images/icon/home_selected@2x.png


BIN
static/images/icon/house@2x.png


BIN
static/images/icon/me_normal@2x.png


BIN
static/images/icon/me_selected.png


BIN
static/images/icon/merchants_normal@2x.png


BIN
static/images/icon/merchants_selected@2x.png


BIN
static/images/icon/search@2x.png


BIN
static/images/icon/second_hand@2x.png


BIN
static/images/icon/vr@2x.png


BIN
static/images/icon_collect.png


BIN
static/images/icon_collect_checked.png


BIN
static/images/icon_cus_chose_allow@2x.png


+ 0 - 0
static/images/icon_error.png


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff