diff --git a/app.json b/app.json
index 2627519..10c33d0 100644
--- a/app.json
+++ b/app.json
@@ -50,7 +50,6 @@
"pages/html/html/index",
"pages/html/notice/index",
"pages/html/integral/index",
- "pages/moment/paper/index",
"pages/ztbvip/index"
],
"subpackages": [
@@ -79,7 +78,8 @@
"pages/purchase/detail/index",
"pages/bidding/index/index",
"pages/bidding/detail/index",
- "pages/paper/price-index/index"
+ "pages/paper/price-index/index",
+ "pages/paper/paper-list/index"
]
}
],
diff --git a/pages/article/factory/index.js b/pages/article/factory/index.js
index 24d56c6..b726297 100644
--- a/pages/article/factory/index.js
+++ b/pages/article/factory/index.js
@@ -1,4 +1,3 @@
-// pages/moment/paper/index.js
import { getAllFactoryList } from "../../../api/ztb"
const util = require('../../../utils/util')
const storage = require('../../../utils/storage')
diff --git a/pages/article/factory/index.wxml b/pages/article/factory/index.wxml
index 72d1d33..f2d570f 100644
--- a/pages/article/factory/index.wxml
+++ b/pages/article/factory/index.wxml
@@ -1,4 +1,3 @@
-
{{type == 1 ? '选择纸厂' : '选择常看的纸厂'}}
diff --git a/pages/article/factory/index.wxss b/pages/article/factory/index.wxss
index c98d427..e69de29 100644
--- a/pages/article/factory/index.wxss
+++ b/pages/article/factory/index.wxss
@@ -1 +0,0 @@
-/* pages/moment/paper/index.wxss */
\ No newline at end of file
diff --git a/pages/home/setting/index.wxml b/pages/home/setting/index.wxml
index 6ea431a..86e94c4 100644
--- a/pages/home/setting/index.wxml
+++ b/pages/home/setting/index.wxml
@@ -15,7 +15,7 @@
-
+
重量显示单位
diff --git a/pages/moment/paper/index.wxss b/pages/moment/paper/index.wxss
deleted file mode 100644
index c98d427..0000000
--- a/pages/moment/paper/index.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* pages/moment/paper/index.wxss */
\ No newline at end of file
diff --git a/pages/moment/paper/index.js b/submodel/pages/paper/paper-list/index.js
similarity index 91%
rename from pages/moment/paper/index.js
rename to submodel/pages/paper/paper-list/index.js
index 1df9aa9..3f6f227 100644
--- a/pages/moment/paper/index.js
+++ b/submodel/pages/paper/paper-list/index.js
@@ -1,8 +1,7 @@
-// pages/moment/paper/index.js
-import { getCategoryList } from "../../../api/moment"
-const util = require('../../../utils/util')
-const storage = require('../../../utils/storage')
-const event = require('../../../utils/event.js')
+import { getCategoryList } from "../../../../api/moment"
+const util = require('../../../../utils/util')
+const storage = require('../../../../utils/storage')
+const event = require('../../../../utils/event.js')
const app = getApp()
Page({
diff --git a/pages/moment/paper/index.json b/submodel/pages/paper/paper-list/index.json
similarity index 100%
rename from pages/moment/paper/index.json
rename to submodel/pages/paper/paper-list/index.json
diff --git a/pages/moment/paper/index.wxml b/submodel/pages/paper/paper-list/index.wxml
similarity index 90%
rename from pages/moment/paper/index.wxml
rename to submodel/pages/paper/paper-list/index.wxml
index 72f704c..20b1e6e 100644
--- a/pages/moment/paper/index.wxml
+++ b/submodel/pages/paper/paper-list/index.wxml
@@ -1,4 +1,3 @@
-
纸品列表
diff --git a/submodel/pages/paper/paper-list/index.wxss b/submodel/pages/paper/paper-list/index.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/submodel/pages/paper/price-index/index.js b/submodel/pages/paper/price-index/index.js
index 4f373bf..ccd3993 100644
--- a/submodel/pages/paper/price-index/index.js
+++ b/submodel/pages/paper/price-index/index.js
@@ -161,7 +161,7 @@ Page({
}, this)
},
toPaperList: function(){
- wx.navigateTo({ url: '/pages/moment/paper/index' })
+ wx.navigateTo({ url: '/submodel/pages/paper/paper-list/index' })
},
onUnload: function(){
event.remove('EventMessage', this)