0627

pages/apply/apply.wxml

@@ -13,37 +13,38 @@
         <view class="date">开赛时间：{{info.start_time}}到{{info.end_time}}结束 </view>
         <view class="date">报名时间：{{info.signup_start_time}}到{{info.signup_end_time}}</view>
         <view class="title title1">2、比赛分组</view>
-        <view class="date" wx:for="{{info.groups}}">{{item.name}}</view>
+        <!-- <view class="date" wx:for="{{info.groups}}">{{item.name}}</view> -->
         
-         <!-- <view class="date">
+        <view class="date">
           <text>冠军组：历届小组前三选手，无资金门槛</text>
           <text>千万组：300W以上</text>
           <text>百万组：50W到300W</text>
-          <text>十万组：10W到500W</text>
+          <text>十万组：10W到50W</text>
           <text>菜鸟组：10W以下</text>
           <text>各组第一有牛气冲天奖杯！</text>
-        </view> -->
+        </view>
         <view class="title title1">3、交作业</view>
         <view class="date">
           7月5日收盘后开始交作业，默认为初始资金，随后每天下午3：00到3：30，在比赛系统自主提交，前排成绩将更新在比赛公众号。
         </view>
-        <view class="title title1">4、转帐与成绩修改规则</view>
+        <view class="title title1">4、银证转账除权规则与账户验证</view>
         <view class="date">
           <text>出金：维持原有成绩，修改初始。</text>
           <text>入金：稀释原有成绩，增加初始。</text>
           <text>比赛期间转帐不超过6次，新股中签不纳入成绩。</text>
+          <text>比赛结束，前排选手需接受账户验证，比赛期间的完整交割单也将公布。</text>
         </view>
         <view class="title title1">5、参赛费用</view>
         <view class="date">
-          <text>自费参赛:每届{{info.player_price}}元，无需开户。</text>
-          <text>免费参赛：在比赛券商开户参赛，可永久免报名费，佣金低-网速快-网上开户几分钟完成，开户选手内部第一奖茅台飞天，具体操作请站内咨询客服。\n
+          <text>自费参赛：每届{{info.player_price}}元，无需开户。</text>
+          <text>免费参赛：在比赛券商开户参赛，可永久免报名费，佣金低-网速快-网上开户几分钟完成，开户选手内部第一奖茅台飞天，具体操作请站内</text>
+          <navigator url="../message/message"><text class="change" >咨询顽主</text></navigator>
+          <text>
           已经取得免费参赛资格的老选手：含（开户选手，历届小组第一，倒数第一，种子选手，腰斩选手），请直接站内联系客服授权登记。</text>
         </view>
-        
         <view class="title title1">6、声明</view>
         <view class="date">
-          <text>比赛期间和比赛结束，比赛方有权验证前排选手的成绩真实性，公布其在比赛期间的完整交割单，选手不得以任何理由拒绝，如不接受将取消比赛成绩，视为作蔽。\n
-          比赛只做学习交流，不做任何投资建议，选手在比赛期间的任何操作与言论，仅代表其个人意见，与比赛方无关，请勿跟风模仿，盈亏自负。\n\n\n
+          <text>比赛只做学习交流，不做任何投资建议，选手在比赛期间的任何操作与言论，仅代表其个人意见，与比赛方无关，请勿跟风模仿，盈亏自负。\n\n\n
           </text>
         </view>
 </scroll-view>
@@ -61,7 +62,9 @@
 <view class="date">每年{{info.viewer_price}}元，到明年今日为止。</view>
 
 <view class="title title1">3、 免费进入系统</view>
-<view class="date">在比赛合作方开户并使用，可永久免费浏览本系统，合作券商佣金低-网速快-网上开户几分钟完成，具体操作可站内咨询客服。</view>
+<view class="date">在比赛合作方开户并使用，可永久免费浏览本系统，合作券商佣金低-网速快-网上开户几分钟完成，具体操作可站内
+<navigator url="../message/message"><text class="change" >咨询顽主</text></navigator>
+</view>
 
 <view class="title title1">4、声明</view>
 <view class="date">比赛只做学习交流，不做任何投资建议，比赛系统内的选手操作与言论，仅代表选手个人意见，与比赛举办方无关，请勿跟风模仿，盈亏自负。如您发现比赛系统内有人发表不当言论，有任何割韭菜的嫌疑，请及时跟比赛方反应。\n\n\n</view>

pages/apply/apply.wxss

@@ -66,4 +66,10 @@ view{
   }
   scroll-view{
     height: calc(100vh - 250rpx);
+  }
+  .change{
+    color: #D94B24;
+    /* font-size: 28rpx; */
+    text-decoration: underline;
+    display: inline;
   }

pages/homepage/homepage.js

@@ -48,6 +48,7 @@ Page({
     })
     $api.getMatchList().then(res=>{
       let l = res.data.data.length - 1;
+      
       this.setData({
         match:res.data.data,
         index: l,

pages/homepage/homepage.wxml

@@ -53,7 +53,7 @@
       <text>初始资产</text>{{datas.today_record.init_fund}}W
     </view>
     <view>
-      <text>结束资产</text>{{datas.today_record.today_fund}}W（ 收益<label  class="{{datas.today_record.today_income[0]=='-' ?'down':'up'}}">{{datas.today_record.today_income}}</label>）
+      <text>结束资产</text>{{datas.today_record.today_fund}}W（ 收益<label  class="{{datas.today_record.today_income[0]=='-' ?'down':'up'}}">{{datas.today_record.total_income}}</label>）
     </view>
     <view>
       <text>胜率</text>{{datas.today_record.win_rate}}（最大回撤 <label class="{{datas.today_record.badest_income[0]=='-' ?'down':'up'}}"> {{datas.today_record.badest_income}} </label>）
@@ -103,7 +103,7 @@
   <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}}'>
       <view class="info">
-        <view class="date">{{item.stock_date}}（今日收益 <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>）</view>
+        <view class="date"> {{item.stock_date}}（今日收益 <text  class="{{item.today_income[0]=='-' ?'down':'up'}}">{{item.today_income}}</text>）</view>
       </view>
       <view class="info">
         <view>资产:  <label>{{item.today_fund}}w</label> （总收益 <text  class="{{item.total_income[0]=='-' ?'down':'up'}}">{{item.total_income}}</text>）</view>
@@ -112,7 +112,7 @@
       <view class="info">
                   持仓：<label wx:if='{{item.is_markt}}'>开超市</label>
                     <label wx:elif='{{item.today_stock.length>0}}'>
-                        <block wx:for="{{item.today_stock}}" wx:for-item='i'> {{i.name}}({{i.fund}}w) </block>
+                        <block wx:for="{{item.today_stock}}" wx:for-item='i'>{{i.name}}({{i.fund}}w) </block>
                     </label>
                     <view wx:else>空仓</view>
       </view>

pages/homepage/homepage.wxss

@@ -297,4 +297,15 @@ picker{
   color: #999;
   font-size: 28rpx;
   margin-right: 40rpx;
-}
+}
+
+.info{
+  font-size: 30rpx;
+  /* padding: 10rpx 24rpx;
+  display: flex; */
+}
+/* .info view{
+  color: #666;
+  width: 85%;
+  vertical-align: top;
+} */

pages/index/index.js

@@ -27,6 +27,8 @@ Page({
     total3: 0,
     page4: 1,
     total4: 0,
+    page5:1, // 今日留言加载更多
+    total5:0,
     error:0
   },
   onLoad() {
@@ -239,15 +241,28 @@ Page({
     wx.showNavigationBarLoading()
     this.getHot()
   },
+
+   //今日留言
+   next5: function () {
+    if (this.data.explist.length < this.data.total5) {
+      const page = this.data.page5 + 1
+      this.setData({
+        page5: page
+      })
+      this.getExp()
+    }
+  },
+
   getExp(){
-    $api.getExperience({page:1,page_size:10}).then(res=>{
+    $api.getExperience({page:this.data.page5,page_size:20}).then(res=>{
       var data=res.data.data.list;
       data.forEach(item=>{
         item.today_income=parseInt(item.today_income)+"%"
         item.total_income=parseInt(item.total_income)+"%"
       })
       this.setData({
-        explist: data
+        explist: data,
+        total5: res.data.data.list.total
       })
     })
   },
@@ -267,7 +282,9 @@ Page({
       page2: 1,
       total2: 0,
       page3: 1,
-      total3: 0
+      total3: 0,
+      page5: 1,
+      total5: 0
     })
     switch(this.data.cur){
       case 0:
@@ -296,8 +313,9 @@ Page({
         })
       }
     })
-    // if(this.data.followList.length<=0){
-    //   this.getFollow()
-    // }
+    
+    if(this.data.followList.length<=0){
+      this.getFollow()
+    }
   },
 })

pages/index/index.wxml

@@ -158,7 +158,7 @@
       </scroll-view>
   </swiper-item>
   <swiper-item>
-      <scroll-view   upper-threshold="0"  scroll-y='{{true}}'>
+      <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}}">
               <view class="relist">
@@ -200,6 +200,9 @@
                 </navigator>
               
           </view>
+          <block wx:if='{{total5 >= 20}}'>
+            <view class='loading' wx:if='{{explist.length < total5}}'>上拉加载更多...</view>
+          </block>
       </scroll-view>
   </swiper-item>
   <!-- <swiper-item>

pages/rank/rank.wxml

@@ -62,7 +62,7 @@
     </navigator>
     <view style="padding:10rpx 30rpx;position: relative;">
       <text class="note">日盈利<text class="up">5%</text>以上{{item.win_count}}人，日亏损<text class="down">5%</text>以上{{item.loss_count}}人</text>
-      <navigator hover-class="none" url="../comment/comment?id={{item.id}}" class="assess">顽主点评</navigator>
+      <!-- <navigator hover-class="none" url="../comment/comment?id={{item.id}}" class="assess">顽主点评</navigator> -->
         <!-- <text class="note">点击选手，查看每日持股与交割单...</text> -->
     </view>
 </view>

pages/style/style.wxss

@@ -4,7 +4,7 @@ page{
 }
 .title{
   font-size: 32rpx;
-  margin: 10rpx 0;
+  margin: 30rpx 0 0 0;
 }
 .item{
   padding: 30rpx 0 0rpx;
@@ -20,6 +20,7 @@ page{
 }
 .tags{
   position: relative;
+  font-size: 36rpx;
 }
 .tags>text{
   display: inline-block;

pages/today/today.wxss

@@ -436,7 +436,7 @@ picker{
       transform: scale(1,1);
     }
     50% {
-      transform: scale(1.2,1.2);
+      transform: scale(2,2);
     }
     100% {
       transform: scale(1,1);

pages/upload/upload.wxml

@@ -50,8 +50,7 @@
         <text>4、有特殊情况可不公布持股金额，但持股名称必须有。</text>
         <text>5、连续3天未交作业，无特殊原因将被视为退赛。</text>
         <text>6、重新归赛请联系顽主，并提交请假期间的银证转账记录。</text>
-        <text>7、比赛结束，前排选手需接受账户验证，比赛期间的完整交割单也将公布，不能公布者将取消成绩。</text>
-        <text>8、数据提交有误可直接修改，再点击上传。</text>
+        <text>7、数据提交有误可直接修改，再点击上传。</text>
     </view>
     
     <button   bindtap="post">上传</button>

project.config.json

@@ -1,60 +1,60 @@
 {
-	"description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-	"packOptions": {
-		"ignore": [],
-		"include": []
-	},
-	"setting": {
-		"urlCheck": true,
-		"es6": true,
-		"enhance": true,
-		"postcss": true,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"newFeature": true,
-		"coverView": true,
-		"nodeModules": false,
-		"autoAudits": false,
-		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"uglifyFileName": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		},
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false,
-		"compileHotReLoad": false,
-		"lazyloadPlaceholderEnable": false,
-		"useMultiFrameRuntime": true,
-		"useApiHook": true,
-		"useApiHostProcess": true,
-		"enableEngineNative": false,
-		"useIsolateContext": false,
-		"userConfirmedBundleSwitch": false,
-		"packNpmManually": false,
-		"packNpmRelationList": [],
-		"minifyWXSS": true,
-		"disableUseStrict": false,
-		"minifyWXML": true,
-		"showES6CompileOption": false,
-		"useCompilerPlugins": false,
-		"useStaticServer": true,
-		"ignoreUploadUnusedFiles": true
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.15.0",
-	"appid": "wxb299e10e65157301",
-	"projectname": "newwzb_xcx",
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"editorSetting": {
-		"tabIndent": "insertSpaces",
-		"tabSize": 2
-	},
-	"condition": {}
+  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": true,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useCompilerModule": false,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "enableEngineNative": false,
+    "useIsolateContext": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "minifyWXML": true,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "useStaticServer": true,
+    "ignoreUploadUnusedFiles": true
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.15.0",
+  "appid": "wxb299e10e65157301",
+  "projectname": "newwzb_xcx",
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
+  "condition": {}
 }