Merge branch 'master' of http://114.215.101.231:8099/miniprogram/jiuzidian

# Conflicts:
#	app.wxss
#	pages/homeblock/zhinengselect/zhinengselect.wxml
#	project.config.json

@@ -32,9 +32,6 @@ App({
         }
       }
     })
-
-
-    
   },
 
   post: function (url, data, headerParams, showLoad) {
@@ -56,7 +53,6 @@ App({
         data: postData,
         method: 'POST',
         header: header,
-
         success: function (res) { //返回取得的数据
           if (res.data.code == '20000') {
             resolve(res.data.data);

@@ -81,9 +81,13 @@ image{
    height:15rpx;
    font-size: 0
  }
- .nodata{
-   color:#999;
-   font-size:30rpx;
+ .noData{
+   height: 360rpx;
+   width: 750rpx;
    text-align: center;
-   margin-top:50rpx;
+   display: flex;
+   align-items: center;
+   font-size: 26rpx;
+   color: #999;
+   justify-content: center;
  }
\ No newline at end of file

@@ -6,8 +6,6 @@
     <view class="registeritem {{item.sel==true?'selact':''}}" wx:for="{{shaikind}}" wx:key="" wx:if="{{type==2}}" data-id="{{item.id}}" catchtap='selectkind'>{{item.country_name}}</view>
     <view class="registeritem {{item.sel==true?'selact':''}}" wx:for="{{shaikind}}" wx:key="" wx:if="{{type==3}}" data-id="{{item.id}}" catchtap='selectkind'>{{item.region_name}}</view>
     <view class="registeritem {{item.sel==true?'selact':''}}" wx:for="{{shaikind}}" wx:key="" wx:if="{{type==4}}" data-id="{{item.id}}" catchtap='selectkind'>{{item.odor_name}}</view>
-
-
   </view>
 </view>
 
@@ -18,19 +16,12 @@
     <view class="selcoun">选择国别</view>
     <view class="cqueding" bindtap="countrysure">确定</view>
   </view>
-
   <view class="countryitem" wx:for="{{countrylist}}" wx:key="" data-name="{{item.country_name}}" bindtap="selectcountry" data-id="{{item.id}}">
     <view class="selcounitem">{{item.country_name}}</view>
-
     <view class="gouimg" wx:if="{{item.sel==true}}">
       <image src="{{url}}/aicon_18x.png"></image>
     </view>
   </view>
-
-
-
-
-
 </view>
 <!-- 城市遮罩层 -->
 <view class="cregister" wx:if="{{showcity}}">
@@ -39,22 +30,15 @@
     <view class="selcoun">选择城市</view>
     <view class="cqueding" bindtap="citysure">确定</view>
   </view>
-
   <view class="nodata" wx:if="{{citylist.length==0}}">暂无数据</view>
-
-
-<block wx:else>
-  <view class="countryitem" wx:for="{{citylist}}" wx:key="" data-name="{{item.country_name}}" bindtap="selectcity" data-index="{{index}}" >
-      <view class="selcounitem" >{{item.city}}</view>
-
+  <block wx:else>
+    <view class="countryitem" wx:for="{{citylist}}" wx:key="" data-name="{{item.country_name}}" bindtap="selectcity" data-index="{{index}}">
+      <view class="selcounitem">{{item.city}}</view>
       <!-- <view class="gouimg" wx:if="{{item.sel==true}}">
       <image src="{{url}}/aicon_18x.png"></image>
     </view> -->
     </view>
-</block>
-
-
-
+  </block>
 </view>
 <!-- 区域选择 -->
 <view class="cregister" wx:if="{{showregin}}">
@@ -67,7 +51,7 @@
 
 
   <view class="countryitem" wx:for="{{reginlist}}" wx:key="" data-name="{{item.name}}" bindtap="selectregin" data-index="{{index}}">
-      <view class="selcounitem" >{{item.name}}</view>
+    <view class="selcounitem">{{item.name}}</view>
 
     <view class="gouimg" wx:if="{{item.sel==true}}">
       <image src="{{url}}/aicon_18x.png"></image>

@@ -21,12 +21,10 @@
       </view>
     </view>
 
-
   </view>
 </view>
 
 <view class="shaisel">
-
   <view class="kind">
     <view class="shaikind" wx:for="{{navarr}}" wx:key='' bindtap="select" data-idx="{{index}}" data-type="{{item.type}}">
       <view class="shaikindname {{item.sel==true?'selactive':''}}">{{item.name}}</view>

@@ -11,8 +11,8 @@ Page({
     url:'',
     phonenum:'',
     currentTime: 60,
-    mimaphone:'',
-    mima:''
+    mimaphone:'18902082533',
+    mima:'qqqqqq'
   },
 
   /**
@@ -127,11 +127,10 @@ Page({
 
       app.post(url, params).then((res) => {
         console.log(res);
-        wx.navigateTo({
+        wx.setStorageSync('token', res.token)
+        wx.switchTab({
           url: '/pages/homapage/homepage',
         })
-       
-
       }).catch((err) => {
         console.log(err)
         wx.showToast({

@@ -17,7 +17,14 @@ Page({
       url: app.globalData.url
     })
   },
-
+  getInformation(){
+    let url = '/user/Center/user_index';
+    app.post(url,{}).then(r=>{
+      this.setData({
+        userInfo:r
+      })
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -29,7 +36,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    this.getInformation();
   },
 
   /**

-
-
 <view class="headimg">
   <image src="{{url}}aicon_87x.png"></image>
-
-  <view class="peopleinfo">
-
+  <navigator class="peopleinfo" url=''>
     <view class="peoplecontent">
       <view class="peopleleft">
-        <image src="{{url}}aicon_77@2x.png"></image>
+        <image src="{{userInfo.avatar||url+'aicon_77@2x.png'}}"></image>
       </view>
-
       <view class="peopletext">
-        <view class="peopletitle">万丈红尘一人醉</view>
-        <view class="level">M1</view>
+        <view class="peopletitle">{{userInfo.user_nickname||'酒字典'}}</view>
+        <view class="level">M{{userInfo.level}}</view>
       </view>
     </view>
-
-
     <view class="iconfont icon-jiantou"> </view>
-  </view>
-
-  <view class="jifen">
-    <view class="jifennum">1600</view>
+  </navigator>
 
+  <navigator class="jifen">
+    <view class="jifennum">{{userInfo.score}}</view>
     <view class="myuse">可用积分</view>
     <view class="iconfont icon-jiantou jirow"></view>
-  </view>
+  </navigator>
 
   <view class="xinhead">
-
-    <view class="xinitem">
+    <navigator class="xinitem" url='/pages/myblock/guanzhu/guanzhu'>
       <view class="xinimg">
         <image src="{{url}}aicon_79.png"></image>
       </view>
-
       <view class="xintitle">关注</view>
-    </view>
-    <view class="xinitem">
+    </navigator>
+    <navigator class="xinitem" url='/pages/myblock/pinglun/pinglun'>
       <view class="ping">
         <image src="{{url}}aicon_80x.png"></image>
       </view>
-
       <view class="xintitle">评论</view>
-    </view>
-    <view class="xinitem">
+    </navigator>
+    <navigator class="xinitem"  url='/pages/myblock/pinglun/pinglun'>
       <view class="history">
         <image src="{{url}}aicon_81x.png"></image>
       </view>
-
       <view class="xintitle">历史</view>
+    </navigator>
   </view>
-
-
-  </view>
-
 </view>
 
 <view class="collect">
@@ -71,62 +56,53 @@
       <view class="collectitemnum">19</view>
       <view class="collectitemtitle">酒企</view>
     </view>
-
   </view>
 </view>
 
 <view class="mylist">
- 
-    <navigator class="mylistitem" url="/pages/myblock/personpage/personpage" redirect="true"   hover-class="none">
+  <navigator class="mylistitem" url="/pages/myblock/personpage/personpage"  hover-class="none">
     <view class="mylistleft">
       <view class="mylistimage">
         <image src="{{url}}aicon_82x.png"></image>
       </view>
       <view class="message">消息通知</view>
     </view>
-
     <view class="iconfont icon-jiantou listrow"></view>
   </navigator>
- 
-
-  <view class="mylistitem">
+  <navigator class="mylistitem">
     <view class="mylistleft">
       <view class="mylistimage">
         <image src="{{url}}aicon_83x.png"></image>
       </view>
       <view class="message">用户反馈</view>
     </view>
-
     <view class="iconfont icon-jiantou listrow"></view>
-  </view>
-  <view class="mylistitem">
+  </navigator>
+  <navigator class="mylistitem" url='/pages/myblock/zhanghaoyuanquan/zhanghaoyuanquan'>
     <view class="mylistleft">
       <view class="mylistimage">
         <image src="{{url}}aicon_84x.png"></image>
       </view>
       <view class="message">账号与安全</view>
     </view>
-
     <view class="iconfont icon-jiantou listrow"></view>
-  </view>
-  <view class="mylistitem">
+  </navigator>
+  <navigator class="mylistitem">
     <view class="mylistleft">
       <view class="mylistimage">
         <image src="{{url}}aicon_85x.png"></image>
       </view>
       <view class="message">协议与规则</view>
     </view>
-
     <view class="iconfont icon-jiantou listrow"></view>
-  </view>
-  <view class="mylistitem">
+  </navigator>
+  <navigator class="mylistitem">
     <view class="mylistleft">
       <view class="mylistimage">
         <image src="{{url}}aicon_86x.png"></image>
       </view>
       <view class="message">关于</view>
     </view>
-
     <view class="iconfont icon-jiantou listrow"></view>
-  </view>
+  </navigator>
 </view>
\ No newline at end of file

@@ -30,9 +30,10 @@ image{
 }
 .peopleleft{
   width:100rpx;
-height:100rpx;
-font-size: 0;
-border-radius: 50%;
+  height:100rpx;
+  font-size: 0;
+  border-radius: 50%;
+  overflow: hidden;
 }
 .peopletitle{
   color:#FFFEFE;

@@ -8,7 +8,36 @@ Page({
   data: {
     navbar:['酒企','酿酒师'],
     currentTab: 0,
-    url:''
+    url:'',
+    page: 1,
+    compony:[],
+    noData: true
+  },
+  getWine(){
+    let url = '/user/Center/concern_company',params = {
+      page: this.data.page
+    };
+    app.post(url,params).then(r=>{
+      var list = this.data.page == 1 ? r.list : this.data.compony.concat(r.list);
+      this.setData({
+        compony: list,
+        totalPage: r.total_page,
+        noData: list.length>0?true:false
+      })
+    })
+  },
+  getTeach() {
+    let url = '/user/Center/concern_company', params = {
+      page: this.data.page
+    };
+    app.post(url, params).then(r => {
+      var list = this.data.page == 1 ? r.list : this.data.compony.concat(r.list);
+      this.setData({
+        compony: list,
+        totalPage: r.total_page,
+        noData: list.length > 0 ? true : false
+      })
+    })
   },
 
   /**
@@ -18,13 +47,15 @@ Page({
     this.setData({
       url: app.globalData.url
     })
+    this.getWine();
   },  
   navbarTap: function (e) {
+    let idx = e.currentTarget.dataset.idx;
     this.setData({
       currentTab: e.currentTarget.dataset.idx,
-     
-
-    })
+      page:1
+    });
+    idx==0?this.getWine():this.getTeach();
   },
 
   /**
@@ -66,7 +97,16 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-
+    this.data.page < this.data.totalPage ?(
+      this.data.currentTab == 0? (this.setData({
+        page: page+1
+      }), this.getWine()) : (this.setData({
+        page: page + 1
+      }), this.getTeach())
+    ):wx.showToast({
+      title: '没有更多了',
+      icon:'none'
+    })
   },
 
   /**

 {
-  "navigationBarTitleText": "关注"
+  "navigationBarTitleText": "关注",
+  "enablePullDownRefresh": true
 }
\ No newline at end of file

-
 <view class="kindnav">
   <view wx:for="{{navbar}}" data-idx="{{index}}" class="kindnav_item {{currentTab==index ? 'kindactive' : ''}}" wx:key="unique" bindtap="navbarTap" data-id="{{item.id}}">{{item}}
   </view>
 </view>
 <!-- 酒企 -->
 <view class="guanzhulist" wx:if="{{currentTab==0}}">
-  <view class="guanzhuitem">
-    <view class="guanzhuitemleft">
-      <view class="guanzhuleftname">湖北白云边股份股份有限公司</view>
-      <view class="gouimg">
-          <image src="{{url}}/aicon_20x.png"></image>
-      </view>
-    </view>
-
-    <view class="guanzhuright">关注</view>
-  </view>
-  <view class="guanzhuitem">
+  <view class="guanzhuitem" wx:for='{{compony}}' wx:key=''>
     <view class="guanzhuitemleft">
-      <view class="guanzhuleftname">湖北白云边股份股份有限公司</view>
+      <view class="guanzhuleftname">{{item.name}}</view>
       <view class="gouimg">
         <image src="{{url}}/aicon_20x.png"></image>
       </view>
     </view>
-
-    <view class="guanzhuright">关注</view>
-  </view>
-  <view class="guanzhuitem">
-    <view class="guanzhuitemleft">
-      <view class="guanzhuleftname">湖北白云边股份股份有限公司</view>
-      <view class="gouimg">
-          <image src="{{url}}/aicon_20x.png"></image>
-      </view>
-    </view>
-
-    <view class="guanzhuright">关注</view>
+    <view class="guanzhuright" bindtap='Action' id='{{item.id}}'>已关注</view>
   </view>
 </view>
 
 <!-- 酿酒师 -->
 
 <view class="guanzhulist" wx:if="{{currentTab==1}}">
-  <view class="guanzhuitem">
+  <view class="guanzhuitem" wx:for='{{compony}}' wx:key=''>
     <view class="guanzhuitemleft">
-
       <view class="teacherimg">
-      <image src="/img/nav_04x.png"></image>
+        <image src="{{item.avatar}}"></image>
       </view>
-
-      <view class="guanzhuleftname teachername">徐强</view>
+      <view class="guanzhuleftname teachername">{{item.name}}</view>
       <view class="gouimg">
         <image src="{{url}}/aicon_20x.png"></image>
       </view>
     </view>
-
     <view class="guanzhuright">关注</view>
   </view>
-  <view class="guanzhuitem">
-    <view class="guanzhuitemleft">
-      <view class="guanzhuleftname">湖北白云边股份股份有限公司</view>
-      <view class="gouimg">
-          <image src="{{url}}/aicon_20x.png"></image>
-      </view>
-    </view>
-
-    <view class="guanzhuright">关注</view>
-  </view>
-  <view class="guanzhuitem">
-    <view class="guanzhuitemleft">
-      <view class="guanzhuleftname">湖北白云边股份股份有限公司</view>
-      <view class="gouimg">
-          <image src="{{url}}/aicon_20x.png"></image>
-      </view>
-    </view>
+</view>
 
-    <view class="guanzhuright">关注</view>
-  </view>
+<view class='noData' wx:if='{{!noData}}'>
+  暂无相关数据
 </view>
\ No newline at end of file

 // pages/myblock/pinglun/pinglun.js
+const app = getApp();
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    page: 1,
+    list:[],
+    noData: true,
+    noMore:!1,
+    edit:!1
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.getList();
+  },
+  edit(){
+    console.log(11)
+    this.setData({
+      edit:!this.data.edit
+    })
+  },
+  getList(){
+    let url = 'user/Center/my_comment', params = {
+        page: this.data.page
+      };
+      app.post(url, params).then(r => {
+        var list = this.data.page == 1 ? r.list : this.data.list.concat(r.list);
+        this.setData({
+          list: list,
+          totalPage: r.total_page,
+          noData: list.length > 0 ? true : false,
+          noMore: r.totalPage==r.page?!0:!1
+        })
+      })
   },
 
   /**

-<view class="pinglunlist">
-  <view class="pinglunitem">
+<view class="pinglunlist" hidden='{{noData}}'>
+  <view class='top_eidt'>
+    我的评论
+    <text class='action' bindtap='edit'>{{edit?'取消':'编辑'}}</text>
+  </view>
+  <view class="pinglunitem" wx:for='{{list}}' wx:key=''>
     <view class="pinglunitemleft">
       <view class="leftimg">
-        <image src=""></image>
+        <image src="{{item.avatar}}"></image>
       </view>
-
       <view class="pinglunright">
-        <view class="righttop">小叶子</view>
-        <view class="rightbottom">2019年11月5日</view>
+        <view class="righttop">{{item.user_nickname}}</view>
+        <view class="rightbottom">{{item.create_time}}</view>
+      </view>
+      <view class='eidt {{item.checked?"choose":""}}' bindtap='choose' id='{{index}}' wx:if='{{edit}}'>
+        <image src='/img/pinglun_xz.png'></image>
       </view>
-
     </view>
-
     <view class="pinglunmiddle">
-      教练，我想学酿酒
+      {{item.content}}
     </view>
-
     <view class="pinglunbottom">
       <view class="pingbottomleft">
-        <image src=""></image>
+        <image src="{{item.article.thumb}}"></image>
       </view>
-
       <view class='pingbottomright'>
-        <view class='xinxi'>浓香酒酿酒大师：沈才宏</view>
+        <view class='xinxi'>{{item.article.title}}</view>
         <view class="biangjiubottom">
           <view class='rightbottomimg'>
-            <image src=''></image>
+            <image src='{{item.article.logo}}'></image>
           </view>
-
-          <text class="niangjiutext">WinesBook</text>
+          <text class="niangjiutext">{{item.article.name}}</text>
         </view>
-
       </view>
     </view>
   </view>
+  <view class='showall' wx:if='{{noMore&&noData}}'>已显示全部内容</view>
 </view>
 
-<view class='showall'>已显示全部内容</view>
 
-<view class="btnbottom">
+<view class="btnbottom" wx:if='{{edit}}'>
   <view class="btnleft">一键清空</view>
   <view class="btnright">删除（1）</view>
 </view>
+
+<view class='noData' wx:if='{{!noData}}'>
+  暂无相关数据
+</view>
\ No newline at end of file

@@ -113,3 +113,38 @@
   line-height: 80rpx;
   margin-left:55rpx;
 }
+.top_eidt{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+  height: 88rpx;
+  border-bottom: 2rpx solid #f5f5f5;
+  border-top:2rpx solid #f5f5f5; 
+  font-size: 26rpx;
+}
+
+.action{
+  position: absolute;
+  top: 50%;
+  right: 40rpx;
+  transform: translateY(-50%);
+  color: #999;
+}
+.eidt{
+  border: 1rpx solid #999;
+  width: 36rpx;
+  height: 36rpx;
+  border-radius: 50%;
+  margin-left: auto;
+  -webkit-margin-start: auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.eidt image{
+  display: none;
+}
+.eidt.choose image{
+  display: block
+}
\ No newline at end of file