diff --git a/assets/image/icon_post_blue.png b/assets/image/icon_post_blue.png deleted file mode 100644 index cad68f6..0000000 Binary files a/assets/image/icon_post_blue.png and /dev/null differ diff --git a/assets/image/icon_post_gray.png b/assets/image/icon_post_gray.png deleted file mode 100644 index 53fc7f4..0000000 Binary files a/assets/image/icon_post_gray.png and /dev/null differ diff --git a/assets/image/icon_self_blue.png b/assets/image/icon_self_blue.png deleted file mode 100644 index 0d4a1fe..0000000 Binary files a/assets/image/icon_self_blue.png and /dev/null differ diff --git a/assets/image/icon_self_gray.png b/assets/image/icon_self_gray.png deleted file mode 100644 index a8e6b99..0000000 Binary files a/assets/image/icon_self_gray.png and /dev/null differ diff --git a/assets/image/icon_trans_blue.png b/assets/image/icon_trans_blue.png deleted file mode 100644 index 06904e8..0000000 Binary files a/assets/image/icon_trans_blue.png and /dev/null differ diff --git a/assets/image/icon_trans_gray.png b/assets/image/icon_trans_gray.png deleted file mode 100644 index 836a8c8..0000000 Binary files a/assets/image/icon_trans_gray.png and /dev/null differ diff --git a/assets/tabs/tab-host-blue.png b/assets/tabs/tab-host-blue.png new file mode 100644 index 0000000..05619ed Binary files /dev/null and b/assets/tabs/tab-host-blue.png differ diff --git a/assets/tabs/tab-host-gray.png b/assets/tabs/tab-host-gray.png new file mode 100644 index 0000000..e4cdfcb Binary files /dev/null and b/assets/tabs/tab-host-gray.png differ diff --git a/assets/tabs/tab-infi-blue.png b/assets/tabs/tab-infi-blue.png new file mode 100644 index 0000000..242007a Binary files /dev/null and b/assets/tabs/tab-infi-blue.png differ diff --git a/assets/tabs/tab-infi-gray.png b/assets/tabs/tab-infi-gray.png new file mode 100644 index 0000000..91d626f Binary files /dev/null and b/assets/tabs/tab-infi-gray.png differ diff --git a/assets/tabs/tab-self-blue.png b/assets/tabs/tab-self-blue.png new file mode 100644 index 0000000..fc569c7 Binary files /dev/null and b/assets/tabs/tab-self-blue.png differ diff --git a/assets/tabs/tab-self-gray.png b/assets/tabs/tab-self-gray.png new file mode 100644 index 0000000..1251266 Binary files /dev/null and b/assets/tabs/tab-self-gray.png differ diff --git a/assets/tabs/tab-trans-blue.png b/assets/tabs/tab-trans-blue.png new file mode 100644 index 0000000..203c8f2 Binary files /dev/null and b/assets/tabs/tab-trans-blue.png differ diff --git a/assets/tabs/tab-trans-gray.png b/assets/tabs/tab-trans-gray.png new file mode 100644 index 0000000..6c124c7 Binary files /dev/null and b/assets/tabs/tab-trans-gray.png differ diff --git a/pages/agent/index/index.wxml b/pages/agent/index/index.wxml index 5f14b88..ce508be 100644 --- a/pages/agent/index/index.wxml +++ b/pages/agent/index/index.wxml @@ -18,7 +18,7 @@ - + diff --git a/pages/article/information-item/index.json b/pages/article/information-item/index.json index 5925a9b..78013bd 100644 --- a/pages/article/information-item/index.json +++ b/pages/article/information-item/index.json @@ -1,9 +1,5 @@ { "component": true, "usingComponents": { - "wux-image": "/components/image/index", - "sudoku-image": "/components/sudoku-image/index", - "fold-text": "/components/fold-text/index", - "wux-tag": "/components/tag/index" } } \ No newline at end of file diff --git a/pages/index/index.wxs b/pages/index/index.wxs index 5c9faee..195d634 100644 --- a/pages/index/index.wxs +++ b/pages/index/index.wxs @@ -1,24 +1,24 @@ function tabImage(tabIndex, index) { if (index == 0) { if(tabIndex == index){ - return '/assets/image/icon_post_blue.png' + return '/assets/tabs/tab-host-blue.png' } - return '/assets/image/icon_post_gray.png' + return '/assets/tabs/tab-host-gray.png' } else if (index == 1) { if(tabIndex == index){ - return '/assets/image/icon_trans_blue.png' + return '/assets/tabs/tab-infi-blue.png' } - return '/assets/image/icon_trans_gray.png' + return '/assets/tabs/tab-infi-gray.png' } else if (index == 2) { if(tabIndex == index){ - return '/assets/image/icon_self_blue.png' + return '/assets/tabs/tab-trans-blue.png' } - return '/assets/image/icon_self_gray.png' + return '/assets/tabs/tab-trans-gray.png' } else if (index == 3) { if(tabIndex == index){ - return '/assets/image/icon_self_blue.png' + return '/assets/tabs/tab-self-blue.png' } - return '/assets/image/icon_self_gray.png' + return '/assets/tabs/tab-self-gray.png' } return '' } diff --git a/pages/moment/attention/index.js b/pages/moment/attention/index.js new file mode 100644 index 0000000..29e3978 --- /dev/null +++ b/pages/moment/attention/index.js @@ -0,0 +1,30 @@ +// pages/message/index.js +const util = require('../../../utils/util') +const app = getApp() + +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, + properties: { + height: { type: Number, value: 0 }, + item: { type: Object, value: null } + }, + data: { + orderList: [] + }, + methods: { + onRestart: function () { + console.log('attention....start') + if(!this.firstShow){ + + } + this.firstShow = true + }, + fetchList: function(){ + + } + } + +}) \ No newline at end of file diff --git a/pages/moment/attention/index.json b/pages/moment/attention/index.json new file mode 100644 index 0000000..8ec30eb --- /dev/null +++ b/pages/moment/attention/index.json @@ -0,0 +1,8 @@ +{ + "component": true, + "usingComponents": { + "wux-skeleton": "/components/skeleton/index", + "wux-skeleton-paragraph": "/components/skeleton-paragraph/index", + "moment-item": "/pages/moment/moment-item/index" + } +} \ No newline at end of file diff --git a/pages/moment/attention/index.wxml b/pages/moment/attention/index.wxml new file mode 100644 index 0000000..f871273 --- /dev/null +++ b/pages/moment/attention/index.wxml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + {{finished?'到底啦~':'加载中...'}} + + + + \ No newline at end of file diff --git a/pages/moment/attention/index.wxss b/pages/moment/attention/index.wxss new file mode 100644 index 0000000..5e8814f --- /dev/null +++ b/pages/moment/attention/index.wxss @@ -0,0 +1,9 @@ +/* pages/mall/shops/index.wxss */ +.item-content { + background: rgba(255, 255, 255, 1); + padding:32rpx +} + +.case3-class { + width: 680rpx; +} \ No newline at end of file diff --git a/pages/moment/fragment/index.js b/pages/moment/fragment/index.js index 87c815a..0027395 100644 --- a/pages/moment/fragment/index.js +++ b/pages/moment/fragment/index.js @@ -1,5 +1,5 @@ // pages/message/index.js -import { getFactoryPrice, getSuccessNotices } from "../../../api/ztb" +import { getSuccessNotices } from "../../../api/ztb" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() @@ -45,26 +45,20 @@ Component({ tabIndex: 0, firstShow: true }) - this.fetchAgentList() } this.data.firstShow = true if(!this.data.noticeList.length){ this.fetchNoticeList() } + this.onResume() }, onEvent: function (message) { - console.log('mall>>index>>onEvent', message) if (message.what == 10 && app.globalData.isVIP == 1) { // this.setData({ token: app.globalData.token }) // this.onRefreshList() - } else if(message.what == 1001){ - this.setData({ kg: app.globalData.kg }) } else if(message.what == 888){ - this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false }) - this.fetchAgentList() } else if(message.what == 444){ - this.setData({ orderList: [], ['form.pageNum']: 1, loading: true, finished: false, cityName: app.nowCity.cityName }) - this.fetchAgentList() + this.setData({ cityName: app.nowCity.cityName }) } }, chooseCity: function(){ @@ -72,15 +66,13 @@ Component({ }, searchList: function(){ - }, - postList: function(){ - }, onTabChange: function({detail}){ if(this.data.tabIndex == Number(detail.index)){ return } - this.fetchAgentList() + this.setData({ tabIndex: Number(detail.index) }) + this.onResume() }, fetchNoticeList: function(){ if (this.data.loopRequesting) { @@ -100,30 +92,19 @@ Component({ this.data.loopRequesting = false }) }, - //*************************************************fetchAgentList************************************************// - fetchAgentList: function () { - if (this.data.requesting || this.data.finished) { - return + toNotice: function(e){ + + }, + onResume: function(){ + var fragment = null + if(this.data.tabIndex == 0){ + fragment = this.selectComponent('#recommend') + } else if(this.data.tabIndex == 1){ + fragment = this.selectComponent('#attention') } - if (this.data.loading) { - this.data.requesting = true - } else { - this.setData({ requesting: true }) + if (fragment) { + fragment.onRestart() } - getFactoryPrice(this.data.form).then(result => { - if (result.data.records.length) { - var respList = result.data.records - let nowList = `orderList[${this.data.orderList.length}]` - var num = result.data.current - var finished = result.data.current >= result.data.pages - this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) - } else { - this.setData({ requesting: false, finished: true, loading: false }) - } - }).catch(err => { - //异常回调 - this.setData({ requesting: false, finished: true, loading: false }) - }) } } diff --git a/pages/moment/fragment/index.json b/pages/moment/fragment/index.json index 1e3e806..8d61b40 100644 --- a/pages/moment/fragment/index.json +++ b/pages/moment/fragment/index.json @@ -1,6 +1,8 @@ { "component": true, "usingComponents": { - "wux-tabi": "/components/tabi/index" + "wux-tabi": "/components/tabi/index", + "recommend": "/pages/moment/recommend/index", + "attention": "/pages/moment/attention/index" } } \ No newline at end of file diff --git a/pages/moment/fragment/index.wxml b/pages/moment/fragment/index.wxml index 68e2650..df62038 100644 --- a/pages/moment/fragment/index.wxml +++ b/pages/moment/fragment/index.wxml @@ -19,7 +19,7 @@ - + {{item}} @@ -28,4 +28,13 @@ - \ No newline at end of file + + + + + + + + + + \ No newline at end of file diff --git a/pages/moment/moment-item/index.js b/pages/moment/moment-item/index.js new file mode 100644 index 0000000..bdfc86d --- /dev/null +++ b/pages/moment/moment-item/index.js @@ -0,0 +1,18 @@ +// pages/stock/index.js +const util = require('../../../utils/util') + +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, + properties: { + item: { type: Object, value: null }, + mclick: { type: Boolean, value: true } + }, + methods: { + lookItem: function(e){ + util.navigateTo('/pakageInfo/pages/article/detail/index?id=' + this.data.item.id) + } + } +}) \ No newline at end of file diff --git a/pages/moment/moment-item/index.json b/pages/moment/moment-item/index.json new file mode 100644 index 0000000..78013bd --- /dev/null +++ b/pages/moment/moment-item/index.json @@ -0,0 +1,5 @@ +{ + "component": true, + "usingComponents": { + } +} \ No newline at end of file diff --git a/pages/moment/moment-item/index.wxml b/pages/moment/moment-item/index.wxml new file mode 100644 index 0000000..f20edcf --- /dev/null +++ b/pages/moment/moment-item/index.wxml @@ -0,0 +1,18 @@ + + + + 一级纸 东莞金洲 + 2021年9月14日 13:47:17 + + + + 2560 + + + 当前价 + + + +20 + 较上次 + + \ No newline at end of file diff --git a/pages/moment/moment-item/index.wxss b/pages/moment/moment-item/index.wxss new file mode 100644 index 0000000..17a4676 --- /dev/null +++ b/pages/moment/moment-item/index.wxss @@ -0,0 +1,23 @@ +/* pages/main/index.wxss */ +.image-load { + width: 50px; + height: 50px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 50rpx; +} +.bottomViewRightImg { + width: 290rpx; + height: 200rpx; + overflow: hidden; +} +.bottomViewRight { + width: 290rpx; + height: 200rpx !important; + overflow: hidden; +} +.imgZt{ + display: flex; + justify-content: flex-start; +} \ No newline at end of file diff --git a/pages/moment/recommend/index.js b/pages/moment/recommend/index.js new file mode 100644 index 0000000..684895c --- /dev/null +++ b/pages/moment/recommend/index.js @@ -0,0 +1,30 @@ +// pages/message/index.js +const util = require('../../../utils/util') +const app = getApp() + +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, + properties: { + height: { type: Number, value: 0 }, + item: { type: Object, value: null } + }, + data: { + orderList: [3] + }, + methods: { + onRestart: function () { + console.log('recomm....start') + if(!this.firstShow){ + + } + this.firstShow = true + }, + fetchList: function(){ + + } + } + +}) \ No newline at end of file diff --git a/pages/moment/recommend/index.json b/pages/moment/recommend/index.json new file mode 100644 index 0000000..408efb4 --- /dev/null +++ b/pages/moment/recommend/index.json @@ -0,0 +1,9 @@ +{ + "component": true, + "usingComponents": { + "wux-skeleton": "/components/skeleton/index", + "wux-skeleton-paragraph": "/components/skeleton-paragraph/index", + "wux-divider": "/components/divider/index", + "moment-item": "/pages/moment/moment-item/index" + } +} \ No newline at end of file diff --git a/pages/moment/recommend/index.wxml b/pages/moment/recommend/index.wxml new file mode 100644 index 0000000..c073a88 --- /dev/null +++ b/pages/moment/recommend/index.wxml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + {{finished?'到底啦~':'加载中...'}} + + + + \ No newline at end of file diff --git a/pages/moment/recommend/index.wxss b/pages/moment/recommend/index.wxss new file mode 100644 index 0000000..5e8814f --- /dev/null +++ b/pages/moment/recommend/index.wxss @@ -0,0 +1,9 @@ +/* pages/mall/shops/index.wxss */ +.item-content { + background: rgba(255, 255, 255, 1); + padding:32rpx +} + +.case3-class { + width: 680rpx; +} \ No newline at end of file diff --git a/pakageInfo/pages/article/sucessFul/index.wxml b/pakageInfo/pages/article/sucessFul/index.wxml index 51388cf..c670946 100644 --- a/pakageInfo/pages/article/sucessFul/index.wxml +++ b/pakageInfo/pages/article/sucessFul/index.wxml @@ -1,11 +1,10 @@ - + 您反馈的情报信息已查收,谢谢您对平台的参与和支持。 - 关闭 - + 关闭 \ No newline at end of file