Revert "Del"

This reverts commit 90da91fe1df5f47bc511eda2594d876513b75e3c.

Furniture/README.md

@@ -0,0 +1,55 @@
+## 存在的问题
+
+### 主页面
+
+1.程序背景色需要绘制成白色
+
+2.右侧功能栏的品类个数很多时，最下方的按钮可能显示不了，比如现在在模拟器上把手机选成iPhone5，床就看不见了
+
+3.报价的时候点了帮助没地方关闭，并且要是在帮助界面点到了报价按钮，依旧会弹出报价单。
+
+4.搜索的时候有404，搜索出来的结果也应该是可以报价的
+
+5.搜索出来的结果点不进详情界面，报错点击进入详情控制区域没定义
+
+6.一页显示了6个但是没翻页按钮
+
+7.风格品类按钮没作用，品类按钮需要适当调整位置，被挡住了
+
+###详情界面
+
+1.上一个下一个按钮点一次触发了两次
+
+2.点击屏幕中间的时候隐藏所有按钮，我之前做的时候这个功能的点击区域没有包括有其他功能的按钮的点击区域，就是图片中心没东西的那一块。现在好像是整个屏幕点击都有这个功能
+
+3.隐藏按钮的时候出发了下一个功能 
+
+4.尺寸安装图点进去了关闭不掉
+
+5.点分享、详情购买和联系商家会触发下一个功能
+
+6.详情购买和联系商家点击之后闪一下就没了，直接跳到下一个商品了
+
+### 解决方案
+
+主要是选择好点击区域和设置点击状态，在详情界面比如屏幕下方的五个按键就只对应5个功能 ，其他功能把这5个按键所在的区域排除在外。点击某个按键之后进入某个状态，在此状态下，指定的操作有效，其他操作无效，这样可以避免像点击了帮助之后任然可以报价的情况
+
+##源码目录说明
+
+```javascript
+./js
+|——draw
+|  |——base.js. 						//绘制两边的目录栏背景和下一页按钮
+|  |——FirstLevelDirectory.js		//绘制顶级目录
+|  |——SecondLevelDirectory.js  	    //绘制子目录
+|  |——content.js					//绘制商品列表
+|  |——details.js					//绘制商品详情
+|  |——price.js                      //价格设置界面绘制
+|——lib
+|  |——symbol.js                     // ES6 Symbol简易兼容
+|  |——weapp-adapter.js              // 小游戏适配器
+|——main.js							//绘制入口
+```
+
+
+

Furniture/api.js

@@ -0,0 +1,11 @@
+var _api_root = "https://t6.9026.com/api/furniture/";
+const app = getApp();
+var api = {
+  login: _api_root + "xcx_login",
+  setting: _api_root + "setting?store_id=" + app.globalData.store_id,
+  news_detail: _api_root + "news_detail?store_id=" + app.globalData.store_id,
+  news_list: _api_root + "news_list?store_id=" + app.globalData.store_id,
+  goods_list: _api_root + "goods_list?store_id=" + app.globalData.store_id,
+  add_comments: _api_root + "add_comments?store_id=" + app.globalData.store_id
+}
+module.exports = api;

Furniture/app.js

@@ -0,0 +1,21 @@
+App({
+  onLaunch: function () {
+    var that = this
+    console.log('App Launch')
+  },
+  onShow: function () {
+    console.log('App Show')
+  },
+  onHide: function () {
+    console.log('App Hide')
+  },
+
+  login: require("utils/login.js"),
+  request: require("utils/request.js"),
+  utils: require("utils/utils.js"),
+  
+  globalData: {
+    hasLogin: false,
+    store_id: 1
+  }
+});

Furniture/app.json

@@ -0,0 +1,25 @@
+{
+  "pages": [
+    "page/homePage/homePage",
+    "page/user/user",
+    "page/lifeCircle/lifeCircle",
+    "page/contact/contact",
+    "page/homePage/detail/detail",
+    "page/homePage/detail/conment/conment",
+    "page/login/login"
+   
+  ],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "天天家居汇",
+    "navigationBarBackgroundColor": "#fff",
+    "backgroundColor": "#dcdcdc"
+  },
+  "networkTimeout": {
+    "request": 10000,
+    "connectSocket": 10000,
+    "uploadFile": 10000,
+    "downloadFile": 10000
+  },
+  "debug": true
+}

Furniture/app.wxss

@@ -0,0 +1,45 @@
+@import 'style/weui.wxss';
+page{
+    background-color: #F8F8F8;
+    font-size: 16px;
+    font-family: -apple-system-font,Helvetica Neue,Helvetica,sans-serif;
+}
+.page__hd {
+    padding: 40px;
+}
+.page__bd {
+    padding-bottom: 40px;
+}
+.page__bd_spacing {
+    padding-left: 15px;
+    padding-right: 15px;
+}
+
+.page__ft{
+    padding-bottom: 10px;
+    text-align: center;
+}
+
+.page__title {
+    text-align: center;
+    font-size: 20px;
+    font-weight: 400;
+}
+
+.page__desc {
+    margin-top: 10px;
+    color: #888888;
+    text-align: left;
+    font-size: 14px;
+}
+
+.we7-bottom-placeholder { width: 100%; height: 134rpx; position: relative; bottom: 0; z-index: -1 }
+.we7-bottom { display: flex; overflow: hidden; position: fixed; left: 0; right: 0; bottom: 0; padding: 10rpx 0; border-top: 1px solid #eee; background-color: #fff; z-index:99; }
+.we7-bottom.active { background-color: #fff; }
+.we7-bottom.active wx-navigatorurl { background-color: #fff }
+.we7-bottom .we7-bottom-item { flex: 1; padding: 10rpx; text-align: center; position: relative; }
+.we7-bottom .item-img { width: 50rpx; height: 50rpx; display: inline-block }
+.we7-bottom .item-text { display: block; font-size: 12px; line-height:1 }
+.we7-bottom-item wx-button,.we7-bottom-item wx-web-view{ position: absolute; top:5px; left: 30%; background: red; width: 100rpx; height: 100rpx; opacity: 0.0; z-index: 100; }
+.we7-bottom-item wx-navigator{ position: absolute; display: block; top:5px; left: 30%; background: red; width: 100rpx; height: 100rpx; opacity: 0.0; z-index: 100; }
+.we7-bottom-item .aview{ position: absolute; display: block; top:5px; left: 30%; background: red; width: 100rpx; height: 100rpx; opacity: 0.0; z-index: 100; }

Furniture/page/contact/contact.js

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

Furniture/page/contact/contact.json

@@ -0,0 +1 @@
+{}

Furniture/page/contact/contact.wxml

@@ -0,0 +1,2 @@
+<!--page/contact/contact.wxml-->
+<text>contact</text>

Furniture/page/contact/contact.wxss

@@ -0,0 +1 @@
+/* page/contact/contact.wxss */

Furniture/page/homePage/detail/conment/conment.js

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

Furniture/page/homePage/detail/conment/conment.json

@@ -0,0 +1 @@
+{}

Furniture/page/homePage/detail/conment/conment.wxml

@@ -0,0 +1,97 @@
+<!--page/homePage/detail/conment/conment.wxml-->
+<!--page/homePage/detail/detail.wxml-->
+<view class="page" style='background-color:white'>
+  <view class="page__bd">
+    <view class="conment" style='margin:20rpx'>
+      <view class='container' style='margin-left:0rpx;margin-top:-20rpx'>
+        <image src='../../../../images/people.png' style='width:80rpx;height:80rpx'></image>
+      </view>
+      <view class='container' style='margin-top:8rpx'>
+        <text style='margin-left:540rpx'>20</text>
+        <image src='../../../../images/点赞.png' style='width:30rpx;height:30rpx;margin-left:10rpx;margin-top:8rpx' bindtap='zan' wx:if="{{!zan}}"></image>
+        <image src='../../../../images/已赞.png' style='width:30rpx;height:30rpx;margin-left:10rpx;margin-top:8rpx' bindtap='zan' wx:if="{{zan}}"></image>
+      </view>
+      <view class="weui-article__title" style='margin-left:100rpx'>梦星羽</view>
+
+
+      <view style='font-size:35rpx;margin-left:0rpx;margin-top:10rpx'>
+        评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内
+      </view>
+      <view style='border-bottom: 2rpx #D3D3D3 solid'>
+      <view class='container' style='margin-left:0rpx;margin-top:5rpx;font-size:24rpx;color:#d3d3d3'>
+        6小时前
+      </view>
+      <view style='margin:0;margin-left:0rpx'>
+        <image src='../../../../images/回复按钮.png' style='width:60rpx;height:30rpx;margin-left:100rpx;margin-top:10rpx'></image>
+      </view>
+      </view>
+      <view style='margin-top:10rpx;'>
+        全部回复(21)
+      </view>
+    </view>
+    <view class='conment' style='margin:20rpx'>
+      <view class='container' style='margin-left:0rpx;margin-top:-20rpx'>
+        <image src='../../../../images/people.png' style='width:80rpx;height:80rpx'></image>
+      </view>
+      <view class='container' style='margin-top:8rpx'>
+        <text style='margin-left:540rpx'>20</text>
+        <image src='../../../../images/点赞.png' style='width:30rpx;height:30rpx;margin-left:10rpx;margin-top:8rpx' bindtap='zan' wx:if="{{!zan}}"></image>
+        <image src='../../../../images/已赞.png' style='width:30rpx;height:30rpx;margin-left:10rpx;margin-top:8rpx' bindtap='zan' wx:if="{{zan}}"></image>
+      </view>
+      <view class="weui-article__title" style='margin-left:100rpx'>梦星羽</view>
+
+
+      <view style='font-size:35rpx;margin-left:100rpx'>
+        评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内
+      </view>
+      <view class='container' style='margin-top:10rpx'>
+        <image src='../../../../images/展开全文按钮.png' style='width:60rpx;height:30rpx;margin-left:20rpx'></image>
+      </view>
+
+      <view class='container' style='margin-left:100rpx;margin-top:55rpx;font-size:24rpx;color:#d3d3d3'>
+        6小时前
+      </view>
+      <view style='margin:0;margin-left:100rpx'>
+        <image src='../../../../images/回复按钮.png' style='width:60rpx;height:30rpx;margin-left:100rpx;margin-top:60rpx'></image>
+      </view>
+
+      <view style='margin-top:5rpx;background-color:#f5f5f5;margin-left:100rpx;'>
+        <view style='margin-left:10rpx'>
+          <text style='font-size:30rpx;font-famaily:"黑体"'>梦星羽：</text>
+          <text style=' font-size:30rpx;color:#606060'>评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评</text>
+        </view>
+
+        <view class='container ' style='margin-top:10rpx'>
+          <image src='../../../../images/展开全文按钮.png ' style='width:60rpx;height:30rpx;margin-left:-70rpx;margin-top:0rpx'></image>
+        </view>
+
+        <view style='margin-top:50rpx;margin-left:10rpx'>
+          <text style='font-size:30rpx;font-famaily:"黑体"'>梦星羽：</text>
+          <text style=' font-size:30rpx;color:#606060'>评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评</text>
+        </view>
+
+        <view class='container ' style='margin-top:10rpx'>
+          <image src='../../../../images/展开全文按钮.png ' style='width:60rpx;height:30rpx;margin-left:-70rpx;margin-top:0rpx'></image>
+        </view>
+
+        <view style='margin-top:50rpx;height:1rpx'>
+        </view>
+        <view class='container' style='margin-top:0rpx'>
+          <image src='../../../../images/查看全部回复按钮.png ' style='width:160rpx;height:25rpx;margin-left:-70rpx;margin-top:0rpx'></image>
+        </view>
+        <view style='margin-top:50rpx;height:1rpx'>
+        </view>
+        <view class='container' style='margin-top:0rpx;margin-left:0rpx'>
+          <image src='../../../../images/回复与回复之间的分割线.png ' style='width:81%;height:2rpx;margin-top:0rpx；margin-left:0rpx'></image>
+        </view>
+      </view>
+    </view>
+
+    <view class='textInput'>
+      <view class="relative">
+        <image class="pic_background" src="../../../../images/底部栏评论1.png"></image>
+        <view class='container' style='margin-top:25rpx;margin-left:60rpx;font-size:30rpx;color:#a9a9a9'>说点什么...</view>
+      </view>
+    </view>
+  </view>
+</view>

Furniture/page/homePage/detail/conment/conment.wxss

@@ -0,0 +1,35 @@
+/* page/homePage/detail/conment/conment.wxss */
+/* page/homePage/detail/detail.wxss */
+.container {
+  height: 100%;
+  width:100%;
+  flex-direction: column;
+  color:#515151;
+  font-size: 26rpx;
+  position: absolute;
+  font-weight:900;
+  font-family: "幼圆","方正姚体",Geneva,"Times New Roman";
+  margin-left:80rpx;
+  margin-top: 18rpx;
+} 
+.conment{
+  margin-bottom: 50rpx;
+}
+.textInput{
+  height:8%;
+  display: flex;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+}
+.relative{
+  height: 100%;
+  width:100%;
+  position:relative;
+}
+ 
+.pic_background{
+  height: 100%;
+  width: 100%;
+  position:absolute;
+}

Furniture/page/homePage/detail/detail.js

@@ -0,0 +1,135 @@
+// page/homePage/detail/detail.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    time: '2018-06-26 9:06',
+    like: true,
+    normal: true,
+    dislike: true,
+    zan: false,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  like: function () {
+    var that = this
+    if (that.data.like == true) {
+      that.setData({
+        like: false,
+        normal: true,
+        dislike: true
+      })
+    } else {
+      that.setData({
+        like: true,
+        normal: true,
+        dislike: true
+      })
+    }
+  },
+  normal: function () {
+    var that = this
+    if (that.data.normal == true) {
+      that.setData({
+        like: true,
+        normal: false,
+        dislike: true
+      })
+    } else {
+      that.setData({
+        like: true,
+        normal: true,
+        dislike: true
+      })
+    }
+  },
+  dislike: function () {
+    var that = this
+    if (that.data.dislike == true) {
+      that.setData({
+        like: true,
+        normal: true,
+        dislike: false
+      })
+    } else {
+      that.setData({
+        like: true,
+        normal: true,
+        dislike: true
+      })
+    }
+  },
+  zan: function () {
+    var that = this
+    if (that.data.zan == true) {
+      that.setData({
+        zan: false
+      })
+    } else {
+      that.setData({
+        zan: true
+      })
+    }
+  },
+  toConment: function () {
+    wx.navigateTo({
+      url: 'conment/conment',
+    })
+  }
+})

Furniture/page/homePage/detail/detail.json

@@ -0,0 +1 @@
+{}

Furniture/page/homePage/detail/detail.wxml

@@ -0,0 +1,189 @@
+<!--page/homePage/detail/detail.wxml-->
+<view class="page" style='background-color:white'>
+  <view class="page__bd">
+    <view class="weui-article">
+      <view class="weui-article__h1" style='font-size:42rpx'>新品发布新品发布新品发布新品发布新品发布</view>
+      <view class='container' style='margin-left:0rpx;margin-top:0rpx'>
+        <image src='../../../images/people.png' style='width:80rpx;height:80rpx'></image>
+      </view>
+      <view class="weui-article__section">
+        <view class="weui-article__title" style='margin-left:100rpx'>天天家居汇</view>
+        <view class="weui-article__section">
+          <view class="weui-article__h3" style='margin-left:100rpx'>{{time}}</view>
+          <view class="weui-article__p" style='font-size:35rpx'>
+            新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布新品发布
+          </view>
+          <view class="weui-article__p">
+            <image src="../../../images/detail.png" mode="aspectFit" style="width: 100%" />
+          </view>
+        </view>
+      </view>
+      <view style='height:80rpx;width:100%;position:relative'>
+        <view class='container'>422</view>
+        <image src='../../../images/眼睛.png' style='width:50rpx;height:50rpx;margin-top:15rpx'></image>
+      </view>
+      <view class='weui-flex'>
+        <view class='weui-flex__item'>
+          <image src='../../../images/like.png' style='width:50%;height:110rpx;margin-left:25%' bindtap='like' wx:if="{{like}}"></image>
+          <image src='../../../images/like1.png' style='width:50%;height:110rpx;margin-left:25%' bindtap='like' wx:if="{{!like}}"></image>
+        </view>
+        <view class='weui-flex__item'>
+          <image src='../../../images/一般.png' style='width:50%;height:110rpx;margin-left:25%' bindtap='normal' wx:if="{{normal}}"></image>
+          <image src='../../../images/一般1.png' style='width:50%;height:110rpx;margin-left:25%' bindtap='normal' wx:if="{{!normal}}"></image>
+        </view>
+        <view class='weui-flex__item'>
+          <image src='../../../images/no.png' style='width:50%;height:110rpx;margin-left:25%' bindtap='dislike' wx:if="{{dislike}}"></image>
+          <image src='../../../images/no1.png' style='width:50%;height:110rpx;margin-left:25%' bindtap='dislike' wx:if="{{!dislike}}"></image>
+        </view>
+      </view>
+      <view class='container' style='margin-left:55rpx;margin-top: 0rpx;' wx:if="{{like}}">
+        喜欢(252)
+      </view>
+      <view class='container' style='margin-left:290rpx;margin-top: 0rpx;' wx:if="{{normal}}">
+        一般(14)
+      </view>
+      <view class='container' style='margin-left:520rpx;margin-top: 0rpx;' wx:if="{{dislike}}">
+        淘汰(0)
+      </view>
+      <view class='container' style='margin-left:55rpx;margin-top: 0rpx;color:#d81e06;' wx:if="{{!like}}">
+        喜欢(252)
+      </view>
+      <view class='container' style='margin-left:290rpx;margin-top: 0rpx;color:#d81e06;' wx:if="{{!normal}}">
+        一般(14)
+      </view>
+      <view class='container' style='margin-left:520rpx;margin-top: 0rpx;color:#d81e06;' wx:if="{{!dislike}}">
+        淘汰(0)
+      </view>
+      <view style='margin-top:80rpx;'>
+        全部评论(85)
+      </view>
+    </view>
+    <view class='conment'>
+      <view class='container' style='margin-left:0rpx;margin-top:-20rpx'>
+        <image src='../../../images/people.png' style='width:80rpx;height:80rpx'></image>
+      </view>
+      <view class='container' style='margin-top:8rpx'>
+        <text style='margin-left:540rpx'>20</text>
+        <image src='../../../images/点赞.png' style='width:30rpx;height:30rpx;margin-left:10rpx;margin-top:8rpx' bindtap='zan' wx:if="{{!zan}}"></image>
+        <image src='../../../images/已赞.png' style='width:30rpx;height:30rpx;margin-left:10rpx;margin-top:8rpx' bindtap='zan' wx:if="{{zan}}"></image>
+      </view>
+      <view class="weui-article__title" style='margin-left:100rpx'>梦星羽</view>
+
+
+      <view style='font-size:35rpx;margin-left:100rpx' bindtap='toConment'>
+        评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内
+      </view>
+      <view class='container' style='margin-top:10rpx'>
+        <image src='../../../images/展开全文按钮.png' style='width:60rpx;height:30rpx;margin-left:20rpx' bindtap='toConment'></image>
+      </view>
+
+      <view class='container' style='margin-left:100rpx;margin-top:55rpx;font-size:24rpx;color:#d3d3d3'>
+        6小时前
+      </view>
+      <view style='margin:0;margin-left:100rpx'>
+        <image src='../../../images/回复按钮.png' style='width:60rpx;height:30rpx;margin-left:100rpx;margin-top:60rpx'></image>
+      </view>
+
+      <view style='margin-top:5rpx;background-color:#f5f5f5;margin-left:100rpx'>
+        <view style='margin-left:10rpx'>
+          <text style='font-size:30rpx;font-famaily:"黑体"'>梦星羽：</text>
+          <text style=' font-size:30rpx;color:#606060'>评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评</text>
+        </view>
+
+        <view class='container ' style='margin-top:10rpx'>
+          <image src='../../../images/展开全文按钮.png ' style='width:60rpx;height:30rpx;margin-left:-70rpx;margin-top:0rpx'></image>
+        </view>
+
+        <view style='margin-top:50rpx;margin-left:10rpx'>
+          <text style='font-size:30rpx;font-famaily:"黑体"'>梦星羽：</text>
+          <text style=' font-size:30rpx;color:#606060'>评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评</text>
+        </view>
+
+        <view class='container ' style='margin-top:10rpx'>
+          <image src='../../../images/展开全文按钮.png ' style='width:60rpx;height:30rpx;margin-left:-70rpx;margin-top:0rpx'></image>
+        </view>
+
+        <view style='margin-top:50rpx;height:1rpx'>
+        </view>
+        <view class='container' style='margin-top:0rpx'>
+          <image src='../../../images/查看全部回复按钮.png ' style='width:160rpx;height:25rpx;margin-left:-70rpx;margin-top:0rpx'></image>
+        </view>
+        <view style='margin-top:50rpx;height:1rpx'>
+        </view>
+        <view class='container' style='margin-top:0rpx;margin-left:0rpx'>
+          <image src='../../../../images/回复与回复之间的分割线.png ' style='width:81%;height:2rpx;margin-top:0rpx；margin-left:0rpx'></image>
+        </view>
+      </view>
+    </view>
+    <view class='conment'>
+      <view class='container' style='margin-left:0rpx;margin-top:-20rpx'>
+        <image src='../../../images/people.png' style='width:80rpx;height:80rpx'></image>
+      </view>
+      <view class='container' style='margin-top:8rpx'>
+        <text style='margin-left:540rpx'>20</text>
+        <image src='../../../images/点赞.png' style='width:30rpx;height:30rpx;margin-left:10rpx;margin-top:8rpx' bindtap='zan' wx:if="{{!zan}}"></image>
+        <image src='../../../images/已赞.png' style='width:30rpx;height:30rpx;margin-left:10rpx;margin-top:8rpx' bindtap='zan' wx:if="{{zan}}"></image>
+      </view>
+      <view class="weui-article__title" style='margin-left:100rpx'>梦星羽</view>
+
+
+      <view style='font-size:35rpx;margin-left:100rpx' bindtap='toConment'>
+        评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内
+      </view>
+      <view class='container' style='margin-top:10rpx'>
+        <image src='../../../images/展开全文按钮.png' style='width:60rpx;height:30rpx;margin-left:20rpx' bindtap='toConment'></image>
+      </view>
+
+      <view class='container' style='margin-left:100rpx;margin-top:55rpx;font-size:24rpx;color:#d3d3d3'>
+        6小时前
+      </view>
+      <view style='margin:0;margin-left:100rpx'>
+        <image src='../../../images/回复按钮.png' style='width:60rpx;height:30rpx;margin-left:100rpx;margin-top:60rpx'></image>
+      </view>
+
+      <view style='margin-top:5rpx;background-color:#f5f5f5;margin-left:100rpx'>
+        <view style='margin-left:10rpx'>
+          <text style='font-size:30rpx;font-famaily:"黑体"'>梦星羽：</text>
+          <text style=' font-size:30rpx;color:#606060'>评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评</text>
+        </view>
+
+        <view class='container ' style='margin-top:10rpx'>
+          <image src='../../../images/展开全文按钮.png ' style='width:60rpx;height:30rpx;margin-left:-70rpx;margin-top:0rpx'></image>
+        </view>
+
+        <view style='margin-top:50rpx;margin-left:10rpx'>
+          <text style='font-size:30rpx;font-famaily:"黑体"'>梦星羽：</text>
+          <text style=' font-size:30rpx;color:#606060'>评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评论内容评</text>
+        </view>
+
+        <view class='container ' style='margin-top:10rpx'>
+          <image src='../../../images/展开全文按钮.png ' style='width:60rpx;height:30rpx;margin-left:-70rpx;margin-top:0rpx'></image>
+        </view>
+
+        <view style='margin-top:50rpx;height:1rpx'>
+        </view>
+        <view class='container' style='margin-top:0rpx'>
+          <image src='../../../images/查看全部回复按钮.png ' style='width:160rpx;height:25rpx;margin-left:-70rpx;margin-top:0rpx'></image>
+        </view>
+        <view style='margin-top:50rpx;height:1rpx'>
+        </view>
+        <view class='container' style='margin-top:0rpx;margin-left:0rpx'>
+          <image src='../../../images/回复与回复之间的分割线.png ' style='width:81%;height:2rpx;margin-top:0rpx；margin-left:0rpx'></image>
+        </view>
+      </view>
+    </view>
+
+    <view class='textInput'>
+      <view class="relative">
+        <image class="pic_background" src="../../../images/底部栏评论.png"></image>
+        <view class='container'>
+          <image src="../../../images/查看评论按钮.png" style='width:6%;height:42%;margin-left:520rpx;margin-top:15rpx'> </image>
+        </view>
+        <view class='container'>
+          <image src="../../../images/分享按钮.png" style='width:6%;height:42%;margin-left:600rpx;margin-top:15rpx'> </image>
+        </view>
+        <view class='container' style='margin-top:25rpx;margin-left:60rpx;font-size:30rpx;color:#a9a9a9'>说点什么...</view>
+      </view>
+    </view>
+  </view>
+</view>

Furniture/page/homePage/detail/detail.wxss

@@ -0,0 +1,35 @@
+/* page/homePage/detail/detail.wxss */
+.container {
+  height: 100%;
+  width:100%;
+  flex-direction: column;
+  color:#515151;
+  font-size: 26rpx;
+  position: absolute;
+  font-weight:900;
+  font-family: "幼圆","方正姚体",Geneva,"Times New Roman";
+  margin-left:80rpx;
+  margin-top: 18rpx;
+} 
+.conment{
+  margin:20rpx;
+  margin-bottom: 50rpx;
+}
+.textInput{
+  height:8%;
+  display: flex;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+}
+.relative{
+  height: 100%;
+  width:100%;
+  position:relative;
+}
+ 
+.pic_background{
+  height: 100%;
+  width: 100%;
+  position:absolute;
+}

Furniture/page/homePage/homePage.js

@@ -0,0 +1,214 @@
+// page/homePage/homePage.js
+
+const app = getApp();
+var a = require("../../wxParse/wxParse.js");
+var api = require("../../api.js");
+var amapFile = require('../../amap-wx.js')
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+    inputShowed: false,
+    inputVal: "",
+    takeup: true,
+    more: false,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this
+
+    var myAmapFun = new amapFile.AMapWX({ key: 'f74da0d1484bbbefb69059efa771b01d' });
+    myAmapFun.getWeather({
+      success: function (data) {
+        console.log(data)
+        that.setData({
+          weather:data.weather.data,
+          temp: data.temperature.data,
+        })
+      },
+      fail: function (info) {
+        //失败回调
+        console.log(info)
+      }
+    })
+
+    app.request({
+      url: api.setting,
+      success: function (e) {
+        console.log(e.data)
+        that.setData({
+          slide: e.data.banner,
+          nav: e.data.navbar,
+          sysinfo: e.data.setting,
+          menus: e.data.menus
+        }),
+          app.avatar = e.data.setting.avatar,
+          app.username = e.data.setting.name
+        wx.setNavigationBarTitle({
+          title: e.data.setting.illustrated_name,
+        }),
+
+          wx.setNavigationBarColor({ frontColor: '#000000', backgroundColor: '#ffffff' })
+      }
+      //console.log(e.data)
+    }),
+      app.request({
+      url: api.news_list,
+        success: function (e) {
+     
+          that.setData({
+            news: e.data.data,
+          })
+        }
+      }),
+      app.request({
+        url: api.goods_list,
+        success: function (e) {
+
+          that.setData({
+            goods: e.data.data,
+          })
+        }
+      })
+
+
+  },
+
+  navigatorClick: function (e) {
+    console.log(1)
+    var page = this;
+    var open_type = e.currentTarget.dataset.open_type;
+    if (open_type == 3) {
+      var url = e.currentTarget.dataset.url;
+      var appid = e.currentTarget.dataset.appid;
+      var user_info = wx.getStorageSync("user_info");
+      //return true;
+      //console.log(url);
+      console.log(appid);
+      wx.navigateToMiniProgram({
+        appId: appid,
+        path: url + '?user_id=' + user_info.user_id,
+        complete: function (e) {
+          console.log(e);
+        }
+      });
+    } else if (open_type == 1) {
+      var phone = e.currentTarget.dataset.phone;
+      wx.makePhoneCall({
+        phoneNumber: phone,
+      })
+    } else if (open_type == 2) {
+      var address = e.currentTarget.dataset.address;
+      var lon = parseFloat(e.currentTarget.dataset.lon);
+      var lat = parseFloat(e.currentTarget.dataset.lat);
+
+      wx.openLocation({
+        name: address,
+        latitude: lat,
+        longitude: lon,
+        scale: 28
+      })
+    } else if (open_type == 4) {
+      var url = e.currentTarget.dataset.url;
+      wx.navigateTo({
+        url: url
+      })
+    }
+    },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  showInput: function () {
+    this.setData({
+      inputShowed: true
+    });
+  },
+  hideInput: function () {
+    this.setData({
+      inputVal: "",
+      inputShowed: false
+    });
+  },
+  clearInput: function () {
+    this.setData({
+      inputVal: ""
+    });
+  },
+  inputTyping: function (e) {
+    this.setData({
+      inputVal: e.detail.value
+    });
+  },
+  takeup: function () {
+    var that = this
+    that.setData({
+      takeup: false,
+      more: true
+    })
+  },
+  more: function () {
+    var that = this
+    that.setData({
+      takeup: true,
+      more: false
+    })
+  },
+  toDetail: function () {
+    wx.navigateTo({
+      url: 'detail/detail',
+    })
+  }
+})

Furniture/page/homePage/homePage.json

@@ -0,0 +1 @@
+{}

Furniture/page/homePage/homePage.wxml

@@ -0,0 +1,133 @@
+<!--page/homePage/homePage.wxml-->
+<import src="../public/footer.wxml" />
+
+<view class="page" style='background-color:white'>
+  <view class="page__bd">
+    <swiper class="swiper" indicator-dots="true" autoplay="true" interval="5000" duration="1000">
+      <block wx:for="{{slide}}" wx:for-index="index">
+        <swiper-item>
+          <image src="{{item.pic_url}}" class="slide-image" mode="aspectFill" />
+        </swiper-item>
+      </block>
+    </swiper>
+    <view class="relative">
+      <image class="pic_background" src="../../images/sousuo.png"></image>
+      <view class="container">
+        现代简约沙发
+      </view>
+      <view class="container" style="margin-left:500rpx;color:#1E90FF;margin-top:20rpx">
+        |{{ weather }}
+      </view>
+      <view class='container' style='margin-left:560rpx'>
+        <image wx:if="{{weather=='多云'}}" src="../../images/weather/duoyun.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
+        <image wx:if="{{weather=='晴'}}" src="../../images/weather/qing.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
+        <image wx:if="{{weather=='阵雨'}}" src="../../images/weather/zhenyu.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
+        <image wx:if="{{weather!='多云'&&weather!='晴'&&weather!='阴'&&weather!='阵雨'}}" src="../../images/weather/yu.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
+       
+      </view>
+      <view class="container" style="margin-left:600rpx;color:#1E90FF;margin-top:20rpx">
+        {{ temp }}°
+      </view>
+    </view>
+
+
+    <view class='weui-flex' style='border-bottom: 2rpx #D3D3D3 solid'>
+      <view class='weui-flex__item'>
+       <navigator target="miniProgram" open-type="navigate" app-id="wx605448628d21d682" path="/pages/index/index" extra-data="" version="release">
+          <image src='../../images/jiajuhuace.png' style='height:215rpx;width:100%;margin:20rpx;margin-top:0;'></image>
+         </navigator>
+      </view>
+      <view class='weui-flex__item' style='margin-left:45rpx;'>
+        <image src='../../images/jiajushouhou.png' style='height:100rpx;width:90%;margin-top:0;'></image>
+        <image src='../../images/chajindu.png' style='height:100rpx;width:90%;'></image>
+      </view>
+    </view>
+    <view class="relative" style='border-bottom: 2rpx #D3D3D3 solid'>
+      <image class="pic_background" src="../../images/xinwenzixun.png"></image>
+      <view class="container" style='color:#000;margin-left:270rpx'>
+        {{ sysinfo.notice }}
+      </view>
+    </view>
+    <view class='weui-flex' style='border-bottom: 2rpx #D3D3D3 solid'>
+    <block>
+  <view class="bus-bg">
+    <view class="bus">
+    <block wx:for="{{menus}}" wx:key="{{index}}" wx:for-item="item">
+      <block wx:if="{{item.open_type == 3}}">
+          <view class="bus-item">
+           <navigator target="miniProgram" open-type="navigate" app-id="{{item.app_id}}" path="{{item.url}}" extra-data="" version="release"><image src='{{item.pic_url}}'></image>
+        </navigator>
+          <text>{{item.name}}</text>
+          </view>
+      </block>
+
+      <block wx:if="{{item.open_type == 4}}">
+          <view class="bus-item" bindtap="navigatorClick" data-url="{{item.url}}" data-open_type="{{item.open_type}}">
+          <image src="{{item.pic_url}}"></image>
+          <text>{{item.name}}</text>
+          </view>
+      </block>
+
+      <block wx:if="{{item.open_type == 1}}">
+          <view class="bus-item" bindtap="navigatorClick" data-phone="{{item.mobile}}" data-open_type="{{item.open_type}}">
+          <image src="{{item.pic_url}}"></image>
+          <text>{{item.name}}</text>
+          </view>
+      </block>
+
+      <block wx:if="{{item.open_type == 2}}">
+          <view class="bus-item" bindtap="navigatorClick" data-address="{{item.address}}" data-lon="{{item.lon}}" data-lat="{{item.lat}}" data-open_type="{{item.open_type}}">
+            <image src="{{item.pic_url}}"></image>
+            <text>{{item.name}}</text>
+          </view>
+      </block>
+    </block>
+    </view>
+  </view>
+</block>
+    </view>
+
+    <view class="relative" style='height:360rpx;border-bottom: 2rpx #D3D3D3 solid'>
+      <image class="pic_background" src="../../images/jiajudapei.png"></image>
+      <scroll-view  class="marketlist" scrollX="true">
+        <view class="marketlist_one" wx:for="{{goods}}" wx:key="{{item.value}}">
+          <image mode="aspectFill" src="{{item.img}}" style="border-radius:10rpx;"></image>
+          <view class="gobyndsingle">¥{{ item.price}}</view>
+        </view>
+      </scroll-view>
+    </view>
+    <view class="relative" style='height:70rpx;border-bottom: 2rpx #D3D3D3 solid'>
+      <image class="pic_background" src="../../images/xinpingfabu.png"></image>
+      <view class="container" wx:if="{{takeup}}">
+        <image src='../../images/shouqianniu.png' style='height:28rpx;width:80rpx;margin-left:500rpx' bindtap='takeup'></image>
+      </view>
+      <view class="container" wx:if="{{more}}">
+        <image src='../../images/gengduoanniu.png' style='height:28rpx;width:80rpx;margin-left:500rpx' bindtap='more'></image>
+      </view>
+    </view>
+    <view wx:if="{{takeup}}">
+
+     <block wx:for="{{news}}" wx:key="{{index1}}" wx:for-item="item" wx:for-index="index1" >
+      <view class="relative" style='height:200rpx;border-bottom: 2rpx #D3D3D3 solid' bindtap='toDetail'>
+        <image class="pic_background" src="../../images/xinpingfabukuangjia.png"></image>
+        <view class="container" style='width:400rpx;color:#000;font-size:33rpx;margin-left:30rpx'>
+          {{ item.title}}
+        </view>
+        <view class="container" style='color:#dcdcdc;font-size:26rpx;margin-left:180rpx;margin-top:130rpx'>
+          {{ item.viewed}}次浏览
+        </view>
+        <view class="container">
+          <image src='{{ item.thumb}}' style='height:160rpx;width:270rpx;margin-left:320rpx'></image>
+        </view>
+      </view>
+    </block>
+     
+      
+      
+    </view>
+  </view>
+</view>
+
+<block>
+   <template data="{{nav:nav}}" is="foot" />
+</block>

Furniture/page/homePage/homePage.wxss

@@ -0,0 +1,115 @@
+/* page/homePage/homePage.wxss */
+.page{
+  overflow-x: hidden;
+}
+.swiper {
+  height: 400rpx;
+  width: 100%;
+  margin-bottom: 10rpx;
+}
+
+.swiper image {
+  height: 100%;
+  width: 100%;
+}
+
+.searchbar-result {
+  margin-top: 0;
+  font-size: 14px;
+}
+
+.searchbar-result:before {
+  display: none;
+}
+
+.weui-cell {
+  margin: 10rpx;
+}
+
+.search {
+  background-image: url('data:../../images/搜索.png;base64,');
+  height: 80rpx;
+  width: 100%;
+}
+
+.relative {
+  height: 80rpx;
+  width: 100%;
+  position: relative;
+}
+
+.pic_background {
+  height: 100%;
+  width: 100%;
+  position: absolute;
+}
+
+.container {
+  height: 100%;
+  width: 100%;
+  flex-direction: column;
+  color: #d3d3d3;
+  font-size: 26rpx;
+  position: absolute;
+  font-weight: 900;
+  font-family: "幼圆", "方正姚体", Geneva, "Times New Roman";
+  margin-top: 20rpx;
+  margin-left: 130rpx;
+}
+
+.container image {
+  height: 45rpx;
+  width: 45rpx;
+}
+
+.newcontainter {
+  height: 200rpx;
+  width: 100%;
+  border-bottom: 2rpx #d3d3d3 solid;
+}
+
+.marketlist {
+  height: 310rpx;
+  width: 100%;
+  padding-left: 30rpx;
+  padding-top: 20rpx;
+  white-space: nowrap;
+}
+
+.marketlist_one {
+  margin-top: 100rpx;
+  width: 150rpx;
+  height: 200rpx;
+  border-radius: 6rpx;
+  margin-right: 40rpx;
+  display: inline-block;
+}
+
+.marketlist_wai {
+  width: 150%;
+  height: 200rpx;
+}
+
+.marketlist_one>image {
+  width: 150rpx;
+  height: 150rpx;
+}
+
+.marketlist_one>view {
+  font-size: 26rpx;
+  color: #333;
+  text-align: center;
+  margin-top: 10rpx;
+}
+
+.bus-bg{ width: 100%; background: white; padding-bottom: 10rpx; }
+.bus{ width: 100%; margin: 0px auto; padding-top:10px; display: flex; justify-content:left; flex-wrap: wrap; }
+.bus-item{ width: 25%; height: 150rpx; text-align: center; }
+.bus-item wx-image{ width: 40px; height: 40px; display: block; margin: 5px auto; }
+.bus-item wx-text{ font-size:13px; color:#333; height:35rpx; display:block; }
+.bus2{ width: 95%; justify-content: center; }
+.bus-item2{ width: 50%; height: 135rpx; text-align: center; }
+.bus-item2 wx-image{ width: 90%; height: 120rpx; display: block; margin: 0 auto; }
+.bus3{ width: 100%; justify-content: space-between; padding-top: 0px; }
+.bus-item3{ width: 32%; height: 175px; margin-top: 13rpx; border: 1px solid #f2f2f2; }
+.bus-item3 wx-image{ height: 175px; display: block; margin: 0 auto; }

Furniture/page/lifeCircle/lifeCircle.js

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

Furniture/page/lifeCircle/lifeCircle.json

@@ -0,0 +1 @@
+{}

Furniture/page/lifeCircle/lifeCircle.wxml

@@ -0,0 +1 @@
+<text>lifecircle</text>

Furniture/page/login/login.js

@@ -0,0 +1,74 @@
+var api = require("../../api.js");
+const app = getApp();
+
+Page({
+  data: {},
+  onLoad: function (e) {
+
+  },
+  onReady: function () {
+
+  },
+  onShow: function () {
+
+  },
+  onHide: function () {
+
+  },
+  onUnload: function () {
+
+  },
+  getUserInfo: function (o) {
+    console.log("getUserInfo----------\x3e", o), "getUserInfo:ok" == o.detail.errMsg && (wx.showLoading({
+      title: "正在登录",
+      mask: !0
+    }),
+      wx.login({
+        success: function (e) {
+          var userinfo = JSON.parse(o.detail.rawData)
+          var t = e.code;
+          var iv = o.detail.iv;
+        
+          getApp().request({
+            url: api.login,
+            method: "post",
+            data: {
+              code: t,
+              nickName: userinfo.nickName,
+              avatar: userinfo.avatarUrl,
+              encrypted_data: o.detail.encryptedData,
+              iv: iv,
+              signature: o.detail.signature,
+              store_id: app.globalData.store_id
+            },
+            success: function (e) {
+              if (0 == e.status_code) {
+                wx.setStorageSync("access_token",'Bearer '+e.data.token), wx.setStorageSync("user_info", e.data.userinfo);
+                var t = wx.getStorageSync("login_pre_page");
+                t && t.route || wx.redirectTo({
+                  url: "/pages/homePage/homePage"
+                });
+                var o = 0;
+                (o = t.options && t.options.user_id ? t.options.user_id : t.options && t.options.scene ? t.options.scene : wx.getStorageSync("parent_id")) && 0 != o && getApp().bindParent({
+                  parent_id: o
+                }), wx.redirectTo({
+                  url: "/" + t.route + "?" + getApp().utils.objectToUrlParams(t.options)
+                });
+              } else console.log(e), wx.showModal({
+          
+                title: "提示",
+                content: e.msg,
+                showCancel: !1
+              });
+            },
+            complete: function () {
+              wx.hideLoading();
+            }
+          });
+        },
+        fail: function (e) {
+          console.log(e)
+        }
+      }));
+  }
+});

Furniture/page/login/login.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "授权登录"
+}

Furniture/page/login/login.wxml

@@ -0,0 +1,12 @@
+<include src="/commons/extension/extension"></include>
+<include src="/commons/navbar/navbar"></include>
+<view class="after-navber">
+    <view style="padding: 0 60rpx">
+        <view style="padding:80rpx 0 48rpx;border-bottom: 1rpx solid #e3e3e3;margin-bottom: 72rpx;text-align: center">
+            <open-data class="wxAvatarUrl" type="userAvatarUrl" style="width: 200rpx;height: 200rpx;border-radius:200rpx;display:block;overflow:hidden;margin:0 auto 10px;"></open-data>
+        </view>
+        <view style="font-size: 13pt;margin-bottom: 40rpx">申请获取以下权限</view>
+        <view style="color: #888;margin-bottom: 88rpx">获得你的公开信息（昵称、头像等）</view>
+        <button bindgetuserinfo="getUserInfo" class="login-btn" openType="getUserInfo">授权登录</button>
+    </view>
+</view>

Furniture/page/login/login.wxss

@@ -0,0 +1,21 @@
+page {
+    background: #fff;
+}
+
+.login-btn {
+    border: none;
+    height: 88rpx;
+    line-height: 88rpx;
+    background: #04be01;
+    color: #fff;
+    font-size: 11pt;
+    border-radius: 999rpx;
+}
+
+.login-btn::after {
+    display: none;
+}
+
+.login-btn.button-hover {
+    box-shadow: inset 0 5rpx 30rpx rgba(0,0,0,.15);
+}

Furniture/page/public/footer.wxml

@@ -0,0 +1,39 @@
+<!--   foot    -->
+<template name="foot">
+  <view class="we7-bottom" style="background-color:{{blist.background_color}};border-color:{{blist.border_color}};">
+    <block wx:for="{{nav}}" wx:for-item="item" wx:for-index="index">
+        <block wx:if="{{blist.m4_name!=''}}">
+          <view class="we7-bottom-item">
+            <block wx:if="{{blist.m4_path=='custom'||blist.m4_path=='tel'||blist.m4_path=='driver'}}">
+              <button bindtap="{{blist.m4_path=='tel'?'tel':''}}{{blist.m4_path=='driver'?'driver':''}}" openType="{{blist.m4_path=='custom'?'contact':''}}"></button>
+            </block>
+            <block wx:if="{{item.open_type == 3}}">
+          
+                <view class="aview">
+                <navigator target="miniProgram" open-type="navigate" app-id="{{item.app_id}}" path="{{item.url}}" extra-data="" version="release">
+    
+         </navigator>
+                </view>
+            </block>
+
+            <block wx:if="{{item.open_type == 4}}">
+                <view class="aview" bindtap="navigatorClick" data-url="{{item.url}}" data-open_type="{{item.open_type}}"></view>
+            </block>
+
+            <block wx:if="{{item.open_type == 1}}">
+                <view class="aview" bindtap="navigatorClick" data-phone="{{item.mobile}}" data-open_type="{{item.open_type}}"></view>
+            </block>
+
+            <block wx:if="{{item.open_type == 2}}">
+                <view class="aview" bindtap="navigatorClick" data-address="{{item.address}}" data-lon="{{item.lon}}" data-lat="{{item.lat}}" data-open_type="{{item.open_type}}"></view>
+            </block>
+            <image class="item-img" mode="widthFix" src="{{item.pic_url}}"></image>
+            <view class="item-text" style="color: #666666">{{item.name}}</view>
+          </view>
+        </block>
+    </block>
+  
+    
+  </view>
+  <view class="we7-bottom-placeholder"></view>
+</template>

Furniture/page/user/user.js

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

Furniture/page/user/user.json

@@ -0,0 +1 @@
+{}

Furniture/page/user/user.wxml

@@ -0,0 +1 @@
+<text>user</text>