Browse Source

no message

featrue/v4.5
xpz2018 4 years ago
parent
commit
4c8ab5b33b
10 changed files with 105 additions and 73 deletions
  1. 14
      components/button/index.wxss
  2. 5
      pages/moment/attention/index.js
  3. 10
      pages/moment/attention/index.wxml
  4. 6
      pages/moment/information/index.js
  5. 2
      pages/moment/moment-item/index.js
  6. 5
      pages/moment/moment-item/index.wxml
  7. 26
      pages/moment/recommend/index.js
  8. 51
      pages/moment/recommend/index.wxml
  9. 13
      pages/moment/theall/index.js
  10. 46
      pages/moment/theall/index.wxml

14
components/button/index.wxss

@ -119,6 +119,20 @@
width: 150rpx; width: 150rpx;
} }
.wux-button--attention {
min-height: 40rpx!important;
height: 40rpx!important;
font-size: 20rpx;
line-height: 40rpx;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
max-width: 120rpx;
width: 120rpx;
min-width: 120rpx;
padding: 0rpx;
}
.wux-button--sale { .wux-button--sale {
padding: 4rpx 24rpx 2rpx 24rpx; padding: 4rpx 24rpx 2rpx 24rpx;
min-width: 180rpx; min-width: 180rpx;

5
pages/moment/attention/index.js

@ -10,8 +10,7 @@ Component({
multipleSlots: true multipleSlots: true
}, },
properties: { properties: {
height: { type: Number, value: 0 },
item: { type: Object, value: null }
height: { type: Number, value: 0 }
}, },
data: { data: {
form: { form: {
@ -57,7 +56,7 @@ Component({
this.onRefreshList() this.onRefreshList()
} }
} else if(message.what == 444 && this.firstShow && app.globalData.userInfo){ } else if(message.what == 444 && this.firstShow && app.globalData.userInfo){
this.onRefreshList()
// this.onRefreshList()
} }
}, },
onRefreshList: function(){ onRefreshList: function(){

10
pages/moment/attention/index.wxml

@ -1,7 +1,6 @@
<!--pages/message/index.wxml-->
<scroll-view scroll-y style="height: {{height}}rpx;" bind:scrolltolower="fetchList"> <scroll-view scroll-y style="height: {{height}}rpx;" bind:scrolltolower="fetchList">
<wux-skeleton active wx:if="{{loading}}"> <wux-skeleton active wx:if="{{loading}}">
<view class="flex item-content">
<view class="flex item-content" style="height:{{height}}rpx">
<wux-skeleton-paragraph rounded rows="12" wux-class="case3-class" /> <wux-skeleton-paragraph rounded rows="12" wux-class="case3-class" />
</view> </view>
</wux-skeleton> </wux-skeleton>
@ -10,6 +9,12 @@
<view class="text-empty">{{ token ? '暂无数据,点击重新加载' : '请登录后加载'}}</view> <view class="text-empty">{{ token ? '暂无数据,点击重新加载' : '请登录后加载'}}</view>
</view> </view>
<view wx:else> <view wx:else>
<view class="bg-white flex flex-center" style="height: 80rpx;padding: 0rpx 32rpx;">
<view style="width: 35%;">纸厂名称</view>
<view style="width: 15%;">涨跌幅</view>
<view style="width: 25%;padding-left: 48rpx;">车辆排队</view>
<view style="width: 25%;padding-left: 24rpx">起扣点</view>
</view>
<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex"> <view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
<view wx:for="{{pageItem}}" wx:key="index"> <view wx:for="{{pageItem}}" wx:key="index">
<view class="bg-white" style="padding: 0rpx 32rpx" wx:if="{{pageIndex != 0 || index != 0 }}"> <view class="bg-white" style="padding: 0rpx 32rpx" wx:if="{{pageIndex != 0 || index != 0 }}">
@ -18,7 +23,6 @@
<moment-item item="{{item}}"></moment-item> <moment-item item="{{item}}"></moment-item>
</view> </view>
</view> </view>
<!--加载更多的UI-->
<view wx:if="{{form.pageNum > 1}}" style="padding:20rpx"> <view wx:if="{{form.pageNum > 1}}" style="padding:20rpx">
<wux-divider> <wux-divider>
<view class="loadmore"> <view class="loadmore">

6
pages/moment/information/index.js

@ -8,17 +8,15 @@ Component({
multipleSlots: true multipleSlots: true
}, },
properties: { properties: {
height: { type: Number, value: 0 },
item: { type: Object, value: null }
height: { type: Number, value: 0 }
}, },
data: { data: {
orderList: [12, 14] orderList: [12, 14]
}, },
methods: { methods: {
onRestart: function () { onRestart: function () {
console.log('information....start')
if(!this.firstShow){ if(!this.firstShow){
this.fetchList()
} }
this.firstShow = true this.firstShow = true
}, },

2
pages/moment/moment-item/index.js

@ -26,7 +26,7 @@ Component({
this.fetchItemList() this.fetchItemList()
} }
}, },
onAttentionChange: function(){
attention: function(){
if (this.data.loading) { if (this.data.loading) {
return return
} }

5
pages/moment/moment-item/index.wxml

@ -3,9 +3,10 @@
<view class="bg-white flex flex-justify" style="padding:18rpx 24rpx"> <view class="bg-white flex flex-justify" style="padding:18rpx 24rpx">
<view style="width: 25%;"> <view style="width: 25%;">
<view class="text-df text-black text-cut">东莞金洲</view> <view class="text-df text-black text-cut">东莞金洲</view>
<view class="attention-bg" bindtap="onAttentionChange">
<!-- <view class="attention-bg" bindtap="onAttentionChange">
<text class="{{item.hasFollowed ? 'text-blue' : 'text-red'}}">{{item.hasFollowed ? '关注' : '已关注'}}</text> <text class="{{item.hasFollowed ? 'text-blue' : 'text-red'}}">{{item.hasFollowed ? '关注' : '已关注'}}</text>
</view>
</view> -->
<wux-button outline type="{{item.hasFollowed ? 'positive' : 'stable'}}" loading="{{loading}}" size="attention" bind:click="attention">{{loading ? '' : item.hasFollowed ? '已关注' : '点击关注'}}</wux-button>
</view> </view>
<view style="width: 35%;"> <view style="width: 35%;">
<view class="flex flex-center"> <view class="flex flex-center">

26
pages/moment/recommend/index.js

@ -10,8 +10,7 @@ Component({
multipleSlots: true multipleSlots: true
}, },
properties: { properties: {
height: { type: Number, value: 0 },
item: { type: Object, value: null }
height: { type: Number, value: 0 }
}, },
data: { data: {
form: { form: {
@ -19,7 +18,10 @@ Component({
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10
}, },
loading: false,
requesting: false, requesting: false,
token: true,
finished: false,
orderList: [] orderList: []
}, },
lifetimes: { lifetimes: {
@ -35,6 +37,7 @@ Component({
if(!this.firstShow){ if(!this.firstShow){
var min = new Date() var min = new Date()
min.setHours(0, 0, 0) min.setHours(0, 0, 0)
this.data.token = app.globalData.userInfo ? true : false
this.data.form.date = util.formatDate(min, 'Y-M-D') this.data.form.date = util.formatDate(min, 'Y-M-D')
this.data.form.cityId = app.nowCity.cityCode this.data.form.cityId = app.nowCity.cityCode
this.fetchList() this.fetchList()
@ -43,11 +46,7 @@ Component({
}, },
onEvent: function (message) { onEvent: function (message) {
if(message.what == 888){ if(message.what == 888){
if(!app.globalData.userInfo){
this.setData({ orderList: [], ['form.pageNum']: 1, finished: false })
} else {
this.onRefreshList()
}
this.setData({ token: app.globalData.userInfo ? true : false })
} else if(message.what == 444 && this.firstShow){ } else if(message.what == 444 && this.firstShow){
this.data.form.cityId = app.nowCity.cityCode this.data.form.cityId = app.nowCity.cityCode
this.onRefreshList() this.onRefreshList()
@ -61,7 +60,7 @@ Component({
if (this.data.requesting) { if (this.data.requesting) {
return return
} }
this.setData({ orderList: [], ['form.pageNum']: 1, finished: false })
this.setData({ orderList: [], ['form.pageNum']: 1, finished: false, loading: true })
this.fetchList() this.fetchList()
}, },
fetchList: function(){ fetchList: function(){
@ -70,17 +69,18 @@ Component({
} }
this.data.requesting = true this.data.requesting = true
getInformationList(this.data.form).then(result => { getInformationList(this.data.form).then(result => {
if (result.data.records.length) {
if (result.data && result.data.records.length) {
var respList = result.data.records var respList = result.data.records
let nowList = `orderList[${this.data.orderList2.length}]`
let nowList = `orderList[${this.data.orderList.length}]`
var num = this.data.form.pageNum var num = this.data.form.pageNum
var finished = this.data.form.pageNum >= result.data.pages var finished = this.data.form.pageNum >= result.data.pages
this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false })
this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false, token: this.data.token })
} else { } else {
this.setData({ finished: true, requesting: false })
this.setData({ finished: true, requesting: false, loading: false, token: this.data.token })
} }
}).catch(err => { }).catch(err => {
this.setData({ requesting: false })
this.setData({ requesting: false, loading: false, token: this.data.token })
util.showToast(err) util.showToast(err)
}) })
} }

51
pages/moment/recommend/index.wxml

@ -1,32 +1,35 @@
<!--pages/message/index.wxml-->
<scroll-view scroll-y style="height: {{height}}rpx;" bind:scrolltolower="fetchList"> <scroll-view scroll-y style="height: {{height}}rpx;" bind:scrolltolower="fetchList">
<wux-skeleton active wx:if="{{!orderList.length}}">
<view class="flex item-content">
<wux-skeleton-paragraph rounded rows="16" wux-class="case3-class" />
<wux-skeleton active wx:if="{{loading}}">
<view class="flex item-content" style="height:{{height}}rpx">
<wux-skeleton-paragraph rounded rows="12" wux-class="case3-class" />
</view> </view>
</wux-skeleton> </wux-skeleton>
<view class="bg-white flex flex-center" style="height: 80rpx;padding: 0rpx 32rpx;display: {{orderList.length ? 'block' : 'none'}};">
<view style="width: 35%;">纸厂名称</view>
<view style="width: 15%;">涨跌幅</view>
<view style="width: 25%;padding-left: 48rpx;">车辆排队</view>
<view style="width: 25%;padding-left: 24rpx">起扣点</view>
<view class="bg-white list-empty" style="height:{{height}}rpx" bindtap="onRefreshList" wx:elif="{{!orderList.length && !loading}}">
<image class="img-empty" src="/assets/image/list_empty.png"></image>
<view class="text-empty">暂无数据,点击重新加载</view>
</view> </view>
<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
<view wx:for="{{pageItem}}" wx:key="index">
<view class="bg-white" style="padding: 0rpx 32rpx" wx:if="{{pageIndex != 0 || index != 0 }}">
<wux-divider show-text="{{ false }}"></wux-divider>
</view>
<moment-item item="{{item}}"></moment-item>
<view wx:else>
<view class="bg-white flex flex-center" style="height: 80rpx;padding: 0rpx 32rpx;">
<view style="width: 35%;">纸厂名称</view>
<view style="width: 15%;">涨跌幅</view>
<view style="width: 25%;padding-left: 48rpx;">车辆排队</view>
<view style="width: 25%;padding-left: 24rpx">起扣点</view>
</view> </view>
</view>
<!--加载更多的UI-->
<view wx:if="{{form.pageNum > 1}}" style="padding:20rpx">
<wux-divider>
<view class="loadmore">
<text class="icon--refresher" wx:if="{{!finished}}"></text>
<text class="text-sm" style="margin-left:8rpx">{{finished?'到底啦~':'加载中...'}}</text>
<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
<view wx:for="{{pageItem}}" wx:key="index">
<view class="bg-white" style="padding: 0rpx 32rpx" wx:if="{{pageIndex != 0 || index != 0 }}">
<wux-divider show-text="{{ false }}"></wux-divider>
</view>
<moment-item item="{{item}}"></moment-item>
</view> </view>
</wux-divider>
</view>
<view wx:if="{{form.pageNum > 1}}" style="padding:20rpx">
<wux-divider>
<view class="loadmore">
<text class="icon--refresher" wx:if="{{!finished}}"></text>
<text class="text-sm" style="margin-left:8rpx">{{finished?'到底啦~':'加载中...'}}</text>
</view>
</wux-divider>
</view>
</view> </view>
</scroll-view> </scroll-view>

13
pages/moment/theall/index.js

@ -23,6 +23,9 @@ Component({
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10
}, },
loading: true,
requesting: false,
finished: false,
orderList: [] orderList: []
}, },
methods: { methods: {
@ -65,8 +68,8 @@ Component({
if (this.data.requesting) { if (this.data.requesting) {
return return
} }
this.setData({ orderList: [], ['form.pageNum']: 1, finished: false, requesting: true })
this.fetchOrderList()
this.setData({ orderList: [], ['form.pageNum']: 1, finished: false, requesting: true, loading: true })
this.fetchList()
}, },
fetchList: function(){ fetchList: function(){
if (this.data.requesting) { if (this.data.requesting) {
@ -79,12 +82,12 @@ Component({
let nowList = `orderList[${this.data.orderList2.length}]` let nowList = `orderList[${this.data.orderList2.length}]`
var num = this.data.form.pageNum var num = this.data.form.pageNum
var finished = this.data.form.pageNum >= result.data.pages var finished = this.data.form.pageNum >= result.data.pages
this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false })
this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
} else { } else {
this.setData({ finished: true, requesting: false })
this.setData({ finished: true, requesting: false, loading: false })
} }
}).catch(err => { }).catch(err => {
this.setData({ requesting: false })
this.setData({ requesting: false, loading: false })
util.showToast(err) util.showToast(err)
}) })
} }

46
pages/moment/theall/index.wxml

@ -1,4 +1,3 @@
<!--pages/message/index.wxml-->
<view class="bg-white" style="height:90rpx;border-bottom:2rpx solid #f3f3f3" wx:if="{{firstShow}}"> <view class="bg-white" style="height:90rpx;border-bottom:2rpx solid #f3f3f3" wx:if="{{firstShow}}">
<wux-tabi tab-data="{{tabList}}" tab-index="{{tabIndex}}" line-height="{{3}}" disable="{{requesting}}" scroll="{{false}}" bind:change="onTabChange"></wux-tabi> <wux-tabi tab-data="{{tabList}}" tab-index="{{tabIndex}}" line-height="{{3}}" disable="{{requesting}}" scroll="{{false}}" bind:change="onTabChange"></wux-tabi>
</view> </view>
@ -6,27 +5,38 @@
<wux-tabi tab-data="{{proviceList}}" tab-index="{{pIndex}}" line-type="{{1}}" disable="{{requesting}}" scroll="{{true}}" bind:change="onProviceChange"></wux-tabi> <wux-tabi tab-data="{{proviceList}}" tab-index="{{pIndex}}" line-type="{{1}}" disable="{{requesting}}" scroll="{{true}}" bind:change="onProviceChange"></wux-tabi>
</view> </view>
<scroll-view scroll-y style="height: {{height - 190}}rpx;" bind:scrolltolower="fetchList">
<wux-skeleton active wx:if="{{!orderList.length}}">
<view class="flex item-content">
<scroll-view scroll-y style="height: {{ height - 190 }}rpx;" bind:scrolltolower="fetchList">
<wux-skeleton active wx:if="{{loading}}">
<view class="flex item-content" style="height:{{height - 190}}rpx">
<wux-skeleton-paragraph rounded rows="8" wux-class="case3-class" /> <wux-skeleton-paragraph rounded rows="8" wux-class="case3-class" />
</view> </view>
</wux-skeleton> </wux-skeleton>
<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
<view wx:for="{{pageItem}}" wx:key="index">
<view class="bg-white" style="padding: 0rpx 32rpx" wx:if="{{pageIndex != 0 || index != 0 }}">
<wux-divider show-text="{{ false }}"></wux-divider>
</view>
<moment-item item="{{item}}"></moment-item>
</view>
<view class="bg-white list-empty" style="height:{{height - 190}}rpx" bindtap="onRefreshList" wx:elif="{{!orderList.length && !loading}}">
<image class="img-empty" src="/assets/image/list_empty.png"></image>
<view class="text-empty">暂无数据,点击重新加载</view>
</view> </view>
<!--加载更多的UI-->
<view wx:if="{{form.pageNum > 1}}" style="padding:20rpx">
<wux-divider>
<view class="loadmore">
<text class="icon--refresher" wx:if="{{!finished}}"></text>
<text class="text-sm" style="margin-left:8rpx">{{finished?'到底啦~':'加载中...'}}</text>
<view wx:else>
<view class="bg-white flex flex-center" style="height: 80rpx;padding: 0rpx 32rpx;">
<view style="width: 35%;">纸厂名称</view>
<view style="width: 15%;">涨跌幅</view>
<view style="width: 25%;padding-left: 48rpx;">车辆排队</view>
<view style="width: 25%;padding-left: 24rpx">起扣点</view>
</view>
<view wx:for-item="pageItem" wx:for-index="pageIndex" wx:for="{{orderList}}" wx:key="pageIndex">
<view wx:for="{{pageItem}}" wx:key="index">
<view class="bg-white" style="padding: 0rpx 32rpx" wx:if="{{pageIndex != 0 || index != 0 }}">
<wux-divider show-text="{{ false }}"></wux-divider>
</view>
<moment-item item="{{item}}"></moment-item>
</view> </view>
</wux-divider>
</view>
<view wx:if="{{form.pageNum > 1}}" style="padding:20rpx">
<wux-divider>
<view class="loadmore">
<text class="icon--refresher" wx:if="{{!finished}}"></text>
<text class="text-sm" style="margin-left:8rpx">{{finished?'到底啦~':'加载中...'}}</text>
</view>
</wux-divider>
</view>
</view> </view>
</scroll-view> </scroll-view>
Loading…
Cancel
Save