--情报article分包--

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": [
 
       ]

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 () {

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){

pages/article/index/index.json

@@ -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"
-  }
-}

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) {

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({

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){

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}){

pages/article/allNewInfo/index.js → 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({
 

pages/article/allNewInfo/index.json → 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"
   }

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)
+      })
+    }
+  }
+})

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"
+  }
+}

pakageInfo/pages/article/article-item/index.wxml

@@ -0,0 +1,47 @@
+<!--pages/main/index.wxml-->
+<wxs module="moment" src="../index.wxs"></wxs>
+<view class="cu-item shadow bg-white" bindtap="lookItem">
+	<view class="flex flex-justify" style="padding:20rpx 32rpx">
+		<view class="flex" style="justify-content: flex-start;">
+			<wux-image width="{{50}}" height="{{50}}" shape="circle" src="{{item.creatorAvatarUrl}}" mode="aspectFill">
+				<image class="image-load" slot="loading" src="/assets/image/ygImg.png"></image>
+				<image class="image-load" slot="error" src="/assets/image/ygImg.png"></image>
+				<image class="image-load" slot="empty" src="/assets/image/ygImg.png"></image>
+			</wux-image>
+			<view class="flex flex-column" style="margin-left:20rpx;justify-content: center">
+				<view class="text-cut text-df" style="max-width:480rpx">{{item.creatorName || ''}}</view>
+				<view class="text-gray text-sm" style="margin-top:4rpx">{{moment.formatMTime(item.createTime)}}</view>
+			</view>
+		</view>
+	</view>
+	<view class="text-black text-bold text-lg" style="padding:0rpx 32rpx 20rpx 32rpx">{{item.title}}</view>
+	<fold-text content="{{item.content}}"></fold-text>
+	<view class="imgZt" style="padding:0rpx 32rpx;margin-top:16rpx" wx:if="{{item.imageUrlList.length}}">
+		<!-- <sudoku-image image-list="{{item.imageUrlList}}"></sudoku-image> -->
+		<view class="bottomViewRight" wx:for="{{ item.imageUrlList }}" wx:for-item="option" wx:for-index="optionIndex" wx:key="optionIndex" >
+			<image style="margin-left:10rpx" class="bottomViewRightImg" src="{{option}}" mode="widthFix"></image>
+		</view>
+	
+	</view>
+	<view class="flex flex-justify text-black" style="height:112rpx; padding:0rpx 32rpx">
+		<view>
+			<wux-tag wx:if="{{item.millPaperId}}" bind:click="toMill">
+				<text style="background-color:#ddd;border-radius: 32rpx;text-align: center;width:32rpx;height:32rpx;line-height:32rpx">#</text>
+				<text class="text-df text-cut" style="margin-left:16rpx;max-width:340rpx">{{item.millPaperName}}</text>
+				<text class="cuIcon-right text-balck" style="font-size:24rpx;margin-left:12rpx;padding-top:2rpx"></text>
+			</wux-tag>
+		</view>
+		<view class="flex flex-center text-df">
+			<view class="flex flex-center" catchtap="likeItem">
+				<!-- <text class="cuIcon-appreciate{{item.isLiked ? 'fill' : ''}} text-{{item.isLiked ? 'blue' : 'black'}}" style="font-size:16px"></text> -->
+				<image style="width:40rpx;height:38rpx" src="/assets/image/prase_blue.png" wx:if="{{item.isLiked}}"></image>
+				<image style="width:40rpx;height:38rpx" src="/assets/image/prase_black.png" wx:else></image>
+				<text class="text-df" style="margin-left:12rpx">{{item.likeQuantity}}</text>
+			</view>
+			<view class="flex flex-center" style="margin-left:48rpx;">
+				<image style="width:42rpx;height:34rpx" src="/assets/image/message_black.png"></image>
+			  <text style="margin-left:12rpx">{{item.replyQuantity}}</text>
+			</view>
+		</view>
+	</view>
+</view>

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;
+}

pages/article/attentionPaperFactory/index.js → 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({
 

pages/article/detail/index.js → 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
     }
   },

pages/article/factory/index.js → 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({

pages/article/feedback/index.js → 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)
       }

pages/article/feedback/index.wxml → pakageInfo/pages/article/feedback/index.wxml

@@ -1,4 +1,4 @@
-<!--pages/article/feedback/index.wxml-->
+<!--pakageInfo/pages/article/feedback/index.wxml-->
 <cu-custom bgColor="bg-white" isBack="{{true}}">
 	<view slot="content">反馈情报</view>
 </cu-custom>

pages/article/feedback/index.wxss → 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;
 }

pages/article/hot-index/index.js → 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]

pages/article/hot-index/index.json → 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"
   }
 }

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
+}

pages/article/index/index.js → 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')
   }
 })

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"
+  }
+}

pages/article/list/index.js → 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')

pages/article/point-index/index.js → 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({

pages/article/point-index/index.json → 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"
   }
 }

pages/article/price-detail/index.js → 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)

pages/article/price-index/index.js → 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({

pages/article/price-index/index.json → 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"
   }
 }

pages/article/publish/index.js → 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({
   /**

pages/article/queue-detail/index.js → 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({

pages/article/queue-index/index.js → 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({

pages/article/queue-index/index.json → 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"
   }
 }

pages/article/sucessFul/index.js → pakageInfo/pages/article/sucessFul/index.js

@@ -1,4 +1,4 @@
-// pages/article/sucessFul/index.js
+// pakageInfo/pages/article/sucessFul/index.js
 Page({
 
   /**

pages/article/sucessFul/index.wxml → pakageInfo/pages/article/sucessFul/index.wxml

@@ -1,4 +1,4 @@
-<!--pages/article/sucessFul/index.wxml-->
+<!--pakageInfo/pages/article/sucessFul/index.wxml-->
 <view class="zt">
 	<view class="view1">
 	<image style="width:198.3rpx;height:198.3rpx" src="/assets/info/sucessful.png"></image>

pages/article/sucessFul/index.wxss → 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;
 }

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,
+}

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')
   }