5.7

pages/apply/apply.wxml

@@ -21,7 +21,7 @@
           <text>百万组：50W到300W</text>
           <text>十万组：10W到50W</text>
           <text>菜鸟组：10W以下</text>
-          <text>各组第一奖牛气冲天奖杯+茅台飞天53度一瓶</text>
+          <text>{{info.awards_content}}</text>
           
         </view>
         <view class="title title1">3、交作业</view>

pages/avg/avg.js

@@ -119,7 +119,7 @@ Page({
       if(res.data.code == 0){
         records = res.data.data.list.reverse()
         var days=res.data.data.list,weeks=[]
-        days=days.reverse()
+        days=days
         for(let i=0;i<55;i++){
           weeks.push({
             name:'',

pages/rank/rank.wxml

@@ -32,8 +32,14 @@
     <!-- {{datas.match.start_time}}至{{datas.match.end_time}} -->
     <picker mode="date" value="{{date}}"  bindchange="bindDateChange">
                 <view class="date-picker">
-                   {{date}}<label wx:if="{{match_day >= 0}}">(开赛{{match_day}}天)</label>
+                   {{date}}
+                   <label wx:if="{{datas.match.end_time == date}}">
+                   (结束日)
+                   </label>
+                   <label wx:elif="{{match_day==0}}">(初始日)</label>
+                   <label wx:elif="{{match_day > 0}}">(开赛{{match_day}}天)</label>
                    <label wx:else>(休)</label>
+                  
 
                    <image style="width:24rpx;" mode="widthFix" src="../../images/icon_down@2x.png"></image>
                 </view>

pages/signup/signup.js

@@ -17,7 +17,6 @@ Page({
     phcode:'',
     signup_name:'',
     text:'获取验证码',
-    isLoading:0,
     userinfo:{},
   },
 
@@ -157,21 +156,12 @@ Page({
         })
         return
       }
-      if(this.data.isLoading == 1){
-        return
-      }
-
-      this.setData({
-        isLoading:1
-      })
+  
       wx.showLoading({
         title: '正在提交订单',
       })
       $api.wxpay(data).then(res=>{
         wx.hideLoading()
-        this.setData({
-          isLoading:0
-        })
         if(res.data.data.free){
           app.globalData.follow = 1
           wx.showToast({

pages/signup/signup.wxml

@@ -40,7 +40,7 @@
 <view class="title"><label>费用说明</label></view>
 <view class="title">
 <label>报名费用</label> 
-<block wx:if="{{userinfo.player_type <= 1}}">
+<block wx:if="{{!userinfo.player_type || userinfo.player_type <= 1}}">
 <label class="content" wx:if='{{type==2}}'>{{info.player_price}}</label>
 <label class="content" wx: wx:else>{{info.viewer_price}}</label>
 <label>元</label>

pages/upload/upload.js

@@ -1,7 +1,7 @@
 // pages/upload/upload.js
 const app = getApp()
 const $api = require('../../utils/api.js').API;
-const baseURL = 'https://test.hunanwanzhu.com';
+const baseURL = 'https://api.hunanwanzhu.com';
 Page({
 
   /**
@@ -214,7 +214,8 @@ Page({
         })
         let imgs = []
         let valueArr = []
-        // 需要oss 验签  此处是调取验签的接口  
+        // 需要oss 验签  此处是调取验签的接口 
+
         $api.getOssSign(res).then((r) => {
           wx.hideLoading()
           const arr = res.tempFiles
@@ -245,13 +246,16 @@ Page({
                 'Content-Type': 'application/x-www-form-urlencoded',
               },
               success: (res) => {
+                
                 if (res.statusCode == 200) {
                   var data=JSON.parse(res.data)
                   today_stock_img.push(data.data.url)
+                  console.log(today_stock_img)
                   that.setData({
                     today_stock_img: today_stock_img
                   })
-                  that.loadOcr(imgs[0],data.data.url)
+
+                  that.loadOcr(imgs[0],today_stock_img[0])
                 } else {
                   // 返回错误信息
                   console.log('error')

pages/upload/upload.wxml

@@ -2,7 +2,7 @@
     <view class="label" >持仓日期 {{stock_date}}<text class="note">交作业时间:15:00-15:30</text></view>
     
     <navigator wx:if="{{role == 2}}" class="change" url="../change/change">今日有银证转帐？先在此申报，再来交作业</navigator>
-    <view class="label">账户截图<text class="note">必须包括:总资产-股票名-持股金额，<text style='color:#E90001;font-size: 22rpx'>禁止打码</text>，买卖点截图也欢迎提交</text></view>
+    <view class="label">账户截图<text class="note">必须包括:总资产-股票名-持股金额，<text style='color:#E90001;font-size: 22rpx'>禁止打码</text>，持仓与清仓品种请尽量截全</text></view>
     <view wx:for='{{today_stock_img}}' class="stock_imgs">
         <image  src="{{item}}" bindtap="prview" data-src="{{item}}" bindload="imageLoad" data-index="{{ index }}"></image>
         <view class="edit">
@@ -20,7 +20,7 @@
             上传图片
     </view>
     <view>
-    <text style="color:rgb(88, 88, 88);font-size:24rpx">注意:识别有误请手动修改，用手机同花顺或券商app截图，可提高准确率，默认识别第一张图</text>
+    <text style="color:rgb(88, 88, 88);font-size:24rpx">注意:系统默认识别第一张图，识别有误可手动修改，手机同花顺或券商app截图可提高识别准确率</text>
     </view>
     <view class="label">今日总资产<text class="note">融资账户填净资产</text>  </view>
     <view class="info">

pages/winloseRank/winloseRank.js

@@ -21,7 +21,7 @@ Page({
         win:res.data.data.slice(0,10)
       })
     })
-    $api.getWinlossRank({user_id:1888,rank_type:'loss',match_id:20}).then(res=>{
+    $api.getWinlossRank({user_id:user_id,rank_type:'loss',match_id:match_id}).then(res=>{
       this.setData({
         loss:res.data.data.slice(0,10)
       })