save v1.0.1

package.json

@@ -19,6 +19,7 @@
   "dependencies": {
     "axios": "^0.18.0",
     "echarts": "^4.1.0",
+    "font-spider": "^1.3.4",
     "moment": "^2.22.2",
     "redux": "^3.7.2",
     "redux-actions": "^2.2.1",

src/app.wpy

@@ -37,7 +37,7 @@ export default class extends wepy.app {
     this.use('requestfix')
   }
 
-  onLaunch() {
+  onLaunch () {
 
   }
 

src/components/common/alert.wpy

@@ -57,7 +57,7 @@ export default class alert extends wepy.component {
   }
 
   onLoad () {
-    console.log('alert')
+    // console.log('alert')
   }
 
   methods = {

src/components/common/loadMore.wpy

 <template>
   <view class="loadMore" @tap="loadMore()">
-    <image src="../../static/img/i_refresh.png" /> 加载更多
+    <image src="{{ imgUrl }}" /> 加载更多
   </view>
 </template>
 
@@ -8,8 +8,16 @@
 import wepy from 'wepy'
 
 export default class loadMore extends wepy.component {
+  props = {
+    // 由于 wepy 的路径解析不咋给力，组件中套用组件，其中的一些url层级会不解析，这里需要手动指定层级关系。
+    z: {
+      type: String,
+      default: '0'
+    }
+  }
+
   onLoad () {
-    console.log('loadMore')
+    // console.log('loadMore')
   }
 
   methods = {
@@ -17,6 +25,13 @@ export default class loadMore extends wepy.component {
       this.$emit('loadMoreClick')
     }
   }
+
+  computed = {
+    imgUrl () {
+      // z 是几就在前面加几个 ../
+      return Array(+this.z).fill('../').join('') + 'static/img/i_refresh.png'
+    }
+  }
 }
 </script>
 

src/components/eventDetail/channelParticipation.wpy

@@ -70,7 +70,7 @@ export default class channelParticipation extends wepy.component {
           mediaType: [ '央级', '科技类', '财经类' ][i],
           value: n.mediaIn,
           showValue: `${Math.format.round(n.mediaIn, 1)}%`,
-          ptList: n.sources.join('、')
+          ptList: n.sources.slice(0, 3).join('、')
         }
       }) : []
     }

src/components/eventDetail/importantChannel.wpy

@@ -29,7 +29,7 @@
 
       </view>
 
-      <loadMore class="loadMoreBtn" wx:if="{{ upperLimit < channelData.length }}" />
+      <loadMore class="loadMoreBtn" z="3" wx:if="{{ upperLimit < channelData.length }}" />
 
     </view>
   </view>

src/components/eventDetail/leader.wpy

@@ -29,7 +29,7 @@
       </view>
 
       <view class="loadMoreBtn" wx:if="{{ upperLimit < leaderData.length }}">
-        <loadMore />
+        <loadMore z="3" />
       </view>
 
     </view>
@@ -65,7 +65,7 @@ export default class leader extends wepy.component {
   }
 
   onLoad () {
-    console.log('leader')
+    // console.log('leader')
   }
 
   computed = {

src/components/eventDetail/mediaViews.wpy

@@ -20,7 +20,7 @@
       </view>
 
       <view class="loadMoreBtn" wx:if="{{ upperLimit < mediaViews.length }}">
-        <loadMore />
+        <loadMore z="3" />
       </view>
 
     </view>

src/components/eventDetail/riskHints.wpy

@@ -19,7 +19,7 @@ import wepy from 'wepy'
 
 export default class riskHints extends wepy.component {
   onLoad () {
-    console.log('riskHints')
+    // console.log('riskHints')
   }
 }
 </script>

src/components/eventDetail/trend.wpy

@@ -106,11 +106,11 @@ export default class trend extends wepy.component {
         this.trendData = [
           { name: '持续时长', value: ago(data.continuedTime) },
           { name: data.isEnd ? '事件平均传播速度' : '过去24小时平均传播速度', value: `${Math.round(data.isEnd ? data.avgVelAll : data.avgVel)}条/小时` },
-          { name: '峰值传播速度', value: `${Math.sum(...data.timeLine.map(n => n.num))}条/小时` }
+          { name: '峰值传播速度', value: `${Math.max(...data.timeLine.map(n => n.num))}条/小时` }
         ]
         this.timelineData = {
-          hour: data.timeLine.map(n => [ moment(`${n.time}:00`).format('YY-DD HH'), n.num ]).slice(0, -1),
-          day: data.dayTimeLine.all.map(n => [ moment(`${n.time}`).format('YY/DD'), n.num ]).slice(0, -1)
+          hour: data.timeLine.map(n => [ moment(`${n.time}:00`).format('MM-DD HH:mm'), n.num ]).slice(0, -1),
+          day: data.dayTimeLine.all.map(n => [ moment(`${n.time}`).format('MM-DD'), n.num ]).slice(0, -1)
         }
         this.ec.option = getOptions({
           data: this.timelineData[this.minUnit]

src/components/eventDetail/trendOptions.js

@@ -44,7 +44,8 @@ export const getOptions = (params) => {
       axisLabel: {
         color: '#000'
       },
-      splitNumber: 3
+      splitNumber: 3,
+      minInterval: 1
     },
     series: [
       {

src/components/home/monthlyEventOptions.js

@@ -15,6 +15,14 @@ export const getOptions = (params) => {
 
   console.log('@/components/home/monthlyEventOption.js 图表数据：', params.data)
 
+  let splitNumber = 3 // Y轴分割线段数
+
+  let getPeakValue = (max) => {
+    let s = +(splitNumber + parseInt(max / 10).toString().split('').fill(0).join(''))
+    // console.log(max, s, Math.ceil(max / s) * s)
+    return Math.ceil(max / s) * s
+  }
+
   let option = {
     color: ['#49619F', '#F56586'],
     grid: {
@@ -48,7 +56,8 @@ export const getOptions = (params) => {
             color: '#EDEDED'
           }
         },
-        splitNumber: 3
+        max: getPeakValue(Math.max(...params.data.evts.data.map(n => n[1]))),
+        splitNumber
       },
       {
         position: 'right',
@@ -58,8 +67,9 @@ export const getOptions = (params) => {
           lineStyle: {
             color: '#EDEDED'
           }
-        }
-        // splitNumber: 3
+        },
+        max: getPeakValue(Math.max(...params.data.infs.data.map(n => n[1]))),
+        splitNumber
       }
     ],
     series: [

src/components/home/overview.wpy

@@ -25,7 +25,7 @@
 
 <script>
 import wepy from 'wepy'
-import { ago } from '@/static/js/ago_CN.js'
+// import { ago } from '@/static/js/ago_CN.js'
 
 export default class overview extends wepy.component {
   props = {
@@ -47,9 +47,9 @@ export default class overview extends wepy.component {
   computed = {
     dataInfo () {
       return this.overviewData.eventCount !== undefined ? [
-        { name: '影响力均值', value: Math.format.thousandBitSymbol(parseInt(this.overviewData.avgSumH)) },
+        { name: '影响力均值', value: Math.format.thousandBitSymbol(Math.round(this.overviewData.avgSumH)) },
         { name: '峰值平均传播速度', value: `${this.overviewData.avgMaxSpeed}条/小时` },
-        { name: '达到峰值平均用时', value: `${ago(this.overviewData.avgMaxTime)}` }
+        { name: '达到峰值平均用时', value: `${Math.format.round(this.overviewData.avgMaxTime / 1000 / 60 / 60, 1)}` }
       ] : []
     }
   }

src/components/searchList/eventCard.wpy

@@ -32,7 +32,7 @@ export default class eventCard extends wepy.component {
   }
 
   onLoad () {
-    console.log(this.eventData)
+    // console.log(this.eventData)
   }
 
   methods = {
@@ -47,7 +47,8 @@ export default class eventCard extends wepy.component {
 .eventCardWpy{
   display: flex;
   padding: 20rpx 0rpx 10rpx;
-  font-size: 36rpx;
+  font-size: 32rpx;
+  font-weight: lighter;
   .left{
     line-height: 1.2;
   }

src/mixins/bind2Way.js

@@ -2,7 +2,7 @@ import wepy from 'wepy'
 
 export default class bind2Way extends wepy.mixin {
   onLoad () {
-    console.log('mixin - bind2Way')
+    // console.log('mixin - bind2Way')
   }
 
   methods = {

src/pages/eventDetail.wpy

@@ -92,7 +92,7 @@ export default class eventDetail extends wepy.page {
         eventId: this.eventId
       }
     }).then(res => {
-      console.log(res)
+      // console.log(res)
       if (res.data.state) {
         let data = res.data.data
         wepy.setNavigationBarTitle({

src/pages/login.wpy

@@ -113,7 +113,7 @@ export default class login extends wepy.page {
         code: await this.getCode()
       }
     }).then(res => {
-      console.log(res)
+      // console.log(res)
       if (res.data.state) {
         let data = res.data.data
         console.log('bindingBrandSmall: ', data)
@@ -161,7 +161,7 @@ export default class login extends wepy.page {
         code: await this.getCode()
       }
     }).then(res => {
-      console.log(res)
+      // console.log(res)
       if (res.data.state) {
         let data = res.data.data
         console.log('loginBrandSmall: ', data)

src/pages/searchList.wpy

@@ -50,9 +50,15 @@
           </view>
         </view>
 
+        <view class="nothing" wx:if="{{ !eventList.length && !loading }}">没有搜索结果</view>
+
+        <view class="loading" wx:if="{{ loading }}" style="height: {{ loadingHeight }};">
+          <image src="../static/img/loading.gif"></image>
+        </view>
+
       </view>
 
-      <loadMore class="loadMoreBtn" wx:if="{{ haveNext }}" />
+      <loadMore class="loadMoreBtn" z="1" wx:if="{{ haveNext && !loading }}" />
 
     </view>
 
@@ -77,6 +83,7 @@ export default class searchList extends wepy.page {
   }
 
   data = {
+    loading: true,
     searchWord: '',
     isSearchPage: false,
     sort: 'time',
@@ -151,6 +158,8 @@ export default class searchList extends wepy.page {
   }
 
   getPageData (isAppend = false) {
+    this.loading = true
+    isAppend || (this.eventList = [])
     return new Promise((resolve, reject) => {
       this.page = isAppend ? this.page + 1 : 1
       console.log(this.tab.filter(n => n.selected)[0].name)
@@ -186,6 +195,8 @@ export default class searchList extends wepy.page {
           }
           this.haveNext = !!data.haveNext
         }
+        this.isSearchPage = !!this.searchWord
+        this.loading = false
         this.$apply()
         resolve(true)
       }).catch(err => {
@@ -197,6 +208,11 @@ export default class searchList extends wepy.page {
   computed = {
     pName () {
       return this.isSearchPage ? '搜索结果' : '事件列表'
+    },
+    loadingHeight () {
+      return this.eventList.length === 0
+        ? (wepy.getSystemInfoSync().windowHeight - 45 - 26 - 35 - 13 - 44 - 24) * 2 + 'rpx'
+        : 100 + 26 + 'rpx'
     }
   }
 
@@ -313,6 +329,22 @@ export default class searchList extends wepy.page {
           }
         }
       }
+      .nothing{
+        height: 700rpx;
+        line-height: 700rpx;
+        text-align: center;
+        font-size: 60rpx;
+        color: #ccc;
+      }
+      .loading{
+        // height: 180rpx;
+        display: flex;
+        image{
+          display: block;
+          margin: auto;
+          transform: scale(2);
+        }
+      }
     }
     .loadMoreBtn{
       margin-top: 26rpx;

src/pages/temp.wpy

@@ -9,7 +9,7 @@ import wepy from 'wepy'
 
 export default class temp extends wepy.page {
   onLoad () {
-    console.log('temp')
+    // console.log('temp')
   }
 }
 </script>

src/static/css/_public.scss

@@ -18,7 +18,7 @@ page, view, input, image{
 page{
 	font-size: 28rpx;
 	font-weight: 400;
-	font-family: 'Microsoft YaHei', 'Avenir', 'Monaco', 'Consolas';
+	// font-family: 'Microsoft YaHei', 'Avenir', 'Monaco', 'Consolas';
 	font-style: normal;
 	line-height: 1;
 	vertical-align: baseline;