优化

pages/change/change.js

@@ -77,20 +77,14 @@ Page({
           in_fund:this.data.in_fund,
           account_img:this.data.today_stock_img
         }
-        if (!data.out_fund){
+        if (!data.out_fund && !data.in_fund){
           wx.showToast({
             icon: 'none',
-            title: '请输入今转出资金'
-          })
-          return
-        }
-        if (!data.in_fund){
-          wx.showToast({
-            icon: 'none',
-            title: '请输入今转入资金'
+            title: '请输入今转出资金或今转入资金'
           })
           return
         }
+   
         $api.update(data).then(res=>{
           if(res.code == 0){
             wx.showToast({

pages/change/change.wxml

@@ -10,10 +10,10 @@
 </view>
 <view class="item">
     <label>账户截图</label>
-    <view wx:for='{{today_stock_img}}' class="stock_imgs">
-        <image  src="{{item}}" bindtap="prview" data-src="{{item}}"></image>
+    <view class="stock_imgs" wx:if='{{today_stock_img}}'>
+        <image  src="{{today_stock_img}}" bindtap="prview" data-src="{{today_stock_img}}"></image>
         <view class="edit">
-            <text bindtap="del" data-id='{{index}}'>删除</text>
+            <text bindtap="del">删除</text>
         </view>
     </view>
     <view  class="upload" bindtap="uploadImg" wx:if="{{!today_stock_img}}">

pages/index/index.js

@@ -77,6 +77,8 @@ Page({
     }).then(res => {
       wx.hideNavigationBarLoading()
       res.data.data.list.forEach(item=>{
+        item.today_income=parseInt(item.today_income)+"%"
+        item.total_income=parseInt(item.total_income)+"%"
         followList.push(item)
       })
       this.setData({

pages/index/index.wxml

@@ -18,7 +18,27 @@
           <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}}">
-              <view class="name">{{item.username}}  <text wx:if='{{item.badge}}'>{{item.badge}}</text> 
+              <view class="relist">
+                  <image src="{{item.avatar}}" ></image>
+                  <view class="msg">
+                      <text class="name">{{item.username}}</text>
+                      <view>资产：{{item.today_fund}}w（总收益 <label class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</label>  |  今日收益 <label class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</label>）</view>
+                  </view>
+              </view>
+              <view class="content">{{item.experience}}</view>
+              <view class="imgs">
+                <image wx:for='{{item.today_stock_img}}' wx:for-item='i'  bindtap="preview" data-src='{{i}}' data-urls='{{item.today_stock_img}}'
+                 class="img" src="{{i}}"></image>
+              </view> 
+              <view class="recomment">
+                  <image mode="widthFix" src="../../images/msg.png"></image>
+                  <text>{{item.comment_count}}</text>
+                  <image mode="widthFix" src="../../images/zan.png"></image>
+                  <text>{{item.zan_count}}</text>
+              </view>
+
+
+              <!-- <view class="name">{{item.username}}  <text wx:if='{{item.badge}}'>{{item.badge}}</text> 
               <view>TOP <text>{{item.group_rank}}</text></view></view> 
               <view class="info">
                 日期： <view>{{item.stock_date}}（今日收益 
@@ -37,12 +57,9 @@
                         <block wx:for="{{item.today_stock}}" wx:for-item='i'> {{i.name}}({{i.fund}}w) </block>
                     </view>
                     <view wx:else>空仓</view>
-                </view>
+                </view>-->
                 </navigator>
-              <view class="imgs">
-                <image wx:for='{{item.today_stock_img}}' wx:for-item='i'  bindtap="preview" data-src='{{i}}' data-urls='{{item.today_stock_img}}'
-                 class="img" src="{{i}}"></image>
-              </view>
+              
           </view>
           <block wx:if='{{total >= 20}}'>
             <view class='loading' wx:if='{{followList.length < total}}'>上拉加载更多...</view>

pages/index/index.wxss

@@ -326,4 +326,46 @@ scroll-view{
 .exp{
   color: #D94B24;
   font-size: 24rpx;
+}
+
+
+.relist{
+  position: relative;
+  padding-left: 80rpx;
+  margin-bottom: 24rpx;
+}
+.relist>image{
+  width: 64rpx;
+  height: 64rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+  border-radius: 100%;
+}
+.content,.msg .name{
+  font-size: 30rpx;
+  line-height: 48rpx;
+  color: #333;
+}
+.msg view{
+  color: #666;
+  font-size: 28rpx;
+}
+.msg view label{
+  font-size: 28rpx;
+}
+.recomment{
+  padding:  24rpx 0;
+  border-bottom: 1px solid rgba(245, 245, 245, 1);
+}
+.recomment image{
+  width: 32rpx;
+  margin-right: 10rpx;
+  position: relative;
+  top: 5rpx;
+}
+.recomment text{
+  color: #999;
+  font-size: 28rpx;
+  margin-right: 40rpx;
 }

pages/signup/signup.js

@@ -29,6 +29,16 @@ Page({
       this.setData({
           info:res.data.data
       })
+      if(options.type == 1){
+        res.data.data.groups.forEach(item=>{
+          if(!item.charge){
+            this.setData({
+              match_group:item.id
+            })
+          }
+        })
+        
+      }
     })
   },
   bindChange(e) {
@@ -40,8 +50,12 @@ Page({
   },
   getcode(){
     if(this.data.phone.length>=11){
+      this.setData({
+        text:"59s重新发送"
+      })
+      this.countdown()
       $api.sendcode({phone:this.data.phone}).then(res=>{
-        this.countdown()
+        
       })
     }else{
       wx.showToast({

pages/signup/signup.wxml

@@ -1,4 +1,4 @@
-<view class="item"> 
+<view class="item" wx:if='{{type==2}}'> 
    <label>比赛分组</label>
    <view class="tags"> 
     <picker  value="{{index}}"  range="{{info.groups}}" range-key='name' bindchange="bindChange">

pages/stock/stock.wxml

@@ -12,8 +12,8 @@
   <view wx:if='{{!info.choiced}}' bindtap="choice">加入自选</view>
   <view wx:else bindtap="delchoice">取消自选</view>
   </view>
-  <!-- <image wx:if='{{info.img}}' mode="withFix" src="{{info.img}}"></image>
-  <view wx:if='{{info.desc}}' class="desc">{{info.desc}}</view> -->
+  <image wx:if='{{info.img}}' mode="withFix" src="{{info.img}}"></image>
+  <view wx:if='{{info.desc}}' class="desc">{{info.desc}}</view>
   <view class="tab">
       <view bindtap="tab" data-id='0' class="{{cur==0?'act':''}}">留言 {{comment_count}} <text></text></view>
       <view bindtap="tab"   data-id='1' class="{{cur==1?'act':''}}">今日持仓 {{info.list.length}}<text></text></view>

pages/today/today.js

@@ -235,6 +235,14 @@ Page({
     $api.zan({record_id:record_id}).then(res=>{
       if(res.data.code == 0){
         this.getzan()
+        this.setData({
+          zan:1
+        })
+        setTimeout(()=>{
+          this.setData({
+            zan:0
+          })
+        },3000)
       }
     })
   },

pages/today/today.wxml

@@ -96,7 +96,7 @@
 </view> -->
 </view>
 <view class="post" wx:if='{{role==2}}'>
-    <image bindtap="zan"  mode="widthFix" src="../../images/zan.png"></image>
+    <image class="{{zan?'zan':''}}" bindtap="zan"  mode="widthFix" src="../../images/zan.png"></image>
     <input   value="{{comment}}" placeholder-style="color:#999" maxlength="500" bindinput="inputchange" focus='{{focus}}' type="text" placeholder="{{text}}"/>
     <button bindtap="sendmsg">提交</button>
 </view>

pages/today/today.wxss

@@ -421,4 +421,19 @@ picker{
   width: 48rpx;
   position: relative;
   top: 10rpx;
+}
+.zan{
+  animation: good .5s;
+}
+@keyframes good
+{
+    0% {
+      transform: scale(1,1);
+    }
+    50% {
+      transform: scale(1.2,1.2);
+    }
+    100% {
+      transform: scale(1,1);
+    }
 }

pages/upload/upload.wxml

@@ -1,10 +1,10 @@
 <form bindtap="blur">
     <view class="label" >持仓日期   {{stock_date}}</view>
     <view class="note">交作业时间:15:00-15:30</view>
-    <view class="label">今日净资产<text class="note">(单位：万)</text>  <navigator wx:if="{{role == 2}}" class="change" url="../change/change">今日资金出入？</navigator></view>
+    <view class="label">今日净资产<text class="note">(单位：万)</text>  </view>
     <input type='digit' value="{{today_fund}}" bindinput="fundChange1" placeholder="请输入今日净资产"></input>
     <text style="color:red;font-weight:500">万</text>
-     
+    <navigator wx:if="{{role == 2}}" class="change" url="../change/change">今日资金有出入？</navigator>
     <block wx:if='{{!is_markt}}'>
     <view class="label">今日持股<text class="note">(空仓请留空不填)</text></view>
     <view class="info" wx:for='{{stock}}' >

pages/upload/upload.wxss

@@ -90,7 +90,7 @@ picker{
   /* height: 88rpx; */
   /* line-height: 88rpx; */
   /* padding: 0; */
-  /* font-size: 32rpx; */
+  font-size: 28rpx;
   /* border-radius: 8rpx; */
   /* margin-top: 50rpx; */
   /* text-align: center; */

pages/user/user.js

@@ -110,13 +110,13 @@ Page({
     wx.removeStorage({
       key: 'userInfo'
     })
-    wx.setNavigationBarTitle({
-      title: '登录',
-    })
     this.setData({
       userinfo: {},
       usercode: ''
     })
+    wx.navigateTo({
+      url: '../login/user',
+    })
   },
   /**登陆 */
   login: function () {