20240910

pages/apply/apply.wxml

@@ -45,7 +45,7 @@
         </view>
         <view class="title title1">6、退赛</view>
         <view class="date">
-          <text>参赛一周内申请退赛可退报名费，比赛系统帐户收回</text>
+          <text>参赛一周内申请退赛可退报名费（请联系客服处理，24小时内退回），比赛系统帐户收回</text>
         </view>
 
         
@@ -73,7 +73,7 @@
 <navigator url="../message/message"><text class="change" >咨询我们</text></navigator>
 </view>
 <view class="title title1">4、 退款</view>
-<view class="date">游客使用系统三天内不满意，可申请退款，系统帐户收回。</view>
+<view class="date">游客使用系统三天内不满意，可申请退款（请联系客服处理，24小时内退回），系统帐户收回。</view>
 
 <view class="title title1">5、声明</view>
 <view class="date">比赛只做学习交流，不做任何投资建议，比赛系统内的选手操作与言论，仅代表选手个人意见，与比赛举办方无关，请勿跟风模仿，盈亏自负。如您发现比赛系统内有人发表不当言论，有任何割韭菜的嫌疑，请及时跟比赛方反应。\n\n\n</view>

pages/homepage/homepage.wxml

@@ -1,4 +1,5 @@
 <view class="per_top">
+    <view class="headbg"></view>
     <image src="{{datas.avatar}}" ></image>
     <view class="name">
       {{datas.username}}
@@ -21,18 +22,20 @@
     </block>
   </view>
 </view>
+<view class="intro">{{datas.intro}}</view>
 <view class="style">
-  <view wx:if='{{datas.style.length>0}}' style="padding-bottom: 0;">
-    <text>风格</text>
+  <view>Wo的风格</view>
+  <view wx:if='{{datas.style.length>0}}' style="padding-bottom: 0;margin-top: 10rpx;">
+    
     <view style="display: inline-block;width: 70%;vertical-align: top;"><label wx:for='{{datas.style}}' class="tag">{{item}}</label></view>
   </view>
-  <view>
-    <text>股龄</text>{{age}}年
+  <view style="margin-top: 20rpx;">
+    股龄{{age}}年
   </view>
 </view>
 
 <view class="match">
-  <view class="match_title">我的比赛</view>
+  <view class="match_title">Wo的比赛</view>
   <view class="match_list" wx:for="{{matchlist}}" wx:key="item">
     <navigator hover-class="none" url='../matchdetail/matchdetail?user_id={{item.user_id}}&match_id={{item.match_id}}'>
     <view>

pages/homepage/homepage.wxss

@@ -27,33 +27,47 @@ ec-canvas {
 }
 
 .per_top{
-  height: 138rpx;
+  height: 220rpx;
   position: relative;
-  padding:24rpx;
-  background: #ff0f03;
+  /* padding:24rpx; */
+  background: #fff;
+  z-index: 1;
+}
+
+.headbg{
+  position: relative;
+  height: 110rpx;
+  background-color: #ff0f03;
+  z-index: 2;
 }
+
 .per_top>image{
-  width: 90rpx;
-  height: 90rpx;
+  width: 160rpx;
+  height:160rpx;
   position: absolute;
   left: 24rpx;
-  top: 24rpx;
+  top: 60rpx;
   border-radius: 100%;
+  border: 1px solid #fff;
+  z-index: 3;
 }
 
 .name{
-  font-size:32rpx;
+  font-size:34rpx;
   font-weight: 500;
-  margin-left: 110rpx;
-  color: #fff;
+  margin-left: 195rpx;
+  margin-top: 15rpx;
+  color: #271f1f;
+  z-index: 5;
+  position: relative;
 }
 .fans{
-  color: rgba(255, 255, 255, 0.75);
+  color:#888888;
   font-size: 28rpx;
   margin-top: 10rpx;
 }
 .fans text{
-  color: #FFF;
+  color: #888888;
   font-weight: bold;
   margin-right: 10rpx;
 }
@@ -61,6 +75,7 @@ ec-canvas {
   position: absolute;
   right: 20rpx;
   top: 32rpx;
+  z-index: 6;
 }
 .per_top .follow,.lahei{
   display: inline-block;
@@ -72,6 +87,11 @@ ec-canvas {
   margin-left: 20rpx;
 }
 
+.intro{
+  font-size: 32rpx;
+  margin: 20rpx;
+}
+
 .style{
   background: #fff;
   padding: 30rpx;
@@ -90,8 +110,8 @@ ec-canvas {
 }
 .style .tag{
   font-size: 28rpx;
-  color: #CE994F;
-  border: 1px solid #CE994F;
+  color: #999;
+  border: 1px solid #999;
   border-radius: 8rpx;
   margin-right: 8rpx;
   font-weight: 400;
@@ -315,12 +335,12 @@ picker{
 } */
 
 .match{
-  padding-left: 24rpx;
+  padding-left: 30rpx;
 }
 
 .match_title{
   font-size: 30rpx;
-  color: #5f5e5e;
+  color: #000;
 }
 
 .match_list{

pages/login/user.wxml

@@ -47,7 +47,7 @@
     </view>
   <navigator url="../apply/apply?type=2"><image style="width: 24px;" mode="widthFix" src="../../images/bs.png"></image>报名选手(参赛)</navigator>
   <navigator  style="background: none;color:#D94B24;" url="../apply/apply?type=1"><image style="width: 24px;" mode="widthFix" src="../../images/yk.png"></image>报名游客(观赛)</navigator>
-  <navigator style="background: none;color:#D94B24;" url="../message/message"><image style="width: 18px;" mode="widthFix" src="../../images/zx.png"></image>  咨询顽主</navigator>
+  <navigator style="background: none;color:#D94B24;" url="../message/message"><image style="width: 18px;" mode="widthFix" src="../../images/zx.png"></image>  联系客服</navigator>
 </view>
 
 <!-- 上传头像和昵称 -->

pages/matchdetail/matchdetail.js

@@ -13,6 +13,7 @@ Page({
    */
   data: {
     datas:{},
+    lists:[],
     total_money:0,
     user_id:'',
     match_id:'',
@@ -115,6 +116,7 @@ Page({
       this.getWeek(records)
       this.setData({
         datas: res.data.data,
+        lists: records.reverse(),
         total_money:tmoney,
         date: stock_date[0] + '-' + stock_date[1],
         ec: {
@@ -277,7 +279,7 @@ Page({
 
 function initChart(canvas, width, height, dpr) {
   var xdata = [], ydata = [];
-  records = records.reverse()
+  records = records
   for (let i = 0; i < records.length; i++) {
     let date = records[i].stock_date.split('-');
     xdata.push(date[1] + '/' + date[2])

pages/matchdetail/matchdetail.wxml

@@ -57,7 +57,7 @@
 
 <view class="title">每日持股</view>
 <view class="days_stock">
-  <view  class="stock" wx:for='{{datas.records}}'>
+  <view  class="stock" wx:for='{{lists}}'>
     <navigator hover-class="none"  bind:tap="pushToday" data-match_id="{{item.match_id}}" data-record_id="{{item.id}}" data-user_id = "{{item.user_id}}">
       <view class="relist">
         <image  src="{{filters.defaultImg(item.avatar)}}"></image>
@@ -76,7 +76,7 @@
         顽主点评：{{item.wanzhu_comment}}
       </view>
       <view class="imgs" wx:if="{{role != 0}}">
-          <image wx:for='{{item.today_stock_img}}' wx:for-item='i'  bindtap="preview" data-src='{{i}}' data-urls='{{item.today_stock_img}}'
+          <image wx:for='{{item.today_stock_img}}' wx:for-item='i'  catch:tap="preview" data-src='{{i}}' data-urls='{{item.today_stock_img}}'
                  class="img" src="{{i}}"></image>
       </view>
       <view class="recomment">

pages/message/message.json

@@ -1,3 +1,3 @@
 {
-  "navigationBarTitleText": "我的咨询"
+  "navigationBarTitleText": "联系客服"
 }

pages/stock/stock.js

@@ -10,6 +10,7 @@ Page({
   data: {
     name:'',
     id:'',
+    date:'',
     stock_date:'',
     type:1,
     page:1,
@@ -36,7 +37,8 @@ Page({
     console.log('112',options)
     this.setData({
       type:options.type,
-      stock_date:options.stock_date
+      stock_date:options.stock_date,
+      date:options.stock_date,
     })
 
     wx.getStorage({

pages/stock/stock.wxml

@@ -94,7 +94,7 @@
           <text wx:else class="number">{{index+1}}</text>
           <view class="stock-name">
             {{item.stock_name}} <text class="cc">{{filters.toFix2(item.total_fund)}}w</text>
-            <text class="code">{{item.stock_code}} {{item.stock_desc}}</text>
+            <text class="code">{{item.stock_code}} <block wx:if="{{date==stock_date}}">{{item.stock_desc}}</block></text>
           </view>
         <view class="num"> <text>{{item.count}}</text> 人持仓 
           <image class="more-image" mode="widthFix" src="../../images/right_icon.png"></image>

pages/upload/upload.js

@@ -23,6 +23,7 @@ Page({
     disable:false,
     id:0,
     images:[],
+    lastdata:{},
   },
 
   /**
@@ -61,6 +62,12 @@ Page({
       })
     })
 
+    $api.getMineLatest().then(res=>{
+      this.setData({
+        lastdata: res.data.data,
+      })
+    })
+
   },
   onLoad: function (options) {
     var y=new Date().getFullYear() 
@@ -349,10 +356,10 @@ Page({
         continue;
       }
 
-      if(slist[i].fund > 5000){
+      if(slist[i].fund > 10000){
         wx.showToast({
           icon: 'none',
-          title: '持仓金额单位为万'
+          title: '持仓金额超过1亿'
         })
         return;
       }
@@ -381,7 +388,7 @@ Page({
     if (parm.today_fund >= 10000) {
       wx.showToast({
         icon: 'none',
-        title: '今日净资产单位为万'
+        title: '今日净资产超过1亿'
       })
       return
     }
@@ -410,13 +417,42 @@ Page({
       })
       return
     }
+
+    if (this.data.lastdata && !this.data.id){
+      var lastfund = this.data.lastdata.today_fund;
+      if((this.data.today_fund - lastfund)/lastfund > 0.15){
+        const that = this
+        wx.showActionSheet({
+          alertText:'今日收益超过15%',
+          itemList: ['缺席期无出入金-收益正常','缺席期有出入金-忘了申报'],
+          success(res){
+            if(res.tapIndex == 0){
+              that.uploadData(parm)
+            } else if(res.tapIndex ==1){
+              wx.navigateTo({
+                url: '../change/change',
+              })
+            }
+          }
+        })
+
+        return
+      }
+      
+    }
+
+    this.uploadData(parm)
+       
+  },
+  
+  uploadData(param){
     wx.showLoading({
       title: '正在提交',
     })
     this.setData({
       disable: true
     })
-    $api.updateRecord(parm).then(res => {
+    $api.updateRecord(param).then(res => {
       wx.hideLoading()
       wx.showToast({
         title: '提交成功',
@@ -444,9 +480,8 @@ Page({
       this.setData({
         disable:false
       })
-    )    
+    ) 
   },
-  
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/user/user.wxml

@@ -35,7 +35,7 @@
 
       <view class="list" style="padding:0 30rpx;background:#fff;">
         <navigator hover-class="none"  class="item" url="../message/message">
-            咨询我们
+            联系客服
               <button class="contactus"></button>
               <image mode="widthFix" src="../../images/right_icon.png"></image>
         </navigator>