From 51a1b2713fda9183869c3c3c608a97afcfd3b77a Mon Sep 17 00:00:00 2001
From: xiaowen <372193233@qq.com>
Date: Thu, 11 Aug 2022 14:34:01 +0800
Subject: [PATCH] cxw-010203
---
app.json | 11 ++-
pages/brandCrisis/crisisList/index.js | 2 +-
pages/brandCrisis/index.js | 2 +-
pages/index/total/tatal.js | 2 +-
pages/logs/logs.js | 82 +++++++++++++++----
pages/logs/logs.json | 4 -
pages/logs/logs.wxml | 8 +-
pages/logs/logs.wxss | 8 --
pages/pages/home/home.js | 66 ---------------
pages/pages/home/home.wxml | 2 -
project.private.config.json | 14 +---
{pages => subPackages/pages}/detail/index.js | 4 +-
.../pages}/detail/index.json | 0
.../pages}/detail/index.wxml | 0
.../pages}/detail/index.wxss | 0
15 files changed, 82 insertions(+), 123 deletions(-)
delete mode 100644 pages/logs/logs.json
delete mode 100644 pages/logs/logs.wxss
delete mode 100644 pages/pages/home/home.js
delete mode 100644 pages/pages/home/home.wxml
rename {pages => subPackages/pages}/detail/index.js (98%)
rename {pages => subPackages/pages}/detail/index.json (100%)
rename {pages => subPackages/pages}/detail/index.wxml (100%)
rename {pages => subPackages/pages}/detail/index.wxss (100%)
diff --git a/app.json b/app.json
index 44f7a31..81d4721 100644
--- a/app.json
+++ b/app.json
@@ -22,7 +22,6 @@
"pages/brandSearch/index",
"pages/varComm/index",
"pages/mine/index",
- "pages/logs/logs",
"pages/mine/pages/bindUser/index",
"pages/mine/pages/myReport/index",
"pages/mine/pages/helpCenter/index",
@@ -32,12 +31,20 @@
"pages/varComm/pages/carModelsRatio/index",
"pages/varComm/pages/theme/index",
"pages/brandCrisis/index",
- "pages/detail/index",
"pages/brandCrisis/crisiSet/index",
"pages/brandCrisis/chooseModel/index",
"pages/brandCrisis/crisisList/index",
"pages/varComm/pages/brandRatio/survey/index"
],
+ "subPackages": [
+ {
+ "root": "subPackages",
+ "name": "分包A",
+ "pages": [
+ "pages/detail/index"
+ ]
+ }
+ ],
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#006BFF",
diff --git a/pages/brandCrisis/crisisList/index.js b/pages/brandCrisis/crisisList/index.js
index 591824c..9a23d51 100644
--- a/pages/brandCrisis/crisisList/index.js
+++ b/pages/brandCrisis/crisisList/index.js
@@ -110,7 +110,7 @@ Page({
handlerDetail(e) {
let row = e.currentTarget.dataset.row;
wx.navigateTo({
- url: '/pages/detail/index?id=' + row._id
+ url: '/subPackages/pages/detail/index?id=' + row._id
})
}
})
\ No newline at end of file
diff --git a/pages/brandCrisis/index.js b/pages/brandCrisis/index.js
index f61dd64..df93f7a 100644
--- a/pages/brandCrisis/index.js
+++ b/pages/brandCrisis/index.js
@@ -226,7 +226,7 @@ Page({
let row = e.currentTarget.dataset.row;
let id = row._id;
wx.navigateTo({
- url: '/pages/detail/index?id=' + id
+ url: '/subPackages/pages/detail/index?id=' + id
})
},
handlerSet() {
diff --git a/pages/index/total/tatal.js b/pages/index/total/tatal.js
index f76e8ce..8496f7f 100644
--- a/pages/index/total/tatal.js
+++ b/pages/index/total/tatal.js
@@ -14,7 +14,7 @@ Page({
})
}else{
wx.navigateTo({
- url: '/pages/detail/index?id=' + id
+ url: '/subPackages/pages/detail/index?id=' + id
})
}
diff --git a/pages/logs/logs.js b/pages/logs/logs.js
index 85f6aac..1bfb5ad 100644
--- a/pages/logs/logs.js
+++ b/pages/logs/logs.js
@@ -1,18 +1,66 @@
-// logs.js
-const util = require('../../utils/util.js')
-
+// pages/logs/logs.js
Page({
- data: {
- logs: []
- },
- onLoad() {
- this.setData({
- logs: (wx.getStorageSync('logs') || []).map(log => {
- return {
- date: util.formatTime(new Date(log)),
- timeStamp: log
- }
- })
- })
- }
-})
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/logs/logs.json b/pages/logs/logs.json
deleted file mode 100644
index 3ee76c1..0000000
--- a/pages/logs/logs.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "navigationBarTitleText": "查看启动日志",
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/logs/logs.wxml b/pages/logs/logs.wxml
index 0b6b645..c49f50c 100644
--- a/pages/logs/logs.wxml
+++ b/pages/logs/logs.wxml
@@ -1,6 +1,2 @@
-
-
-
- {{index + 1}}. {{log.date}}
-
-
+
+pages/logs/logs.wxml
diff --git a/pages/logs/logs.wxss b/pages/logs/logs.wxss
deleted file mode 100644
index 94d4b88..0000000
--- a/pages/logs/logs.wxss
+++ /dev/null
@@ -1,8 +0,0 @@
-.log-list {
- display: flex;
- flex-direction: column;
- padding: 40rpx;
-}
-.log-item {
- margin: 10rpx;
-}
diff --git a/pages/pages/home/home.js b/pages/pages/home/home.js
deleted file mode 100644
index e9682f9..0000000
--- a/pages/pages/home/home.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/pages/home/home.js
-Page({
-
- /**
- * 页面的初始数据
- */
- data: {
-
- },
-
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad(options) {
-
- },
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
diff --git a/pages/pages/home/home.wxml b/pages/pages/home/home.wxml
deleted file mode 100644
index e8ad897..0000000
--- a/pages/pages/home/home.wxml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-pages/pages/home/home.wxml
diff --git a/project.private.config.json b/project.private.config.json
index 4bc670f..9807b3c 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -5,18 +5,6 @@
"compileHotReLoad": true,
"urlCheck": false
},
- "condition": {
- "miniprogram": {
- "list": [
- {
- "name": "详情",
- "pathName": "pages/detail/index",
- "query": "id=452949383c124d65a4b315b64309d29e&mod=0",
- "launchMode": "default",
- "scene": null
- }
- ]
- }
- },
+ "condition": {},
"libVersion": "2.25.2"
}
\ No newline at end of file
diff --git a/pages/detail/index.js b/subPackages/pages/detail/index.js
similarity index 98%
rename from pages/detail/index.js
rename to subPackages/pages/detail/index.js
index bd304db..c8ed2e0 100644
--- a/pages/detail/index.js
+++ b/subPackages/pages/detail/index.js
@@ -1,6 +1,6 @@
import {
doStr
-} from "../../utils/doStr.js"
+} from "../../../utils/doStr.js"
const app = getApp();
let iPageIndex = 1 // 当前第几页,0代表第一页
let iPageSize = 10 //每页显示多少数据
@@ -178,7 +178,7 @@ Page({
handlerSource(e) {
const row = e.currentTarget.dataset.row;
wx.navigateTo({
- url: '/pages/detail/index?id=' + row._id,
+ url: '/subPackages/pages/detail/index?id=' + row._id,
})
console.log(row)
}
diff --git a/pages/detail/index.json b/subPackages/pages/detail/index.json
similarity index 100%
rename from pages/detail/index.json
rename to subPackages/pages/detail/index.json
diff --git a/pages/detail/index.wxml b/subPackages/pages/detail/index.wxml
similarity index 100%
rename from pages/detail/index.wxml
rename to subPackages/pages/detail/index.wxml
diff --git a/pages/detail/index.wxss b/subPackages/pages/detail/index.wxss
similarity index 100%
rename from pages/detail/index.wxss
rename to subPackages/pages/detail/index.wxss