Browse Source

no message

featrue/v4.5
xpz2018 4 years ago
parent
commit
dbce4f6246
8 changed files with 8 additions and 16 deletions
  1. 4
      app.json
  2. 5
      pages/shop/shop.wxs
  3. 0
      submodel/libs/wxcharts.js
  4. 8
      submodel/pages/paper/price-index/index.js
  5. 0
      submodel/pages/paper/price-index/index.json
  6. 2
      submodel/pages/paper/price-index/index.wxml
  7. 1
      submodel/pages/paper/price-index/index.wxss
  8. 4
      utils/util.js

4
app.json

@ -31,7 +31,6 @@
"pages/article/attention-factory/index", "pages/article/attention-factory/index",
"pages/article/sucessful/index", "pages/article/sucessful/index",
"pages/mall/index/index", "pages/mall/index/index",
"pages/mall/price-index/index",
"pages/mall/detail/index", "pages/mall/detail/index",
"pages/mall/search-list/index", "pages/mall/search-list/index",
"pages/agent/ability/index", "pages/agent/ability/index",
@ -80,7 +79,8 @@
"pages/purchase/create/index", "pages/purchase/create/index",
"pages/purchase/detail/index", "pages/purchase/detail/index",
"pages/bidding/index/index", "pages/bidding/index/index",
"pages/bidding/detail/index"
"pages/bidding/detail/index",
"pages/paper/price-index/index"
] ]
} }
], ],

5
pages/shop/shop.wxs

@ -1,7 +1,3 @@
function isEmpty(val) {
return typeof val === 'undefined' || val === '' || val === null
}
function orderBidding(status) { function orderBidding(status) {
if (status == -1) { if (status == -1) {
return '已流拍' return '已流拍'
@ -37,7 +33,6 @@ function orderStatus(status) {
} }
return '' return ''
} }
module.exports = { module.exports = {
orderBidding: orderBidding, orderBidding: orderBidding,

libs/wxcharts.js → submodel/libs/wxcharts.js

pages/mall/price-index/index.js → submodel/pages/paper/price-index/index.js

@ -1,8 +1,8 @@
// pages/moment/price/index.js // pages/moment/price/index.js
import { getCategoryList, getCategoryPrice } from "../../../api/moment"
const util = require('../../../utils/util')
const storage = require('../../../utils/storage')
const event = require('../../../utils/event')
import { getCategoryList, getCategoryPrice } from "../../../../api/moment"
const util = require('../../../../utils/util')
const storage = require('../../../../utils/storage')
const event = require('../../../../utils/event')
var wxCharts = require('../../../libs/wxcharts') var wxCharts = require('../../../libs/wxcharts')
const app = getApp() const app = getApp()
var lineChart = null var lineChart = null

pages/mall/price-index/index.json → submodel/pages/paper/price-index/index.json

pages/mall/price-index/index.wxml → submodel/pages/paper/price-index/index.wxml

@ -1,5 +1,3 @@
<!--pages/moment/price/index.wxml-->
<wxs module="formate" src="../../../pages/formate.wxs"></wxs>
<cu-custom bgColor="bg-white" isBack="{{true}}"> <cu-custom bgColor="bg-white" isBack="{{true}}">
<view slot="content">价格指数</view> <view slot="content">价格指数</view>
</cu-custom> </cu-custom>

pages/mall/price-index/index.wxss → submodel/pages/paper/price-index/index.wxss

@ -1,4 +1,3 @@
/* pages/moment/price/index.wxss */
.container { .container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

4
utils/util.js

@ -165,7 +165,7 @@ function checkId(id) {
} }
const tokenList = [ const tokenList = [
'pages/mall/price-index/index',
'/submodel/pages/paper/price-index/index',
'/pages/shop/index/index', '/pages/shop/index/index',
'/submodel/pages/bidding/index/index', '/submodel/pages/bidding/index/index',
'/submodel/pages/morder/index/index', '/submodel/pages/morder/index/index',
@ -213,7 +213,7 @@ function navigateTarget(redirectInfo){
} else if(redirectInfo.targetView == 'showProxyList'){ } else if(redirectInfo.targetView == 'showProxyList'){
navigateTo('/pages/agent/index/index') navigateTo('/pages/agent/index/index')
} else if(redirectInfo.targetView == 'showQNPrice'){ } else if(redirectInfo.targetView == 'showQNPrice'){
navigateTo('/pages/mall/price-index/index')
navigateTo('/submodel/pages/paper/price-index/index')
} else if(redirectInfo.targetView == 'showArticleHome'){ } else if(redirectInfo.targetView == 'showArticleHome'){
event.emit('EventMessage', { what: 250, desc: 'page-article', index: 0 }) event.emit('EventMessage', { what: 250, desc: 'page-article', index: 0 })
} else if(redirectInfo.targetView == 'myArticle'){ } else if(redirectInfo.targetView == 'myArticle'){

Loading…
Cancel
Save