Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/wanzb_xcxv3

pages/comment/comment.wxml

@@ -1,6 +1,6 @@
 <!--pages/comment/comment.wxml-->
 <scroll-view scroll-y='{{true}}' bindscrolltolower='next'>
-  <navigator hover-class="none" class="list" wx:for='{{list}}' url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
+  <navigator hover-class="none" class="list" wx:for='{{list}}' url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
         <view class="name">{{item.username}}  <text>选手</text> <view>TOP <text>{{item.group_rank}}</text></view></view> 
         <view class="info">
                   日期： <view>{{item.stock_date}}（收益 <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>）</view>

pages/day/day.js

@@ -18,7 +18,7 @@ Page({
   onLoad: function (options) {
     this.setData({
       id: options.id,
-      player_id: options.player_id
+      user_id: options.user_id
     })
     this.getData();
   },
@@ -38,7 +38,7 @@ Page({
     var list = this.data.list
     //每日持股
     var parm = {
-      id: this.data.id, player_id: this.data.player_id,
+      id: this.data.id, user_id: this.data.user_id,
       page: this.data.page, page_size: 20
     }
     $api.getRecordList(parm).then(res => {

pages/day/day.wxml

@@ -1,6 +1,6 @@
 <scroll-view scroll-y='{{true}}' bindscrolltolower='next'>
   <view class="stock" wx:for='{{list}}'>
-  <navigator hover-class="none" url='../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{player_id}}' >
+  <navigator hover-class="none" url='../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{user_id}}' >
     <view class="info">
       <view>{{item.stock_date}}（今日收益 <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>）</view>
     </view>

pages/follow/follow.js

@@ -43,7 +43,7 @@ Page({
     var list = this.data.list
     if(this.data.type == 1){
       $api.getMyFollow({
-        page: this.data.page, page_size: 20,player_id:this.data.id
+        page: this.data.page, page_size: 20,user_id:this.data.id
       }).then(res => {
         wx.hideLoading()
         res.data.data.list.forEach(item => {
@@ -56,7 +56,7 @@ Page({
       })
     }else{
       $api.getFans({
-        page: this.data.page, page_size: 20,player_id:this.data.id
+        page: this.data.page, page_size: 20,user_id:this.data.id
       }).then(res => {
         wx.hideLoading()
         res.data.data.list.forEach(item => {

pages/follow/follow.wxml

@@ -1,5 +1,5 @@
 <scroll-view  scroll-y='{{true}}' bindscrolltolower='next'>
-  <navigator hover-class="none" class="follow" wx:for='{{list}}' url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
+  <navigator hover-class="none" class="follow" wx:for='{{list}}' url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
     <view class="name">{{item.username}}  <text>选手</text> 
     <!-- <view>TOP <text>{{item.group_rank}}</text></view> -->
     </view> 

pages/homepage/homepage.js

@@ -34,20 +34,19 @@ Page({
       type:options.type?options.type:'',
       id: id,
       record_id: record_id,
-      player_id: options.player_id ? options.player_id:'',
       user_id: options.user_id ? options.user_id:'',
-      cur_user_id:options.cur_user_id
     })
+    console.log(this.data,11111111111)
     if(options.type){
         wx.setNavigationBarTitle({
           title: '我的主页',
         })
     }
-    $api.getAuthinfo().then(res=>{
-      this.setData({
-        user_id:res.data.data.id
-      })
-    })
+    // $api.getAuthinfo().then(res=>{
+    //   this.setData({
+    //     user_id:res.data.data.id
+    //   })
+    // })
     $api.getMatchList().then(res=>{
       let l = res.data.data.length - 1;
       
@@ -61,10 +60,8 @@ Page({
     
   },
   getDays(){
-    // match_id   player_id  month: "2021-12"
     $api.getCalendar({
-      player_id: this.data.player_id,
-      user_id:this.data.cur_user_id,
+      user_id:this.data.user_id,
       match_id:this.data.id,
       month: this.data.date
     }).then(res=>{
@@ -103,11 +100,11 @@ Page({
     if (this.data.id) {
       data.id = this.data.id
     }
-    if (this.data.player_id) {
-      data.player_id = this.data.player_id
+    if (this.data.user_id) {
+      data.user_id = this.data.user_id
     }
-    if (this.data.cur_user_id) {
-      data.user_id = this.data.cur_user_id
+    if (this.data.user_id) {
+      data.user_id = this.data.user_id
     }
     if (this.data.record_id) {
       // data.record_id = this.data.record_id
@@ -118,10 +115,9 @@ Page({
         datas: res.data.data,
         date: stock_date[0] + '-' + stock_date[1],
         is_follow: res.data.data.is_follow,
-        player_id: res.data.data.today_record.player_id,
+        // user_id: res.data.data.today_record.user_id,
         followers:res.data.data.followers,
         fans:res.data.data.fans,
-        // id: res.data.data.match.id,
         ec: {
           onInit: initChart
         },
@@ -140,7 +136,7 @@ Page({
     
     //每日持股
     var parm={
-      id: this.data.id, player_id: this.data.player_id?data.player_id:o,user_id: this.data.cur_user_id?this.data.cur_user_id:null
+      id: this.data.id, user_id: this.data.user_id?data.user_id:o,user_id: this.data.user_id?this.data.user_id:null
     }
     $api.getRecordList(parm).then(res=>{
         this.setData({
@@ -199,7 +195,7 @@ Page({
   },
   followPlayer(e){
     let action = e.target.dataset.action;
-    $api.follow({ follow_id: this.data.player_id, action:action}).then(res=>{
+    $api.follow({ follow_id: this.data.user_id, action:action}).then(res=>{
       wx.showToast({
         title: action?'取消成功':'已关注',
       })
@@ -222,7 +218,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    if(this.data.player_id){
+    if(this.data.user_id){
       this.getData();
     }
   },

pages/homepage/homepage.wxml

@@ -4,8 +4,8 @@
       {{datas.today_record.username}}
       <view class="fans">
           
-          <navigator url="../follow/follow?id={{player_id}}&type=2" style="display: inline-block;"><text>{{fans}}</text>粉丝</navigator>
-          <navigator url="../follow/follow?id={{player_id}}&type=1" style="display: inline-block;"><text style="margin-left: 20rpx;">{{followers}}</text>关注</navigator>
+          <navigator url="../follow/follow?id={{user_id}}&type=2" style="display: inline-block;"><text>{{fans}}</text>粉丝</navigator>
+          <navigator url="../follow/follow?id={{user_id}}&type=1" style="display: inline-block;"><text style="margin-left: 20rpx;">{{followers}}</text>关注</navigator>
       </view>
     </view>
     <block wx:if='{{user_id!=datas.today_record.user_id}}'>
@@ -101,7 +101,7 @@
   <view class="title">每日持股
   </view>
   <view  class="stock" wx:for='{{stockList}}' wx:if="{{index<3}}">
-    <navigator hover-class="none" url='../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{player_id}}'>
+    <navigator hover-class="none" url='../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{user_id}}'>
       <view class="info">
         <view class="date"> {{item.stock_date}}（今日收益 <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>）</view>
       </view>
@@ -135,7 +135,7 @@
     </view>
   </view>
   <view class="look_all" wx:if="{{stockList.length>0}}">
-    <navigator hover-class="none" url="../day/day?id={{id}}&player_id={{player_id}}">
+    <navigator hover-class="none" url="../day/day?id={{id}}&user_id={{user_id}}">
           查看全部
     </navigator>
   </view>

pages/index/index.wxml

@@ -17,7 +17,7 @@
       <scroll-view   upper-threshold="0" bindscrolltoupper='fresh' scroll-y='{{true}}' bindscrolltolower='next'>
           <view wx:if='{{loading}}' class="loading">下拉刷新</view>
           <view  class="item1" wx:for='{{followList}}'>
-            <navigator hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
+            <navigator hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
               <view class="relist">
                   <image src="{{item.avatar}}" ></image>
                   <view class="msg">
@@ -131,7 +131,7 @@
   <swiper-item>
       <scroll-view  scroll-y='{{true}}' bindscrolltolower='next3'>
           <view class="item3">
-             <navigator hover-class="none" class="win" wx:for='{{hotFollowList}}' url="../today/today?id={{item.match_id}}&player_id={{item.id}}">
+             <navigator hover-class="none" class="win" wx:for='{{hotFollowList}}' url="../today/today?id={{item.match_id}}&user_id={{item.id}}">
                 <image wx:if='{{index==0}}' mode="widthFix" src="../../images/1.png"></image>
                 <image wx:if='{{index==1}}' mode="widthFix" src="../../images/2.png"></image>
                 <image wx:if='{{index==2}}' mode="widthFix" src="../../images/3.png"></image>
@@ -162,7 +162,7 @@
   <swiper-item>
       <scroll-view  scroll-y='{{true}}'  bindscrolltolower='next5'>
           <view  class="item1" wx:for='{{explist}}'>
-            <navigator hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
+            <navigator hover-class="none"  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
               <view class="relist">
                   <image src="{{item.user_avatar}}" ></image>
                   <view class="msg">

pages/list/list.wxml

@@ -18,7 +18,7 @@
     </view>
 </view>
 <scroll-view scroll-y="true" class="list" bindscrolltolower='next'>
-    <navigator hover-class="none" class="item" wx:for='{{list}}'  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&player_id={{item.player_id}}">
+    <navigator hover-class="none" class="item" wx:for='{{list}}'  url="../today/today?id={{item.match_id}}&record_id={{item.id}}&user_id={{item.user_id}}">
         <image wx:if='{{item.group_rank==1}}' mode="widthFix" src="../../images/1.png"></image>
         <image wx:if='{{item.group_rank==2}}' mode="widthFix" src="../../images/2.png"></image>
         <image wx:if='{{item.group_rank==3}}' mode="widthFix" src="../../images/3.png"></image>

pages/mymatch/mymatch.js

@@ -17,7 +17,7 @@ Page({
       key: 'userInfo',
       success: res=> {
         this.setData({
-          player_id: res.data.id
+          user_id: res.data.id
         })
       },
     })

pages/mymatch/mymatch.wxml

@@ -1,3 +1,3 @@
 <!--pages/mymatch/mymatch.wxml-->
-<navigator hover-class="none" wx:for="{{list}}" url="../today/today?id={{item.id}}&player_id={{item.player_id}}">{{item.name}}</navigator>
+<navigator hover-class="none" wx:for="{{list}}" url="../today/today?id={{item.id}}&user_id={{item.user_id}}">{{item.name}}</navigator>
 <view wx:if="{{list.length<=0}}" class="not_data">-暂无数据-</view>

pages/rank/rank.wxml

@@ -53,7 +53,7 @@
         </navigator>
     </view> 
     <navigator hover-class="none" class="item" wx:for='{{item.players}}' 
-    wx:for-index='i' wx:for-item='player'  url="../today/today?id={{item.match_id}}&record_id={{player.id}}&player_id={{player.player_id}}">
+    wx:for-index='i' wx:for-item='player'  url="../today/today?id={{item.match_id}}&record_id={{player.id}}&user_id={{player.user_id}}">
         <image wx:if='{{i==0}}' mode="widthFix" src="../../images/1.png"></image>
         <image wx:if='{{i==1}}' mode="widthFix" src="../../images/2.png"></image>
         <image wx:if='{{i==2}}' mode="widthFix" src="../../images/3.png"></image>

pages/search/search.wxml

@@ -27,7 +27,7 @@
   </picker>
 </view>
 <scroll-view scroll-y='{{true}}' bindscrolltolower='next'>
-  <navigator hover-class="none" url="../today/today?id={{item.match_id}}&player_id={{item.id}}" class="player" wx:for='{{list}}'>
+  <navigator hover-class="none" url="../today/today?id={{item.match_id}}&user_id={{item.id}}" class="player" wx:for='{{list}}'>
     <view class="name">{{item.username}}  <text>{{item.badge}}</text></view>
     <view class="info" wx:if='{{item.style.length>0}}'>风格：
                 <label class="tag" wx:for='{{item.style}}' wx:for-item='i'>{{i}}</label>

pages/stock/stock.wxml

@@ -23,9 +23,9 @@
   <scroll-view bindtap="blur"  scroll-y='{{true}}' style="height:calc(100vh - 380rpx);background: #fff;padding: 30rpx;">
     <view class="content" wx:if='{{cur==0}}'>
         <view class="_list" wx:for="{{comment_list}}">
-          <navigator url="../homepage/homepage?player_id={{item.player_id}}"><image src="{{item.user_avatar}}" ></image></navigator>
+          <navigator url="../homepage/homepage?user_id={{item.user_id}}"><image src="{{item.user_avatar}}" ></image></navigator>
             <view class="msg">
-                <navigator url="../homepage/homepage?player_id={{item.player_id}}" class="_name">{{item.user_name}}</navigator>
+                <navigator url="../homepage/homepage?user_id={{item.user_id}}" class="_name">{{item.user_name}}</navigator>
                 <view class="_content">{{item.content}}</view>
                 <view class="answer" wx:if="{{item.children.length>0}}">
                     <view  wx:for="{{item.children}}" wx:for-item='i'>
@@ -41,7 +41,7 @@
         </view>
       </view>
       <view wx:if='{{cur==1}}'>
-        <navigator hover-class="none" class="player" wx:for='{{info.list}}' url="../today/today?id={{item.match_id}}&player_id={{item.player_id}}">
+        <navigator hover-class="none" class="player" wx:for='{{info.list}}' url="../today/today?id={{item.match_id}}&user_id={{item.user_id}}">
             <view class="name">{{item.username}}  <text>{{item.badge}}</text> 
             <view>TOP <text>{{item.group_rank}}</text></view></view> 
             <view class="info">
@@ -62,7 +62,7 @@
           </navigator>
       </view>
       <view wx:if='{{cur==2}}'>
-        <navigator hover-class="none"  class="_list" wx:for="{{myList}}" url="../homepage/homepage?id={{item.match_id}}&player_id={{item.player_id}}">
+        <navigator hover-class="none"  class="_list" wx:for="{{myList}}" url="../homepage/homepage?id={{item.match_id}}&user_id={{item.user_id}}">
           <image src="{{item.user_avatar}}" ></image>
             <view class="msg">
                 <text class="_name" style="line-height:60rpx;">{{item.user_name}}</text>

pages/today/today.js

@@ -26,12 +26,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    // options.id = 9, options.player_id = 3520
     id = options.id, record_id = options.record_id
     this.setData({
       id: id,
       record_id: record_id,
-      player_id: options.player_id ? options.player_id:''
+      user_id: options.user_id ? options.user_id:''
     })
     $api.getAuthinfo().then(res=>{
       wx.setNavigationBarTitle({
@@ -75,9 +74,8 @@ Page({
     })
 },
   getDays(){
-    // match_id   player_id  month: "2021-12"
     $api.getCalendar({
-      player_id: this.data.player_id,
+      user_id: this.data.user_id,
       match_id:this.data.id,
       month: this.data.date
     }).then(res=>{
@@ -105,8 +103,8 @@ Page({
     if (this.data.id) {
       data.id = this.data.id
     }
-    if (this.data.player_id) {
-      data.player_id = this.data.player_id
+    if (this.data.user_id) {
+      data.user_id = this.data.user_id
     }
     if (this.data.record_id) {
       data.record_id = this.data.record_id
@@ -117,8 +115,7 @@ Page({
         datas: res.data.data,
         date: stock_date[0] + '-' + stock_date[1],
         is_follow: res.data.data.is_follow,
-        player_id: res.data.data.today_record.player_id,
-        cur_user_id: res.data.data.today_record.user_id,
+        user_id: res.data.data.today_record.user_id,
         followers:res.data.data.followers,
         fans:res.data.data.fans,
         record_id: this.data.record_id ? this.data.record_id:res.data.data.today_record.id,
@@ -141,7 +138,7 @@ Page({
     })
     //每日持股
     var parm={
-      id: data.id, player_id: this.data.player_id
+      id: data.id, user_id: this.data.user_id
     }
     // $api.getRecordList(parm).then(res=>{
     //     this.setData({
@@ -192,7 +189,7 @@ Page({
   },
   followPlayer(e){
     let action = e.target.dataset.action;
-    $api.follow({ follow_id: this.data.player_id, action:action}).then(res=>{
+    $api.follow({ follow_id: this.data.user_id, action:action}).then(res=>{
       wx.showToast({
         title: action?'取消成功':'已关注',
       })

pages/today/today.wxml

@@ -5,11 +5,11 @@
       {{datas.today_record.username}}
 
       <view class="fans">
-          <navigator url="../follow/follow?id={{player_id}}&type=2" style="display: inline-block;"><text>{{fans}}</text>粉丝</navigator>
-          <navigator url="../follow/follow?id={{player_id}}&type=1" style="display: inline-block;"><text style="margin-left: 20rpx;">{{followers}}</text>关注</navigator>
+          <navigator url="../follow/follow?id={{user_id}}&type=2" style="display: inline-block;"><text>{{fans}}</text>粉丝</navigator>
+          <navigator url="../follow/follow?id={{user_id}}&type=1" style="display: inline-block;"><text style="margin-left: 20rpx;">{{followers}}</text>关注</navigator>
       </view>
     </view>
-    <navigator url="../homepage/homepage?id={{id}}&record_id={{record_id}}&player_id={{player_id}}&cur_user_id={{cur_user_id}}">Ta的主页</navigator>
+    <navigator url="../homepage/homepage?id={{id}}&record_id={{record_id}}&user_id={{user_id}}">Ta的主页</navigator>
 </view>
 <view class="per_info">
     <view class="rank">
@@ -98,7 +98,7 @@
 </view>
 <view class="post">
     <image class="{{zan?'zan':''}}" bindtap="zan"  mode="widthFix" src="../../images/zan.png"></image>
-    <input 	confirm-type='send' bindconfirm='sendmsg' value="{{comment}}" placeholder-style="color:#999" maxlength="500" bindinput="inputchange" focus='{{focus}}' type="text" placeholder="{{text}}"/>
+    <input 	confirm-type='send' bindconfirm='sendmsg' value="{{comment}}" placeholder-style="color:#999" maxlength="1000" bindinput="inputchange" focus='{{focus}}' type="text" placeholder="{{text}}"/>
     <button bindtap="sendmsg">提交</button>
 </view>
 

pages/user/user.wxml

@@ -7,10 +7,10 @@
             <view>{{userinfo.username}}</view>
             <text wx:if='{{userinfo.id}}'>代码：{{usercode}}</text>
         </view>
-        <navigator  url="../homepage/homepage?id={{todayinfo.match_id}}&record_id={{todayinfo.id}}&player_id={{todayinfo.player_id}}&type=1" class="mine">我的主页</navigator>
+        <navigator  url="../homepage/homepage?id={{todayinfo.match_id}}&record_id={{todayinfo.id}}&user_id={{todayinfo.user_id}}&type=1" class="mine">我的主页</navigator>
       </view>
       <view  wx:if='{{todayinfo.today_fund}}' class="today">
-      <navigator hover-class="none"  url="../today/today?id={{todayinfo.match_id}}&record_id={{todayinfo.id}}&player_id={{todayinfo.player_id}}">
+      <navigator hover-class="none"  url="../today/today?id={{todayinfo.match_id}}&record_id={{todayinfo.id}}&user_id={{todayinfo.user_id}}">
       
       <view class="money">
         <text class="{{todayinfo.today_income_fund < 0 ?'down':'up'}}">{{todayinfo.today_income_fund}}  </text>
@@ -26,7 +26,7 @@
         <text >总收益 <text class="{{todayinfo.total_income[0]=='-' ?'down':'up'}}"> {{todayinfo.total_income}}</text></text>
       </view>
       </navigator>
-      <navigator class="msg"  hover-class="none"  url="../today/today?id={{todayinfo.match_id}}&record_id={{todayinfo.id}}&player_id={{todayinfo.player_id}}">
+      <navigator class="msg"  hover-class="none"  url="../today/today?id={{todayinfo.match_id}}&record_id={{todayinfo.id}}&user_id={{todayinfo.user_id}}">
         <view ><image mode="widthFix" src="../../images/msg.png"></image>{{todayinfo.comments_count}}</view>
         <view><image mode="widthFix" src="../../images/zan.png"></image>{{todayinfo.zan_count}}</view>
       </navigator>

utils/api.js

@@ -5,9 +5,9 @@ const FORM = 'FORM';
 const DELETE = 'DELETE';
 // wxb299e10e65157301
 // wx2938132b773c7b5a
-// const baseURL = 'https://wx.scxjc.club';
+const baseURL = 'https://wx.scxjc.club';
 // const baseURL = 'https://www.hunanwanzhu.com';
-const baseURL = 'https://api.hunanwanzhu.com';
+// const baseURL = 'https://api.hunanwanzhu.com';
 
 function request(method, url, data) {
   var token='';