改bug

pages/index/index.js

@@ -294,8 +294,8 @@ Page({
         })
       }
     })
-    if(this.data.followList.length<=0){
-      this.getFollow()
-    }
+    // if(this.data.followList.length<=0){
+    //   this.getFollow()
+    // }
   },
 })

pages/index/index.wxml

@@ -25,7 +25,7 @@
                       <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="content" wx:if="{{item.experience}}">{{item.experience}}</view>
               <view class="imgs">
                 <image wx:for='{{item.today_stock_img}}' wx:for-item='i'  catchtap="preview" data-src='{{i}}' data-urls='{{item.today_stock_img}}'
                  class="img" src="{{i}}"  mode="heightFix"></image>
@@ -168,7 +168,7 @@
                       <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="content" wx:if="{{item.experience}}">{{item.experience}}</view>
               <view class="recomment">
                   <image mode="widthFix" src="../../images/msg.png"></image>
                   <text>{{item.comments_count}}</text>

pages/rank/rank.wxml

@@ -9,12 +9,16 @@
   
 </view> -->
 <view  class="marquee_container">
-    <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">{{info.name}}正在报名中 <text>报名时间：{{info.signup_start_time}}到{{info.signup_end_time}}</text> </navigator>
-      </view>
-    </view>     
+  <view class="zd"></view>
+  <image src="../../images/lb.png" mode="widthFix" class="notice"></image>
+    <view class="marquee_text">
+      <navigator hover-class="none" url="../apply/apply?type=2">{{info.name}}正在报名中 
+      <text>报名时间：{{info.signup_start_time}}到{{info.signup_end_time}}</text> 
+      </navigator>
+    </view>
+    <image class="signupPoint" mode="widthFix" src="../../images/right.png"></image>
+</view>
+
 
 <view class="game_info" wx:if='{{datas.match.name}}'>
     <!-- <image   mode="widthFix" src="../../images/jiangbei.png"></image> -->
@@ -22,6 +26,7 @@
     <picker  value="{{index}}"  range="{{match}}" range-key='name' bindchange="bindChange">
       <view class="picker">
         {{match[index].name}}
+        <image style="width:24rpx;" mode="widthFix" src="../../images/icon_down@2x.png"></image>
       </view>
     </picker>
     <!-- {{datas.match.start_time}}至{{datas.match.end_time}} -->

pages/rank/rank.wxss

@@ -54,13 +54,20 @@ page{
   font-size: 26rpx;
   margin-top: 5rpx;
 }
-.marquee_container image{
+.marquee_container .notice{
   width: 34rpx;
   height: 34rpx;
   position: absolute;
   left: 10px;
   top: 46rpx;
 }
+.marquee_container .signupPoint{
+  width: 34rpx;
+  height: 34rpx;
+  position: absolute;
+  right: 10px;
+  top: 46rpx;
+}
 ._top{
   background: #D94B24;
   text-align: center;

pages/stock/stock.js

@@ -28,6 +28,12 @@ Page({
       stock_date: options.date,
       type: options.type
     })
+    $api.getAuthinfo().then(res=>{
+      this.setData({
+        user_id:res.data.data.id,
+        role: res.data.data.role
+      })
+    })
     if (options.id){
       this.setData({id:options.id})
       this.getComment()
@@ -69,6 +75,14 @@ Page({
       })
     })
   },
+  delmsg(e){
+    var data={
+      id:e.target.dataset.id
+    }
+    $api.delcomment(data).then(res=>{
+      this.getComment()
+    })
+  },
   inputchange1(e) {
     this.setData({
       comment: e.detail.value

pages/stock/stock.wxml

@@ -33,6 +33,7 @@
                 </view>
                 <view class="addr">
                     <text>{{item.ctime}}</text><text>来自{{item.location}}</text>
+                    <image wx:if="{{item.user_id==user_id}}" class="del" data-id='{{item.id}}' data-name='{{item.user_name}}' catchtap="delmsg" mode="widthFix" src="../../images/delete.png"></image>
                     <image data-id='{{item.id}}' data-name='{{item.user_name}}' catchtap="answer" mode="widthFix" src="../../images/msg.png"></image>
                 </view>
             </view>

pages/stock/stock.wxss

@@ -214,6 +214,11 @@ image{
   right: 0;
   top: 12rpx;
 }
+.addr .del{
+  right: 50rpx;
+  width: 50rpx;
+  top: 0;
+}
 .post{
   position: fixed;
   padding: 24rpx 30rpx 80rpx;

pages/today/today.wxml

@@ -58,7 +58,7 @@
 </view>
 
 <view class="imgs" wx:if='{{datas.today_record.today_stock_img.length>0}}'>
-    <view class="title">交割单111</view>
+    <view class="title">交割单</view>
     <image wx:for='{{datas.today_record.today_stock_img}}' wx:for-item='i'  bindtap="preview" data-src='{{i}}' data-urls='{{datas.today_record.today_stock_img}}'
                  class="img" src="{{i}}"></image>
 </view>
@@ -84,7 +84,7 @@
           </view>
           <view class="addr">
               <text>{{item.ctime}}</text><text>来自{{item.location}}</text>
-              <image wx:if="{{user_id==datas.today_record.user_id}}" class="del" data-id='{{item.id}}' data-name='{{item.user_name}}' catchtap="delmsg" mode="widthFix" src="../../images/delete.png"></image>
+              <image wx:if="{{user_id==datas.today_record.user_id||item.user_id==user_id}}" class="del" data-id='{{item.id}}' data-name='{{item.user_name}}' catchtap="delmsg" mode="widthFix" src="../../images/delete.png"></image>
               <image data-id='{{item.id}}' data-name='{{item.user_name}}' catchtap="answer" mode="widthFix" src="../../images/msg.png"></image>
           </view>
       </view>

project.config.json

@@ -1,58 +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,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "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": {}
 }