feat：更新代码

app.json

@@ -1,10 +1,8 @@
 {
   "pages": [
-
     "pages/index/index",
-    "pages/city/city",
-
     "pages/store/store",
+    "pages/city/city",
     "pages/user/user",
     "pages/discover/discover",
     "pages/ncategory/category",
@@ -52,9 +50,9 @@
     "pages/shared/shared",
     "pages/godis/godis",
     "component/auth/auth",
-    "pages/user/imageCropper"
-
-
+    "pages/user/imageCropper",
+    "component/storeItem/storeItem",
+    "pages/sence/sence"
   ],
   "window": {
     "backgroundTextStyle": "dark",
@@ -63,28 +61,28 @@
     "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": "white",
     "selectedColor": "#333333",
-    "color": "AFAFAF",
-    "list": [{
+    "color": "#AFAFAF",
+    "list": [
+      {
         "pagePath": "pages/index/index",
         "iconPath": "static/images/icon/home_normal@2x.png",
         "selectedIconPath": "static/images/icon/home_selected@2x.png",

app.wxss

@@ -52,9 +52,9 @@ button::after {
 }
 
 .theme-font{
-  color: #ED5D18;
+  color: #0075DC;
 }
 
 .theme-background{
-  background-color: #ED5D18;
+  background-color: #0075DC;
 }

component/roomItem/roomItem.wxml

@@ -25,7 +25,7 @@
 					<view class="tj_listItemTag">
 						<view class="tagVr">
 							<view class="tagItemIcon">
-								<image mode="heightFix" src="../../static/images/icon/vr@2x.png"></image>
+								<image mode="heightFix" src="../../static/images/icon/vrIcon.png"></image>
 							</view>
 							<view class="tip">
 								房源

component/storeItem/storeItem.js

@@ -0,0 +1,30 @@
+// components/house-item/house-item.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    store: 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}`
+    //   })
+    // }
+  }
+})

component/storeItem/storeItem.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

component/storeItem/storeItem.wxml

@@ -0,0 +1,13 @@
+<!--component/storeItem/storeItem.wxml-->
+<view class="storeBox">
+  <view class="storeCover">
+    <image mode="widthFix"
+      src="https://m4.publicimg.browser.qq.com/publicimg/pcqb/ewtab_yunying/477_266_datu_20210802.jpg"></image>
+  </view>
+  <view class="storeTitle">
+    Adidas阿迪达斯富华里官方旗舰店Adidas阿迪达斯富华里官方旗舰店
+  </view>
+  <view class="storeView">
+    6.8w 人浏览过
+  </view>
+</view>

component/storeItem/storeItem.wxss

@@ -0,0 +1,35 @@
+/* component/storeItem/storeItem.wxss */
+.storeBox {
+  width: 334rpx;
+  height: 508rpx;
+  border-radius: 10rpx;
+  overflow: hidden;
+}
+
+.storeBox .storeCover {
+  width: 334rpx;
+  height: 334rpx;
+  overflow: hidden;
+}
+
+.storeTitle {
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  font-size: 32rpx;
+  color: #333;
+  margin-top: 18rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  height: 88rpx;
+}
+
+.storeView {
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  color: #999999;
+  font-size: 24rpx;
+  margin-top: 10rpx;
+}

custom-tab-bar/index.js

@@ -2,7 +2,7 @@ let tabBar = {
   "custom": true,
   "backgroundColor": "#fff",
   "borderStyle": "black",
-  "selectedColor": "#ED5D18",
+  "selectedColor": "#0075DC",
   "color": "#666C7D",
   "list": [
     {

custom-tab-bar/index.wxss

@@ -75,7 +75,7 @@
   width: 12px;
   height: 12px;
   border-radius: 50%;
-  background-color: #ED5D18;
+  background-color: #0075DC;
   color: #fff;
   font-size: 10px;
   text-align: center;

dataReport/components/scene-report/scene-report.js

@@ -296,7 +296,7 @@ function init3Chart(canvas, width, height, dpr, xdata,) {
     title: {
       text: ''
     },
-    color: ['#ED5D18'],
+    color: ['#0075DC'],
     tooltip: {
       formatter: `{a}: {c} \n${new Date().getFullYear()}-{b}`,
       axisPointer: {
@@ -364,7 +364,7 @@ function init2Chart(canvas, width, height, dpr) {
         showSymbol: false,
         symbol: 'circle',
         smooth: 0.5,
-        color: '#ED5D18',
+        color: '#0075DC',
         areaStyle: {
           opacity: 0.1
         },

dataReport/components/scene-report/scene-report.wxss

@@ -87,9 +87,9 @@ view, text, page {
   margin-right: 24rpx;
 }
 .chart-type.is-active {
-  border-color: #ED5D18;
+  border-color: #0075DC;
   color: #202020;
 }
 .chart-type.is-active .icon {
-  color: #ED5D18;
+  color: #0075DC;
 }

pages/auth/mobile/mobile.wxss

@@ -3,7 +3,7 @@
   flex-direction: column;
   align-items: center;
   padding-bottom: 25rpx;
-  background: linear-gradient(to bottom, #ED5D18 0%, #c3f7f5 100%);
+  background: linear-gradient(to bottom, #0075DC 0%, #c3f7f5 100%);
 }
 
 .userinfo-avatar {
@@ -87,7 +87,7 @@
 
 .desc-line.asset-count {
   font-size: 32rpx;
-  color: #ED5D18;
+  color: #0075DC;
 }
 
 .slide-img {
@@ -155,7 +155,7 @@
   line-height: 84rpx;
   width: 250rpx;
   font-size: 30rpx;
-  background-color: #ED5D18;
+  background-color: #0075DC;
 }
 
 .login .password-second-line {
@@ -182,7 +182,7 @@
 .third-line button {
   height: 80rpx;
   font-size: 32rpx;
-  background-color: #ED5D18;
+  background-color: #0075DC;
 }
 
 .login-type {

pages/brandDetail/brandDetail.wxss

@@ -123,5 +123,5 @@ page{
   height: 30rpx;
   text-align: center;
   font-size: 30rpx;
-  color: #ED5D18;
+  color: #0075DC;
 }

pages/cart/cart.wxss

@@ -74,7 +74,7 @@ page{
 }
 .to-index-btn{
     color:#fff;
-    background:#ED5D18;
+    background:#0075DC;
     border-radius:6px;
     width:300rpx;
     height: auto;
@@ -185,7 +185,7 @@ page{
 
 .cart-view .item .price{
     float: left;
-    color: #ED5D18;
+    color: #0075DC;
     font-size: 30rpx;
 }
 
@@ -360,7 +360,7 @@ page{
     flex: 1;
     /* margin: 26rpx 10rpx 34rpx 14rpx; */
     padding-left: 20rpx;
-    color: #ED5D18;
+    color: #0075DC;
     font-size: 26rpx;
 }
 

pages/catalog/catalog.wxss

@@ -122,7 +122,7 @@ page {
   top: 0;
   bottom: 0;
   width: 8rpx;
-  background: #ED5D18;
+  background: #0075DC;
 }
 
 .catalog .cate {

pages/category/category.wxss

@@ -34,8 +34,8 @@
 }
 
 .cate-nav .item.active .name{
-    color: #ED5D18;
-    border-bottom: 2px solid #ED5D18;
+    color: #0075DC;
+    border-bottom: 2px solid #0075DC;
 }
 
 .cate-item{
@@ -119,7 +119,7 @@
   height: 40rpx;
   text-align: center;
   font-size: 30rpx;
-  color: #ED5D18;
+  color: #0075DC;
   bottom: 10rpx;
 }
 

pages/coupon/coupon.wxss

@@ -30,7 +30,7 @@
 
 .tab view.active {
   position: relative;
-  color: #ED5D18;
+  color: #0075DC;
 }
 
 .tab view.active::after {
@@ -39,7 +39,7 @@
   bottom: -20rpx;
   height: 4rpx;
   width: 60rpx;
-  background-color: #ED5D18;
+  background-color: #0075DC;
   left: 50%;
   transform: translateX(-50%);
 }
@@ -106,7 +106,7 @@
 
 .illustrate .momey {
   font-size: 50rpx;
-  color: #ED5D18;
+  color: #0075DC;
   font-weight: bold;
 }
 
@@ -144,7 +144,7 @@
   color: #fff;
   font-size: 22rpx;
   border-radius:4px;
-  background-color: #ED5D18;
+  background-color: #0075DC;
 }
 
 

pages/discover/discover.wxss

@@ -64,11 +64,11 @@ page {
 }
 
 .live-tabs .item.active {
-  color: #ED5D18;
+  color: #0075DC;
 }
 
 .live-tabs .item.active .zw  {
-  background-color: #ED5D18;
+  background-color: #0075DC;
 }
 
 .live {
@@ -371,7 +371,7 @@ page {
 }
 
 .commodity-view .c-tabs .text.active {
-  color: #ED5D18;
+  color: #0075DC;
   font-size: 16px;
   position: relative;
 }
@@ -382,7 +382,7 @@ page {
   left: 0;
   right: 0;
   height: 4rpx;
-  background-color: #ED5D18;
+  background-color: #0075DC;
   margin: 0 20rpx;
 }
 
@@ -462,7 +462,7 @@ page {
 
 .commodity-view .c-money .text {
   display: inline;
-  color: #ED5D18;
+  color: #0075DC;
 }
 
 .commodity-view .c-money .text:nth-child(1), .c-money .text:nth-child(3) {
@@ -497,7 +497,7 @@ page {
 }
 
 .commodity-view .oper-btn:nth-child(2) {
-  background-color: #ED5D18;
+  background-color: #0075DC;
 }
 
 

pages/goods/goods.wxss

@@ -76,7 +76,7 @@
 
 .goods-info .price {
     font-size: 40rpx;
-    color: #ED5D18;
+    color: #0075DC;
     font-weight: bold;
     text-align: left;
     flex: 1;
@@ -85,7 +85,7 @@
 
 .goods-info .brand {
     text-align: center;
-    border: 1px solid #ED5D18;
+    border: 1px solid #0075DC;
     border-radius: 20rpx;
 
 }
@@ -410,7 +410,7 @@
     display: block;
     height: 8rpx;
     width: 8rpx;
-    background: #ED5D18;
+    background: #0075DC;
     border-radius: 50%;
     margin-top: 11rpx;
 }
@@ -534,7 +534,7 @@
     height: 40rpx;
     text-align: center;
     font-size: 30rpx;
-    color: #ED5D18;
+    color: #0075DC;
     bottom: 10rpx;
 
 }
@@ -587,7 +587,7 @@
     position: absolute;
     top: 0;
     right: 0;
-    background: #ED5D18;
+    background: #0075DC;
     text-align: center;
     font-size: 18rpx;
     color: #fff;
@@ -622,8 +622,8 @@
     line-height: 96rpx;
     flex: 1;
     text-align: center;
-    border: 1px solid #ED5D18;
-    background: #ED5D18;
+    border: 1px solid #0075DC;
+    background: #0075DC;
     color: #fff;
     font-size: 16px;
 }
@@ -726,8 +726,8 @@
 }
 
 .spec-con .value.selected {
-    border: 1px solid #ED5D18;
-    color: #ED5D18;
+    border: 1px solid #0075DC;
+    color: #0075DC;
 
 }
 

pages/index/index.js

@@ -12,51 +12,82 @@ Router({
     // 头部导航栏的高度
     statusBarHeight: app.globalData.statusBarHeight,
     classifyList: [{
-        id: 1,
+        type: 0,
         title: '新房',
         icon: "../../static/images/icon/house@2x.png",
       },
       {
-        id: 2,
+        type: 1,
         title: '二手房',
         icon: "../../static/images/icon/second_hand@2x.png",
       },
 
       {
-        id: 3,
+        type: 2,
         title: '公寓',
         icon: "../../static/images/icon/apartments@2x.png",
       },
       {
-        id: 4,
+        type: 3,
         title: '民宿',
         icon: "../../static/images/icon/b&b@2x.png",
       },
       {
-        id: 5,
+        type: 4,
         title: '社区',
         icon: "../../static/images/icon/community@2x.png",
       },
     ],
+    type:'',
+    middleType: 11,
+    // type :-1:所有；0：新房；1:二手房；2:公寓；3:民宿；4：社区
+    // 11:新上房源；12:热门房源;13:热门企业；
+    // 21:商家列表；
+    // 31：VR场景；32：VR直播间
     middleTabList: [{
-        id: 1,
+        type: 11,
         title: '新上房源'
       },
       {
-        id: 2,
+        type: 12,
         title: '热门房源'
       },
       {
-        id: 3,
+        type: 13,
         title: '热门企业'
       },
     ],
-    middleType: 1,
+    middleList: [{
+      url: 'https://m4.publicimg.browser.qq.com/publicimg/pcqb/ewtab_yunying/477_266_datu_20210802.jpg',
+      title: '华发水岸1'
+    }, {
+      url: 'https://m4.publicimg.browser.qq.com/publicimg/pcqb/ewtab_yunying/477_266_datu_20210802.jpg',
+      title: '华发水岸1'
+    }, {
+      url: 'https://m4.publicimg.browser.qq.com/publicimg/pcqb/ewtab_yunying/477_266_datu_20210802.jpg',
+      title: '华发水岸1'
+    }, ],
+    roomTabList: [{
+        type: 0,
+        title: '新房'
+      },
+      {
+        type: 1,
+        title: '二手房'
+      },
+      {
+        type: 2,
+        title: '公寓'
+      },
+    ],
+    roomType: 0,
     city: app.globalData.city,
     fetcherData: {
-      city:'',
+      type:'',
+      city: '',
       page_num: 1,
-      page_size:20
+      page_size: 20,
+      name:''
     }
 
   },
@@ -75,7 +106,67 @@ Router({
     // this.getBrandList(1, false, true);
     app.onPullDownRefresh()
   },
+  onReachBottom: function () {
+    console.log('onReachBottom')
+  },
   inputFocus: function () {},
+  changeMiddleTab(e) {
+    let type = e.currentTarget.dataset.type
+    this.setData({
+      middleType: type
+    })
+
+  },
+  chengeRoomType(e) {
+    let type = e.currentTarget.dataset.type
+    this.setData({
+      roomType: type
+    })
+  },
+
+  getRoomList(){
+    this.setData({
+      'fetcherData.type':this.data.roomType,
+    })
+    if(app.globalData.city=='全国'){
+      this.setData({
+        'fetcherData.city':'',
+      })
+    
+    }else{
+      this.setData({
+        'fetcherData.city':app.globalData.city,
+      })
+    }
+    util.request(api.OrderList, this.data.fetcherData).then( (res)=> {
+      console.log(res)
+      if (res.errno === 0) {
+      
+      }
+    });
+  },
+  getMiddleList(){
+    this.setData({
+      'fetcherData.type':this.data.middleType,
+    })
+    if(app.globalData.city=='全国'){
+      this.setData({
+        'fetcherData.city':'',
+      })
+    
+    }else{
+      this.setData({
+        'fetcherData.city':app.globalData.city,
+      })
+    }
+    util.request(api.OrderList, this.data.fetcherData).then( (res)=> {
+      console.log(res)
+      if (res.errno === 0) {
+      
+      }
+    });
+  },
+
   toCity() {
     wx.navigateTo({
       url: `/pages/city/city`
@@ -97,10 +188,12 @@ Router({
 
   onReady: function () {
     // 页面渲染完成
+    this.getRoomList()
+    this.getMiddleList()
   },
 
   onShow: function (options) {
-
+  
     console.log(app.globalData.city)
     // 页面显示
     let city = app.globalData.city
@@ -108,6 +201,8 @@ Router({
       this.setData({
         'city': app.globalData.city,
       })
+      this.getRoomList()
+      this.getMiddleList()
     }
 
 

pages/index/index.json

@@ -1,6 +1,5 @@
 {
-  "navigationBarTitleText": "指房宝",
-  "navigationStyle": "custom",
+  "navigationBarTitleText": "首页",
   "usingComponents": {
     "roomItem": "../../component/roomItem/roomItem"
   }

pages/index/index.wxml

@@ -1,12 +1,14 @@
 <view>
 	<!-- 自定义的导航栏 -->
 	<view style="background: #fff;">
-		<view class="custom flex_center" style="padding-top:{{statusBarHeight}}px">
+		<view class="custom flex_center">
 			<view class="headerNav">
 				<view class='navInput'>
 					<view class="currentCity" bindtap="toCity">
 						<view class="city_text">{{city}}</view>
-						<view class="icon"></view>
+						<view class="icon">
+							<image mode="widthFix" src="../../static/images/icon/arrows@2x.png"></image>
+						</view>
 
 					</view>
 					<input placeholder='请输入VR场景名称' placeholder-class='none'
@@ -15,16 +17,19 @@
 			</view>
 
 		</view>
-		<view class="empty_custom" style="padding-top:{{statusBarHeight}}px"></view>
+
 		<view class="paddingBox"></view>
 	</view>
 
 	<!-- 头图 -->
-	<view class="headerImage">
-		<image mode="widthFix"
-			src="https://m4.publicimg.browser.qq.com/publicimg/pcqb/ewtab_yunying/477_266_datu_20210802.jpg"></image>
+	<view class="banner">
+		<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>
 
+
 	<!-- 分类 -->
 	<view class="fl_content">
 		<view class="fl_list">
@@ -39,19 +44,19 @@
 	<view>
 		<view class="middleTab">
 			<view class="middletabContent">
-				<view class="middleTabItem {{middleType==item.id?'active':''}}" wx:for="{{middleTabList}}">
+				<view class="middleTabItem {{middleType==item.type?'active':''}}" data-type="{{item.type}}"
+					bindtap="changeMiddleTab" wx:for="{{middleTabList}}">
 					<text>{{item.title}}</text>
 				</view>
 			</view>
 		</view>
 
 		<view class="middleList">
-			<view class="middleList_item" wx:for="{{3}}">
+			<view class="middleList_item" wx:for="{{middleList}}">
 				<view class="middleList_cover">
-					<image mode="heightFix"
-						src="https://m4.publicimg.browser.qq.com/publicimg/pcqb/ewtab_yunying/477_266_datu_20210802.jpg"></image>
+					<image mode="heightFix" src="{{item.url}}"></image>
 				</view>
-				<text class="middleList_title">华发水岸</text>
+				<text class="middleList_title">{{item.title}}</text>
 			</view>
 		</view>
 	</view>
@@ -61,15 +66,10 @@
 		<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 class="tj_tabItem {{roomType==item.type?'active':''}}" 	bindtap="chengeRoomType" data-type="{{item.type}}" wx:for="{{roomTabList}}">
+					<text>{{item.title}}</text>
 				</view>
+
 			</view>
 		</view>
 

pages/index/index.wxss

@@ -9,11 +9,12 @@
   z-index: 999;
   background: #fff;
   box-sizing: border-box;
+  padding: 0 32rpx;
+  box-sizing: border-box;
 }
 
 .headerNav {
   width: 100%;
-  padding-left: 32rpx;
   background: #fff;
   box-sizing: border-box;
   height: 90rpx;
@@ -25,7 +26,7 @@
 .navInput {
   /* float: left; */
   /* margin-top: 8rpx; */
-  width: 498rpx;
+  width: 100%;
   height: 64rpx;
   overflow: hidden;
   box-sizing: border-box;
@@ -67,14 +68,18 @@
 }
 
 .currentCity .icon {
-  width: 0px;
+  width: 8rpx;
   height: 8rpx;
-  border: 4rpx solid;
-  border-color: #666 transparent transparent transparent;
-  position: absolute;
-  right: 7%;
-  top: 50%;
-  transform: translateY(-50%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+}
+
+.currentCity .icon image {
+  width: 8rpx;
+  height: 8rpx;
+
 }
 
 .navInput input {
@@ -110,9 +115,18 @@
 
 
 /* 自定义导航栏结束 */
+.banner {
+  width: 100%;
+  height: 240rpx;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  margin-top: 20rpx;
+}
+
 .headerImage {
   width: 100%;
-  height: 408rpx;
+  height: 240rpx;
+  border-radius: 10rpx;
   overflow: hidden;
 }
 
@@ -124,7 +138,7 @@
 .fl_content {
   width: 100%;
   height: auto;
-  margin-top: 20rpx;
+  margin-top: 40rpx;
 }
 
 .fl_content .fl_list {

pages/logistics/index.js

@@ -38,7 +38,7 @@ Page({
         longitude: 113.324520,
         latitude: 23.21229
       }],
-      color: "#ED5D18",
+      color: "#0075DC",
       width: 4,
       dottedLine: false,
       arrowLine: true

pages/ncategory/category.wxss

@@ -117,7 +117,7 @@
 }
 
 .header .ul .active {
-  color: #ED5D18;
+  color: #0075DC;
   font-weight: bolder;
   font-size: 36rpx;
   position: relative;
@@ -130,7 +130,7 @@
   left: 0;
   right: 0;
   height: 4rpx;
-  background-color: #ED5D18;
+  background-color: #0075DC;
 }
 
 

pages/pay/pay.wxss

@@ -105,7 +105,7 @@ page{
     width: 100%;
     text-align: center;
     line-height: 100rpx;
-    background: #ED5D18;
+    background: #0075DC;
     color: #fff;
     font-size: 30rpx;
 }

pages/payResult/payResult.wxss

@@ -38,7 +38,7 @@ page {
 }
 
 .pay-result .error .msg {
-  color: #ED5D18;
+  color: #0075DC;
   margin-bottom: 60rpx;
 }
 

pages/search/search.wxss

@@ -243,8 +243,8 @@ page{
 }
 
 .sort-box-category .item.active{
-    color: #ED5D18;
-    border: 1px solid #ED5D18;
+    color: #0075DC;
+    border: 1px solid #0075DC;
 }
 
 .cate-item{
@@ -327,7 +327,7 @@ page{
   display: block;
   text-align: center;
   font-size: 30rpx;
-  color: #ED5D18;
+  color: #0075DC;
 }
 
 .search-result-empty{

pages/searchRoom/searchRoom.wxml

@@ -13,4 +13,8 @@
     </view>
 
   </view>
+  <view class="unbrand">
+    <image src="/static/images/img_nodata@2x.png"></image>
+    <view class="text">暂无相关数据</view>
+  </view>
 </view>

pages/searchRoom/searchRoom.wxss

@@ -47,4 +47,22 @@
 .resulst{
   padding: 10rpx 32rpx;
   box-sizing: border-box;
+}
+
+
+.unbrand {
+  margin-top: 180rpx;
+  text-align: center;
+}
+
+.unbrand image {
+  display: inline-block;
+  width: 250rpx;
+  height: 274rpx;
+}
+
+.unbrand .text {
+  color: #666C7D;
+  font-size: 30rpx;
+  margin-top: 40rpx;
 }

pages/sence/sence.js

@@ -0,0 +1,81 @@
+// pages/sence/sence.js
+var util = require('./../../utils/util.js');
+var api = require('./../../config/api.js');
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    console.log(options)
+    if(options.type==1){
+      wx.setNavigationBarTitle({
+        title: 'VR场景' 
+      })
+    }else{
+      wx.setNavigationBarTitle({
+        title: 'VR场景直播间' 
+      })
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    util.request(api.OrderList, { page: 1, size: 1, orderStatus: 1}).then(function (res) {
+      if (res.errno === 0) {
+      
+      }
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/sence/sence.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "VR场景",
+  "usingComponents": {
+    "roomItem": "../../component/roomItem/roomItem"
+  }
+  
+}

pages/sence/sence.wxml

@@ -0,0 +1,23 @@
+<view>
+  <lip-sync />
+  <auth bindlogin="onShow" />
+  <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 class="unbrand">
+    <image src="/static/images/img_nodata@2x.png"></image>
+    <view class="text">暂无相关数据</view>
+  </view>
+</view>

pages/sence/sence.wxss

@@ -0,0 +1,68 @@
+/* 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;
+}
+
+
+.unbrand {
+  margin-top: 180rpx;
+  text-align: center;
+}
+
+.unbrand image {
+  display: inline-block;
+  width: 250rpx;
+  height: 274rpx;
+}
+
+.unbrand .text {
+  color: #666C7D;
+  font-size: 30rpx;
+  margin-top: 40rpx;
+}

pages/share/share.wxss

@@ -58,7 +58,7 @@
 
 .share-info .oper-btn {
   flex: 0 0 auto;
-  background-color: #ED5D18;
+  background-color: #0075DC;
   color: #fff;
   padding: 0 16rpx;
 }
@@ -244,5 +244,5 @@
 }
 
 .btns view.enter {
-  color: #ED5D18;
+  color: #0075DC;
 }

pages/shared/shared.wxss

@@ -48,7 +48,7 @@
   right: 40rpx;
   top: 588rpx;
   font-size: 22rpx;
-  background: #ED5D18;
+  background: #0075DC;
   border-radius: 4rpx;
   line-height: 54rpx;
   width: 144rpx;
@@ -159,7 +159,7 @@
 }
 
 .edit-footer .submit {
-  color: #ED5D18;
+  color: #0075DC;
   border-left: 2rpx solid #e5e5e5;
 }
 

pages/shopping/address/address.wxss

@@ -55,8 +55,8 @@ page{
     line-height: 26rpx;
     text-align: center;
     font-size: 20rpx;
-    color: #ED5D18;
-    border: 1rpx solid #ED5D18;
+    color: #0075DC;
+    border: 1rpx solid #0075DC;
     visibility: visible;
 }
 
@@ -97,7 +97,7 @@ page{
 }
 
 .add-address{
-    background: #ED5D18;
+    background: #0075DC;
     text-align: center;
     width: 100%;
     height: 99rpx;

pages/shopping/addressAdd/addressAdd.js

@@ -322,7 +322,7 @@ Page({
           title: '提示',
           content: res.errmsg,
           showCancel: false,
-          confirmColor:'#ED5D18',
+          confirmColor:'#0075DC',
           success: function (res) {
 
           }

pages/shopping/addressAdd/addressAdd.wxss

@@ -76,7 +76,7 @@ page{
 }
 
 .add-address .save{
-    background: #ED5D18;
+    background: #0075DC;
 }
 
 
@@ -122,7 +122,7 @@ page{
 }
 
 .region-select .region-selected .item.selected{
-  color: #ED5D18;
+  color: #0075DC;
 }
 
 .region-select .done{
@@ -174,7 +174,7 @@ page{
 }
 
 .region-select .region-list .item.selected{
-  color: #ED5D18;
+  color: #0075DC;
 }
 
 

pages/shopping/checkout/checkout.wxss

@@ -48,11 +48,11 @@ page{
     width: 62rpx;
     height: 33rpx;
     border-radius: 5rpx;
-    border: 1px solid #ED5D18;
+    border: 1px solid #0075DC;
     font-size: 20.5rpx;
     text-align: center;
     line-height: 29rpx;
-    color: #ED5D18;
+    color: #0075DC;
 }
 
 .address-box .m{
@@ -257,7 +257,7 @@ page{
     overflow: hidden;
     line-height: 41rpx;
     font-size: 30rpx;
-    color: #ED5D18;
+    color: #0075DC;
 }
 
 .order-total{
@@ -275,7 +275,7 @@ page{
     flex: 1;
     height: 100rpx;
     line-height: 100rpx;
-    color: #ED5D18;
+    color: #0075DC;
     font-size: 33rpx;
     padding-left: 31.25rpx;
     box-shadow:0px -1px 4px rgba(0,0,0,0.05);
@@ -284,8 +284,8 @@ page{
 .order-total .r{
     width: 233rpx;
     height: 100rpx;
-    background: #ED5D18;
-    border: 1px solid #ED5D18;
+    background: #0075DC;
+    border: 1px solid #0075DC;
     line-height: 100rpx;
     text-align: center;
     color: #fff;

pages/shopping/selCoupon/selCoupon.wxss

@@ -13,7 +13,7 @@ page{
   margin: 30rpx auto 30rpx;
   width: 690rpx;
   height: 88rpx;
-  background-color: #ED5D18;
+  background-color: #0075DC;
   border-radius: 5rpx;
   font-size: 32rpx;
   font-weight: normal;

pages/store/store.js

@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    type: 21
   },
 
   /**

pages/store/store.json

@@ -1,3 +1,6 @@
 {
-  "navigationBarTitleText": "商家"
+  "navigationBarTitleText": "商家",
+  "usingComponents": {
+    "storeItem": "../../component/storeItem/storeItem"
+  }
 }

pages/store/store.wxml

@@ -2,7 +2,18 @@
   <view class="storeContent">
     <view class="storeSearch">
       <image src="../../static/images/icon/search@2x.png"></image>
-      <input type="text" placeholder="请输入VR场景名称"  placeholder-class="placeholderStyle"/>
+      <input type="text" placeholder="请输入VR场景名称" placeholder-class="placeholderStyle" />
     </view>
   </view>
-</view>
+  <view style="height: 64rpx;"></view>
+  <view class="storeList">
+    <view wx:for="{{10}}">
+      <storeItem></storeItem>
+    </view>
+  </view>
+
+  <view class="unbrand">
+    <image src="/static/images/img_nodata@2x.png"></image>
+    <view class="text">暂无相关数据</view>
+  </view>
+</view>

pages/store/store.wxss

@@ -3,7 +3,11 @@
   width: 100%;
   padding: 0 32rpx;
   box-sizing: border-box;
-
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #fff;
+  z-index: 100;
 }
 
 .storeSearch {
@@ -17,17 +21,57 @@
   padding: 0 32rpx;
   box-sizing: border-box;
 }
-.storeSearch image{
+
+.storeSearch image {
   width: 24rpx;
   height: 24rpx;
 }
-.storeSearch input{
+
+.storeSearch input {
   font-size: 24rpx;
   color: #333;
   margin-left: 4rpx;
   width: 100%;
 }
-.storeSearch .placeholderStyle{
+
+.storeSearch .placeholderStyle {
   font-size: 24rpx;
   color: #B2B2B2;
+}
+
+.storeList {
+  width: 100%;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  /* display: flex;
+  align-items: center;
+  justify-content: center; */
+  margin-top: 32rpx;
+}
+
+.storeList>view {
+  overflow: hidden;
+  width: 334rpx;
+  float: left;
+}
+
+.storeList>view:nth-of-type(odd){
+  margin-right: 18rpx;
+}
+
+.unbrand {
+  margin-top: 180rpx;
+  text-align: center;
+}
+
+.unbrand image {
+  display: inline-block;
+  width: 250rpx;
+  height: 274rpx;
+}
+
+.unbrand .text {
+  color: #666C7D;
+  font-size: 30rpx;
+  margin-top: 40rpx;
 }

pages/ucenter/address/address.wxss

@@ -50,8 +50,8 @@ page{
     line-height: 33rpx;
     text-align: center;
     font-size: 20rpx;
-    color: #ED5D18;
-    border: 1rpx solid #ED5D18;
+    color: #0075DC;
+    border: 1rpx solid #0075DC;
     visibility: visible;
 }
 
@@ -92,7 +92,7 @@ page{
 }
 
 .add-address{
-    background: #ED5D18;
+    background: #0075DC;
     text-align: center;
     width: 100%;
     height: 99rpx;

pages/ucenter/addressAdd/addressAdd.js

@@ -326,7 +326,7 @@ Page({
           title: '提示',
           content: res.errmsg,
           showCancel: false,
-          confirmColor:'#ED5D18',
+          confirmColor:'#0075DC',
           success: function (res) {
 
           }

pages/ucenter/addressAdd/addressAdd.wxss

@@ -76,7 +76,7 @@ page{
 }
 
 .add-address .save{
-    background: #ED5D18;
+    background: #0075DC;
 }
 
 
@@ -121,7 +121,7 @@ page{
 }
 
 .region-select .region-selected .item.selected{
-  color: #ED5D18;
+  color: #0075DC;
 }
 
 .region-select .done{
@@ -165,7 +165,7 @@ page{
 }
 
 .region-select .region-list .item.selected{
-  color: #ED5D18;
+  color: #0075DC;
 }
 
 

pages/ucenter/feedback/feedback.wxss

@@ -111,7 +111,7 @@ page{
   width: 100%;
   height: 98rpx;
   line-height: 98rpx;
-  background: #ED5D18;
+  background: #0075DC;
   position: fixed;
   bottom: 0;
   left: 0;

pages/ucenter/help/help.wxss

@@ -10,5 +10,5 @@ page ,.container{
   background-color: #fff;
   padding: 30rpx;
   font-size: 35rpx;
-  color: #ED5D18;
+  color: #0075DC;
 }

pages/ucenter/index/index.js

@@ -69,6 +69,20 @@ Page({
             id: 1
           }
         ],
+        senceList:[
+          {
+            icon: 'vr@2x',
+            url: '/pages/sence/sence',
+            name: 'VR场景',
+            type: 31
+          },
+          {
+            icon: 'vr_live@2x',
+            url: '/pages/sence/sence',
+            name: 'VR场景直播间',
+            type: 32
+          }
+        ],
         relatedGoods: [],
         isLogin: app.globalData.isLogin
 
@@ -88,14 +102,17 @@ Page({
 
   tapByIdx:function(e){
     let {
+      type
+    } = e.currentTarget.dataset;
+    let {
       url
     } = e.currentTarget.dataset;
 
-    console.log(app.globalData)
+    console.log(url+'?type='+type)
 
     // if (this.data.isLogin) {
       wx.navigateTo({
-        url: url,
+        url: url+'?type='+type,
         success: function (res) { },
         fail: function (res) { },
         complete: function (res) { },
@@ -109,7 +126,7 @@ Page({
     //   //   title: '提示',
     //   //   content: '请登录后查看',
     //   //   showCancel: false,
-    //   //   confirmColor: '#ED5D18',
+    //   //   confirmColor: '#0075DC',
     //   //   success: res=>{
 
     //   //   }
@@ -218,8 +235,10 @@ Page({
 
     },
     onPullDownRefresh() {
+ 
       getApp().onPullDownRefresh()
     },
+ 
     onHide: function () {
         // 页面隐藏
 

pages/ucenter/index/index.json

@@ -1,5 +1,4 @@
 {
   "backgroundColor": "#f4f4f4",
-  "enablePullDownRefresh": false,
   "navigationStyle":"custom"
 }

pages/ucenter/index/index.wxml

@@ -37,8 +37,8 @@
   </view>
 
     <view class="order-list-v">
-      <view wx:for="{{barList}}"  bindtap="tapByIdx" wx:key="{{item.id}}"  data-url="{{item.url}}" class="navigator a">
-        <image wx:if="{{imgServer}}" src="{{'/static/images/'+item.icon+'.png'}}"></image>
+      <view wx:for="{{senceList}}"  bindtap="tapByIdx" wx:key="{{item.id}}" data-type="{{item.type}}"  data-url="{{item.url}}" class="navigator a">
+        <image wx:if="{{imgServer}}" src="{{'/static/images/icon/'+item.icon+'.png'}}"></image>
         <view>{{item.name}}</view>
         <image src="/static/images/go.png" class="go"></image>
       </view>

pages/ucenter/index/index.wxss

@@ -188,7 +188,7 @@ page{
   height: 28rpx;
   text-align: center;
   line-height: 28rpx;
-  background: #ED5D18;
+  background: #0075DC;
   color: #fff;
   font-size: 18rpx;
   border-radius: 50%;
@@ -343,7 +343,7 @@ page{
   height: 40rpx;
   text-align: center;
   font-size: 30rpx;
-  color: #ED5D18;
+  color: #0075DC;
   position: absolute;
   bottom: 10rpx;
 

pages/ucenter/order/order.wxss

@@ -18,7 +18,7 @@ page{
 }
 
 .header-list .active{
-  color: #ED5D18;
+  color: #0075DC;
 }
 
 .orders{
@@ -90,7 +90,7 @@ page{
 
 .order .goods .status{
     width:105rpx;
-    color: #ED5D18;
+    color: #0075DC;
     font-size: 25rpx;
 }
 
@@ -122,7 +122,7 @@ page{
     border-radius: 5rpx;
     font-size: 26rpx;
     color: #fff;
-    background: #ED5D18;
+    background: #0075DC;
     float: right;
 }
 

pages/ucenter/orderDetail/orderDetail.wxss

@@ -55,7 +55,7 @@ page{
 }
 
 .item-c .cost{
-    color: #ED5D18;
+    color: #0075DC;
 }
 
 .item-c .btn{
@@ -69,7 +69,7 @@ page{
 }
 
 .item-c .btn.active{
-    background: #ED5D18;
+    background: #0075DC;
     color: #fff;
 }
 
@@ -94,7 +94,7 @@ page{
 .order-goods .h .status{
     float: right;
     font-size: 30rpx;
-    color: #ED5D18;
+    color: #0075DC;
 }
 
 
@@ -172,13 +172,13 @@ page{
 .order-bottom .pay-fee .label{
     display: inline-block;
     width: 140rpx;
-    color: #ED5D18;
+    color: #0075DC;
 }
 
 .order-bottom .pay-fee .txt{
     display: inline-block;
     width: 140rpx;
-    color: #ED5D18;
+    color: #0075DC;
 }
 
 

pages/user/imageCropper.wxss

@@ -6,7 +6,7 @@
   left: 20px;
   right: 20px;
   height: 96rpx;
-  background: #ED5D18;
+  background: #0075DC;
   color: #fff;
   font-size: 34rpx;
   line-height: 96rpx;

pages/user/user.wxss

@@ -111,7 +111,7 @@ page {
 
 .save button {
   height: 96rpx;
-  background: #ED5D18;
+  background: #0075DC;
   color: #fff;
   font-size: 34rpx;
   line-height: 96rpx;