up

app.json

@@ -5,6 +5,7 @@
     "pages/rank/rank",
     "pages/upload/upload",
     "pages/user/user",
+    "pages/choice/choice",
     "pages/homepage/homepage",
     "pages/today/today",
     "pages/signup/signup",

pages/choice/choice.js

@@ -0,0 +1,72 @@
+// pages/choice/choice.js
+const app = getApp()
+const $api = require('../../utils/api.js').API;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    myList:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    $api.getChoice().then(res=>{
+      this.setData({
+        myList: res.data.data.list
+      })
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/choice/choice.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我的自选"
+}

pages/choice/choice.wxml

@@ -0,0 +1,12 @@
+<view>
+                          <navigator hover-class="none" url="../stock/stock?id={{item.stock_id}}&date={{date}}" class="gp" wx:for='{{myList}}'>
+                              <!-- <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> -->
+                              <text class="rank">{{index+1}}</text>
+                              <view class="gp-name">{{item.stock_name}}</view>
+                              <view class="num"> <text>{{item.count}}</text> 人持仓</view>
+                              <view class="comment"><text>留言 {{item.comments_count}} 条</text>|<text>跟踪 {{item.choice_count}} 人</text></view>
+                          </navigator>
+                          <view class="loading" wx:if='{{!myList}}'>暂无数据</view>
+                        </view>

pages/choice/choice.wxss

@@ -0,0 +1,52 @@
+/* pages/choice/choice.wxss */
+.gp{
+  display: flex;
+  justify-content: space-between;
+  padding: 24rpx 0;
+  flex-wrap: wrap;
+  border-bottom: 1px solid #F5F5F5;
+}
+.rank{
+  width:50rpx;text-align:center;color:#CE994F;
+  display: inline-block;
+}
+.gp-name{
+  font-weight: 500;
+  font-size: 32rpx;
+  width: 60%;
+  padding-left: 8rpx;
+}
+.num{
+  font-size: 28rpx;
+  color: #999;
+  text-align: right;
+  width: 200rpx;
+}
+.num text{
+  font-size: 36rpx;
+  font-weight: 500;
+  color: #D94B24;
+}
+.comment{
+  width: 100%;
+  padding-top: 10rpx;
+  padding-left: 60rpx;
+}
+.comment text{
+  color: #666;
+  margin:0 10rpx;
+  font-size: 28rpx;
+}
+.more{
+  display: block;
+  
+  line-height: 94rpx;
+  text-align: center;
+  font-size: 28rpx;
+  color: #333;
+}
+.more image{
+  width: 24rpx;
+  position: relative;
+  top: 3rpx;
+}

pages/index/index.js

@@ -197,11 +197,7 @@ Page({
     //     hotsellList: res.data.data.list
     //   })
     // })
-    $api.getChoice().then(res=>{
-      this.setData({
-        myList: res.data.data.list
-      })
-    })
+    
   },
   tabChange(e){
       this.setData({

pages/index/index.wxml

@@ -81,10 +81,10 @@
               <view class="hot">
                     <!-- <view class="tab1">热门持仓</view>
                      -->
-                    <view class="hot_tab">
+                    <!-- <view class="hot_tab">
                         <view bindtap="tabChange1" data-id='0' class="{{hot==0?'act1':''}}">今日热门 <text></text></view>
                         <view bindtap="tabChange1" data-id='1' class="{{hot==1?'act1':''}}">我的自选 <text></text></view>
-                    </view>
+                    </view> -->
                     <scroll-view style="padding:0;" scroll-y='{{true}}' style="height:calc(100vh - 377rpx);">
                         <view wx:if='{{hot==0}}'>
                           <navigator hover-class="none" url="../stock/stock?id={{item.id}}&date={{date}}" class="gp" wx:for='{{hotbuyList}}' wx:if='{{index<10}}'>

pages/rank/rank.js

@@ -23,6 +23,11 @@ Page({
     // this.setData({
     //   date: y + '-' + m + '-' + d
     // })
+    $api.getsignup().then(res=>{
+        this.setData({
+            info:res.data.data
+        })
+    })
     $api.getMatchList().then(res=>{
       let l = res.data.data.length - 1;
       this.setData({

pages/rank/rank.wxml

@@ -12,7 +12,7 @@
     <view class="zd"></view>
     <image src="../../images/lb.png" mode="widthFix"></image>
       <view class="marquee_text">
-        <navigator hover-class="none" url="../apply/apply?type=2">第50届顽主杯实盘大赛正在报名中 <text>报名时间：6月27日到7月5日</text> </navigator>
+        <navigator hover-class="none" url="../apply/apply?type=2">{{info.name}}正在报名中 <text>报名时间：{{info.start_time}}到{{info.end_time}}</text> </navigator>
       </view>
     </view>     
 

pages/user/user.wxml

@@ -34,6 +34,11 @@
 
 
       <view class="list" style="padding:0 30rpx;background:#fff;">
+        <navigator hover-class="none"  class="item" url="../choice/choice">
+            我的自选
+              <button class="contactus"></button>
+              <image mode="widthFix" src="../../images/right_icon.png"></image>
+        </navigator>
         <navigator hover-class="none"  class="item" url="../message/message">
             咨询顽主
               <button class="contactus"></button>