Merge branch 'master' of http://119.23.72.7/shiyu/icsalesProgram

# Conflicts:
#	project.config.json

app.js

@@ -37,6 +37,7 @@ function addMember(id) {
 App({
   globalData: {
     unReadMessageNum: 0,
+    token:wx.getStorageSync('access_token'),
     isIPX: false //是否为iphone X
   },
   conn: {
@@ -81,9 +82,9 @@ App({
       success(res) {
         if (res.authSetting['scope.userInfo']) {
           // 已经授权
-          wx.switchTab({
-            url: '/pages/tab/home/home'
-          })
+          // wx.switchTab({
+          //   url: '/pages/tab/home/home'
+          // })
         }
       }
     })

app.json

 {
   "pages": [
     "pages/person/auth/index",
-    "pages/person/mine/index",
     "pages/person/forget/index",
     "pages/person/register/index",
     "pages/person/verifycode/index",
@@ -23,7 +22,9 @@
     "pages/form/xj/index",
     "pages/detail/good/index",
     "pages/detail/xj/index",
-    "pages/list/qd/index"
+    "pages/list/qd/index",
+    "pages/person/setting/index",
+    "pages/person/privacy/index"
   ],
   "window": {
     "backgroundTextStyle": "light",
@@ -36,7 +37,8 @@
     "selectedColor": "#0D84D1",
     "borderStyle": "white",
     "backgroundColor": "#fff",
-    "list": [{
+    "list": [
+      {
         "pagePath": "pages/tab/home/home",
         "text": "首页",
         "iconPath": "/res/images/icons/home-icon.png",

pages/person/login/index.js

@@ -14,7 +14,7 @@ Page({
     passwordType: true,
     mobileFlag: false,
     passwordFlag: false,
-    disabled: false,
+    disabled: false, 
     loading: false,
     formData: {
       mobile: '',

pages/person/mine/index.wxml

-<view class="mine" hover-class="none" hover-stop-propagation="false">
-    <view class="head row verCenter">
-        <view class="pic">
-            <cover-image class="im" src="/res/images/imgs/test.jpg"></cover-image>
-        </view>
-        <view class="text">
-            <text class="t1">深圳市猎芯科技有限公司</text>
-            <view class="row verCenter">
-                <text class="t2" selectable="false" space="false" decode="false">普通会员</text>
-                <view>
-                    <text class="t3">金币：</text>
-                    <text class="t4">13,123</text>
-                </view>
-            </view>
-        </view>
-    </view>
-    <view class="tab-bar row verCenter rowCenter">
-        <view class="wrap">
-            <text class="t1">513</text>
-            <text class="t2">商品</text>
-        </view>
-        <view class="wrap">
-            <text class="t1">53</text>
-            <text class="t2">询价</text>
-        </view>
-        <view class="wrap">
-            <text class="t1">513</text>
-            <text class="t2">报价</text>
-        </view>
-    </view>
-    <view class="ad boxsiz row verCenter">
-         <text class="icon iconfont iconiconxiantiaoshouji16"></text>
-        <text class='t1'>福利中心</text>
-        <text class='t2'>金币提现兑换、领红包</text>
-    </view>
-</view>
\ No newline at end of file

pages/person/mine/index.wxss

-.mine .head {
-  padding: 0 24rpx;
-}
-.mine .head .pic {
-  margin-right: 24rpx;
-}
-.mine .head .pic .im {
-  width: 120rpx;
-  height: 120rpx;
-  border-radius: 50%;
-}
-.mine .head .text .t1 {
-  font-size: 36rpx;
-  font-weight: 600;
-  color: #2E3033;
-  line-height: 50rpx;
-  margin-bottom: 20rpx;
-  display: block;
-}
-.mine .head .text .t2 {
-  width: 112rpx;
-  height: 36rpx;
-  background: linear-gradient(135deg, #adb6bf 0%, #8a9299 100%);
-  border-radius: 4rpx;
-  font-size: 22rpx;
-  color: #ffffff;
-  text-align: center;
-  line-height: 36rpx;
-  margin-right: 28rpx;
-}
-.mine .head .text .t3 {
-  font-size: 26rpx;
-  color: #8A9299;
-}
-.mine .head .text .t4 {
-  font-size: 26rpx;
-  color: #2E3033;
-}
-.mine .tab-bar {
-  margin-top: 38rpx;
-  margin-bottom: 48rpx;
-}
-.mine .tab-bar .wrap {
-  flex: 1;
-  text-align: center;
-}
-.mine .tab-bar .wrap .t1 {
-  font-size: 32rpx;
-  font-weight: 600;
-  color: #515559;
-  line-height: 45rpx;
-  display: block;
-}
-.mine .tab-bar .wrap .t2 {
-  font-size: 24rpx;
-  color: #8A9299;
-  line-height: 33rpx;
-  display: block;
-}
-.mine .ad {
-  margin: 0 24rpx;
-  height: 110rpx;
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAr4AAABuCAYAAADBJhBzAAAVFklEQVR4Xu3dO4zkyH3H8X/x0b07+wju1sDdSYCDC2QDdiQZdurYgc4QzhIgR45sQ850wilw5EAHnTILliJHMgzbMnQKFCu1YTmyAEnBBQLk3QO8d8HM7tx281HGn92creaQzWI3m2R3fwlJ+5hqsvgpjvCb2j+rjAxwWGuDT5PkD8SEfyxiPm+t/ZyIvG5EHlhr5wN0gUsggAACCCCAAAIIjCxgjFlYkSsReWKM+ZWI/W+x2U/vxvF/GWPyQ3fPHPIC19Z+Rpbp16yYPxeRzx7yWpwbAQQQQAABBBBA4GgFfmPE/kBm0XcvjPnfQ93FQYLvpbWvhovs74yRv7AizOgeavQ4LwIIIIAAAgggcEICRmRhrfxjNg//9qExH/d9a70H3+vUftnm2XfFyqO+O8v5EEAAAQQQQAABBM5AwMhTE4Rfu4jMv/R5t70FX2ttdL3I/l6M/GWfHeRcCCCAAAIIIIAAAmcqYOX7F/Pwb4wxaR8CvQRfa+3d62X2byLyJ310inMggAACCCCAAAIIILAW+MnFLHzbGPPpviJ7B99ipneZfUDo3Xco+DwCCCCAAAIIIIBAg4CG37f2nfndO/g+f5F+j/IGHlIEEEAAAQQQQACBgwpY+f69O9Ff7XONvYLv1SL9SiDyz/t0gM8igAACCCCAAAKnLGCtlTzPJc9tcZvGGAkC/W9wyrd9kHszYfiVfV542zn4FkuWJdkvWb3hIOPKSRFAAAEEEEDgyAU08KZZJllWvy+DBuA4CgnAXcbZyNMsDn9n16XOdg6+z5fpP4iVvaabu9wnbRFAAAEEEEAAgWMR0NC7XKZiZTXLu+2IwlDCMChmgjk8BKx8796d6K89Wt5qspPwake27EM2p9iFnM8ggAACCCCAwKkLLJO0KG/wPbTsQWd/Cb/tYrrJhczCN3fZ4W234LtIvmXFvNveNVoggAACCCCAAALnJZDluSTJbsvOzuKI0gePx8WIfe9iHn/To+lGk87B11obXC+zX4vIZ7tejPYIIIAAAggggMCpC3Sd7a16aOlDFIWnzrTv/f3mYhb+tjHGf1pdXyzsetXr5fIPrQ3+o+vnaI8AAggggAACCJy6gNb2LpbJ3rdJ6UM7oTH5H13MZv/Z3vJli+7BN8netbn9VpeL0BYBBBBAAAEEEDgHAa3r1Rnffg4jq9KHznGtn8tP/CwmMN+8iMP3unSzs+TzRfpDEflSl4vQFgEEEEAAAQQQOAeBJNXly7Jeb1XLHrT8gWNTwATBDy/i4O0uLjsE3+x/ROzvdbkIbRFAAAEEEEAAgXMQ0DIHLXfo+wiDoKj7ZdUHV9b8/N48/P0u1t2D7zL7P7H2UZeL0BYBBBBAAAEEEDh1gb7qe5uc2PCiImPM03uz8Le6PFedg+/1MnthrZ13uQhtEUAAAQQQQACBUxfYZxmzLjZxFBUbXpz7YYxZXMzCO10cOgff54u0//n7Lj2mLQIIIIAAAgggMEEBXbtXw+8QB6UPK+V786hTlu3UWC9A8B3iceYaCCCAAAIIIHBsAoeq721y0NIHXfXhnOt+Cb7H9l1CfxFAAAEEEEDg6AUOXd+7DeicSx8Ivkf/rcMNIIAAAggggMCxCegSZrqU2VhHYEyx6oNufNH10NBe1LGuV6MoF6Uo/nb1n5dfW/1JjAkkDMxO1+vav23tCb59anIuBBBAAAEEEEDAQ2DfbYo9LuHdRMOvKYpZ9X/K8LoKrDeh9mW63WEf35dd0QAcF4G7c/Ws9/0QfHuh4iQIIIAAAggggEA/AovFcj0X2s/5ju0sqx3mus8273ufzPjuK8jnEUAAAQQQQACBDgJ5bmWZJB0+cZpN57N48BftCL6n+SxxVwgggAACCCAwUYE0yyVN04n2brhuhWFYlD0MeRB8h9TmWggggAACCCBw9gJTqu8dezDuzGeDdoHgOyg3F0MAAQQQQACBcxd4sVieO8HN/c/ieNAX3Qi+PHoIIIAAAggggMBAAnmei874cqwEhn7JjeDLk4cAAggggAACCAwkoGv36hq+HGXwZcaXZwEBBBBAAAEEEDhJgeUykbxcE/ck77DbTc1ns/Uawt0+t2trZnx3leNzCCCAAAIIIIBAB4Extynu0M3Bmuo6vlrqMORB8B1Sm2shgAACCCCAwNkKZHkuCfW9N+Mfx5GEA29iQfA9228/bhwBBBBAAAEEhhRgGbNN7aHLHPTqBN8hn3iuhQACCCCAAAJnKVCs5rBMRcxZ3v6tmx6jzIHgy7OHAAIIIIAAAggcWEBre3W2V3/lWAkMvYxZ6c6ML08gAggggAACCCBwIAENu0maSp4Tel3ioXdsI/ge6AHntAgggAACCCCAgArosmXJMhUrhF73idAX2vTFtjEOZnzHUOeaCCCAAAIIIHDSAmmaScpGFbVjPFaZg3aG4HvS33bcHAIIIIAAAggMKUA973ZtI0bm83jIIdm4FsF3NHoujAACCCCAAAKnJJBleVHPy9EsEIaBxNE4ZQ7M+PJkIoAAAggggAACewqsXmDLRJcs49guMJvFEpjx1nRjxpcnFAEEEEAAAQQQ2FGAWV5/OGOMzGfjlTkw4+s/VrREAAEEEEAAAQRuBHSWV19eS9NcRpzAPKoRicJQoigctc/M+I7Kz8URQAABBBBA4NgEdE3eJE2E/Sj8R06t9KW2McscmPH1Hy9aIoAAAggggAACwjJluz0EUyhzIPjuNnZ8CgEEEEAAAQTOTKDYjIJth3cedS1x0FKHsQ9KHcYeAa6PAAIIIIAAApMWWNXyZpPu49Q7py+16azv2AfBd+wR4PoIIIAAAgggMEkBlinrZ1i0rleXMZvCQfCdwijQBwQQQAABBBCYlICuybtM2Iyij0HRDSt044opHATfKYwCfUAAAQQQQACByQiwNm+/QzGVMge9K4Jvv2PL2RBAAAEEEEDgiAW0vGGxTI74DqbV9ams5lCqEHyn9XzQGwQQQAABBBAYUUDLG9h6uL8BCMNQ4pE3rXDvhuDb39hyJgQQQAABBBA4YgFme/sfvKksY8aMb/9jyxkRQAABBBBA4IgFeKGt/8Ej+PZvyhkRQAABBBBAAIG9BQi+exPeOoGu5qCrOkzloNRhKiNBPxBAAAEEEEBgVIE8t7JMeLGtz0Hg5bY+NTkXAggggAACCCDQk4C1sl7RwfZ0Rk4jVmQ+n8aubToazPjyTCKAAAIIIIAAAmuBJE1F1/Hl6E9gSis7EHz7G1fOhAACCCCAAAJHLsDKDv0PoJY7zOJI9NexD4Lv2CPA9RFAAAEEEEBgUgK85Nb/cGjwDYLxty0m+PY/tpwRAQQQQAABBI5cILdWkiQVnQHm2F9AQ6+G37EPgu/YI8D1EUAAAQQQQGCSAhp6td43zbJJ9u/YOjWfjf+SG8H32J4a+osAAggggAACgwpo6UOSZsz+7qkehaHohhZjHgTfMfW5NgIIIIAAAggchQCzv/sP0xTW9CX47j+OnAEBBBBAAAEEzkRAA7AueaabXXB0Fxj7JTeCb/cx4xMIIIAAAgggcOYCWvurAZijm0AYBBKP+JIbwbfbeNEaAQQQQAABBBAoBHT2N00zSbNcJrBE7dGMypgvuRF8j+YxoaMIIIAAAgggMEWBLM8l1aXPpti5CfYpjiIJw3HW9CX4TvCBoEsIIIAAAgggcFwCxexvlkvG0metAzfmS24E39bhoQECCCCAAAIIIOAnwNJn7U66J8h8HkswQn0Iwbd9fGiBAAIIIIAAAgh4C2jJQ1bU/rLxRRPaWC+5EXy9H2MaIoAAAggggAAC/gJse7zdaoyX3Ai+/s8vLRFAAAEEEEAAgU4Cq9rfrNj6mGNTYIyX3Ai+PIUIIIAAAggggMCBBVbLnlH64DIHgZFZHB9YfvP0owZf/SnIPfQtPw4EEEAAAQQQQOAUBZaJ7vjGzK87tn2VO/hmSoLvKX5ncU8IIIAAAgggMDkBDWeLZTK5fo3ZoTAMJY7CvbtwFMF377vkBAgggAACCCCAwBEJ6DbH1Pu+HLCh1/QddcZXb7ua0N1nl9KHI/pOpqsIIIAAAggg0Cqgu7wlSdra7lwaaNXrnXksXTPfrvmR4HsuTxb3iQACCCCAAAKjC1DucHsIdqnznWzwffYi2XiDzSfRb7uZksvnPKM/3XQAAQQQQAABBBCoCPCS2yZIU/DtKw+657l/J+60kkKnxnpbuwbftpvV4Ev45f9LEEAAAQQQQODYBLTGV2t9OaTIchp8q4fmwL6y4KDB9/kivZnx9X3jTm++7Wa1za7B1+fcPIwIIIAAAggggMAhBM6p3KEtq0VhKFHNqg4+WW3buZsy56A1vtuCb/VrdTesN1j+fRvkIR5UzokAAggggAACCPQhsFwmolsan/PRtqKDm/macqHr52bDSQbfsrNuoN32APi2O+eHiHtHAAEEEEAAgekLsJObyCyOJAiC1sHyzX/b2pWh+OAzvmWNb11n3L/zSfKtMjRAAAEEEEAAAQSOQOCcyh2qwxEYI5GG3j127N2WG7dlzsFebmsLviWKeyPVzzSVN1D+cATf4XQRAQQQQAABBDYEdBc3n1rWQ7NpvtKZ16YgWhRklGUZ5uVvi3455RqbhRv6p1WJarkyggmMhHqdmlnetizXJR+OHnyLm/ZI9U3tfDCaHhyf6x76geL8CCCAAAIIIIBAVWDscgfNSPpimYbRIY9tmW2XSc4uOfPB3VmnFcpqG1tr448+efaWtfJFEfsFI/KGFXmgiA/v3621LDvZlOB9CpTrZomrFyP4Dvkocy0EEEAAAQQQ8BUYaxc3naSNo0DCMBKPeUnf2/Fut22Wu5rbfBZGqKsQaArDl88+LfppRK6syGMR8zNj5MevvXL/A2NMcitHVv/i8dPLPxUr74uRN+vu+MG9Oxt/XRdE697a2xZ8vWUrS55N4Z8TuvSdtggggAACCCBw2gIvFsvBbzCKIonCYWd5D5nr2lb9cvPf1fMX9d5WPhQj77zx6OGP3AY3M77W2uCjT67eEzFft9Y2ThvXzfhWZ3urs767PgFtJRG7npfPIYAAAggggAAChxBIklR05neIQ8NaPIv3eqms7372kd3qcmQZhqsTruWMb919GGOsiP3Oa688eNcYUwzKTcB98vHlt62Vd9oAmkod9HNlR32D77YZWzdMU97QNip8HQEEEEAAAQSmIKC7uKUD7OKm2SiOtbShU4nrwYl889u2fjcF37rObwu+ZXtj5P3XX334jZvgq+UNxph/3zbTW364LHXwTfRdXnBrOiclDQd/TrkAAggggAACCPQksDhwuYOuoqChd4pHU01vXWlEU7lsW5h382JjqYODozO/1tovadmD/i5+8vTqF001vVXUphpf7USfAbW86T7POcUHhD4hgAACCCCAwGkJaLlDbg9T7qBbAodhOGmwQ2Q4PWfdeX2Cb4Fl5cPXHz34XfPk46u3rbX/6itYF3zrShzK8+lPJe7X3U4Tan3VaYcAAggggAACxyKQZplkWdZ7d+MwkmDgl9h6v4n1CatBtsyH+mteUyPtft3r5baajhtj/sw8fnr1AxH7Vd8bqwbfus+5na578c2dwvb5qcC92SK0n/le2L5jRTsEEEAAAQQQGF5Ac8oyubWS1s4dMTLNel69oWqO81nazG3jlsRWX2BzJ0+b8LxnfIsTmH8yj59e/lJEPuc7GtUaX+1w2bHq7G4ZUqso1fXZ2q5dotwEZi2raPsQX0cAAQQQQAABBEYS0ODbx0RdYAKJo1AT5kh30nzZokfrfpUlr231ue7Z6pYtqwbhMlzrLHA5sepOiHYLvvIr8+Tp5WW5OYWPqAbfuoF0O1N9G6/a/lYQ3nJhn4fGp43PvdEGAQQQQAABBBDoQ2BV7rBfnW8YBqI1vVM6fILt1hUb1jfT9C/+1cnR8s9Ns7/PrhfePLrJhc74Xsp6VzafT96/mK/2aXZ+8qj7s3uu6moNxWfXs7Y+P7/4BFufNj73RxsEEEAAAQQQQGBfgVW5Q7rTaTQb6dbDGvamdOwbest70X+1L2eLq++JVa/Rljeff9ppw5Ai+O5d6lAdlGoQrgu31SnxajiuzhpPaeDpCwIIIIAAAggg0CaQpKnkebfiTA16WtrgEzLbrj/G1+vyW13Gc19u25gsdf5QzZPll/Yqdej6ctu9u7NiMNyb2Lghp/62bTbXffHNLWiuzt5WwW5+YuAltzGeaa6JAAIIIIAAAh4Cq1lfXd3BL/wWoVc3pfA499hNqsG8KatV8131Bbam+yjFqjPD1QzapdSheLmt63JmGnz1qKvNKEsY9OtuqG0bnKZE3/a58jo+7WiDAAIIIIAAAggMLZBbK2matb7oNsV63iarXWejffPerXDsTLhWM2iXUodiObOuG1i4wXdjOnutU5YwuB3b9pC5tR3VOo7yc40he+inl+shgAACCCCAAAIdBTTr6MtuGoKrR1HPG06vntfnFreVNVRzoBt6fYKzO4N8kwOdTpXh2Dv4lhtY6Dm6bFlcBl8XpJySrwux7o1uewGtbor8pr07578x912m7bJK2meYaIMAAggggAACCIwgYKUIv+XLXfquv08IHKGn9Ze8eSvNyV9FwnWar3Na3WTmtnt1Jznrfl8XfvWqPsF3Y8visqtPPr78trXyThuuBt+N1O58oFxjrUz5btB1Z4KbrqGPgluwvC0ot/WTryOAAAIIIIAAAgiMI+DW4ha5saVyufqyW/Xz7goX5Ryonvf6RftGIcbI+6+/+vAbGxndWht89MnVeyLm69baxrrqm1IHN9zrTy/rJc7qwmp1Nlf3r65bnqJuyrxtuJque1Q/QbXdJF9HAAEEEEAAAQQGFqhmOt8X08puVnNdtcZX/6wbdOjR9HKcO5laDccagLfN+OpMr4j9zmuvPHjXGFMsqnwr4GrZg1h5X4y8Wed7U+qwrlOpK2W4lfIru43UBV/3WuU5m2p+fcbd3U3Epz1tEEAAAQQQQAABBNYCO+ySW81tdS+zVduUwdcNy3X/+l9X/qC7xjUGXysfipF33nj08EfumNbO7OoLbx998uwta+WLIvYLRuSNcne3++tVHaplDNV0v7F8xbqEoekzGx1ab26x7cHbZWaYBxkBBBBAAAEEEEBgf4FOOayyIsOtzLf+i5vcKKslc6vLlpWfc4Oz/v7ZegML3ZXNijwWMT8zRn782iv3PzDG3KqD+H9Y0cCav9GwygAAAABJRU5ErkJggg==');
-  background-repeat: no-repeat;
-  background-size: cover;
-}
-.mine .ad .icon {
-  font-size: 68rpx;
-  color: #E76F6F;
-  margin-left: 24rpx;
-}
-.mine .ad .t1 {
-  font-size: 32rpx;
-  color: #515559;
-  font-weight: 600;
-  margin-left: 24rpx;
-  line-height: 45rpx;
-}
-.mine .ad .t2 {
-  font-size: 24rpx;
-  color: #8A9299;
-  font-weight: 400;
-  margin-left: 24rpx;
-  line-height: 33rpx;
-}

pages/person/mine/index.js → pages/person/privacy/index.js

-// pages/person/mine/index.js
+// pages/person/privacy/index.js
 Page({
 
   /**

pages/person/mine/index.json → pages/person/privacy/index.json

 {
   "usingComponents": {},
-  "navigationBarTitleText": "我的"
+  "navigationBarTitleText": "隐私设置"
 }
\ No newline at end of file

pages/person/privacy/index.less

+.privacy{ 
+    .bar {
+        padding: 0 24rpx 0 0;
+        margin-left: 24rpx;
+        height: 100rpx;
+
+        .t1 {
+            font-size: 28rpx;
+            color: #515559;
+            margin-left: 20rpx;
+            font-weight: 400;
+        }
+
+        .t2 {
+            font-size: 26rpx;
+            color: #8A9299; 
+            font-weight: 400;
+        }
+
+        .iconChevron {
+            font-size: 27rpx;
+            color: #ADB6BF;
+            margin-left: 12rpx;
+        }
+
+        &.bor {
+            border-bottom: 1px solid #F5F9FC;
+        }
+    }
+}
\ No newline at end of file

pages/person/privacy/index.wxml

+<view class="privacy" hover-class="none" hover-stop-propagation="false">
+    <view class="boxsiz bar row bothSide verCenter bor">
+        <view>
+            <text class="t1">商品展示</text>
+        </view>
+        <view>
+            <switch checked />
+        </view>
+    </view>
+    <view class="boxsiz bar row bothSide verCenter bor">
+        <view>
+            <text class="t1">询价展示</text>
+        </view>
+        <view>
+            <switch />
+        </view>
+    </view>
+    <view class="boxsiz bar row bothSide verCenter bor">
+        <view>
+            <text class="t1">报价展示</text>
+        </view>
+        <view>
+            <switch />
+        </view>
+    </view>
+</view>
\ No newline at end of file

pages/person/privacy/index.wxss

+.privacy .bar {
+  padding: 0 24rpx 0 0;
+  margin-left: 24rpx;
+  height: 100rpx;
+}
+.privacy .bar .t1 {
+  font-size: 28rpx;
+  color: #515559;
+  margin-left: 20rpx;
+  font-weight: 400;
+}
+.privacy .bar .t2 {
+  font-size: 26rpx;
+  color: #8A9299;
+  font-weight: 400;
+}
+.privacy .bar .iconChevron {
+  font-size: 27rpx;
+  color: #ADB6BF;
+  margin-left: 12rpx;
+}
+.privacy .bar.bor {
+  border-bottom: 1px solid #F5F9FC;
+}

pages/person/setting/index.js

+const http = require('../../../utils/util.js');
+import {
+  apis
+} from '../../../utils/api.js';
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  /**
+   * 跳转地址
+   */
+  toUrl: function (e) {
+
+    if (e.target.dataset.url) {
+      wx.navigateTo({
+        url: e.target.dataset.url
+      })
+    }
+
+  },
+  /**
+   * 退出系统
+   */
+  logout: function (e) {
+
+    wx.showModal({
+      title: '提示',
+      content: '您确定退出系统嘛？',
+      success(res) {
+        if (res.confirm) {
+
+          http.getData(apis.authLogout, 'POST', null, (res) => {
+            if (res.err_code === 0) {
+              wx.switchTab({
+                url: '/pages/tab/home/home'
+              });
+            } else {
+              wx.showToast({
+                title: res.err_msg,
+                icon: 'none',
+                duration: 2000
+              });
+            }
+          }, false, true);
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+
+  }
+})
\ No newline at end of file

pages/person/setting/index.json

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "设置"
+}
\ No newline at end of file

pages/person/setting/index.less

+.setting {
+    .hr {
+        height: 10rpx;
+        background: #F5F9FC;
+    }
+
+    .bar {
+        padding: 0 24rpx 0 0;
+        margin-left: 24rpx;
+        height: 100rpx;
+
+        .t1 {
+            font-size: 28rpx;
+            color: #515559;
+            margin-left: 20rpx;
+            font-weight: 400;
+        }
+
+        .t2 {
+            font-size: 26rpx;
+            color: #8A9299;
+            font-weight: 400;
+        }
+
+        .iconChevron {
+            font-size: 27rpx;
+            color: #ADB6BF;
+            margin-left: 12rpx;
+        }
+
+        &.bor {
+            border-bottom: 1px solid #F5F9FC;
+        }
+    }
+}
\ No newline at end of file

pages/person/setting/index.wxml

+<view class="setting" hover-class="none" hover-stop-propagation="false">
+    <view class="boxsiz bar row bothSide verCenter bor">
+        <view>
+            <text class="t1">登录密码</text>
+        </view>
+        <view>
+            <text class="t2">已设置</text>
+            <text class="icon iconfont iconChevron"></text>
+        </view>
+    </view>
+    <view class="boxsiz bar row bothSide verCenter">
+        <view>
+            <text class="t1">绑定微信</text>
+        </view>
+        <view>
+            <text class="t2">已绑定</text>
+            <text class="icon iconfont iconChevron"></text>
+        </view>
+    </view>
+    <view class="hr"></view>
+    <view class="boxsiz bar row bothSide verCenter" bind:tap="toUrl" data-url="/pages/person/privacy/index">
+        <view>
+            <text class="t1">隐私设置</text>
+        </view>
+        <view>
+            <text class="icon iconfont iconChevron"></text>
+        </view>
+    </view>
+    <view class="hr"></view>
+    <view class="boxsiz bar row bothSide verCenter bor">
+        <view>
+            <text class="t1">版本信息</text>
+        </view>
+        <view>
+            <text class="t2">V1.20</text>
+            <text class="icon iconfont iconChevron"></text>
+        </view>
+    </view>
+    <view class="boxsiz bar row bothSide verCenter">
+        <view>
+            <text class="t1">关于我们</text>
+        </view>
+        <view>
+            <text class="icon iconfont iconChevron"></text>
+        </view>
+    </view>
+    <view class="hr"></view>
+    <view class="boxsiz bar row bothSide verCenter bor" bind:tap="logout">
+        <view>
+            <text class="t1">退出登录</text>
+        </view>
+    </view>
+</view>
\ No newline at end of file

pages/person/setting/index.wxss

+.setting .hr {
+  height: 10rpx;
+  background: #F5F9FC;
+}
+.setting .bar {
+  padding: 0 24rpx 0 0;
+  margin-left: 24rpx;
+  height: 100rpx;
+}
+.setting .bar .t1 {
+  font-size: 28rpx;
+  color: #515559;
+  margin-left: 20rpx;
+  font-weight: 400;
+}
+.setting .bar .t2 {
+  font-size: 26rpx;
+  color: #8A9299;
+  font-weight: 400;
+}
+.setting .bar .iconChevron {
+  font-size: 27rpx;
+  color: #ADB6BF;
+  margin-left: 12rpx;
+}
+.setting .bar.bor {
+  border-bottom: 1px solid #F5F9FC;
+}

pages/tab/me/me.js

-// pages/tab/me/me.js
+const http = require('../../../utils/util.js');
+import {
+  apis
+} from '../../../utils/api.js';
+
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    isShow: false,
+    userInfo:{
+      avatar:'',
+      mobile:''
+    },
+    business: {
+      goods: '',
+      inquiry: '',
+      offer: ''
+    }
   },
 
   /**
@@ -13,6 +26,27 @@ Page({
    */
   onLoad: function (options) {
 
+    //获取数量统计
+    http.getData(apis.countBusiness, 'GET', {
+      token: wx.getStorageSync('access_token')
+    }, (res) => {
+      if (res.errcode === 0) {
+        this.setData({
+          business: res.data
+        });
+      }
+    }, true);
+
+    http.getData(apis.userInfo, 'GET', {
+      token: wx.getStorageSync('access_token')
+    }, (res) => {
+      if (res.errcode === 0) {
+        this.setData({
+          userInfo: res.data
+        });
+      }
+    }, true);
+
   },
 
   /**
@@ -62,5 +96,17 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  /**
+   * 跳转地址
+   */
+  toUrl: function (e) {
+
+    if (e.target.dataset.url) {
+      wx.navigateTo({
+        url: e.target.dataset.url
+      })
+    }
+
   }
 })
\ No newline at end of file

pages/tab/me/me.json

 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "我的"
 }
\ No newline at end of file

pages/person/mine/index.less → pages/tab/me/me.less

-.mine {
+.mine { 
     .head {
+        position: relative;
         padding: 0 24rpx;
 
         .pic {
@@ -42,6 +43,30 @@
             .t4 {
                 font-size: 26rpx;
                 color: #2E3033;
+                font-weight: 600;
+            }
+        }
+
+        .signin {
+            position: absolute;
+            bottom: 0;
+            right: 0;
+            width: 195rpx;
+            height: 60rpx;
+            background: linear-gradient(140deg, rgba(173, 182, 191, 1) 0%, rgba(138, 146, 153, 1) 100%);
+            box-shadow: 0px 10rpx 20rpx 0px rgba(173, 182, 191, 0.2);
+            border-radius: 30rpx 0px 0px 30rpx;
+
+            .iconiconxiantiaoshouji17 {
+                font-size: 40rpx;
+                color: #FFFFFF;
+            }
+
+            .t1 {
+                font-size: 24rpx;
+                color: #FFFFFF;
+                font-weight: 400;
+                margin-left: 8rpx;
             }
         }
     }
@@ -103,5 +128,136 @@
         }
     }
 
+    .bar-list {
+        margin-top: 36rpx;
+
+        .hr {
+            height: 10rpx;
+            background: #F5F9FC;
+        }
+
+        .bar {
+            padding: 0 24rpx 0 0;
+            margin-left: 24rpx;
+            height: 100rpx;
+
+            .iconiconcaiseshouye1 {
+                font-size: 40rpx;
+                color: #61A0F2;
+            }
+
+            .iconiconxiantiaoshouji18 {
+                font-size: 40rpx;
+                color: #FFB526;
+            }
+
+            .iconiconxiantiaoshouji19 {
+                font-size: 40rpx;
+                color: #61A0F2;
+            }
+
+            .iconiconcaiseshouye {
+                color: #FFB526;
+                font-size: 40rpx;
+
+            }
+
+            .iconjuxing6 {
+                color: #61A0F2;
+                font-size: 40rpx;
+
+            }
+
+            .t1 {
+                font-size: 28rpx;
+                color: #515559;
+                margin-left: 20rpx;
+                font-weight: 400;
+            }
+
+            .t2 {
+                font-size: 26rpx;
+                color: #8A9299;
+                font-weight: 400;
+            }
+
+            .iconChevron {
+                font-size: 27rpx;
+                color: #ADB6BF;
+                margin-left: 12rpx;
+            }
+
+            &.bor {
+                border-bottom: 1px solid #F5F9FC;
+            }
+        }
+    }
+
+}
+
+.layer-mask {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 99;
+    background: rgba(0, 0, 0, 0.5);
 
+    .layer {
+        position: relative;
+        width: 360rpx;
+        height: 310rpx;
+        background: rgba(255, 255, 255, 1);
+        border-radius: 10rpx;
+
+        .im {
+            position: absolute;
+            top: -49rpx;
+            left: 0;
+            right: 0;
+            text-align: center;
+            margin: 0 auto;
+            width: 268rpx;
+            height: 114rpx;
+        }
+
+        .t1 {
+            font-size: 28rpx;
+            color: #515559;
+            font-weight: 600;
+            margin-bottom: 8rpx;
+            line-height:46rpx;
+        }
+
+        .txt {
+            margin-bottom: 28rpx;
+
+            .t2 {
+                font-size: 48rpx;
+                color: #ED4141;
+                font-weight: 600;
+            }
+
+            .t3 {
+                font-size: 26rpx;
+                color: #686E73;
+                margin-left: 8rpx;
+                font-weight: 400;
+            }
+        }
+
+        .btn {
+            width: 200rpx;
+            height: 48rpx;
+            line-height: 48rpx;
+            background: linear-gradient(143deg, rgba(234, 162, 23, 1) 0%, rgba(255, 99, 39, 1) 100%);
+            box-shadow: 0px 10rpx 20rpx 0rpx rgba(242, 191, 97, 0.4);
+            border-radius: 34rpx;
+            text-align: center;
+            font-size: 24rpx;
+            color:#FFFFFF;
+        }
+
+    }
 }
\ No newline at end of file

pages/tab/me/me.wxml

-<!--pages/tab/me/me.wxml-->
-<text>pages/tab/me/me.wxml</text>
+<view class="mine" hover-class="none" hover-stop-propagation="false">
+    <view class="head row verCenter">
+        <view class="pic">
+            <cover-image class="im" src="{{userInfo.avatar ? userInfo.avatar:'/res/images/imgs/default.png'}}"></cover-image>
+        </view>
+        <view class="text">
+            <text class="t1">深圳市猎芯科技有限公司</text>
+            <view class="row verCenter">
+                <text class="t2" selectable="false" space="false" decode="false">普通会员</text>
+                <view>
+                    <text class="t3">金币：</text>
+                    <text class="t4">13,123</text>
+                </view>
+            </view>
+        </view>
+        <view class="signin row verCenter rowCenter">
+            <text class="icon iconfont iconiconxiantiaoshouji17"></text>
+            <text class="t1">签到成功</text>
+        </view>
+    </view>
+    <view class="tab-bar row verCenter rowCenter">
+        <view class="wrap">
+            <text class="t1">{{business.goods}}</text>
+            <text class="t2">商品</text>
+        </view>
+        <view class="wrap">
+            <text class="t1">{{business.inquiry}}</text>
+            <text class="t2">询价</text>
+        </view>
+        <view class="wrap">
+            <text class="t1">{{business.offer}}</text>
+            <text class="t2">报价</text>
+        </view>
+    </view>
+    <view class="ad boxsiz row verCenter">
+        <text class="icon iconfont iconiconxiantiaoshouji16"></text>
+        <text class='t1'>福利中心</text>
+        <text class='t2'>金币提现兑换、领红包</text>
+    </view>
+    <view class="bar-list boxsiz">
+        <view class="boxsiz bar row bothSide verCente">
+            <view>
+                <text class="icon iconfont iconiconcaiseshouye1"></text>
+                <text class="t1">个人主页</text>
+            </view>
+            <view>
+                <text class="icon iconfont iconChevron"></text>
+            </view>
+        </view>
+        <view class="hr"></view>
+        <view class="boxsiz bar row bothSide verCenter bor">
+            <view>
+                <text class="icon iconfont iconiconxiantiaoshouji18"></text>
+                <text class="t1">注册手机号</text>
+            </view>
+            <view>
+                <text class="t2">{{userInfo.mobile}}</text>
+            </view>
+        </view>
+        <view class="boxsiz bar row bothSide verCenter">
+            <view>
+                <text class="icon iconfont iconiconxiantiaoshouji19"></text>
+                <text class="t1">认证管理</text>
+            </view>
+            <view>
+                <text class="t2">已认证</text>
+                <text class="icon iconfont iconChevron"></text>
+            </view>
+        </view>
+        <view class="hr"></view>
+        <view class="boxsiz bar row bothSide verCenter bor" data-url="/pages/person/setting/index" bind:tap="toUrl">
+            <view>
+                <text class="icon iconfont iconiconcaiseshouye"></text>
+                <text class="t1">设置</text>
+            </view>
+            <view>
+                <text class="icon iconfont iconChevron"></text>
+            </view>
+        </view>
+        <view class="boxsiz bar row bothSide verCenter bor">
+            <view>
+                <text class="icon iconfont iconjuxing6"></text>
+                <text class="t1">邀请好友注册</text>
+            </view>
+            <view>
+                <text class="icon iconfont iconChevron"></text>
+            </view>
+        </view>
+    </view>
+</view>
+<!-- 签到弹出层 -->
+<view wx:if="{{isShow}}" class="layer-mask column verCenter rowCenter" hover-class="none" hover-stop-propagation="false">
+    <view class="layer column verCenter rowCenter">
+        <cover-image class="im" src="/res/images/imgs/star.png"></cover-image>
+        <text class="t1">恭喜您获得</text>
+        <view class="txt">
+            <text class="t2">666</text>
+            <text class="t3">金币</text>
+        </view>
+        <view class="btn">关闭</view>
+    </view>
+</view>
\ No newline at end of file

project.config.json

@@ -48,12 +48,12 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 6,
+			"current": 0,
 			"list": [
 				{
-					"id": -1,
-					"name": "pages/detail/chat/index",
-					"pathName": "pages/detail/chat/index",
+					"id": 0,
+					"name": "pages/person/login/index",
+					"pathName": "pages/person/login/index",
 					"query": "",
 					"scene": null
 				},
@@ -66,9 +66,16 @@
 				},
 				{
 					"id": 2,
-					"name": "pages/list/xj/index",
-					"pathName": "pages/list/xj/index",
-					"query": "inquiryItemsId=156327106368454",
+					"name": "pages/tab/me/me",
+					"pathName": "pages/tab/me/me",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": 2,
+					"name": "pages/person/setting/index",
+					"pathName": "pages/person/setting/index",
+					"query": "",
 					"scene": null
 				},
 				{

utils/util.js

-import {
-	apis
-} from './api.js';
-
-
 //数据请求(get,post)
 const getData = (url, type, param, callBack, loading, isheader) => {
 	wx.showNavigationBarLoading();
 
-	//获取token
 	var token, header;
-	wx.getStorage({
-		key: 'access_token',
-		success(res) {
-			if (res.data) {
-				token = res.data;
-			}
-		}
-	});
+
+	//获取token
+	token = wx.getStorageSync('access_token');
 
 	//参数字段追加来源字段
 	var params = Object.assign({}, param, {
@@ -131,4 +120,4 @@ const chooseImg = (num, callback) => {
 module.exports = {
 	getData: getData,
 	chooseImg: chooseImg
-}
+}
\ No newline at end of file