From bdcefd7a9d54a48308ecce327011775db6a92ed6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 10 七月 2024 17:48:45 +0800
Subject: [PATCH] wxmini

---
 wechat_jiaxuan/pages/discover/discover.js              |   12 
 wechat_jiaxuan/pages/store/staffList.wxml              |   36 
 wechat_jiaxuan/components/navBar/navBar.js             |    7 
 wechat_jiaxuan/static/icon/mingpian_bg_kehu@2x.png     |    0 
 wechat_jiaxuan/static/icon/mingpian_ic_dizhi@2x.png    |    0 
 wechat_jiaxuan/components/disProduct/index.less        |  174 +++
 wechat_jiaxuan/app.js                                  |    2 
 wechat_jiaxuan/pages/discover/discover.less            |   30 
 wechat_jiaxuan/pages/store/staff.wxss                  |  167 +++
 wechat_jiaxuan/pages/discover/discover.wxss            |   25 
 wechat_jiaxuan/pages/store/staff.less                  |  181 +++
 wechat_jiaxuan/pages/store/store.wxml                  |   64 +
 wechat_jiaxuan/pages/store/staffList.js                |   66 +
 wechat_jiaxuan/pages/webView/index.js                  |  197 +++
 wechat_jiaxuan/pages/calculator/index.js               |  235 ++++
 wechat_jiaxuan/pages/consult/detail.wxml               |    2 
 wechat_jiaxuan/pages/store/info.json                   |    3 
 wechat_jiaxuan/pages/discover/discover.json            |    3 
 wechat_jiaxuan/static/icon/home_ic_guwen@2x.png        |    0 
 wechat_jiaxuan/pages/consult/detail.js                 |    8 
 wechat_jiaxuan/pages/store/staff.json                  |    5 
 wechat_jiaxuan/pages/store/store.js                    |   75 +
 wechat_jiaxuan/pages/webView/index.wxss                |   50 +
 wechat_jiaxuan/pages/webView/index.json                |    3 
 wechat_jiaxuan/pages/calculator/index.wxss             |  164 +++
 wechat_jiaxuan/project.private.config.json             |   23 
 wechat_jiaxuan/static/icon/mingpian_erweima@2x.png     |    0 
 wechat_jiaxuan/pages/store/info.wxml                   |   51 +
 wechat_jiaxuan/components/navBar/navBar.wxml           |    2 
 wechat_jiaxuan/pages/store/staff.js                    |   76 +
 wechat_jiaxuan/static/icon/mendian_ic_daohang@2x.png   |    0 
 wechat_jiaxuan/pages/store/store.json                  |    3 
 wechat_jiaxuan/components/disProduct/index.wxml        |  116 ++
 wechat_jiaxuan/pages/calculator/index.json             |    9 
 wechat_jiaxuan/pages/store/staffList.wxss              |   66 +
 wechat_jiaxuan/components/disProduct/index.js          |   34 
 wechat_jiaxuan/pages/store/info.js                     |   69 +
 wechat_jiaxuan/pages/store/info.less                   |  128 ++
 wechat_jiaxuan/static/icon/chanpin_ic_new@2x.png       |    0 
 wechat_jiaxuan/app.wxss                                |    3 
 wechat_jiaxuan/pages/store/store.less                  |  126 ++
 wechat_jiaxuan/app.json                                |    8 
 wechat_jiaxuan/pages/discover/discover.wxml            |   23 
 wechat_jiaxuan/pages/design/design.wxml                |    2 
 wechat_jiaxuan/pages/store/staff.wxml                  |   69 +
 wechat_jiaxuan/components/disProduct/index.json        |    4 
 wechat_jiaxuan/pages/store/store.wxss                  |  119 ++
 wechat_jiaxuan/static/icon/mingpian_bg_nianxian@2x.png |    0 
 wechat_jiaxuan/static/icon/ic_search@2x.png            |    0 
 wechat_jiaxuan/pages/store/staffList.less              |   69 +
 wechat_jiaxuan/static/icon/mingpian_ic_mendian@2x.png  |    0 
 wechat_jiaxuan/pages/index/index.js                    |   38 
 wechat_jiaxuan/static/icon/call.png                    |    0 
 wechat_jiaxuan/static/icon/location.png                |    0 
 wechat_jiaxuan/pages/store/staffList.json              |    3 
 wechat_jiaxuan/pages/webView/index.wxml                |   42 
 /dev/null                                              |    0 
 wechat_jiaxuan/pages/calculator/index.wxml             |  101 ++
 wechat_jiaxuan/static/icon/mingpian_ic_phone@2x.png    |    0 
 wechat_jiaxuan/pages/index/index.wxml                  |    6 
 wechat_jiaxuan/static/icon/mingpian_ic_edit@2x.png     |    0 
 wechat_jiaxuan/components/disProduct/index.wxss        |  173 +++
 wechat_jiaxuan/static/images/design_banner@2x.png      |    0 
 wechat_jiaxuan/pages/store/info.wxss                   |  116 ++
 64 files changed, 2,969 insertions(+), 19 deletions(-)

diff --git a/wechat_jiaxuan/app.js b/wechat_jiaxuan/app.js
index 746a9f2..bcf5be3 100644
--- a/wechat_jiaxuan/app.js
+++ b/wechat_jiaxuan/app.js
@@ -7,10 +7,8 @@
   onLaunch: function () {
     //鑾峰彇褰撳墠璁惧淇℃伅
     const WindowInfo = wx.getWindowInfo()
-    console.log('WindowInfo', WindowInfo);
     if (WindowInfo.safeArea.top > 20) {
       this.globalData.bottomLift = WindowInfo.screenHeight - WindowInfo.safeArea.bottom;
-      console.log(this.globalData.bottomLift);
     }
   }
 })
diff --git a/wechat_jiaxuan/app.json b/wechat_jiaxuan/app.json
index 7b8159b..ebd3ce0 100644
--- a/wechat_jiaxuan/app.json
+++ b/wechat_jiaxuan/app.json
@@ -6,7 +6,13 @@
     "pages/consult/detail",
     "pages/mine/mine",
     "pages/auth/auth",
-    "pages/design/design"
+    "pages/design/design",
+    "pages/store/store",
+    "pages/store/info",
+    "pages/store/staff",
+    "pages/store/staffList",
+    "pages/calculator/index",
+    "pages/webView/index"
   ],
   "window": {
     "navigationBarTitleText": "蹇楅偊瀹堕��",
diff --git a/wechat_jiaxuan/app.wxss b/wechat_jiaxuan/app.wxss
index 2efc949..986db10 100644
--- a/wechat_jiaxuan/app.wxss
+++ b/wechat_jiaxuan/app.wxss
@@ -5,6 +5,7 @@
 page{
   background-color: #fff;
   --themeColor:#B08771;
+  color: #111111;
 }
 image{
   display: flex;
@@ -16,7 +17,7 @@
   font-size: 28rpx;
 } 
 .primary{
-  color: var(--themeColor);
+  color: var(--themeColor) !important;
 }
 .df_sb{
   display: flex;
diff --git a/wechat_jiaxuan/components/disProduct/index.js b/wechat_jiaxuan/components/disProduct/index.js
new file mode 100644
index 0000000..fc3ea5f
--- /dev/null
+++ b/wechat_jiaxuan/components/disProduct/index.js
@@ -0,0 +1,34 @@
+// components/disProduct/index.js
+Component({
+  /**
+   * 缁勪欢鐨勫睘鎬у垪琛�
+   */
+  properties: {
+
+  },
+
+  /**
+   * 缁勪欢鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    showOne: false,
+    showTwo: false,
+    activeStatus: '0'
+  },
+  methods: {
+    changeOne(){
+      const showOne = !this.data.showOne
+      this.setData({showOne})
+      this.setData({showTwo: false})
+    },
+    changeTwo(){
+      const showTwo = !this.data.showTwo
+      this.setData({showTwo})
+      this.setData({showOne: false})
+    },
+    statusChange(e) {
+      const activeStatus = e.currentTarget.dataset.status
+      this.setData({activeStatus})
+    }
+  }
+})
diff --git a/wechat_jiaxuan/components/disProduct/index.json b/wechat_jiaxuan/components/disProduct/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/wechat_jiaxuan/components/disProduct/index.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disProduct/index.less b/wechat_jiaxuan/components/disProduct/index.less
new file mode 100644
index 0000000..5e22d80
--- /dev/null
+++ b/wechat_jiaxuan/components/disProduct/index.less
@@ -0,0 +1,174 @@
+.search_wrap{
+  width: 670rpx;
+  height: 72rpx;
+  margin: 24rpx auto;
+  background: #F7F7F7;
+  border-radius: 8rpx;
+  padding: 0 40rpx;
+  display: flex;
+  align-items: center;
+  background-color: #F7F7F7;
+  image{
+    width: 28rpx;
+    margin-right: 16rpx;
+  }
+}
+
+.app{
+  height: 100%;
+  width: 100%;
+}
+.main_content{
+  display: flex;
+  height: calc( 100% - 120rpx );
+  .main_left{
+    width: 160rpx;
+    height: 100%;
+    overflow-y: auto;
+    border-radius: 0rpx 16rpx 16rpx 0rpx;
+    .item{
+      width: 160rpx;
+      height: 100rpx;
+      background: #F7F7F7;
+      font-weight: 400;
+      font-size: 26rpx;
+      color: #666666;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+    .active{
+      background-color: #fff;
+      font-weight: 500;
+      font-size: 30rpx;
+      color: #111111;
+    }
+  }
+  .main_right{
+    flex: 1;
+    position: relative;
+    .query_wrap{
+      display: flex;
+      .item{
+        height: 100rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #666666; 
+        flex: 1;
+        .name{
+          margin-right: 12rpx;
+        }
+      }
+    }
+    .query_form{
+      position: absolute;
+      background-color: #fff;
+      .list{
+        width: 100%;
+        display: flex;
+        flex-wrap: wrap;
+        padding: 30rpx 40rpx;
+        .item{
+          width: 154rpx;
+          height: 72rpx;
+          text-align: center;
+          line-height: 70rpx;
+          background: #F7F7F7;
+          border-radius: 8rpx;
+          font-size: 26rpx;
+          color: #333333;
+          white-space: nowrap;
+          overflow: hidden;//鏂囨湰瓒呭嚭闅愯棌
+          text-overflow: ellipsis;
+          margin-right: 24rpx;
+          margin-bottom: 24rpx;
+          &:nth-of-type(3n){
+            margin-right: 0;
+          }
+        }
+        .active{
+          color: var(--themeColor);
+          background: rgba(176,135,113,0.08);
+        }
+      }
+      .btns{
+        display: flex;
+        .btn{
+          width: 296rpx;
+          height: 88rpx;
+          background: #E5E5E5;
+          color: #666666;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+        .sub{
+          background: var(--themeColor);
+          color: #fff;
+        }
+      }
+    }
+    .status{
+      display: flex;
+      padding: 0rpx 40rpx;
+      margin: 20rpx 0;
+      align-items: center;
+      .active{
+        color: var(--themeColor);
+      }
+      .separate{
+        margin: 0 12rpx;
+        width: 1rpx;
+        height: 28rpx;
+        background-color: #333333;
+      }
+    }
+    .goods_list{
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      padding: 12rpx 40rpx;
+      .item{
+        flex-shrink: 0;
+        margin-bottom: 32rpx;
+        .img_wrap{
+          width: 242rpx;
+          height: 136rpx;
+          border-radius: 8rpx;
+          overflow: hidden;
+          position: relative;
+          .img{
+            width: 100%;
+            height: 100%;
+          }
+          .new{
+            width: 72rpx;
+            position: absolute;
+            left: 0;
+            top: 0;
+            z-index: 100;
+          }
+        }
+        .name{
+          margin: 12rpx 0 8rpx;
+        }
+        .info{
+          display: flex;
+          align-items: center;
+          color: #666666;
+          .icon{
+            width: 28rpx;
+            margin-right: 8rpx;
+          }
+          .num{
+            margin-right: 16rpx;
+          }
+          .primary{
+            color: var(--themeColor);
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disProduct/index.wxml b/wechat_jiaxuan/components/disProduct/index.wxml
new file mode 100644
index 0000000..e262976
--- /dev/null
+++ b/wechat_jiaxuan/components/disProduct/index.wxml
@@ -0,0 +1,116 @@
+<view class="app">
+  <view class="search_wrap">
+    <image src="../../static/icon/ic_search@2x.png" mode="widthFix"></image>
+    <input type="text" placeholder="鎼滅储浜у搧鍚嶇О" />
+  </view>
+  <view class="main_content">
+    <view class="main_left">
+      <view class="item active">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+      <view class="item">鍏ㄥ眿瀹氬埗</view>
+    </view>
+    <view class="main_right">
+      <view class="query_wrap">
+        <view class="item" bindtap="changeOne">
+          <view class="name">瑁呬慨椋庢牸</view>
+          <van-icon name="{{ showOne ? 'arrow-up' : 'arrow-down' }}" />
+        </view>
+        <view class="item" bindtap="changeTwo">
+          <view class="name">绌洪棿鍚嶇О</view>
+          <van-icon name="{{ showTwo ? 'arrow-up' : 'arrow-down' }}" />
+        </view>
+      </view>
+      <view wx:if="{{ showOne }}" class="query_form">
+        <view class="list">
+          <view class="item active">涓滆姖鐢佃</view>
+          <view class="item">涓滆姖鍟婄殑鏃舵拻鐨勪唬鐢佃</view>
+          <view class="item">涓滆姖鐢佃</view>
+          <view class="item">涓滆姖鐢佃</view>
+          <view class="item">涓滆姖鐢佃</view>
+        </view>
+        <view class="btns">
+          <view class="btn" bindtap="changeOne">鍙栨秷</view>
+          <view class="btn sub">纭</view>
+        </view>
+      </view>
+      <view wx:if="{{ showTwo }}" class="query_form">
+        <view class="list">
+          <view class="item active">瀹滃</view>
+          <view class="item">瀹滃</view>
+          <view class="item">瀹滃</view>
+          <view class="item">瀹滃</view>
+          <view class="item">瀹滃</view>
+        </view>
+        <view class="btns">
+          <view class="btn" bindtap="changeTwo">鍙栨秷</view>
+          <view class="btn sub">纭</view>
+        </view>
+      </view>
+      <view class="status">
+        <view class="item {{ activeStatus == '0' ? 'active' : '' }}" data-status="0" bindtap="statusChange">榛樿</view>
+        <view class="separate"></view>
+        <view class="item {{ activeStatus == '1' ? 'active' : '' }}" data-status="1" bindtap="statusChange">鏈�鐑�</view>
+        <view class="separate"></view>
+        <view class="item {{ activeStatus == '2' ? 'active' : '' }}" data-status="2" bindtap="statusChange">鏈�鏂�</view>
+      </view>
+      <view class="goods_list">
+        <view class="item">
+          <view class="img_wrap">
+            <image src="../../static/icon/test.png" class="img"></image>
+            <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+          </view>
+          <view class="name">閽㈢惔鏇�</view>
+          <view class="info">
+            <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+            <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+            <text class="num {{true ? 'primary' : ''}}">34</text>
+            <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+            <text>1000</text>
+          </view>
+        </view>
+        <view class="item">
+          <view class="img_wrap">
+            <image src="../../static/icon/test.png" class="img"></image>
+            <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+          </view>
+          <view class="name">閽㈢惔鏇�</view>
+          <view class="info">
+            <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+            <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+            <text class="num {{true ? 'primary' : ''}}">34</text>
+            <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+            <text>1000</text>
+          </view>
+        </view>
+        <view class="item">
+          <view class="img_wrap">
+            <image src="../../static/icon/test.png" class="img"></image>
+            <image wx:if="{{ true }}" class="new" src="../../static/icon/chanpin_ic_new@2x.png" mode="widthFix"></image>
+          </view>
+          <view class="name">閽㈢惔鏇�</view>
+          <view class="info">
+            <image wx:if="{{ false }}" class="icon" src="../../static/icon/detail_nav_collect.png" mode="widthFix"></image>
+            <image wx:else="" class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
+            <text class="num {{true ? 'primary' : ''}}">34</text>
+            <image class="icon" src="../../static/icon/zixun_ic_liulan.png" mode="widthFix"></image>
+            <text>1000</text>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+
+
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/components/disProduct/index.wxss b/wechat_jiaxuan/components/disProduct/index.wxss
new file mode 100644
index 0000000..7fb775c
--- /dev/null
+++ b/wechat_jiaxuan/components/disProduct/index.wxss
@@ -0,0 +1,173 @@
+.search_wrap {
+  width: 670rpx;
+  height: 72rpx;
+  margin: 24rpx auto;
+  background: #F7F7F7;
+  border-radius: 8rpx;
+  padding: 0 40rpx;
+  display: flex;
+  align-items: center;
+  background-color: #F7F7F7;
+}
+.search_wrap image {
+  width: 28rpx;
+  margin-right: 16rpx;
+}
+.app {
+  height: 100%;
+  width: 100%;
+}
+.main_content {
+  display: flex;
+  height: calc(100% - 120rpx);
+}
+.main_content .main_left {
+  width: 160rpx;
+  height: 100%;
+  overflow-y: auto;
+  border-radius: 0rpx 16rpx 16rpx 0rpx;
+}
+.main_content .main_left .item {
+  width: 160rpx;
+  height: 100rpx;
+  background: #F7F7F7;
+  font-weight: 400;
+  font-size: 26rpx;
+  color: #666666;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.main_content .main_left .active {
+  background-color: #fff;
+  font-weight: 500;
+  font-size: 30rpx;
+  color: #111111;
+}
+.main_content .main_right {
+  flex: 1;
+  position: relative;
+}
+.main_content .main_right .query_wrap {
+  display: flex;
+}
+.main_content .main_right .query_wrap .item {
+  height: 100rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #666666;
+  flex: 1;
+}
+.main_content .main_right .query_wrap .item .name {
+  margin-right: 12rpx;
+}
+.main_content .main_right .query_form {
+  position: absolute;
+  background-color: #fff;
+}
+.main_content .main_right .query_form .list {
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  padding: 30rpx 40rpx;
+}
+.main_content .main_right .query_form .list .item {
+  width: 154rpx;
+  height: 72rpx;
+  text-align: center;
+  line-height: 70rpx;
+  background: #F7F7F7;
+  border-radius: 8rpx;
+  font-size: 26rpx;
+  color: #333333;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  margin-right: 24rpx;
+  margin-bottom: 24rpx;
+}
+.main_content .main_right .query_form .list .item:nth-of-type(3n) {
+  margin-right: 0;
+}
+.main_content .main_right .query_form .list .active {
+  color: var(--themeColor);
+  background: rgba(176, 135, 113, 0.08);
+}
+.main_content .main_right .query_form .btns {
+  display: flex;
+}
+.main_content .main_right .query_form .btns .btn {
+  width: 296rpx;
+  height: 88rpx;
+  background: #E5E5E5;
+  color: #666666;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.main_content .main_right .query_form .btns .sub {
+  background: var(--themeColor);
+  color: #fff;
+}
+.main_content .main_right .status {
+  display: flex;
+  padding: 0rpx 40rpx;
+  margin: 20rpx 0;
+  align-items: center;
+}
+.main_content .main_right .status .active {
+  color: var(--themeColor);
+}
+.main_content .main_right .status .separate {
+  margin: 0 12rpx;
+  width: 1rpx;
+  height: 28rpx;
+  background-color: #333333;
+}
+.main_content .main_right .goods_list {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  padding: 12rpx 40rpx;
+}
+.main_content .main_right .goods_list .item {
+  flex-shrink: 0;
+  margin-bottom: 32rpx;
+}
+.main_content .main_right .goods_list .item .img_wrap {
+  width: 242rpx;
+  height: 136rpx;
+  border-radius: 8rpx;
+  overflow: hidden;
+  position: relative;
+}
+.main_content .main_right .goods_list .item .img_wrap .img {
+  width: 100%;
+  height: 100%;
+}
+.main_content .main_right .goods_list .item .img_wrap .new {
+  width: 72rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 100;
+}
+.main_content .main_right .goods_list .item .name {
+  margin: 12rpx 0 8rpx;
+}
+.main_content .main_right .goods_list .item .info {
+  display: flex;
+  align-items: center;
+  color: #666666;
+}
+.main_content .main_right .goods_list .item .info .icon {
+  width: 28rpx;
+  margin-right: 8rpx;
+}
+.main_content .main_right .goods_list .item .info .num {
+  margin-right: 16rpx;
+}
+.main_content .main_right .goods_list .item .info .primary {
+  color: var(--themeColor);
+}
diff --git a/wechat_jiaxuan/components/navBar/navBar.js b/wechat_jiaxuan/components/navBar/navBar.js
index d9da59d..7a52c81 100644
--- a/wechat_jiaxuan/components/navBar/navBar.js
+++ b/wechat_jiaxuan/components/navBar/navBar.js
@@ -17,7 +17,12 @@
   data: {
 
   },
-
+  navigateBack () {
+    console.log('----');
+    wx.navigateBack({
+      delta: 1,
+    })
+  },
   /**
    * 缁勪欢鐨勬柟娉曞垪琛�
    */
diff --git a/wechat_jiaxuan/components/navBar/navBar.wxml b/wechat_jiaxuan/components/navBar/navBar.wxml
index 36bb296..9cb054e 100644
--- a/wechat_jiaxuan/components/navBar/navBar.wxml
+++ b/wechat_jiaxuan/components/navBar/navBar.wxml
@@ -1,5 +1,5 @@
 <van-nav-bar title="{{ title }}" border="{{ false }}">
     <view slot="left">
-      <van-icon wx:if="{{ showBack }}" name="arrow-left" size="22px" color="#000000" />
+      <van-icon wx:if="{{ showBack }}" fixed placeholder bind:click-left="navigateBack" name="arrow-left" size="22px" color="#000000" />
     </view>
   </van-nav-bar>
diff --git a/wechat_jiaxuan/pages/calculator/index.js b/wechat_jiaxuan/pages/calculator/index.js
new file mode 100644
index 0000000..560f42b
--- /dev/null
+++ b/wechat_jiaxuan/pages/calculator/index.js
@@ -0,0 +1,235 @@
+// pages/calculator/index.js
+// import { imageUrl } from '../../utils/config'
+// import { calculatorOption, calculatorSave, decodePhone, bindPhone } from '../../api/index'
+// import Ls from '../../utils/storage'
+// let ls = new Ls
+Page({
+
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    // background: imageUrl + 'calculator/background.jpg',
+    userPhone: '',
+    type: '',
+    info: '',
+    area: '',
+    money: '',
+    typeArray: ['绮捐', '姣涘澂'],
+    infoArray: [
+      '涓�瀹や竴鍘�', '涓ゅ涓�鍘�', '涓ゅ涓ゅ巺', '涓夊涓ゅ巺',
+      '鍥涘涓ゅ巺', '浜斿涓ゅ巺鍙婁互涓�'
+    ],
+    calculatorOptions: [],
+    showPopup: false,
+    activePicker: '',
+    pickerIndex: 0,
+    // 灞曠ず璁$畻缁撴灉
+    showResultMoney: false,
+    containerContentStyle: 'hidden;'
+  },
+
+  // 杩斿洖涓婁竴椤�
+  navigateBack () {
+    wx.navigateBack({
+      delta: 1,
+    })
+  },
+
+  // picker 閫夋嫨
+  onChange (e) {
+    this.setData({ pickerIndex: e.detail.index })
+  },
+
+  // input 杈撳叆
+  inputTyping (e) {
+    this.setData({ [e.currentTarget.dataset.index]: e.detail.value })
+  },
+
+  // 閫夋嫨鎴垮眿绫诲瀷銆佹埛鍨嬩俊鎭�
+  toSelectType (e) {
+    let index = e.currentTarget.dataset.index
+    let { activePicker } = this.data
+    if ( activePicker === index) {
+      this.setData({ showPopup: true })
+    } else {
+      this.setData({
+        pickerIndex: 0,
+        activePicker: index,
+        showPopup: true
+      })
+    }
+  },
+
+  // 鍙栨秷閫夋嫨
+  cancelPicker () {
+    this.setData({ showPopup: false })
+  },
+
+  // 纭閫夋嫨
+  confirmPicker () {
+    let { activePicker, pickerIndex } = this.data
+    this.setData({ [activePicker]: pickerIndex, showPopup: false })
+  },
+
+  // 鑾峰彇鐢ㄦ埛鎵嬫満鍙�
+  getPhoneNumber (e) {
+    // console.log(e)
+    let that = this
+    decodePhone({ code: e.detail.code })
+      .then(res => {
+        if (res.phone === undefined || res.phone.length === null || !res.phone) {
+          wx.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+        } else {
+          bindPhone({ phone: res.phone })
+            .then(newInfo => {
+              ls.set('userInfo', newInfo.member)
+              that.setData({ userPhone: res.phone })
+              that.submit()
+            })
+        }
+      })
+  },
+
+  // 绔嬪嵆璁$畻
+  submit () {
+    // console.log('绔嬪嵆璁$畻')
+    let { userPhone } = this.data
+    ls.get('userInfo').then(res => {
+      // console.log(res)
+      if (userPhone) {
+        let { type, info, area, money, typeArray, infoArray, calculatorOptions: options } = this.data
+        let submitData = {}
+        submitData.name = res.name
+        submitData.phone = res.phone
+  
+        if (type === '') {
+          wx.showToast({
+            title: '璇烽�夋嫨鎴垮眿绫诲瀷',
+            icon: 'none'
+          })
+          return false
+        } 
+        if (info === '') {
+          wx.showToast({
+            title: '璇烽�夋嫨鎴峰瀷淇℃伅',
+            icon: 'none'
+          })
+          return false
+        } 
+        if (area === '') {
+          wx.showToast({
+            title: '璇疯緭鍏ユ埧灞嬮潰绉�',
+            icon: 'none'
+          })
+          return false
+        } 
+        if (money === '') {
+          wx.showToast({
+            title: '璇疯緭鍏ヨ淇绠�',
+            icon: 'none'
+          })
+          return false
+        }
+  
+        submitData = ['鎴垮眿绫诲瀷锛�' + typeArray[type], '鎴峰瀷淇℃伅锛�' + infoArray[info], '鎴垮眿闈㈢Н锛�' + area + '銕�', '瑁呬慨棰勭畻锛�' + money + '涓囧厓'].join('-')
+        for (let i in options) {
+          options[i].money = (money * options[i].rate / 100).toFixed(2)
+          let childList = options[i].childList
+          for(let j in childList) {
+            childList[j].money = (money * childList[j].rate / 100).toFixed(2)
+          }
+        }
+        this.setData({ calculatorOptions: options, showResultMoney: true, containerContentStyle: 'auto' })
+        this.submitCalculatorResult(submitData)
+      }
+    })
+  },
+
+  // 鎻愪氦璁$畻缁撴灉
+  submitCalculatorResult (data) {
+    calculatorSave({ info: data }).then(res => {
+      // console.log(res)
+      if (res.success) {
+        wx.showToast({
+          title: '璁$畻鎴愬姛',
+          icon: 'none'
+        })
+      } else {
+        console.log(res.msg)
+      }
+    })
+  },
+
+  // 鑾峰彇璁$畻鍣ㄩ厤缃�
+  getCalculatorOption () {
+    calculatorOption().then(res => {
+      this.setData({ calculatorOptions: res.data })
+    })
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+   */
+  onLoad: function (options) {
+    let that = this
+    // this.getCalculatorOption()
+    // ls.get('userInfo').then(res => {
+    //   if (res.phone) {
+    //     that.setData({ userPhone: res.phone })
+    //   }
+    // })
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/calculator/index.json b/wechat_jiaxuan/pages/calculator/index.json
new file mode 100644
index 0000000..d12237e
--- /dev/null
+++ b/wechat_jiaxuan/pages/calculator/index.json
@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "van-nav-bar": "@vant/weapp/nav-bar/index",
+    "van-picker": "@vant/weapp/picker/index",
+    "van-popup": "@vant/weapp/popup/index"
+  },
+  "navigationStyle": "custom",
+  "navigationBarTextStyle": "white"
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/calculator/index.wxml b/wechat_jiaxuan/pages/calculator/index.wxml
new file mode 100644
index 0000000..88ace3a
--- /dev/null
+++ b/wechat_jiaxuan/pages/calculator/index.wxml
@@ -0,0 +1,101 @@
+<!--pages/calculator/index.wxml-->
+<view class="container" style="background-image: {{ 'url(' + background + ')' }};">
+  <view class="container-content" style="overflow-y: {{ containerContentStyle }};">
+    <van-nav-bar border="{{ false }}" custom-class="top-head-transparent" bind:click-left="navigateBack" fixed placeholder>
+      <van-icon name="arrow-left" class="top-head-icon" slot="left" />
+    </van-nav-bar>
+
+    <!-- 璁$畻鍣� -->
+    <view class="calculator">
+      <view class="title">瑁呬慨璁$畻鍣�</view>
+      <view class="tips">涓烘偍璁$畻鏈�浼樺瑁呭垎閰�</view>
+
+      <!-- 璁$畻鍣ㄨ緭鍏ュ唴瀹� -->
+      <view class="form">
+
+        <view class="form-item">
+          <view class="label">鎴垮眿绫诲瀷锛�</view>
+          <view class="input-box" data-index="type" bindtap="toSelectType">
+            <view class="select">
+              <view class="value" wx:if="{{ type !== '' }}">{{ typeArray[type] }}</view>
+              <view class="placeholder" wx:else>璇烽�夋嫨</view>
+            </view>
+            <van-icon class="icon" name="arrow-down" />
+          </view>
+        </view>
+
+        <view class="form-item">
+          <view class="label">鎴峰瀷淇℃伅锛�</view>
+          <view class="input-box" data-index="info" bindtap="toSelectType">
+            <view class="select">
+              <view class="value" wx:if="{{ info !== '' }}">{{ infoArray[info] }}</view>
+              <view class="placeholder" wx:else>璇烽�夋嫨</view>
+            </view>
+            <van-icon class="icon" name="arrow-down" />
+          </view>
+        </view>
+
+        <view class="form-item">
+          <view class="label">鎴垮眿闈㈢Н锛�</view>
+          <view class="input-box">
+            <input class="input" placeholder-class="placeholder" placeholder="0"
+              data-index="area" bindinput="inputTyping" value="{{ area }}"/>
+            <view class="icon">銕�</view>
+          </view>
+        </view>
+
+        <view class="form-item">
+          <view class="label">瑁呬慨棰勭畻锛�</view>
+          <view class="input-box">
+            <input class="input" placeholder-class="placeholder" placeholder="0"
+              data-index="money" bindinput="inputTyping" value="{{ money }}"/>
+            <view class="icon">涓囧厓</view>
+          </view>
+        </view>
+
+        <view class="form-item">
+          <view class="submit-btn" bindtap="submit" wx:if="{{ userPhone != null && userPhone != 'undefined' && userPhone.length === 11 }}">绔嬪嵆璁$畻</view>
+          <button class="submit-btn" wx:else
+            open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">绔嬪嵆璁$畻</button>
+        </view>
+      </view>
+    </view>
+    <!-- 璁$畻鍣� end -->
+
+    <!-- 璁$畻缁撴灉灞曠ず -->
+    <view class="results" style="opacity: {{ showResultMoney ? '1' : '0.2' }};">
+      <view class="results-title">鏈�浼樺瑁呭垎閰嶈〃</view>
+      <view class="flex thead">
+        <view class="td name">璇︽儏</view>
+        <view class="td rate">鍙傝�冩瘮渚�</view>
+        <view class="td money">鍙傝�冧环鏍�</view>
+      </view>
+      <view class="item" wx:for="{{ calculatorOptions }}" wx:key="index"
+        hidden="{{ type == item.info }}">
+        <view class="flex th">
+          <view class="td name">{{ item.name }}</view>
+          <view class="td rate">鍗犳瘮{{ item.rate }}%</view>
+          <view class="td money">鍚堣{{ item.money }}(涓囧厓)</view>
+        </view>
+        <view class="flex tr" wx:for="{{ item.childList }}" wx:for-item="ite" wx:for-index="idx" wx:key="idx">
+          <view class="td name">{{ ite.name }}</view>
+          <view class="td rate">{{ ite.rate }}%</view>
+          <view class="td money">{{ ite.money }}</view>
+        </view>
+      </view>
+    </view>
+
+  </view>
+</view>
+
+<!-- 閫夋嫨鍣� -->
+<van-popup round show="{{ showPopup }}" position="bottom" custom-style="height: auto;">
+  <view class="popup-content">
+    <view class="flex-cb buttons">
+      <view class="btn btn-cancel" bindtap="cancelPicker">鍙栨秷</view>
+      <view class="btn btn-confirm" bindtap="confirmPicker">纭畾</view>
+    </view>
+    <van-picker class="picker" columns="{{ typeArray }}" bind:change="onChange" default-index="{{ type }}" wx:if="{{ activePicker === 'type' }}" />
+    <van-picker class="picker" columns="{{ infoArray }}" bind:change="onChange" default-index="{{ info }}" wx:if="{{ activePicker === 'info' }}" />
+  </view>
+</van-popup>
diff --git a/wechat_jiaxuan/pages/calculator/index.wxss b/wechat_jiaxuan/pages/calculator/index.wxss
new file mode 100644
index 0000000..85e9ded
--- /dev/null
+++ b/wechat_jiaxuan/pages/calculator/index.wxss
@@ -0,0 +1,164 @@
+/* pages/calculator/index.wxss */
+.container {
+  color: #fff;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: cover;
+  position: relative;
+  overflow: hidden;
+}
+
+.container::before {
+  content: '';
+  display: block;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  background-color: rgba(255,255,255,0.5);
+  position: absolute;
+}
+
+.container-content {
+  background-color: rgba(0,0,0,0.75);
+  position: absolute;
+  height: 100%;
+  width: 100%;
+  left: 0;
+  right: 0;
+}
+
+.top-head-transparent {
+  background-color: transparent!important;
+}
+
+.top-head-transparent .van-icon.van-icon-arrow-left {
+  font-size: 40rpx!important;
+  color: #fff!important;
+}
+
+.calculator {
+  padding: 40rpx;
+}
+
+.calculator .title {
+  font-size: 52rpx;
+  padding: 60rpx 0 20rpx;
+}
+
+.calculator .tips {
+  font-size: 28rpx;
+  margin-bottom: 70rpx;
+  opacity: 0.8;
+}
+
+.calculator .form-item {
+  display: flex;
+  height: 88rpx;
+  line-height: 88rpx;
+  margin-bottom: 40rpx;
+}
+
+.calculator .input-box {
+  display: flex;
+  flex: 1;
+  border: 1px solid #fff;
+  background-color: rgba(0,0,0,0.1);
+  padding: 0 40rpx;
+  border-radius: 8rpx;
+}
+
+.calculator .input-box .input,
+.calculator .input-box .select {
+  flex: 1;
+  height: 88rpx;
+  line-height: 88rpx;
+}
+
+.calculator .input-box .placeholder {
+  color: rgba(255,255,255,0.6);
+}
+
+.calculator .submit-btn {
+  text-align: center;
+  line-height: 100rpx;
+  height: 100rpx;
+  background: linear-gradient(180deg, #E0B49C 0%, #B68B74 100%);
+box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176,135,113,0.3000), inset 0rpx 2rpx 2rpx 0rpx rgba(255,255,255,0.3300);
+border-radius: 8rpx;
+  width: 100%;
+  font-size: 32rpx;
+  color: #fff;
+}
+
+.popup-content .btn {
+  padding: 40rpx;
+}
+
+.popup-content .btn-cancel {
+  color: #999999;
+}
+
+.popup-content .btn-confirm {
+  color: #222222;
+}
+
+.picker {
+  height: 100%;
+  width: 100%;
+}
+
+.results {
+  background-color: #f7f7f7;
+  color: #222;
+  text-align: center;
+  margin: 0 30rpx 60rpx;
+  border-radius: 8rpx;
+  padding: 30rpx;
+}
+
+.results-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  margin-bottom: 60rpx;
+  margin-top: 30rpx;
+}
+
+.results .thead {
+  font-size: 26rpx;
+  color: #555555;
+  margin-bottom: 32rpx;
+}
+
+.results .item {
+  background-color: #fff;
+  margin-bottom: 40rpx;
+  border-radius: 8rpx;
+  overflow: hidden;
+}
+
+.results .item:last-of-type {
+  margin-bottom: 0;
+}
+
+.results .item .td {
+  line-height: 74rpx;
+  height: 74rpx;
+}
+
+.results .item .th {
+  color: #7C4B31;
+  background-color: rgba(176, 135, 113, 0.2);
+}
+
+.results .name {
+  width: 35%;
+}
+
+.results .rate {
+  width: 30%;
+}
+
+.results .money {
+  width: 35%;
+}
diff --git a/wechat_jiaxuan/pages/consult/detail.js b/wechat_jiaxuan/pages/consult/detail.js
index 5b4e6fb..0042f46 100644
--- a/wechat_jiaxuan/pages/consult/detail.js
+++ b/wechat_jiaxuan/pages/consult/detail.js
@@ -5,14 +5,18 @@
    * 椤甸潰鐨勫垵濮嬫暟鎹�
    */
   data: {
-    navTitle: '璇︽儏'
+    navTitle: '璇︽儏',
+    bottomLift: 0
   },
 
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad(options) {
-
+    var app = getApp().globalData
+    this.setData({
+      bottomLift: app.bottomLift
+    })
   },
 
   /**
diff --git a/wechat_jiaxuan/pages/consult/detail.wxml b/wechat_jiaxuan/pages/consult/detail.wxml
index 127121f..c684ab4 100644
--- a/wechat_jiaxuan/pages/consult/detail.wxml
+++ b/wechat_jiaxuan/pages/consult/detail.wxml
@@ -9,7 +9,7 @@
     </view>
   </view>
   <!-- footer -->
-  <view class="footer">
+  <view class="footer" style="bottom: {{bottomLift}}px;">
     <view class="item">
       <image class="icon" src="../../static/icon/detail_nav_collected.png" mode="widthFix"></image>
       <view class="name">鏀惰棌</view>
diff --git a/wechat_jiaxuan/pages/design/design.wxml b/wechat_jiaxuan/pages/design/design.wxml
index 0d05f9f..dea7739 100644
--- a/wechat_jiaxuan/pages/design/design.wxml
+++ b/wechat_jiaxuan/pages/design/design.wxml
@@ -1,6 +1,6 @@
 <view class="container">
   <navBar title="0鍏冨厤璐硅璁�"></navBar>
-  <image class="banner" src="../../static/images/design_banner.png"></image>
+  <!-- <image class="banner" src="../../static/images/design_banner.png"></image> -->
   <view class="main_content">
     <view class="title">0鍏冨畾鍒� | 鎮ㄧ殑鎴峰瀷瑁呬慨鏂规</view>
     <view class="line">
diff --git a/wechat_jiaxuan/pages/discover/discover.js b/wechat_jiaxuan/pages/discover/discover.js
index bc40b7d..9e16cde 100644
--- a/wechat_jiaxuan/pages/discover/discover.js
+++ b/wechat_jiaxuan/pages/discover/discover.js
@@ -5,16 +5,22 @@
    * 椤甸潰鐨勫垵濮嬫暟鎹�
    */
   data: {
-
+    menuButtonInfo: {},
+    activeTabs: '0'
   },
 
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
    */
   onLoad(options) {
-
+    let menuButtonInfo = wx.getMenuButtonBoundingClientRect();
+    this.setData({menuButtonInfo})
+    console.log('WindowInfo', menuButtonInfo);
+  },  
+  tabsClick(e) {
+    const activeTabs = e.currentTarget.dataset.tab
+    this.setData({activeTabs})
   },
-
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
    */
diff --git a/wechat_jiaxuan/pages/discover/discover.json b/wechat_jiaxuan/pages/discover/discover.json
index 41f4720..aecbe3e 100644
--- a/wechat_jiaxuan/pages/discover/discover.json
+++ b/wechat_jiaxuan/pages/discover/discover.json
@@ -1,4 +1,7 @@
 {
+  "usingComponents": {
+    "disProduct": "../../components/disProduct"
+  },
   "navigationStyle": "custom",
   "navigationBarTextStyle": "white"
 }
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/discover/discover.less b/wechat_jiaxuan/pages/discover/discover.less
new file mode 100644
index 0000000..f37a748
--- /dev/null
+++ b/wechat_jiaxuan/pages/discover/discover.less
@@ -0,0 +1,30 @@
+.main_tab{
+  display: flex;
+  align-items: flex-end;
+  height: 88rpx;
+  padding: 0 40rpx;
+  .item{
+    width: 76rpx;
+    font-size: 32rpx;
+    color: #555555;
+    margin-right: 60rpx;
+    .name{}
+    .border{
+      width: 60rpx;
+      height: 10rpx;
+      background: #fff;
+    }
+  }
+  .active{
+    font-weight: 600;
+    font-size: 38rpx;
+    color: #222222;
+    .border{
+      background: linear-gradient( 270deg, rgba(255,255,255,0.56) 0%, rgba(206,144,111,0.88) 100%); 
+    }
+  }
+}
+.container{
+}
+.main_content{
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/discover/discover.wxml b/wechat_jiaxuan/pages/discover/discover.wxml
index 8e00219..352c4be 100644
--- a/wechat_jiaxuan/pages/discover/discover.wxml
+++ b/wechat_jiaxuan/pages/discover/discover.wxml
@@ -1,2 +1,21 @@
-<!--pages/discover/discover.wxml-->
-<text>pages/discover/discover.wxml</text>
+<view class="container">
+  <view style="height: {{ menuButtonInfo.top }}px;"></view>
+  <view class="main_tab">
+    <view class="item {{ activeTabs == '0' ? 'active' : '' }}" data-tab="0" bindtap="tabsClick">
+      <view class="name">浜у搧</view>
+      <view class="border"></view>
+    </view>
+    <view class="item {{ activeTabs == '1' ? 'active' : '' }}" data-tab="1" bindtap="tabsClick">
+      <view class="name">妗堜緥</view>
+      <view class="border"></view>
+    </view>
+    <view class="item {{ activeTabs == '2' ? 'active' : '' }}" data-tab="2" bindtap="tabsClick">
+      <view class="name">瀹炴櫙</view>
+      <view class="border"></view>
+    </view>
+  </view>
+  <!--  -->
+  <view class="main_content" style="height: calc( 100vh - {{menuButtonInfo.top}}px - 88rpx )">
+    <disProduct wx:if="{{ activeTabs == '0' }}" />
+  </view>
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/discover/discover.wxss b/wechat_jiaxuan/pages/discover/discover.wxss
new file mode 100644
index 0000000..a97b40c
--- /dev/null
+++ b/wechat_jiaxuan/pages/discover/discover.wxss
@@ -0,0 +1,25 @@
+.main_tab {
+  display: flex;
+  align-items: flex-end;
+  height: 88rpx;
+  padding: 0 40rpx;
+}
+.main_tab .item {
+  width: 76rpx;
+  font-size: 32rpx;
+  color: #555555;
+  margin-right: 60rpx;
+}
+.main_tab .item .border {
+  width: 60rpx;
+  height: 10rpx;
+  background: #fff;
+}
+.main_tab .active {
+  font-weight: 600;
+  font-size: 38rpx;
+  color: #222222;
+}
+.main_tab .active .border {
+  background: linear-gradient(270deg, rgba(255, 255, 255, 0.56) 0%, rgba(206, 144, 111, 0.88) 100%);
+}
diff --git a/wechat_jiaxuan/pages/index/index.js b/wechat_jiaxuan/pages/index/index.js
index 06434ae..c76e354 100644
--- a/wechat_jiaxuan/pages/index/index.js
+++ b/wechat_jiaxuan/pages/index/index.js
@@ -30,7 +30,45 @@
   onLoad(options) {
 
   },
+  changePath(e) {
+    let index = e.currentTarget.dataset.type
+    console.log(index);
+    switch (index) {
+      case '0':
+        wx.navigateTo({
+          url: '/pages/webView/index',
+          success: function (res) {
+            // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+            res.eventChannel.emit('acceptDataFromOpenerPage', { link: 'https://m.zbom.com/mobile/styleTest.html?type=1' })
+            saveBehavior({ type: 1 })
+          }
+        })
+        break;
 
+      case '1':
+        wx.navigateTo({
+          url: '/pages/calculator/index'
+        })
+        break;
+
+      case '2':
+        wx.navigateTo({
+          url: '/pages/design/design'
+        })
+        // wx.navigateTo({
+        //   url: '/pages/wonderful_activity/index',
+        //   success: function(res) {
+        //     // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+        //     res.eventChannel.emit('acceptDataFromOpenerPage', { type: 1 })
+        //   }
+        // })
+        break;
+
+      default:
+        console.log('error')
+        break;
+    }
+  },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
    */
diff --git a/wechat_jiaxuan/pages/index/index.wxml b/wechat_jiaxuan/pages/index/index.wxml
index dbb8a95..ff64287 100644
--- a/wechat_jiaxuan/pages/index/index.wxml
+++ b/wechat_jiaxuan/pages/index/index.wxml
@@ -18,17 +18,17 @@
   </swiper>
   <!--  -->
   <view class="function_wrap">
-    <view class="item">
+    <view class="item" data-type="0" bindtap="changePath">
       <image class="img" src="../../static/icon/test.png"></image>
       <view class="name">闇�姹�</view>
       <view class="placeholder9">鍒嗘瀽灏忓府鎵�</view>
     </view>
-    <view class="item">
+    <view class="item" data-type="2" bindtap="changePath">
       <image class="img" src="../../static/icon/test.png"></image>
       <view class="name">鍏嶈垂閲忓昂</view>
       <view class="placeholder9">鍒嗘瀽灏忓府鎵�</view>
     </view>
-    <view class="item">
+    <view class="item" data-type="1" bindtap="changePath">
       <image class="img" src="../../static/icon/test.png"></image>
       <view class="name">棰勭畻</view>
       <view class="placeholder9">蹇�熻幏鍙栨姤浠�</view>
diff --git a/wechat_jiaxuan/pages/store/info.js b/wechat_jiaxuan/pages/store/info.js
new file mode 100644
index 0000000..f999bbb
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/info.js
@@ -0,0 +1,69 @@
+// pages/store/info.js
+Page({
+
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    bottomLift: 0
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+   */
+  onLoad(options) {
+    var app = getApp().globalData
+    this.setData({
+      bottomLift: app.bottomLift
+    })
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/info.json b/wechat_jiaxuan/pages/store/info.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/info.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/info.less b/wechat_jiaxuan/pages/store/info.less
new file mode 100644
index 0000000..fdff4f7
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/info.less
@@ -0,0 +1,128 @@
+.header {
+  width: 670rpx;
+  margin: 40rpx auto 48rpx;
+  height: 224rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.2);
+  border-radius: 8rpx;
+  padding: 30rpx;
+
+  .name {
+    font-weight: 500;
+    font-size: 36rpx;
+  }
+
+  .desc {
+    font-size: 26rpx;
+    color: #666666;
+    margin: 16rpx 0 24rpx;
+  }
+
+  .addr {
+    font-size: 26rpx;
+    color: #888888;
+  }
+}
+.bg_wrap{
+  width: 750rpx;
+  height: 400rpx;
+  background-color: #333333;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: -1;
+}
+.main_content {
+  padding: 0 40rpx 40rpx;
+
+  .title {
+    font-weight: 600;
+    font-size: 36rpx;
+    margin-bottom: 38rpx;
+  }
+
+  .list {
+    .item {
+      width: 670rpx;
+      height: 148rpx;
+      background: rgba(176, 135, 113, 0.05) #FFFFFF;
+      box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0, 0, 0, 0.12);
+      border-radius: 8rpx;
+      padding: 0 30rpx;
+      display: flex;
+      align-items: center;
+      margin-bottom: 30rpx;
+
+      .content {
+        flex: 1;
+
+        .name {
+          font-size: 30rpx;
+          margin-bottom: 12rpx;
+        }
+
+        .desc {
+          font-size: 24rpx;
+          color: #999999;
+        }
+      }
+
+      .avatar {
+        width: 88rpx;
+        height: 88rpx;
+        border-radius: 50%;
+        border: 1rpx solid #cccccc;
+        margin-right: 24rpx;
+      }
+
+      .btn {
+        width: 118rpx;
+        height: 56rpx;
+        line-height: 52rpx;
+        text-align: center;
+        background: #FFFFFF;
+        border-radius: 8rpx;
+        font-weight: 500;
+        font-size: 26rpx;
+        color: var(--themeColor);
+        border: 1rpx solid var(--themeColor);
+      }
+    }
+  }
+}
+.footer{
+  display: flex;
+  align-items: center;
+  height: 100rpx;
+  position: fixed;
+  bottom: 0;
+  left: 0rpx;
+  width: 750rpx;
+  padding: 20rpx 40rpx 0;
+  box-shadow: 0rpx -4rpx 8rpx 0rpx rgba(0,0,0,0.14);
+  .btn {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: 500;
+    background-color: #fff;
+    font-size: 32rpx;
+    height: 88rpx;
+    border-radius: 8rpx;
+    color: var(--themeColor);
+    border: 1rpx solid var(--themeColor);
+    flex: 1;
+    image{
+      width: 28rpx;
+      margin-right: 12rpx;
+    }
+  }
+  .phone{
+    background-color: var(--themeColor);
+    color: #fff;
+    margin-left: 20rpx;
+    image{
+      width: 32rpx;
+    }
+  }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/info.wxml b/wechat_jiaxuan/pages/store/info.wxml
new file mode 100644
index 0000000..4e7f6cf
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/info.wxml
@@ -0,0 +1,51 @@
+<view>
+  <navBar title=""></navBar>
+  <view class="bg_wrap"></view>
+  <view class="container">
+    <view class="header">
+      <view class="name">鍚堣偉鏂规灄搴�</view>
+      <view class="desc">鍏ㄥ眿瀹氬埗銆佹暣浣撳帹鎴裤�佹湪闂ㄥ鏉裤�佸崼闃冲畾鍒�</view>
+      <view class="addr">2.4km锝滃悎鑲ュ競閲戝璺惀鐝�浜旂幆鍥介檯A搴�</view>
+    </view>
+    <view class="main_content">
+      <view class="title">闂ㄥ簵瀵艰喘</view>
+      <view class="list">
+        <view class="item">
+          <view class="avatar"></view>
+          <view class="content">
+            <view class="name">涓佹鏋�</view>
+            <view class="desc">瀵艰喘锝�5骞寸粡楠�</view>
+          </view>
+          <view class="btn">鑱旂郴TA</view>
+        </view>
+        <view class="item">
+          <view class="avatar"></view>
+          <view class="content">
+            <view class="name">涓佹鏋�</view>
+            <view class="desc">瀵艰喘锝�5骞寸粡楠�</view>
+          </view>
+          <view class="btn">鑱旂郴TA</view>
+        </view>
+        <view class="item">
+          <view class="avatar"></view>
+          <view class="content">
+            <view class="name">涓佹鏋�</view>
+            <view class="desc">瀵艰喘锝�5骞寸粡楠�</view>
+          </view>
+          <view class="btn">鑱旂郴TA</view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <!-- footer -->
+  <view class="footer" style="bottom: {{bottomLift}}px;">
+    <view class="btn">
+      <image src="../../static/icon/mendian_ic_daohang@2x.png" mode="widthFix"></image>
+      <view>瀵艰埅</view>
+    </view>
+    <view class="btn phone">
+      <image src="../../static/icon/call.png" mode="widthFix"></image>
+      <view>闂ㄥ簵鐢佃瘽</view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/info.wxss b/wechat_jiaxuan/pages/store/info.wxss
new file mode 100644
index 0000000..6723b44
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/info.wxss
@@ -0,0 +1,116 @@
+.header {
+  width: 670rpx;
+  margin: 40rpx auto 48rpx;
+  height: 224rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.2);
+  border-radius: 8rpx;
+  padding: 30rpx;
+}
+.header .name {
+  font-weight: 500;
+  font-size: 36rpx;
+}
+.header .desc {
+  font-size: 26rpx;
+  color: #666666;
+  margin: 16rpx 0 24rpx;
+}
+.header .addr {
+  font-size: 26rpx;
+  color: #888888;
+}
+.bg_wrap {
+  width: 750rpx;
+  height: 400rpx;
+  background-color: #333333;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: -1;
+}
+.main_content {
+  padding: 0 40rpx 40rpx;
+}
+.main_content .title {
+  font-weight: 600;
+  font-size: 36rpx;
+  margin-bottom: 38rpx;
+}
+.main_content .list .item {
+  width: 670rpx;
+  height: 148rpx;
+  background: rgba(176, 135, 113, 0.05) #FFFFFF;
+  box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(0, 0, 0, 0.12);
+  border-radius: 8rpx;
+  padding: 0 30rpx;
+  display: flex;
+  align-items: center;
+  margin-bottom: 30rpx;
+}
+.main_content .list .item .content {
+  flex: 1;
+}
+.main_content .list .item .content .name {
+  font-size: 30rpx;
+  margin-bottom: 12rpx;
+}
+.main_content .list .item .content .desc {
+  font-size: 24rpx;
+  color: #999999;
+}
+.main_content .list .item .avatar {
+  width: 88rpx;
+  height: 88rpx;
+  border-radius: 50%;
+  border: 1rpx solid #cccccc;
+  margin-right: 24rpx;
+}
+.main_content .list .item .btn {
+  width: 118rpx;
+  height: 56rpx;
+  line-height: 52rpx;
+  text-align: center;
+  background: #FFFFFF;
+  border-radius: 8rpx;
+  font-weight: 500;
+  font-size: 26rpx;
+  color: var(--themeColor);
+  border: 1rpx solid var(--themeColor);
+}
+.footer {
+  display: flex;
+  align-items: center;
+  height: 100rpx;
+  position: fixed;
+  bottom: 0;
+  left: 0rpx;
+  width: 750rpx;
+  padding: 20rpx 40rpx 0;
+  box-shadow: 0rpx -4rpx 8rpx 0rpx rgba(0, 0, 0, 0.14);
+}
+.footer .btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-weight: 500;
+  background-color: #fff;
+  font-size: 32rpx;
+  height: 88rpx;
+  border-radius: 8rpx;
+  color: var(--themeColor);
+  border: 1rpx solid var(--themeColor);
+  flex: 1;
+}
+.footer .btn image {
+  width: 28rpx;
+  margin-right: 12rpx;
+}
+.footer .phone {
+  background-color: var(--themeColor);
+  color: #fff;
+  margin-left: 20rpx;
+}
+.footer .phone image {
+  width: 32rpx;
+}
diff --git a/wechat_jiaxuan/pages/store/staff.js b/wechat_jiaxuan/pages/store/staff.js
new file mode 100644
index 0000000..c951641
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/staff.js
@@ -0,0 +1,76 @@
+// pages/store/staff.js
+Page({
+
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    bottomLift: 0,
+    isShow: false
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+   */
+  onLoad(options) {
+    var app = getApp().globalData
+    this.setData({
+      bottomLift: app.bottomLift
+    })
+  },
+  openModal() {
+    this.setData({isShow: true})
+  },
+  onClose() {
+    this.setData({isShow: false})
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/staff.json b/wechat_jiaxuan/pages/store/staff.json
new file mode 100644
index 0000000..31a5700
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/staff.json
@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "van-popup": "@vant/weapp/popup/index"
+  }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/staff.less b/wechat_jiaxuan/pages/store/staff.less
new file mode 100644
index 0000000..7986de4
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/staff.less
@@ -0,0 +1,181 @@
+.bg_wrap {
+  width: 750rpx;
+  height: 400rpx;
+  background-color: #333333;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: -1;
+}
+
+.container {
+  padding: 26rpx 40rpx;
+  .avatar {
+    margin-top: 260rpx;
+    width: 140rpx;
+    height: 140rpx;
+    border-radius: 50%;
+    border: 4rpx solid #FFFFFF;
+  }
+  .desc {
+    display: flex;
+    align-items: center;
+    padding: 0 30rpx;
+    width: 670rpx;
+    height: 80rpx;
+    background: #F7F7F7;
+    margin-bottom: 40rpx;
+    color: #333333;
+    position: relative;
+    .icon{
+      position: absolute;
+      background: #F7F7F7;
+      width: 32rpx;
+      height: 32rpx;
+      left: 40rpx;
+      top: -16rpx;
+      transform: rotate(45deg);
+    }
+    image {
+      width: 32rpx;
+      margin-right: 20rpx;
+    }
+  }
+}
+
+.name_wrap {
+  display: flex;
+  margin-bottom: 32rpx;
+
+  .left {
+    flex: 1;
+    display: flex;
+    align-items: flex-end;
+
+    .name {
+      font-weight: 600;
+      font-size: 36rpx;
+    }
+
+    .tag {
+      height: 42rpx;
+      line-height: 40rpx;
+      color: var(--themeColor);
+      border: 1rpx solid var(--themeColor);
+      border-radius: 8rpx;
+      margin-left: 12rpx;
+      padding: 0 10rpx;
+    }
+  }
+
+  .qrcode {
+    width: 80rpx;
+  }
+}
+
+
+.static {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 60rpx;
+
+  .card {
+    width: 320rpx;
+    height: 156rpx;
+    padding: 28rpx 40rpx;
+    background-color: #f7f7f7;
+    border-radius: 8rpx;
+    font-size: 26rpx;
+    color: #333333;
+
+    .num {
+      color: var(--themeColor);
+      margin-top: 8rpx;
+      font-weight: 600;
+      font-size: 40rpx;
+      display: flex;
+    }
+  }
+}
+
+.guide {
+  .title {
+    font-weight: 500;
+    font-size: 32rpx;
+    margin-bottom: 40rpx;
+  }
+
+  .line {
+    display: flex;
+    align-items: center;
+    font-size: 30rpx;
+    margin-bottom: 42rpx;
+    .icon {
+      width: 30rpx;
+    }
+    .label {
+      color: #777777;
+      margin-left: 24rpx;
+      margin-right: 44rpx;
+    }
+  }
+}
+.footer{
+  display: flex;
+  align-items: center;
+  height: 100rpx;
+  position: fixed;
+  bottom: 0;
+  left: 0rpx;
+  width: 750rpx;
+  padding: 0rpx 40rpx;
+  .btn {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: 500;
+    background-color: var(--themeColor);
+    color: #fff;
+    font-size: 32rpx;
+    height: 88rpx;
+    border-radius: 8rpx;
+    flex: 1;
+    image{
+      width: 32rpx;
+      margin-right: 12rpx;
+    }
+  }
+}
+.modal{
+  width: 600rpx;
+  height: 720rpx;
+  padding: 48rpx 40rpx;
+  border-radius: 16rpx;
+  .header{
+    display: flex;
+    .avatar{
+      width: 88rpx;
+      height: 88rpx;
+      border-radius: 50%;
+      margin-right: 24rpx;
+    }
+    .content{
+      .name{font-size: 30rpx;}
+      .desc{
+        font-size: 24rpx;
+        color: #999999;
+        margin-top: 12rpx; 
+      }
+    }
+  }
+  .qrcode{
+    width: 400rpx;
+    height: 400rpx;
+    margin: 60rpx auto 40rpx;
+  }
+  .text{
+    font-size: 26rpx;
+    color: #999999;
+    text-align: center;
+  }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/staff.wxml b/wechat_jiaxuan/pages/store/staff.wxml
new file mode 100644
index 0000000..3af0d01
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/staff.wxml
@@ -0,0 +1,69 @@
+<view>
+  <!-- <navBar></navBar> -->
+  <image src="../../static/images/design_banner@2x.png" mode="widthFix" class="bg_wrap"></image>
+  <view class="container">
+    <image class="avatar" src=""></image>
+    <view class="name_wrap">
+      <view class="left">
+        <view class="name">濮撳悕</view>
+        <view class="tag">瀵艰喘</view>
+        <view class="tag">5骞寸粡楠�</view>
+      </view>
+      <image class="qrcode" src="../../static/icon/mingpian_erweima@2x.png" mode="widthFix"></image>
+    </view>
+    <view class="desc">
+      <image src="../../static/icon/mingpian_ic_edit@2x.png" mode="widthFix"></image>
+      <view>鐢ㄥ績鏈嶅姟姣忎竴浣嶉【瀹�</view>
+      <view class="icon"></view>
+    </view>
+    <view class="static">
+      <view class="card">
+        <view>浠庝笟骞撮檺</view>
+        <view class="num">5</view>
+      </view>
+      <view class="card">
+        <view>鏈嶅姟瀹㈡埛</view>
+        <view class="num">500+</view>
+      </view>
+    </view>
+    <view class="guide">
+      <view class="title">瀵艰喘淇℃伅</view>
+      <view class="line">
+        <image class="icon" src="../../static/icon/mingpian_ic_phone@2x.png" mode="widthFix"></image>
+        <text class="label">鑱旂郴鐢佃瘽</text>
+        <text class="val">1888888888888</text>
+      </view>
+      <view class="line">
+        <image class="icon" src="../../static/icon/mingpian_ic_mendian@2x.png" mode="widthFix"></image>
+        <text class="label">闂ㄥ簵鍚嶇О</text>
+        <text class="val">1888888888888</text>
+      </view>
+      <view class="line">
+        <image class="icon" src="../../static/icon/mingpian_ic_dizhi@2x.png" mode="widthFix"></image>
+        <text class="label">闂ㄥ簵鍦板潃</text>
+        <text class="val">1888888888888</text>
+      </view>
+    </view>
+  </view>
+  <!-- footer -->
+  <view class="footer" style="bottom: {{bottomLift}}px;">
+    <view class="btn">
+      <image src="../../static/icon/call.png" mode="widthFix"></image>
+      <view bindtap="openModal">鑱旂郴TA</view>
+    </view>
+  </view>
+  <!-- 璇︽儏 -->
+  <van-popup show="{{ isShow }}"  closeable round bind:close="onClose">
+    <view class="modal">
+      <view class="header">
+        <image class="avatar" src=""></image>
+        <view class="content">
+            <view class="name">濮撳悕</view>
+            <view class="desc">瀵艰喘 锝� 5骞寸粡楠�</view>
+        </view>
+      </view>
+      <image class="qrcode" src=""></image>
+      <view class="text">闀挎寜鍥剧墖璇嗗埆浜岀淮鐮�</view>
+    </view>
+  </van-popup>
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/staff.wxss b/wechat_jiaxuan/pages/store/staff.wxss
new file mode 100644
index 0000000..5b174a1
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/staff.wxss
@@ -0,0 +1,167 @@
+.bg_wrap {
+  width: 750rpx;
+  height: 400rpx;
+  background-color: #333333;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: -1;
+}
+.container {
+  padding: 26rpx 40rpx;
+}
+.container .avatar {
+  margin-top: 260rpx;
+  width: 140rpx;
+  height: 140rpx;
+  border-radius: 50%;
+  border: 4rpx solid #FFFFFF;
+}
+.container .desc {
+  display: flex;
+  align-items: center;
+  padding: 0 30rpx;
+  width: 670rpx;
+  height: 80rpx;
+  background: #F7F7F7;
+  margin-bottom: 40rpx;
+  color: #333333;
+  position: relative;
+}
+.container .desc .icon {
+  position: absolute;
+  background: #F7F7F7;
+  width: 32rpx;
+  height: 32rpx;
+  left: 40rpx;
+  top: -16rpx;
+  transform: rotate(45deg);
+}
+.container .desc image {
+  width: 32rpx;
+  margin-right: 20rpx;
+}
+.name_wrap {
+  display: flex;
+  margin-bottom: 32rpx;
+}
+.name_wrap .left {
+  flex: 1;
+  display: flex;
+  align-items: flex-end;
+}
+.name_wrap .left .name {
+  font-weight: 600;
+  font-size: 36rpx;
+}
+.name_wrap .left .tag {
+  height: 42rpx;
+  line-height: 40rpx;
+  color: var(--themeColor);
+  border: 1rpx solid var(--themeColor);
+  border-radius: 8rpx;
+  margin-left: 12rpx;
+  padding: 0 10rpx;
+}
+.name_wrap .qrcode {
+  width: 80rpx;
+}
+.static {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 60rpx;
+}
+.static .card {
+  width: 320rpx;
+  height: 156rpx;
+  padding: 28rpx 40rpx;
+  background-color: #f7f7f7;
+  border-radius: 8rpx;
+  font-size: 26rpx;
+  color: #333333;
+}
+.static .card .num {
+  color: var(--themeColor);
+  margin-top: 8rpx;
+  font-weight: 600;
+  font-size: 40rpx;
+  display: flex;
+}
+.guide .title {
+  font-weight: 500;
+  font-size: 32rpx;
+  margin-bottom: 40rpx;
+}
+.guide .line {
+  display: flex;
+  align-items: center;
+  font-size: 30rpx;
+  margin-bottom: 42rpx;
+}
+.guide .line .icon {
+  width: 30rpx;
+}
+.guide .line .label {
+  color: #777777;
+  margin-left: 24rpx;
+  margin-right: 44rpx;
+}
+.footer {
+  display: flex;
+  align-items: center;
+  height: 100rpx;
+  position: fixed;
+  bottom: 0;
+  left: 0rpx;
+  width: 750rpx;
+  padding: 0rpx 40rpx;
+}
+.footer .btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-weight: 500;
+  background-color: var(--themeColor);
+  color: #fff;
+  font-size: 32rpx;
+  height: 88rpx;
+  border-radius: 8rpx;
+  flex: 1;
+}
+.footer .btn image {
+  width: 32rpx;
+  margin-right: 12rpx;
+}
+.modal {
+  width: 600rpx;
+  height: 720rpx;
+  padding: 48rpx 40rpx;
+  border-radius: 16rpx;
+}
+.modal .header {
+  display: flex;
+}
+.modal .header .avatar {
+  width: 88rpx;
+  height: 88rpx;
+  border-radius: 50%;
+  margin-right: 24rpx;
+}
+.modal .header .content .name {
+  font-size: 30rpx;
+}
+.modal .header .content .desc {
+  font-size: 24rpx;
+  color: #999999;
+  margin-top: 12rpx;
+}
+.modal .qrcode {
+  width: 400rpx;
+  height: 400rpx;
+  margin: 60rpx auto 40rpx;
+}
+.modal .text {
+  font-size: 26rpx;
+  color: #999999;
+  text-align: center;
+}
diff --git a/wechat_jiaxuan/pages/store/staffList.js b/wechat_jiaxuan/pages/store/staffList.js
new file mode 100644
index 0000000..af08ea9
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/staffList.js
@@ -0,0 +1,66 @@
+// pages/store/staffList.js
+Page({
+
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/staffList.json b/wechat_jiaxuan/pages/store/staffList.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/staffList.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/staffList.less b/wechat_jiaxuan/pages/store/staffList.less
new file mode 100644
index 0000000..111ac98
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/staffList.less
@@ -0,0 +1,69 @@
+page{
+  background-color: #f7f7f7;
+}
+.header{
+  height: 174rpx;
+  padding: 36rpx 40rpx;
+  .line{
+    display: flex;
+    align-items: center;
+    font-weight: 600;
+    font-size: 36rpx;
+    margin-bottom: 10rpx;
+    image{
+      width: 36rpx;
+      margin-right: 16rpx;
+    }
+  }
+  .desc{
+    font-size: 26rpx;
+    color: #333333;
+    font-weight: 300;
+  }
+}
+.list {
+  padding: 0 40rpx 40rpx;
+  .item {
+    width: 670rpx;
+    height: 148rpx;
+    background: #FFFFFF;
+    border-radius: 8rpx;
+    padding: 0 30rpx;
+    display: flex;
+    align-items: center;
+    margin-bottom: 30rpx;
+    .content {
+      flex: 1;
+      .name {
+        font-size: 30rpx;
+        margin-bottom: 12rpx;
+      }
+
+      .desc {
+        font-size: 24rpx;
+        color: #999999;
+      }
+    }
+
+    .avatar {
+      width: 88rpx;
+      height: 88rpx;
+      border-radius: 50%;
+      border: 1rpx solid #cccccc;
+      margin-right: 24rpx;
+    }
+
+    .btn {
+      width: 118rpx;
+      height: 56rpx;
+      line-height: 52rpx;
+      text-align: center;
+      background: #FFFFFF;
+      border-radius: 8rpx;
+      font-weight: 500;
+      font-size: 26rpx;
+      color: var(--themeColor);
+      border: 1rpx solid var(--themeColor);
+    }
+  }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/staffList.wxml b/wechat_jiaxuan/pages/store/staffList.wxml
new file mode 100644
index 0000000..14d5c45
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/staffList.wxml
@@ -0,0 +1,36 @@
+<view>
+  <navBar title="瀵艰喘鍒楄〃" />
+  <view class="header">
+    <view class="line">
+      <image src="../../static/icon/home_ic_guwen@2x.png" mode="widthFix"></image>
+      <view>浣犵殑涓撳睘瀹跺眳椤鹃棶</view>
+    </view>
+    <view class="desc">鎮ㄨ韩杈圭殑鍏ㄥ眿璁捐涓撳锝�</view>
+  </view>
+  <view class="list">
+        <view class="item">
+          <view class="avatar"></view>
+          <view class="content">
+            <view class="name">涓佹鏋�</view>
+            <view class="desc">瀵艰喘锝�5骞寸粡楠�</view>
+          </view>
+          <view class="btn">鑱旂郴TA</view>
+        </view>
+        <view class="item">
+          <view class="avatar"></view>
+          <view class="content">
+            <view class="name">涓佹鏋�</view>
+            <view class="desc">瀵艰喘锝�5骞寸粡楠�</view>
+          </view>
+          <view class="btn">鑱旂郴TA</view>
+        </view>
+        <view class="item">
+          <view class="avatar"></view>
+          <view class="content">
+            <view class="name">涓佹鏋�</view>
+            <view class="desc">瀵艰喘锝�5骞寸粡楠�</view>
+          </view>
+          <view class="btn">鑱旂郴TA</view>
+        </view>
+      </view>
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/staffList.wxss b/wechat_jiaxuan/pages/store/staffList.wxss
new file mode 100644
index 0000000..901473f
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/staffList.wxss
@@ -0,0 +1,66 @@
+page {
+  background-color: #f7f7f7;
+}
+.header {
+  height: 174rpx;
+  padding: 36rpx 40rpx;
+}
+.header .line {
+  display: flex;
+  align-items: center;
+  font-weight: 600;
+  font-size: 36rpx;
+  margin-bottom: 10rpx;
+}
+.header .line image {
+  width: 36rpx;
+  margin-right: 16rpx;
+}
+.header .desc {
+  font-size: 26rpx;
+  color: #333333;
+  font-weight: 300;
+}
+.list {
+  padding: 0 40rpx 40rpx;
+}
+.list .item {
+  width: 670rpx;
+  height: 148rpx;
+  background: #FFFFFF;
+  border-radius: 8rpx;
+  padding: 0 30rpx;
+  display: flex;
+  align-items: center;
+  margin-bottom: 30rpx;
+}
+.list .item .content {
+  flex: 1;
+}
+.list .item .content .name {
+  font-size: 30rpx;
+  margin-bottom: 12rpx;
+}
+.list .item .content .desc {
+  font-size: 24rpx;
+  color: #999999;
+}
+.list .item .avatar {
+  width: 88rpx;
+  height: 88rpx;
+  border-radius: 50%;
+  border: 1rpx solid #cccccc;
+  margin-right: 24rpx;
+}
+.list .item .btn {
+  width: 118rpx;
+  height: 56rpx;
+  line-height: 52rpx;
+  text-align: center;
+  background: #FFFFFF;
+  border-radius: 8rpx;
+  font-weight: 500;
+  font-size: 26rpx;
+  color: var(--themeColor);
+  border: 1rpx solid var(--themeColor);
+}
diff --git a/wechat_jiaxuan/pages/store/store.js b/wechat_jiaxuan/pages/store/store.js
new file mode 100644
index 0000000..cbbe687
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/store.js
@@ -0,0 +1,75 @@
+// pages/store/store.js
+Page({
+
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+
+  },
+
+  selAddress() {
+    console.log('鐐瑰嚮浜�');
+    wx.chooseLocation({
+      type: 'wgs84',
+      success: (res)=> {
+        this.setData({
+          city: res.name
+        })
+        console.log('res', res);
+      }
+    })
+  },
+  onLoad(options) {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/store.json b/wechat_jiaxuan/pages/store/store.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/store.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/store.less b/wechat_jiaxuan/pages/store/store.less
new file mode 100644
index 0000000..ed04715
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/store.less
@@ -0,0 +1,126 @@
+.app_header {
+  display: flex;
+  align-items: center;
+  height: 100rpx;
+  background-color: #fff;
+  padding: 0 40rpx;
+
+  .location {
+    width: 30rpx;
+  }
+
+  .add {
+    flex: 1;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin: 0 10rpx;
+  }
+
+  .right {
+    width: 42rpx;
+  }
+}
+
+.main_content {
+  padding: 40rpx;
+  min-height: calc(100vh - 100rpx);
+  background-color: #F7F7F7;
+  .app_title {
+    font-weight: 600;
+    font-size: 36rpx;
+    margin-bottom: 40rpx;
+  }
+
+  .shops {
+    .shop {
+      width: 670rpx;
+      height: 362rpx;
+      background: linear-gradient(180deg, #F2E7E1 0%, #FEFEFD 30%, #FFFFFF 100%);
+      border-radius: 8rpx;
+      margin-bottom: 20rpx;
+      padding: 30rpx;
+      .header{
+        display: flex;
+        align-items: center;
+        .left{
+          flex: 1;
+          .title{
+            font-weight: 500;
+            font-size: 32rpx; 
+            width: 100%;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            margin-bottom: 16rpx;
+          }
+          .address{
+            display: flex;
+            align-items: center;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            font-size: 26rpx;
+            color: #888888;
+            image{
+              width: 13rpx;
+              margin-left: 8rpx;
+            }
+          }
+        }
+        .right{
+          width: 60rpx;
+          font-size: 24rpx;
+          color: #333333;
+          text-align: center;
+          margin-left: 80rpx;
+          .phone{
+            width: 60rpx;
+            margin-bottom: 4rpx;
+          }
+        }
+      }
+      .user_list{
+        display: flex;
+        padding: 24rpx 10rpx;
+        .item{
+          width: 240rpx;
+          height: 180rpx;
+          padding: 20rpx 0;
+          background: #FFFFFF;
+          box-shadow: 0rpx 0rpx 10rpx rgba(0,0,0,0.12);
+          border-radius: 8rpx;
+          margin-right: 20rpx;
+          flex-shrink: 0;
+          .info{
+            display: flex;
+            align-items: center;
+            padding: 0 20rpx 14rpx;
+            border-bottom: 1rpx solid #eeeeee;
+            .avatar{
+              width: 72rpx;
+              height: 72rpx;
+              border: 1px solid;
+              border-radius: 50%;
+              margin-right: 16rpx;
+            }
+            .ex{
+              font-size: 24rpx;
+              color: #999999;
+              margin-top: 4rpx;
+            }
+          }
+          .btn{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 66rpx;
+            font-weight: 500;
+            font-size: 26rpx;
+            color: var(--themeColor);
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/store.wxml b/wechat_jiaxuan/pages/store/store.wxml
new file mode 100644
index 0000000..1365783
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/store.wxml
@@ -0,0 +1,64 @@
+<view>
+  <navBar title="鎺ㄨ崘闂ㄥ簵"></navBar>
+  <view class="app_header">
+    <image class="location" src="../../static/icon/location.png" mode="widthFix"></image>
+    <view bindtap="selAddress" class="add">{{ 111 }}</view>
+    <image class="right" src="../../static/icon/home_ar@2x.png" mode="widthFix"></image>
+  </view>
+  <view class="main_content">
+    <view class="app_title">AI涓烘偍鎺ㄨ崘浠ヤ笅闂ㄥ簵锛�</view>
+    <view class="shops">
+      <view class="shop">
+        <view class="header">
+          <view class="left">
+            <view class="title">title</view>
+            <view class="address">
+              <text>1</text>
+              <image src="../../static/icon/arrow_right.png" mode="widthFix"></image>
+            </view>
+          </view>
+          <view class="right">
+            <image class="phone" src="../../static/icon/phone.png" mode="widthFix"></image>
+            <view>鐢佃瘽</view>
+          </view>
+
+
+        </view>
+        <scroll-view scroll-x style="width: 640rpx">
+          <view class="user_list">
+            <view class="item">
+              <view class="info">
+                <image class="avatar" src="" mode="widthFix"></image>
+                <view class="text">
+                  <view class="name">name</view>
+                  <view class="ex">5骞寸粡楠�</view>
+                </view>
+              </view>
+              <view class="btn">鑱旂郴TA</view>
+            </view>
+            <view class="item">
+              <view class="info">
+                <image class="avatar" src="" mode="widthFix"></image>
+                <view class="text">
+                  <view class="name">name</view>
+                  <view class="ex">5骞寸粡楠�</view>
+                </view>
+              </view>
+              <view class="btn">鑱旂郴TA</view>
+            </view>
+            <view class="item">
+              <view class="info">
+                <image class="avatar" src="" mode="widthFix"></image>
+                <view class="text">
+                  <view class="name">name</view>
+                  <view class="ex">5骞寸粡楠�</view>
+                </view>
+              </view>
+              <view class="btn">鑱旂郴TA</view>
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+  </view>
+</view>
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/store/store.wxss b/wechat_jiaxuan/pages/store/store.wxss
new file mode 100644
index 0000000..a6214e1
--- /dev/null
+++ b/wechat_jiaxuan/pages/store/store.wxss
@@ -0,0 +1,119 @@
+.app_header {
+  display: flex;
+  align-items: center;
+  height: 100rpx;
+  background-color: #fff;
+  padding: 0 40rpx;
+}
+.app_header .location {
+  width: 30rpx;
+}
+.app_header .add {
+  flex: 1;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  margin: 0 10rpx;
+}
+.app_header .right {
+  width: 42rpx;
+}
+.main_content {
+  padding: 40rpx;
+  min-height: calc(100vh - 100rpx);
+  background-color: #F7F7F7;
+}
+.main_content .app_title {
+  font-weight: 600;
+  font-size: 36rpx;
+  margin-bottom: 40rpx;
+}
+.main_content .shops .shop {
+  width: 670rpx;
+  height: 362rpx;
+  background: linear-gradient(180deg, #F2E7E1 0%, #FEFEFD 30%, #FFFFFF 100%);
+  border-radius: 8rpx;
+  margin-bottom: 20rpx;
+  padding: 30rpx;
+}
+.main_content .shops .shop .header {
+  display: flex;
+  align-items: center;
+}
+.main_content .shops .shop .header .left {
+  flex: 1;
+}
+.main_content .shops .shop .header .left .title {
+  font-weight: 500;
+  font-size: 32rpx;
+  width: 100%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  margin-bottom: 16rpx;
+}
+.main_content .shops .shop .header .left .address {
+  display: flex;
+  align-items: center;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-size: 26rpx;
+  color: #888888;
+}
+.main_content .shops .shop .header .left .address image {
+  width: 13rpx;
+  margin-left: 8rpx;
+}
+.main_content .shops .shop .header .right {
+  width: 60rpx;
+  font-size: 24rpx;
+  color: #333333;
+  text-align: center;
+  margin-left: 80rpx;
+}
+.main_content .shops .shop .header .right .phone {
+  width: 60rpx;
+  margin-bottom: 4rpx;
+}
+.main_content .shops .shop .user_list {
+  display: flex;
+  padding: 24rpx 10rpx;
+}
+.main_content .shops .shop .user_list .item {
+  width: 240rpx;
+  height: 180rpx;
+  padding: 20rpx 0;
+  background: #FFFFFF;
+  box-shadow: 0rpx 0rpx 10rpx rgba(0, 0, 0, 0.12);
+  border-radius: 8rpx;
+  margin-right: 20rpx;
+  flex-shrink: 0;
+}
+.main_content .shops .shop .user_list .item .info {
+  display: flex;
+  align-items: center;
+  padding: 0 20rpx 14rpx;
+  border-bottom: 1rpx solid #eeeeee;
+}
+.main_content .shops .shop .user_list .item .info .avatar {
+  width: 72rpx;
+  height: 72rpx;
+  border: 1px solid;
+  border-radius: 50%;
+  margin-right: 16rpx;
+}
+.main_content .shops .shop .user_list .item .info .ex {
+  font-size: 24rpx;
+  color: #999999;
+  margin-top: 4rpx;
+}
+.main_content .shops .shop .user_list .item .btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 66rpx;
+  font-weight: 500;
+  font-size: 26rpx;
+  color: var(--themeColor);
+}
diff --git a/wechat_jiaxuan/pages/webView/index.js b/wechat_jiaxuan/pages/webView/index.js
new file mode 100644
index 0000000..47d07be
--- /dev/null
+++ b/wechat_jiaxuan/pages/webView/index.js
@@ -0,0 +1,197 @@
+// pages/webView/index.js
+// import Ls from '../../utils/storage'
+// let ls = new Ls()
+// import { saveBannerLookNum } from '../../api/index'
+// import { decodePhone, bindPhone, memberUpdate } from '../../api/index'
+Page({
+
+  /**
+   * 椤甸潰鐨勫垵濮嬫暟鎹�
+   */
+  data: {
+    hasUserInfo: true,
+    userInfo: {},
+    id: '',
+    link: 'https://m.zbom.com/mobile/styleTest.html?type=1'
+  },
+
+  // 鏇存柊鐢ㄦ埛淇℃伅
+  toLogin() {
+    let that = this
+    wx.getUserProfile({
+      desc: '鐢ㄤ簬瀹屽杽浼氬憳璧勬枡', // 澹版槑鑾峰彇鐢ㄦ埛涓汉淇℃伅鍚庣殑鐢ㄩ�旓紝鍚庣画浼氬睍绀哄湪寮圭獥涓紝璇疯皑鎱庡~鍐�
+      success: (wxInfo) => {
+        // console.log(wxInfo)
+        let { nickName: name, avatarUrl: imgurl, gender } = wxInfo.userInfo
+        let sex
+        switch (gender) {
+          case 0:
+            sex = ''
+            break;
+
+          case 1:
+            sex = 0
+            break;
+
+          case 2:
+            sex = 1
+            break;
+
+          default:
+            break;
+        }
+        memberUpdate({ name, imgurl, sex }).then(res => {
+          ls.set('userInfo', res.member)
+          that.getWxUserInfo()
+          that.toSever()
+        })
+      },
+      fail: (err) => {
+        console.log(err)
+        wx.showToast({
+          title: '鎺堟潈澶辫触',
+          icon: 'none'
+        })
+      }
+    })
+  },
+  // 鑾峰彇鐢ㄦ埛id鍜屾墜鏈哄彿
+  bindgetphonenumber(e) {
+    // 鐢ㄦ埛鎷掔粷
+    let that = this
+    // 鐢ㄦ埛鍚屾剰
+    if (e.detail.errMsg === 'getPhoneNumber:ok') {
+      decodePhone({ code: e.detail.code }).then(res => {
+        if (res.phone === undefined || res.phone.length === null || !res.phone) {
+          wx.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+        } else {
+          that.setPhoneNumber(res.phone)
+        }
+      })
+    }
+  },
+  setPhoneNumber(phone) {
+    console.log(phone);
+    bindPhone({ phone }).then(res => {
+      console.log(res)
+      ls.set('userInfo', res.member)
+      this.setData({ userInfo: res.member })
+      this.toSever()
+    })
+  },
+  toSever () {
+    try {
+      wx.openCustomerServiceChat({
+        extInfo: {
+          url: "https://work.weixin.qq.com/kfid/kfcfbccadc81cd01c0b?enc_scene=ENC5EhZgjepB9zsutZUQ5AiRnyN7GamomkuWsUA4bwigukSK6w5pVyRzcNDKurjFDNDC7" //瀹㈡湇ID
+        },
+        corpId: 'ww3686d2bb864ce3e2', //浼佷笟寰俊ID
+        success(res) { }
+      })
+    } catch (error) {
+      wx.showToast({
+        title: '璇锋洿鏂拌嚦寰俊鏈�鏂扮増鏈�',
+        icon: 'none'
+      })
+    }
+  },
+  // 鑾峰彇鐢ㄦ埛寰俊淇℃伅
+  getWxUserInfo() {
+    // 浠庣紦瀛樹腑鑾峰彇鐢ㄦ埛寰俊淇℃伅
+    ls.get('userInfo').then(res => {
+      if (res) {
+        if (!res.name || !res.imgurl) {
+          this.setData({ hasUserInfo: false })
+        } else {
+          this.setData({ hasUserInfo: true, userInfo: res })
+        }
+      }
+    })
+    ls.get('sessionkey').then(res => {
+      this.setData({ sessionkey: res })
+    })
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
+   */
+  onLoad: function (options) {
+    return
+    let that = this
+    const eventChannel = this.getOpenerEventChannel()
+   
+    if (options.link) {
+      that.setData({ link: options.link, id: options.id })
+      saveBannerLookNum({ id: id })
+    } else {
+      // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+      eventChannel.on('acceptDataFromOpenerPage', function(data) {
+        console.log('鍙傛暟', data)
+        if (data.title)  wx.setNavigationBarTitle({ title: data.title })
+        that.setData({ link: data.link, id: data.id })
+        saveBannerLookNum({ id: data.id })
+      })
+    }
+    // // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+    // eventChannel.on('acceptDataFromOpenerPage', function(data) {
+    //   if (data.title)  wx.setNavigationBarTitle({ title: data.title })
+    //   that.setData({ link: data.link })
+    // })
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
+   */
+  onShow: function () {
+    this.getWxUserInfo()
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage: function () {
+    let { link, id } = this.data
+    return {
+      title: '',
+      path: '/pages/index/index?id=' + id + '&link=' + link + '&type=2'
+    }
+  }
+})
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/webView/index.json b/wechat_jiaxuan/pages/webView/index.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/wechat_jiaxuan/pages/webView/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/wechat_jiaxuan/pages/webView/index.wxml b/wechat_jiaxuan/pages/webView/index.wxml
new file mode 100644
index 0000000..673111e
--- /dev/null
+++ b/wechat_jiaxuan/pages/webView/index.wxml
@@ -0,0 +1,42 @@
+<!--pages/webView/index.wxml-->
+<web-view src="{{ link }}">
+  <!-- <cover-view class="flex-cc bottom-btn-box">
+    <cover-view class="btn">
+      <button 
+        plain="true"
+        style="background-color: #fff; border: 0; text-align: center;"
+        open-type="share"
+      >
+        <cover-view>
+          <cover-image style="margin: 8rpx auto; display: block;" mode="widthFix" src="/static/icon/share.png"></cover-image>
+          <cover-view style="height: 14px; line-height: 14px; color: #666; font-size: 10px;">鍒嗕韩</cover-view>
+        </cover-view>
+      </button>
+    </cover-view>
+    <cover-view class="reserve-design">
+      <button wx:if="{{!hasUserInfo}}" bindtap="toLogin">
+        <cover-image src="/static/icon/home_ic_kefu.png" mode="widthFix"></cover-image>
+        <cover-view class="title">绔嬪嵆鍜ㄨ瀹㈡湇</cover-view>
+      </button>
+      <cover-view wx:else>
+        <button 
+          wx:if="{{userInfo.phone && userInfo.phone != 'undefined' && userInfo.phone != null && userInfo.phone != ''}}" 
+          bindtap="toSever"
+        >
+          <cover-image src="/static/icon/home_ic_kefu.png" mode="widthFix"></cover-image>
+          <cover-view class="title">绔嬪嵆鍜ㄨ瀹㈡湇</cover-view>
+        </button>
+        <button 
+          wx:else 
+          open-type="getPhoneNumber" 
+          bindgetphonenumber="bindgetphonenumber"
+        >
+          <cover-image src="/static/icon/home_ic_kefu.png" mode="widthFix"></cover-image>
+          <cover-view class="title">绔嬪嵆鍜ㄨ瀹㈡湇</cover-view>
+        </button>
+      </cover-view>
+    </cover-view>
+  </cover-view> -->
+</web-view>
+
+
diff --git a/wechat_jiaxuan/pages/webView/index.wxss b/wechat_jiaxuan/pages/webView/index.wxss
new file mode 100644
index 0000000..78b4b79
--- /dev/null
+++ b/wechat_jiaxuan/pages/webView/index.wxss
@@ -0,0 +1,50 @@
+/* pages/webView/index.wxss */
+
+.duiba-back-btn {
+  position: fixed;
+  z-index: 999999;
+  bottom:0rpx;
+  left:0;
+  /* width:100rpx;
+  height:50rpx; */
+}
+
+.bottom-btn-box {
+  box-shadow: 0 0 4rpx 0 #ccc;
+}
+
+.bottom-btn-box .btn {
+  margin-right: 40rpx !important;
+}
+
+.bottom-btn-box .reserve-design button {
+  flex: 1;
+  height: 72rpx;
+  line-height: 72rpx;
+  background-color: #B68B74;
+  box-shadow: 0rpx 4rpx 16rpx 0rpx rgba(176, 135, 113, 0.3000), inset 0rpx 2rpx 2rpx 0rpx rgba(255, 255, 255, 0.3300);
+  border-radius: 8rpx;
+  color: #fff;
+  cursor: pointer;
+  text-align: center;
+}
+
+.bottom-btn-box .reserve-design button {
+  border: 0;
+  line-height: 72rpx;
+  font-size: 14px;
+  color: white;
+}
+
+.bottom-btn-box .reserve-design button .title {
+  padding: 0 8rpx;
+  height: 72rpx;
+  line-height: 72rpx;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.bottom-btn-box .reserve-design button cover-image {
+  display: inline-block;
+  margin-right: 0 !important;
+}
diff --git a/wechat_jiaxuan/project.private.config.json b/wechat_jiaxuan/project.private.config.json
index aa31e69..8b968e7 100644
--- a/wechat_jiaxuan/project.private.config.json
+++ b/wechat_jiaxuan/project.private.config.json
@@ -10,7 +10,7 @@
       "list": [
         {
           "name": "",
-          "pathName": "pages/auth/auth",
+          "pathName": "pages/discover/discover",
           "query": "",
           "launchMode": "default",
           "scene": null
@@ -35,6 +35,27 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/store/store",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/store/info",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/calculator/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }
diff --git a/wechat_jiaxuan/static/icon/call.png b/wechat_jiaxuan/static/icon/call.png
new file mode 100644
index 0000000..a88eb83
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/call.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/chanpin_ic_new@2x.png b/wechat_jiaxuan/static/icon/chanpin_ic_new@2x.png
new file mode 100644
index 0000000..bc51c3a
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/chanpin_ic_new@2x.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/home_ic_guwen@2x.png b/wechat_jiaxuan/static/icon/home_ic_guwen@2x.png
new file mode 100644
index 0000000..21cc344
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/home_ic_guwen@2x.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/ic_search@2x.png b/wechat_jiaxuan/static/icon/ic_search@2x.png
new file mode 100644
index 0000000..4d7c22b
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/ic_search@2x.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/location.png b/wechat_jiaxuan/static/icon/location.png
new file mode 100644
index 0000000..254c23b
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/location.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/mendian_ic_daohang@2x.png b/wechat_jiaxuan/static/icon/mendian_ic_daohang@2x.png
new file mode 100644
index 0000000..2213ecd
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/mendian_ic_daohang@2x.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/mingpian_bg_kehu@2x.png b/wechat_jiaxuan/static/icon/mingpian_bg_kehu@2x.png
new file mode 100644
index 0000000..b1ecb23
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/mingpian_bg_kehu@2x.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/mingpian_bg_nianxian@2x.png b/wechat_jiaxuan/static/icon/mingpian_bg_nianxian@2x.png
new file mode 100644
index 0000000..4a55d54
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/mingpian_bg_nianxian@2x.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/mingpian_erweima@2x.png b/wechat_jiaxuan/static/icon/mingpian_erweima@2x.png
new file mode 100644
index 0000000..df922de
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/mingpian_erweima@2x.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/mingpian_ic_dizhi@2x.png b/wechat_jiaxuan/static/icon/mingpian_ic_dizhi@2x.png
new file mode 100644
index 0000000..9bb0821
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/mingpian_ic_dizhi@2x.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/mingpian_ic_edit@2x.png b/wechat_jiaxuan/static/icon/mingpian_ic_edit@2x.png
new file mode 100644
index 0000000..2886f9e
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/mingpian_ic_edit@2x.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/mingpian_ic_mendian@2x.png b/wechat_jiaxuan/static/icon/mingpian_ic_mendian@2x.png
new file mode 100644
index 0000000..fe2b548
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/mingpian_ic_mendian@2x.png
Binary files differ
diff --git a/wechat_jiaxuan/static/icon/mingpian_ic_phone@2x.png b/wechat_jiaxuan/static/icon/mingpian_ic_phone@2x.png
new file mode 100644
index 0000000..8d93a56
--- /dev/null
+++ b/wechat_jiaxuan/static/icon/mingpian_ic_phone@2x.png
Binary files differ
diff --git a/wechat_jiaxuan/static/images/design_banner.png b/wechat_jiaxuan/static/images/design_banner.png
deleted file mode 100644
index 7f92ef1..0000000
--- a/wechat_jiaxuan/static/images/design_banner.png
+++ /dev/null
Binary files differ
diff --git a/wechat_jiaxuan/static/images/design_banner@2x.png b/wechat_jiaxuan/static/images/design_banner@2x.png
new file mode 100644
index 0000000..8b301fa
--- /dev/null
+++ b/wechat_jiaxuan/static/images/design_banner@2x.png
Binary files differ

--
Gitblit v1.9.3