From dbce4f6246725115f65015e1594b4c0145a540a0 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Mon, 11 Oct 2021 20:38:06 +0800
Subject: [PATCH] no message

---
 app.json                                                  | 4 ++--
 pages/shop/shop.wxs                                       | 5 -----
 {libs => submodel/libs}/wxcharts.js                       | 0
 {pages/mall => submodel/pages/paper}/price-index/index.js | 8 ++++----
 .../mall => submodel/pages/paper}/price-index/index.json  | 0
 .../mall => submodel/pages/paper}/price-index/index.wxml  | 2 --
 .../mall => submodel/pages/paper}/price-index/index.wxss  | 1 -
 utils/util.js                                             | 4 ++--
 8 files changed, 8 insertions(+), 16 deletions(-)
 rename {libs => submodel/libs}/wxcharts.js (100%)
 rename {pages/mall => submodel/pages/paper}/price-index/index.js (95%)
 rename {pages/mall => submodel/pages/paper}/price-index/index.json (100%)
 rename {pages/mall => submodel/pages/paper}/price-index/index.wxml (91%)
 rename {pages/mall => submodel/pages/paper}/price-index/index.wxss (93%)

diff --git a/app.json b/app.json
index 9aed8b6..ac7e029 100644
--- a/app.json
+++ b/app.json
@@ -31,7 +31,6 @@
     "pages/article/attention-factory/index",
     "pages/article/sucessful/index",
     "pages/mall/index/index",
-    "pages/mall/price-index/index",
     "pages/mall/detail/index",
     "pages/mall/search-list/index",
     "pages/agent/ability/index",
@@ -80,7 +79,8 @@
         "pages/purchase/create/index",
         "pages/purchase/detail/index",
         "pages/bidding/index/index",
-        "pages/bidding/detail/index"
+        "pages/bidding/detail/index",
+        "pages/paper/price-index/index"
       ]
     }
   ],
diff --git a/pages/shop/shop.wxs b/pages/shop/shop.wxs
index 7467f2f..663ac97 100644
--- a/pages/shop/shop.wxs
+++ b/pages/shop/shop.wxs
@@ -1,7 +1,3 @@
-function isEmpty(val) {
-  return typeof val === 'undefined' || val === '' || val === null
-}
-
 function orderBidding(status) {
   if (status == -1) {
     return '已流拍'
@@ -37,7 +33,6 @@ function orderStatus(status) {
   }
   return ''
 }
- 
 
 module.exports = {
   orderBidding: orderBidding,
diff --git a/libs/wxcharts.js b/submodel/libs/wxcharts.js
similarity index 100%
rename from libs/wxcharts.js
rename to submodel/libs/wxcharts.js
diff --git a/pages/mall/price-index/index.js b/submodel/pages/paper/price-index/index.js
similarity index 95%
rename from pages/mall/price-index/index.js
rename to submodel/pages/paper/price-index/index.js
index 97ca7d6..4f373bf 100644
--- a/pages/mall/price-index/index.js
+++ b/submodel/pages/paper/price-index/index.js
@@ -1,8 +1,8 @@
 // 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')
 const app = getApp()
 var lineChart = null
diff --git a/pages/mall/price-index/index.json b/submodel/pages/paper/price-index/index.json
similarity index 100%
rename from pages/mall/price-index/index.json
rename to submodel/pages/paper/price-index/index.json
diff --git a/pages/mall/price-index/index.wxml b/submodel/pages/paper/price-index/index.wxml
similarity index 91%
rename from pages/mall/price-index/index.wxml
rename to submodel/pages/paper/price-index/index.wxml
index 9ae6254..71ef214 100644
--- a/pages/mall/price-index/index.wxml
+++ b/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}}">
   <view slot="content">价格指数</view>
 </cu-custom>
diff --git a/pages/mall/price-index/index.wxss b/submodel/pages/paper/price-index/index.wxss
similarity index 93%
rename from pages/mall/price-index/index.wxss
rename to submodel/pages/paper/price-index/index.wxss
index cfa819f..ca006b3 100644
--- a/pages/mall/price-index/index.wxss
+++ b/submodel/pages/paper/price-index/index.wxss
@@ -1,4 +1,3 @@
-/* pages/moment/price/index.wxss */
 .container {
   display: flex;
   flex-direction: column;
diff --git a/utils/util.js b/utils/util.js
index 5ec5075..1fd9f75 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -165,7 +165,7 @@ function checkId(id) {
 }
 
 const tokenList = [
-  'pages/mall/price-index/index',
+  '/submodel/pages/paper/price-index/index',
   '/pages/shop/index/index',
   '/submodel/pages/bidding/index/index',
   '/submodel/pages/morder/index/index',
@@ -213,7 +213,7 @@ function navigateTarget(redirectInfo){
   } else if(redirectInfo.targetView == 'showProxyList'){
     navigateTo('/pages/agent/index/index')
   } else if(redirectInfo.targetView == 'showQNPrice'){
-    navigateTo('/pages/mall/price-index/index')
+    navigateTo('/submodel/pages/paper/price-index/index')
   } else if(redirectInfo.targetView == 'showArticleHome'){
     event.emit('EventMessage', { what: 250, desc: 'page-article', index: 0 })
   } else if(redirectInfo.targetView == 'myArticle'){