diff --git a/app.json b/app.json index ead87e5..0aa935a 100644 --- a/app.json +++ b/app.json @@ -26,18 +26,6 @@ "pages/shop/order/index", "pages/shop/bidding/index", "pages/shop/bill/index", - "pages/article/publish/index", - "pages/article/detail/index", - "pages/article/price-detail/index", - "pages/article/queue-detail/index", - "pages/article/factory/index", - "pages/article/newInfo/index", - "pages/article/allNewInfo/index", - "pages/article/feedback/index", - "pages/article/list/index", - "pages/article/index/index", - "pages/article/attentionPaperFactory/index", - "pages/article/sucessFul/index", "pages/goods/ablility/index", "pages/goods/index/index", "pages/goods/detail/index", @@ -92,6 +80,7 @@ "pages/payment/index", "pages/home/personal/personal", "pages/home/enterprise/enterprise", + "pages/article/newInfo/index", "pages/moment/paper/index" ], "subpackages": [ @@ -108,13 +97,24 @@ ] }, { - "root": "pakageInfo/pages/", + "root": "pakageInfo/", "pages": [ + "pages/article/publish/index", + "pages/article/detail/index", + "pages/article/price-detail/index", + "pages/article/queue-detail/index", + "pages/article/factory/index", + "pages/article/allNewInfo/index", + "pages/article/feedback/index", + "pages/article/list/index", + "pages/article/index/index", + "pages/article/attentionPaperFactory/index", + "pages/article/sucessFul/index" ] }, { - "root": "pakageMy/pages/", + "root": "pakageMy/", "pages": [ ] diff --git a/pages/agent/factory/index.js b/pages/agent/factory/index.js index 15169b4..bafd164 100644 --- a/pages/agent/factory/index.js +++ b/pages/agent/factory/index.js @@ -150,7 +150,7 @@ Page({ }) }, postMoment: function () { - util.navigateTo('/pages/article/publish/index?factoryId=' + this.data.factoryDetail.paperMillId + '&name=' + this.data.factoryDetail.name) + util.navigateTo('/pakageInfo/pages/article/publish/index?factoryId=' + this.data.factoryDetail.paperMillId + '&name=' + this.data.factoryDetail.name) }, //*************************************************momentList************************************************// onRefreshList: function () { diff --git a/pages/article/article-item/index.js b/pages/article/article-item/index.js index cc599e2..269b853 100644 --- a/pages/article/article-item/index.js +++ b/pages/article/article-item/index.js @@ -1,5 +1,5 @@ // pages/stock/index.js -import { likeMoment } from "../../api/moment" +import { likeMoment } from "../../../pages/api/moment" const util = require('../../../utils/util') const app = getApp() @@ -20,7 +20,7 @@ Component({ util.navigateTo('/pages/agent/factory/index?tabIndex=1&id=' + this.data.item.millPaperId) }, lookItem: function(e){ - util.navigateTo('/pages/article/detail/index?id=' + this.data.item.id) + util.navigateTo('/pakageInfo/pages/article/detail/index?id=' + this.data.item.id) }, likeItem: function(e){ if(!app.globalData.userInfo){ diff --git a/pages/article/index/index.json b/pages/article/index/index.json deleted file mode 100644 index f632ea2..0000000 --- a/pages/article/index/index.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "usingComponents": { - "wux-tabi": "/components/tabi/index", - "hot": "/pages/article/hot-index/index", - "price": "/pages/article/price-index/index", - "queue": "/pages/article/queue-index/index", - "point": "/pages/article/point-index/index" - } -} \ No newline at end of file diff --git a/pages/article/newInfo/index.js b/pages/article/newInfo/index.js index dd3e05e..76d660b 100644 --- a/pages/article/newInfo/index.js +++ b/pages/article/newInfo/index.js @@ -42,16 +42,16 @@ Component({ }, toPage: function (e) { if (e.currentTarget.id == 'toqb') { - util.navigateTo('/pages/article/index/index') + util.navigateTo('/pakageInfo/pages/article/index/index') } if (e.currentTarget.id == 'toAllFactory') { - util.navigateTo('/pages/article/allNewInfo/index') + util.navigateTo('/pakageInfo/pages/article/allNewInfo/index') } if(e.currentTarget.id == 'toAttentionFactory'){ util.navigateTo('/pages/home/attentionPaperList/index') } if(e.currentTarget.id == 'tofeedback'){ - util.navigateTo('/pages/article/feedback/index') + util.navigateTo('/pakageInfo/pages/article/feedback/index') } if(e.currentTarget.id == 'toFactoryDetails'){ util.navigateTo('/pages/agent/factory/index?id='+e.currentTarget.dataset.factoryid) @@ -69,7 +69,7 @@ Component({ } }, toPageDetails:function(e){ - util.navigateTo('/pages/article/detail/index?id='+e.currentTarget.id) + util.navigateTo('/pakageInfo/pages/article/detail/index?id='+e.currentTarget.id) }, changeTable: function (e) { if (e.currentTarget.id === this.data.tableSgin) { diff --git a/pages/home/index/index.js b/pages/home/index/index.js index b9fe63a..13791dd 100644 --- a/pages/home/index/index.js +++ b/pages/home/index/index.js @@ -123,7 +123,7 @@ Component({ } else if (e.currentTarget.id == 'integral') { util.navigateTo('/pages/html/integral/index') } else if (e.currentTarget.id == 'article') { - util.navigateTo('/pages/article/list/index') + util.navigateTo('/pakageInfo/pages/article/list/index') } else if (e.currentTarget.id == 'adress') { util.navigateTo('/pages/adress/list/index') } else if (e.currentTarget.id == 'setting') { @@ -211,7 +211,7 @@ Component({ }) } else if (parseInt(e.currentTarget.id) == 6) { wx.navigateTo({ - url: '/pages/article/list/index' + url: '/pakageInfo/pages/article/list/index' }) } else if (parseInt(e.currentTarget.id) == 7) { wx.navigateTo({ diff --git a/pages/html/integral/index.js b/pages/html/integral/index.js index c84d149..6481500 100644 --- a/pages/html/integral/index.js +++ b/pages/html/integral/index.js @@ -77,7 +77,7 @@ Page({ wx.navigateBack({ delta: 1 }) } else if(targetView == 'createArticle'){ // 发布帖子 - wx.redirectTo({ url: '/pages/article/publish/index' }) + wx.redirectTo({ url: '/pakageInfo/pages/article/publish/index' }) } }, exchangePoint: function(event){ diff --git a/pages/mall/index/index.js b/pages/mall/index/index.js index 5fca57b..8dfa338 100644 --- a/pages/mall/index/index.js +++ b/pages/mall/index/index.js @@ -110,9 +110,9 @@ Component({ } else if (index === 3) { util.navigateTo('/pages/mall/price-index/index') } else if (index === 4) { - util.navigateTo('/pages/article/price-detail/index') + util.navigateTo('/pakageInfo/pages/article/price-detail/index') } else if (index === 5) { - util.navigateTo('/pages/article/queue-detail/index') + util.navigateTo('/pakageInfo/pages/article/queue-detail/index') } }, onTabChange: function({detail}){ diff --git a/pages/article/allNewInfo/index.js b/pakageInfo/pages/article/allNewInfo/index.js similarity index 95% rename from pages/article/allNewInfo/index.js rename to pakageInfo/pages/article/allNewInfo/index.js index 6b13ba1..99d92a3 100644 --- a/pages/article/allNewInfo/index.js +++ b/pakageInfo/pages/article/allNewInfo/index.js @@ -1,9 +1,9 @@ -const util = require('../../../utils/util') -const math = require('../../../utils/math') //导入模块 +const util = require('../../../../utils/util') +const math = require('../../../../utils/math') //导入模块 const app = getApp() import { getPaperMillOfInformationList -} from "../../api/ztb" +} from "../../../../pages/api/ztb" Page({ diff --git a/pages/article/allNewInfo/index.json b/pakageInfo/pages/article/allNewInfo/index.json similarity index 51% rename from pages/article/allNewInfo/index.json rename to pakageInfo/pages/article/allNewInfo/index.json index ab34018..8cef1c0 100644 --- a/pages/article/allNewInfo/index.json +++ b/pakageInfo/pages/article/allNewInfo/index.json @@ -2,10 +2,6 @@ "component": true, "usingComponents": { "wux-tabi": "/components/tabi/index", - "hot": "/pages/article/hot-index/index", - "price": "/pages/article/price-index/index", - "queue": "/pages/article/queue-index/index", - "point": "/pages/article/point-index/index", "wux-accordion-group": "/components/accordion-group/index", "wux-accordion": "/components/accordion/index" } diff --git a/pages/article/allNewInfo/index.wxml b/pakageInfo/pages/article/allNewInfo/index.wxml similarity index 100% rename from pages/article/allNewInfo/index.wxml rename to pakageInfo/pages/article/allNewInfo/index.wxml diff --git a/pages/article/allNewInfo/index.wxss b/pakageInfo/pages/article/allNewInfo/index.wxss similarity index 100% rename from pages/article/allNewInfo/index.wxss rename to pakageInfo/pages/article/allNewInfo/index.wxss diff --git a/pakageInfo/pages/article/article-item/index.js b/pakageInfo/pages/article/article-item/index.js new file mode 100644 index 0000000..f00fa9f --- /dev/null +++ b/pakageInfo/pages/article/article-item/index.js @@ -0,0 +1,42 @@ +// pages/stock/index.js +import { likeMoment } from "../../../../pages/api/moment" +const util = require('../../../../utils/util') +const app = getApp() + +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, + properties: { + item: { type: Object, value: null }, + mclick: { type: Boolean, value: true } + }, + methods: { + toMill: function(){ + if(!this.data.mclick){ + return + } + util.navigateTo('/pages/agent/factory/index?tabIndex=1&id=' + this.data.item.millPaperId) + }, + lookItem: function(e){ + util.navigateTo('/pakageInfo/pages/article/detail/index?id=' + this.data.item.id) + }, + likeItem: function(e){ + if(!app.globalData.userInfo){ + wx.navigateTo({ url: '/pages/login/index' }) + return + } + if(this.data.item.isLiked){ + util.showToast('请勿重复点赞') + return + } + // /article/like-or-cancel/article/{id} + likeMoment({articleId: this.data.item.id}).then(result => { + this.setData({ ['item.likeQuantity']: result.data.likeQuantity, ['item.isLiked']: 1 }) + }).catch(error => { + util.showToast(error) + }) + } + } +}) \ No newline at end of file diff --git a/pakageInfo/pages/article/article-item/index.json b/pakageInfo/pages/article/article-item/index.json new file mode 100644 index 0000000..5925a9b --- /dev/null +++ b/pakageInfo/pages/article/article-item/index.json @@ -0,0 +1,9 @@ +{ + "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/pakageInfo/pages/article/article-item/index.wxml b/pakageInfo/pages/article/article-item/index.wxml new file mode 100644 index 0000000..57cfbb9 --- /dev/null +++ b/pakageInfo/pages/article/article-item/index.wxml @@ -0,0 +1,47 @@ + + + + + + + + + + + + {{item.creatorName || ''}} + {{moment.formatMTime(item.createTime)}} + + + + {{item.title}} + + + + + + + + + + + + # + {{item.millPaperName}} + + + + + + + + + {{item.likeQuantity}} + + + + {{item.replyQuantity}} + + + + \ No newline at end of file diff --git a/pakageInfo/pages/article/article-item/index.wxss b/pakageInfo/pages/article/article-item/index.wxss new file mode 100644 index 0000000..17a4676 --- /dev/null +++ b/pakageInfo/pages/article/article-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/article/attentionPaperFactory/index.js b/pakageInfo/pages/article/attentionPaperFactory/index.js similarity index 94% rename from pages/article/attentionPaperFactory/index.js rename to pakageInfo/pages/article/attentionPaperFactory/index.js index 5899753..44ca896 100644 --- a/pages/article/attentionPaperFactory/index.js +++ b/pakageInfo/pages/article/attentionPaperFactory/index.js @@ -2,9 +2,9 @@ import { getFactoryPrice, userPushFollowMill -} from '../../api/ztb' -const event = require('../../../utils/event.js') -const storage = require('../../../utils/storage') +} from '../../../../pages/api/ztb' +const event = require('../../../../utils/event.js') +const storage = require('../../../../utils/storage') const app = getApp() Page({ diff --git a/pages/article/attentionPaperFactory/index.json b/pakageInfo/pages/article/attentionPaperFactory/index.json similarity index 100% rename from pages/article/attentionPaperFactory/index.json rename to pakageInfo/pages/article/attentionPaperFactory/index.json diff --git a/pages/article/attentionPaperFactory/index.wxml b/pakageInfo/pages/article/attentionPaperFactory/index.wxml similarity index 100% rename from pages/article/attentionPaperFactory/index.wxml rename to pakageInfo/pages/article/attentionPaperFactory/index.wxml diff --git a/pages/article/attentionPaperFactory/index.wxss b/pakageInfo/pages/article/attentionPaperFactory/index.wxss similarity index 100% rename from pages/article/attentionPaperFactory/index.wxss rename to pakageInfo/pages/article/attentionPaperFactory/index.wxss diff --git a/pages/article/detail/index.js b/pakageInfo/pages/article/detail/index.js similarity index 96% rename from pages/article/detail/index.js rename to pakageInfo/pages/article/detail/index.js index 964bca8..3899d69 100644 --- a/pages/article/detail/index.js +++ b/pakageInfo/pages/article/detail/index.js @@ -4,8 +4,8 @@ import { likeMoment, likeComment, commentMoment -} from "../../api/moment" -const util = require('../../../utils/util') +} from "../../../../pages/api/moment" +const util = require('../../../../utils/util') const app = getApp() // pages/moment/detail/index.js Page({ @@ -261,7 +261,7 @@ Page({ } return { title: this.data.momentDetail.title, - path: 'pages/index/index?url=/pages/article/detail/index&key=id&value=' + this.data.momentDetail.id, + path: 'pages/index/index?url=/pakageInfo/pages/article/detail/index&key=id&value=' + this.data.momentDetail.id, // imageUrl: this.data.imagePath } }, @@ -273,7 +273,7 @@ Page({ } return { title: this.data.momentDetail.title, - path: 'pages/index/index?url=/pages/article/detail/index&key=id&value=' + this.data.momentDetail.id, + path: 'pages/index/index?url=/pakageInfo/pages/article/detail/index&key=id&value=' + this.data.momentDetail.id, imageUrl: imageUrl } }, diff --git a/pages/article/detail/index.json b/pakageInfo/pages/article/detail/index.json similarity index 100% rename from pages/article/detail/index.json rename to pakageInfo/pages/article/detail/index.json diff --git a/pages/article/detail/index.wxml b/pakageInfo/pages/article/detail/index.wxml similarity index 100% rename from pages/article/detail/index.wxml rename to pakageInfo/pages/article/detail/index.wxml diff --git a/pages/article/detail/index.wxss b/pakageInfo/pages/article/detail/index.wxss similarity index 100% rename from pages/article/detail/index.wxss rename to pakageInfo/pages/article/detail/index.wxss diff --git a/pages/article/factory/index.js b/pakageInfo/pages/article/factory/index.js similarity index 95% rename from pages/article/factory/index.js rename to pakageInfo/pages/article/factory/index.js index 23bfdff..f5fa920 100644 --- a/pages/article/factory/index.js +++ b/pakageInfo/pages/article/factory/index.js @@ -1,8 +1,8 @@ // pages/moment/paper/index.js -import { getAllFactoryList } from "../../api/ztb" -const util = require('../../../utils/util') -const storage = require('../../../utils/storage') -const event = require('../../../utils/event.js') +import { getAllFactoryList } from "../../../../pages/api/ztb" +const util = require('../../../../utils/util') +const storage = require('../../../../utils/storage') +const event = require('../../../../utils/event.js') const app = getApp() Page({ diff --git a/pages/article/factory/index.json b/pakageInfo/pages/article/factory/index.json similarity index 100% rename from pages/article/factory/index.json rename to pakageInfo/pages/article/factory/index.json diff --git a/pages/article/factory/index.wxml b/pakageInfo/pages/article/factory/index.wxml similarity index 100% rename from pages/article/factory/index.wxml rename to pakageInfo/pages/article/factory/index.wxml diff --git a/pages/article/factory/index.wxss b/pakageInfo/pages/article/factory/index.wxss similarity index 100% rename from pages/article/factory/index.wxss rename to pakageInfo/pages/article/factory/index.wxss diff --git a/pages/article/feedback/index.js b/pakageInfo/pages/article/feedback/index.js similarity index 93% rename from pages/article/feedback/index.js rename to pakageInfo/pages/article/feedback/index.js index 12a491f..b04f9fa 100644 --- a/pages/article/feedback/index.js +++ b/pakageInfo/pages/article/feedback/index.js @@ -1,9 +1,9 @@ -// pages/article/feedback/index.js +// pakageInfo/pages/article/feedback/index.js import { getAllFactoryList, feedbackMillInformation -} from "../../api/ztb" -const util = require('../../../utils/util') +} from "../../../../pages/api/ztb" +const util = require('../../../../utils/util') Page({ /** @@ -140,7 +140,7 @@ Page({ feedbackMillInformation(model).then(res => { if (res.code == 0) { util.showToast('提交成功！') - util.navigateTo('/pages/article/sucessFul/index') + util.navigateTo('/pakageInfo/pages/article/sucessFul/index') } else { util.showToast('提交失败失败！原因：' + res.message) } diff --git a/pages/article/feedback/index.json b/pakageInfo/pages/article/feedback/index.json similarity index 100% rename from pages/article/feedback/index.json rename to pakageInfo/pages/article/feedback/index.json diff --git a/pages/article/feedback/index.wxml b/pakageInfo/pages/article/feedback/index.wxml similarity index 95% rename from pages/article/feedback/index.wxml rename to pakageInfo/pages/article/feedback/index.wxml index 707153b..e5e9b22 100644 --- a/pages/article/feedback/index.wxml +++ b/pakageInfo/pages/article/feedback/index.wxml @@ -1,4 +1,4 @@ - + 反馈情报 diff --git a/pages/article/feedback/index.wxss b/pakageInfo/pages/article/feedback/index.wxss similarity index 93% rename from pages/article/feedback/index.wxss rename to pakageInfo/pages/article/feedback/index.wxss index ce0b89b..f5035dc 100644 --- a/pages/article/feedback/index.wxss +++ b/pakageInfo/pages/article/feedback/index.wxss @@ -1,4 +1,4 @@ -/* pages/article/feedback/index.wxss */ +/* pakageInfo/pages/article/feedback/index.wxss */ page { background-color: white; } diff --git a/pages/article/hot-index/index.js b/pakageInfo/pages/article/hot-index/index.js similarity index 93% rename from pages/article/hot-index/index.js rename to pakageInfo/pages/article/hot-index/index.js index 23d1a8b..54c50de 100644 --- a/pages/article/hot-index/index.js +++ b/pakageInfo/pages/article/hot-index/index.js @@ -1,9 +1,9 @@ // pages/stock/index.js -import { getPreferList } from "../../api/moment" -import { getAllFactoryList, getIndexInfoId } from "../../api/ztb" -const util = require('../../../utils/util') -const storage = require('../../../utils/storage') -const event = require('../../../utils/event.js') +import { getPreferList } from "../../../../pages/api/moment" +import { getAllFactoryList, getIndexInfoId } from "../../../../pages/api/ztb" +const util = require('../../../../utils/util') +const storage = require('../../../../utils/storage') +const event = require('../../../../utils/event.js') const app = getApp() Component({ @@ -73,7 +73,7 @@ Component({ }) }, toFactoryList: function(){ - wx.navigateTo({ url: '/pages/article/factory/index' }) + wx.navigateTo({ url: '/pakageInfo/pages/article/factory/index' }) }, toFactory: function(e){ var item = this.data.factoryList[e.currentTarget.dataset.index] diff --git a/pages/article/hot-index/index.json b/pakageInfo/pages/article/hot-index/index.json similarity index 90% rename from pages/article/hot-index/index.json rename to pakageInfo/pages/article/hot-index/index.json index ebee684..0aa254c 100644 --- a/pages/article/hot-index/index.json +++ b/pakageInfo/pages/article/hot-index/index.json @@ -14,6 +14,6 @@ "refresh-view": "/components/refresher/index", "wux-button": "/components/button/index", "wux-tag": "/components/tag/index", - "article-item": "/pages/article/article-item/index" + "article-item": "/pakageInfo/pages/article/article-item/index" } } \ No newline at end of file diff --git a/pages/article/hot-index/index.wxml b/pakageInfo/pages/article/hot-index/index.wxml similarity index 100% rename from pages/article/hot-index/index.wxml rename to pakageInfo/pages/article/hot-index/index.wxml diff --git a/pages/article/hot-index/index.wxss b/pakageInfo/pages/article/hot-index/index.wxss similarity index 100% rename from pages/article/hot-index/index.wxss rename to pakageInfo/pages/article/hot-index/index.wxss diff --git a/pakageInfo/pages/article/index.wxs b/pakageInfo/pages/article/index.wxs new file mode 100644 index 0000000..a51b288 --- /dev/null +++ b/pakageInfo/pages/article/index.wxs @@ -0,0 +1,32 @@ +function isEmpty(val) { + return typeof val === 'undefined' || val === '' || val === null +} + +function formatMTime(time) { + if (isEmpty(time)) { + return '' + } + var minute = 60 * 1000 + var just = 3 * 60 * 1000 + var onehour = 60 * 60 * 1000 + var oneday = 24 * 60 * 60 * 1000 + time = time.replace(getRegExp('/\s/g', 'g'), '') + var datetime = getDate(time.trim()) + var gap = getDate().getTime() - datetime.getTime() + + if (gap > oneday) { + return time.substring(0, 10) + } else if (gap > onehour) { + return parseInt(gap / onehour) + '小时前' + } else if (gap > onehour) { + return parseInt(gap / onehour) + '小时前' + } else if (gap > just) { + return parseInt(gap / minute) + '分钟前' + } else { + return '刚刚更新' + } +} + +module.exports = { + formatMTime: formatMTime +} \ No newline at end of file diff --git a/pages/article/index/index.js b/pakageInfo/pages/article/index/index.js similarity index 89% rename from pages/article/index/index.js rename to pakageInfo/pages/article/index/index.js index 005d535..30494c0 100644 --- a/pages/article/index/index.js +++ b/pakageInfo/pages/article/index/index.js @@ -1,5 +1,5 @@ // pages/stock/index.js -const util = require('../../../utils/util') +const util = require('../../../../utils/util') const app = getApp() Page({ @@ -37,6 +37,6 @@ Page({ return false }, postMoment: function(){ - util.navigateTo('/pages/article/publish/index') + util.navigateTo('/pakageInfo/pages/article/publish/index') } }) \ No newline at end of file diff --git a/pakageInfo/pages/article/index/index.json b/pakageInfo/pages/article/index/index.json new file mode 100644 index 0000000..a4c6b23 --- /dev/null +++ b/pakageInfo/pages/article/index/index.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "wux-tabi": "/components/tabi/index", + "hot": "/pakageInfo/pages/article/hot-index/index", + "price": "/pakageInfo/pages/article/price-index/index", + "queue": "/pakageInfo/pages/article/queue-index/index", + "point": "/pakageInfo/pages/article/point-index/index" + } +} \ No newline at end of file diff --git a/pages/article/index/index.wxml b/pakageInfo/pages/article/index/index.wxml similarity index 100% rename from pages/article/index/index.wxml rename to pakageInfo/pages/article/index/index.wxml diff --git a/pages/article/index/index.wxss b/pakageInfo/pages/article/index/index.wxss similarity index 100% rename from pages/article/index/index.wxss rename to pakageInfo/pages/article/index/index.wxss diff --git a/pages/article/list/index.js b/pakageInfo/pages/article/list/index.js similarity index 91% rename from pages/article/list/index.js rename to pakageInfo/pages/article/list/index.js index c1baa96..e52051f 100644 --- a/pages/article/list/index.js +++ b/pakageInfo/pages/article/list/index.js @@ -1,7 +1,7 @@ // pages/bidding/index/index.js -import { getMyList, getReplyList, getViewedList, deleteMoment } from "../../api/moment" -const util = require('../../../utils/util') -const event = require('../../../utils/event.js') +import { getMyList, getReplyList, getViewedList, deleteMoment } from "../../../../pages/api/moment" +const util = require('../../../../utils/util') +const event = require('../../../../utils/event.js') const app = getApp() Page({ @@ -117,9 +117,9 @@ Page({ lookItem: function (e) { var item = this.data.messageList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] if(item.articleDetailDto && this.data.tabIndex == 1){ - wx.navigateTo({ url: '/pages/article/detail/index?id=' + item.articleDetailDto.id }) + wx.navigateTo({ url: '/pakageInfo/pages/article/detail/index?id=' + item.articleDetailDto.id }) } else { - wx.navigateTo({ url: '/pages/article/detail/index?id=' + item.id }) + wx.navigateTo({ url: '/pakageInfo/pages/article/detail/index?id=' + item.id }) } }, onTabChange: function ({detail}) { @@ -147,7 +147,7 @@ Page({ }) }, editMoment: function(item){ - wx.navigateTo({ url: '/pages/article/publish/index?id=' + item.id }) + wx.navigateTo({ url: '/pakageInfo/pages/article/publish/index?id=' + item.id }) }, deleteMoment: function(item){ this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog') diff --git a/pages/article/list/index.json b/pakageInfo/pages/article/list/index.json similarity index 100% rename from pages/article/list/index.json rename to pakageInfo/pages/article/list/index.json diff --git a/pages/article/list/index.wxml b/pakageInfo/pages/article/list/index.wxml similarity index 100% rename from pages/article/list/index.wxml rename to pakageInfo/pages/article/list/index.wxml diff --git a/pages/article/list/index.wxss b/pakageInfo/pages/article/list/index.wxss similarity index 100% rename from pages/article/list/index.wxss rename to pakageInfo/pages/article/list/index.wxss diff --git a/pages/article/point-index/index.js b/pakageInfo/pages/article/point-index/index.js similarity index 95% rename from pages/article/point-index/index.js rename to pakageInfo/pages/article/point-index/index.js index e9af28d..ed4d2e7 100644 --- a/pages/article/point-index/index.js +++ b/pakageInfo/pages/article/point-index/index.js @@ -1,6 +1,6 @@ // pages/stock/index.js -import { getPreferList } from "../../api/moment" -const event = require('../../../utils/event.js') +import { getPreferList } from "../../../../pages/api/moment" +const event = require('../../../../utils/event.js') const app = getApp() Component({ diff --git a/pages/article/point-index/index.json b/pakageInfo/pages/article/point-index/index.json similarity index 88% rename from pages/article/point-index/index.json rename to pakageInfo/pages/article/point-index/index.json index 3e32d9d..a632f88 100644 --- a/pages/article/point-index/index.json +++ b/pakageInfo/pages/article/point-index/index.json @@ -11,6 +11,6 @@ "refresh-view": "/components/refresher/index", "wux-button": "/components/button/index", "wux-tag": "/components/tag/index", - "article-item": "/pages/article/article-item/index" + "article-item": "/pakageInfo/pages/article/article-item/index" } } \ No newline at end of file diff --git a/pages/article/point-index/index.wxml b/pakageInfo/pages/article/point-index/index.wxml similarity index 100% rename from pages/article/point-index/index.wxml rename to pakageInfo/pages/article/point-index/index.wxml diff --git a/pages/article/point-index/index.wxss b/pakageInfo/pages/article/point-index/index.wxss similarity index 100% rename from pages/article/point-index/index.wxss rename to pakageInfo/pages/article/point-index/index.wxss diff --git a/pages/article/price-detail/index.js b/pakageInfo/pages/article/price-detail/index.js similarity index 90% rename from pages/article/price-detail/index.js rename to pakageInfo/pages/article/price-detail/index.js index 1e58ce6..a6001f7 100644 --- a/pages/article/price-detail/index.js +++ b/pakageInfo/pages/article/price-detail/index.js @@ -1,7 +1,7 @@ // pages/moment/price/index.js -import { getFactoryPrice } from "../../api/ztb" -const event = require('../../../utils/event') -const storage = require('../../../utils/storage') +import { getFactoryPrice } from "../../../../pages/api/ztb" +const event = require('../../../../utils/event') +const storage = require('../../../../utils/storage') const app = getApp() Page({ @@ -104,7 +104,7 @@ Page({ }) }, selectMill: function(){ - wx.navigateTo({ url: '/pages/article/factory/index?type=4&ids=' + this.data.form.paperMillIdList}) + wx.navigateTo({ url: '/pakageInfo/pages/article/factory/index?type=4&ids=' + this.data.form.paperMillIdList}) }, onUnload: function(){ event.remove('EventMessage', this) diff --git a/pages/article/price-detail/index.json b/pakageInfo/pages/article/price-detail/index.json similarity index 100% rename from pages/article/price-detail/index.json rename to pakageInfo/pages/article/price-detail/index.json diff --git a/pages/article/price-detail/index.wxml b/pakageInfo/pages/article/price-detail/index.wxml similarity index 100% rename from pages/article/price-detail/index.wxml rename to pakageInfo/pages/article/price-detail/index.wxml diff --git a/pages/article/price-detail/index.wxss b/pakageInfo/pages/article/price-detail/index.wxss similarity index 100% rename from pages/article/price-detail/index.wxss rename to pakageInfo/pages/article/price-detail/index.wxss diff --git a/pages/article/price-index/index.js b/pakageInfo/pages/article/price-index/index.js similarity index 95% rename from pages/article/price-index/index.js rename to pakageInfo/pages/article/price-index/index.js index 6f4d46f..c072938 100644 --- a/pages/article/price-index/index.js +++ b/pakageInfo/pages/article/price-index/index.js @@ -1,6 +1,6 @@ // pages/stock/index.js -import { getPreferList } from "../../api/moment" -const event = require('../../../utils/event.js') +import { getPreferList } from "../../../../pages/api/moment" +const event = require('../../../../utils/event.js') const app = getApp() Component({ diff --git a/pages/article/price-index/index.json b/pakageInfo/pages/article/price-index/index.json similarity index 90% rename from pages/article/price-index/index.json rename to pakageInfo/pages/article/price-index/index.json index 4fb567e..07deb39 100644 --- a/pages/article/price-index/index.json +++ b/pakageInfo/pages/article/price-index/index.json @@ -13,6 +13,6 @@ "refresh-view": "/components/refresher/index", "wux-button": "/components/button/index", "wux-tag": "/components/tag/index", - "article-item": "/pages/article/article-item/index" + "article-item": "/pakageInfo/pages/article/article-item/index" } } \ No newline at end of file diff --git a/pages/article/price-index/index.wxml b/pakageInfo/pages/article/price-index/index.wxml similarity index 100% rename from pages/article/price-index/index.wxml rename to pakageInfo/pages/article/price-index/index.wxml diff --git a/pages/article/price-index/index.wxss b/pakageInfo/pages/article/price-index/index.wxss similarity index 100% rename from pages/article/price-index/index.wxss rename to pakageInfo/pages/article/price-index/index.wxss diff --git a/pages/article/publish/index.js b/pakageInfo/pages/article/publish/index.js similarity index 95% rename from pages/article/publish/index.js rename to pakageInfo/pages/article/publish/index.js index d4b781b..710c081 100644 --- a/pages/article/publish/index.js +++ b/pakageInfo/pages/article/publish/index.js @@ -1,8 +1,8 @@ // pages/moment/create/index.js -import { getMomentDetail, postMoment, updateMoment } from "../../api/moment" -import { getFactoryList } from "../../api/ztb" -const util = require('../../../utils/util') -const event = require('../../../utils/event.js') +import { getMomentDetail, postMoment, updateMoment } from "../../../../pages/api/moment" +import { getFactoryList } from "../../../../pages/api/ztb" +const util = require('../../../../utils/util') +const event = require('../../../../utils/event.js') Page({ /** diff --git a/pages/article/publish/index.json b/pakageInfo/pages/article/publish/index.json similarity index 100% rename from pages/article/publish/index.json rename to pakageInfo/pages/article/publish/index.json diff --git a/pages/article/publish/index.wxml b/pakageInfo/pages/article/publish/index.wxml similarity index 100% rename from pages/article/publish/index.wxml rename to pakageInfo/pages/article/publish/index.wxml diff --git a/pages/article/publish/index.wxss b/pakageInfo/pages/article/publish/index.wxss similarity index 100% rename from pages/article/publish/index.wxss rename to pakageInfo/pages/article/publish/index.wxss diff --git a/pages/article/queue-detail/index.js b/pakageInfo/pages/article/queue-detail/index.js similarity index 96% rename from pages/article/queue-detail/index.js rename to pakageInfo/pages/article/queue-detail/index.js index 5bd6fd4..39d95b7 100644 --- a/pages/article/queue-detail/index.js +++ b/pakageInfo/pages/article/queue-detail/index.js @@ -1,5 +1,5 @@ // pages/moment/price/index.js -import { getFactoryTodayList } from "../../api/ztb" +import { getFactoryTodayList } from "../../../../pages/api/ztb" const app = getApp() Page({ diff --git a/pages/article/queue-detail/index.json b/pakageInfo/pages/article/queue-detail/index.json similarity index 100% rename from pages/article/queue-detail/index.json rename to pakageInfo/pages/article/queue-detail/index.json diff --git a/pages/article/queue-detail/index.wxml b/pakageInfo/pages/article/queue-detail/index.wxml similarity index 100% rename from pages/article/queue-detail/index.wxml rename to pakageInfo/pages/article/queue-detail/index.wxml diff --git a/pages/article/queue-detail/index.wxss b/pakageInfo/pages/article/queue-detail/index.wxss similarity index 100% rename from pages/article/queue-detail/index.wxss rename to pakageInfo/pages/article/queue-detail/index.wxss diff --git a/pages/article/queue-index/index.js b/pakageInfo/pages/article/queue-index/index.js similarity index 95% rename from pages/article/queue-index/index.js rename to pakageInfo/pages/article/queue-index/index.js index 5726b03..2d5196a 100644 --- a/pages/article/queue-index/index.js +++ b/pakageInfo/pages/article/queue-index/index.js @@ -1,6 +1,6 @@ // pages/stock/index.js -import { getPreferList } from "../../api/moment" -const event = require('../../../utils/event') +import { getPreferList } from "../../../../pages/api/moment" +const event = require('../../../../utils/event') const app = getApp() Component({ diff --git a/pages/article/queue-index/index.json b/pakageInfo/pages/article/queue-index/index.json similarity index 88% rename from pages/article/queue-index/index.json rename to pakageInfo/pages/article/queue-index/index.json index 3e32d9d..a632f88 100644 --- a/pages/article/queue-index/index.json +++ b/pakageInfo/pages/article/queue-index/index.json @@ -11,6 +11,6 @@ "refresh-view": "/components/refresher/index", "wux-button": "/components/button/index", "wux-tag": "/components/tag/index", - "article-item": "/pages/article/article-item/index" + "article-item": "/pakageInfo/pages/article/article-item/index" } } \ No newline at end of file diff --git a/pages/article/queue-index/index.wxml b/pakageInfo/pages/article/queue-index/index.wxml similarity index 100% rename from pages/article/queue-index/index.wxml rename to pakageInfo/pages/article/queue-index/index.wxml diff --git a/pages/article/queue-index/index.wxss b/pakageInfo/pages/article/queue-index/index.wxss similarity index 100% rename from pages/article/queue-index/index.wxss rename to pakageInfo/pages/article/queue-index/index.wxss diff --git a/pages/article/sucessFul/index.js b/pakageInfo/pages/article/sucessFul/index.js similarity index 95% rename from pages/article/sucessFul/index.js rename to pakageInfo/pages/article/sucessFul/index.js index 9b6ece3..cf32d5c 100644 --- a/pages/article/sucessFul/index.js +++ b/pakageInfo/pages/article/sucessFul/index.js @@ -1,4 +1,4 @@ -// pages/article/sucessFul/index.js +// pakageInfo/pages/article/sucessFul/index.js Page({ /** diff --git a/pages/article/sucessFul/index.json b/pakageInfo/pages/article/sucessFul/index.json similarity index 100% rename from pages/article/sucessFul/index.json rename to pakageInfo/pages/article/sucessFul/index.json diff --git a/pages/article/sucessFul/index.wxml b/pakageInfo/pages/article/sucessFul/index.wxml similarity index 84% rename from pages/article/sucessFul/index.wxml rename to pakageInfo/pages/article/sucessFul/index.wxml index a7370e3..51388cf 100644 --- a/pages/article/sucessFul/index.wxml +++ b/pakageInfo/pages/article/sucessFul/index.wxml @@ -1,4 +1,4 @@ - + diff --git a/pages/article/sucessFul/index.wxss b/pakageInfo/pages/article/sucessFul/index.wxss similarity index 91% rename from pages/article/sucessFul/index.wxss rename to pakageInfo/pages/article/sucessFul/index.wxss index f45ed74..6646eae 100644 --- a/pages/article/sucessFul/index.wxss +++ b/pakageInfo/pages/article/sucessFul/index.wxss @@ -1,4 +1,4 @@ -/* pages/article/sucessFul/index.wxss */ +/* pakageInfo/pages/article/sucessFul/index.wxss */ page { background-color: white; } diff --git a/pakageInfo/pages/formate.wxs b/pakageInfo/pages/formate.wxs new file mode 100644 index 0000000..ba36ad8 --- /dev/null +++ b/pakageInfo/pages/formate.wxs @@ -0,0 +1,114 @@ +var numberUtil = { + numberFormat: function (value) { + // var v = parseInt(value)//强转Int，毕竟有可能返回是String类型的数字 + if (value || value == 0) { + return Number(value).toFixed(2) + } + return '' + }, + numberFormat2: function (value) { + // var v = parseInt(value)//强转Int，毕竟有可能返回是String类型的数字 + if (value || value == 0) { + return Number(value).toFixed(2) + } + return '' + }, + numberFormat3: function (value) { + // var v = parseInt(value)//强转Int，毕竟有可能返回是String类型的数字 + if (value) { + return value.toFixed(3) + } + return '' + }, + formateMoney: function (value) { + // var v = parseInt(value)//强转Int，毕竟有可能返回是String类型的数字 + if (value || value == 0) { + return (parseFloat(value)).toFixed(2) + } + return '' + }, + formateWeight: function (value, kg) { + if (value || value == 0) { + if(kg){ + return (parseFloat(value)).toFixed(1) + 'KG' + } else { + return (parseFloat(value) / 1000).toFixed(3) + '吨' + } + } + return '' + }, + formateWeight3: function (value) { + return (parseFloat(value) / 1000).toFixed(1) + '吨' + }, + forWeight: function (value, kg) { + if (value || value == 0) { + if(kg){ + return (parseFloat(value)).toFixed(1) + } else { + return (parseFloat(value) / 1000).toFixed(3) + } + } + return '' + }, + formateAmount: function (value) { + if (value || value == 0) { + return (parseFloat(value)).toFixed(2) + } + return '' + }, + formatePrice: function (value, kg) { + if (value || value == 0) { + if(kg){ + return (parseFloat(value)).toFixed(3) + } else { + return (parseFloat(value) * 1000).toFixed(1) + } + } + return '' + }, + formatePrice2: function (value, kg) { + if (value || value == 0) { + if(kg){ + return (parseFloat(value)).toFixed(3) + '元/KG' + } else { + return (parseFloat(value) * 1000).toFixed(1) + '元/吨' + } + } + return '' + }, + formateDrice: function (value) { + if (value || value == 0) { + return (parseFloat(value) * 1000).toFixed(0) + } + return '- -' + }, + substring: function(str, start, end){ + if(str){ + return str.substring(start, end) + } + return '' + }, + formateDescripe: function (value) { + if (typeof(value) == 'number') { + return value + '%' + } + return '- -' + } +} + + +module.exports = { + numberFormat: numberUtil.numberFormat, //暴露接口调用 + numberFormat2: numberUtil.numberFormat2, //暴露接口调用 + numberFormat3: numberUtil.numberFormat3, //暴露接口调用 + formateMoney: numberUtil.formateMoney, + formateWeight: numberUtil.formateWeight, + formateWeight3: numberUtil.formateWeight3, + formateAmount: numberUtil.formateAmount, + formatePrice: numberUtil.formatePrice, + formatePrice2: numberUtil.formatePrice2, + substring: numberUtil.substring, + forWeight: numberUtil.forWeight, + formateDrice: numberUtil.formateDrice, + formateDescripe: numberUtil.formateDescripe, +} \ No newline at end of file diff --git a/utils/util.js b/utils/util.js index a53c21e..3022deb 100644 --- a/utils/util.js +++ b/utils/util.js @@ -166,23 +166,23 @@ function checkId(id) { const tokenList = [ 'pages/mall/price-index/index', - '/pages/article/price-detail/index', - '/pages/article/queue-detail/index', + '/pakageInfo/pages/article/price-detail/index', + '/pakageInfo/pages/article/queue-detail/index', '/pages/shop/index/index', '/pages/bidding/index/index', '/pages/morder/index/index', '/pages/message/index/index', '/pages/home/setting/index', '/pages/adress/list/index', - '/pages/article/list/index', + '/pakageInfo/pages/article/list/index', '/pages/html/integral/index', '/pages/withdrawal/balance/index', '/pages/agent/order/index', '/pages/home/idcard/index', '/pages/shop/detail/index', - '/pages/article/publish/index', + '/pakageInfo/pages/article/publish/index', '/pages/home/attentionPaperList/index', - '/pages/article/feedback/index', + '/pakageInfo/pages/article/feedback/index', 'pages/agent/edit/index', '/pages/agent/ability/index' ] @@ -212,13 +212,13 @@ function navigateTarget(redirectInfo){ } else if(redirectInfo.targetView == 'showQNPrice'){ navigateTo('/pages/mall/price-index/index') } else if(redirectInfo.targetView == 'showFactoryPrice'){ - navigateTo('/pages/article/price-detail/index') + navigateTo('/pakageInfo/pages/article/price-detail/index') } else if(redirectInfo.targetView == 'showFactoryQueue'){ - navigateTo('/pages/article/queue-detail/index') + navigateTo('/pakageInfo/pages/article/queue-detail/index') } else if(redirectInfo.targetView == 'showArticleHome'){ event.emit('EventMessage', { what: 250, desc: 'page-article', index: 0 }) } else if(redirectInfo.targetView == 'myArticle'){ - navigateTo('/pages/article/list/index') + navigateTo('/pakageInfo/pages/article/list/index') } else if(redirectInfo.targetView == 'myMessage'){ navigateTo('/pages/message/index/index') } else if(redirectInfo.targetView == 'member'){ @@ -250,7 +250,7 @@ function navigateTarget(redirectInfo){ } else if(redirectInfo.targetView == 'buyerOrderList'){ navigateTo('/pages/morder/index/index') } else if(redirectInfo.targetView == 'createArticle'){ - navigateTo('/pages/article/publish/index') + navigateTo('/pakageInfo/pages/article/publish/index') } else if(redirectInfo.targetView == 'proxySellActivity'){ navigateTo('/pages/agent/ability/index') }