迁移食堂到分包

nngkxxdp/src/main/resources/static/nnzwminiapp/app.json

@@ -13,8 +13,6 @@
     "pages/deliciousList/deliciousList",
     "pages/aticleList/aticleList",
     "pages/commentList/commentList",
-    "pages/menu/menu",
-    "pages/myCenter/myCenter",
     "pages/serve/serve",
     "pages/dataCenter/dataCenter",
     "pages/dataCenterXXTJ/dataCenterXXTJ",
@@ -25,10 +23,8 @@
     "pages/leaveMessage/leaveMessage",
     "pages/leaveMessage2/leaveMessage2",
     "pages/web/web",
-    "pages/like/like",
+    
     "pages/comment/comment",
-    "pages/myCollection/myCollection",
-	"pages/myComment/myComment",
 	"pages/publics/government/government",
 	"pages/publics/publicLeaderDetail/publicLeaderDetail",
 	"pages/publics/leaderInfo/leaderInfo",
@@ -38,24 +34,24 @@
 	"pages/publics/interpretation/interpretation",
 	"pages/publics/fileList/fileList",
 	"pages/publics/fileDetail/fileDetail",
+	"pages/myCenter/myCenter",
 	"pages/ourCanteen/ourCanteen"
     
   ],
   "subpackages":[{
 	"root": "pagesPublic",
 	"pages": [
-		"pages/personalData/index/personalData",
-		"pages/personalData/nickname/nickname",
-		"pages/personalData/email/email",
-		"pages/personalData/certification/certification",
-		"pages/personalData/manage/manage",
 		"pages/yxnaJfq/yxnaJfq",
 		"pages/yxnaJfh/yxnaJfh",
 		"pages/yxnaQxn/yxnaQxn",
 		"pages/yxna/yxna",
 		"pages/album/album",
 		"pages/albumDetail/albumDetail",
-		"pages/albumEdit/albumEdit"
+		"pages/albumEdit/albumEdit",
+		"pages/menu/menu",
+		"pages/myCollection/myCollection",
+		"pages/myComment/myComment",
+		"pages/like/like"
 	]
   }],
   "window": {

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/myCenter/myCenter.js

@@ -100,27 +100,27 @@ Page({
 	},
 	toLike() {
 		wx.navigateTo({
-			url: '/pages/like/like',
+			url: '/pagesPublic/pages/like/like',
 		})
 	},
 	navto() {
 		wx.navigateTo({
-			url: '/pages/menu/menu',
-		})
-	},
-	toPersonalData() {
-		wx.navigateTo({
-			url: '/pages/personalData/index/personalData',
+			url: '/pagesPublic/pages/menu/menu',
 		})
 	},
+	// toPersonalData() {
+	// 	wx.navigateTo({
+	// 		url: '/pagesPublic/pages/personalData/index/personalData',
+	// 	})
+	// },
 	gotoMyCollection() {
 		wx.navigateTo({
-			url: '/pages/myCollection/myCollection',
+			url: '/pagesPublic/pages/myCollection/myCollection',
 		})
 	},
 	toMyComment() {
 		wx.navigateTo({
-			url: '/pages/myComment/myComment',
+			url: '/pagesPublic/pages/myComment/myComment',
 		})
 	},
 	tologin() {

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/certification/certification.js

@@ -1,66 +0,0 @@
-// pages/personalData/certification/certification.js
-Page({
-
-	/**
-	 * 页面的初始数据
-	 */
-	data: {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面加载
-	 */
-	onLoad(options) {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面显示
-	 */
-	onShow() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面隐藏
-	 */
-	onHide() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面卸载
-	 */
-	onUnload() {
-
-	},
-
-	/**
-	 * 页面相关事件处理函数--监听用户下拉动作
-	 */
-	onPullDownRefresh() {
-
-	},
-
-	/**
-	 * 页面上拉触底事件的处理函数
-	 */
-	onReachBottom() {
-
-	},
-
-	/**
-	 * 用户点击右上角分享
-	 */
-	onShareAppMessage() {
-
-	}
-})

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/certification/certification.json

@@ -1,4 +0,0 @@
-{
-	"usingComponents": {},
-	"navigationBarTitleText": "实名认证"
-}

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/certification/certification.wxml

@@ -1,2 +0,0 @@
-<!--pages/personalData/certification/certification.wxml-->
-<text>pages/personalData/certification/certification.wxml</text>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/certification/certification.wxss

@@ -1 +0,0 @@
-/* pages/personalData/certification/certification.wxss */

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/email/email.js

@@ -1,66 +0,0 @@
-// pages/personalData/email/email.js
-Page({
-
-	/**
-	 * 页面的初始数据
-	 */
-	data: {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面加载
-	 */
-	onLoad(options) {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面显示
-	 */
-	onShow() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面隐藏
-	 */
-	onHide() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面卸载
-	 */
-	onUnload() {
-
-	},
-
-	/**
-	 * 页面相关事件处理函数--监听用户下拉动作
-	 */
-	onPullDownRefresh() {
-
-	},
-
-	/**
-	 * 页面上拉触底事件的处理函数
-	 */
-	onReachBottom() {
-
-	},
-
-	/**
-	 * 用户点击右上角分享
-	 */
-	onShareAppMessage() {
-
-	}
-})

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/email/email.json

@@ -1,4 +0,0 @@
-{
-	"usingComponents": {},
-	"navigationBarTitleText": "修改邮箱"
-}

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/email/email.wxml

@@ -1,2 +0,0 @@
-<!--pages/personalData/email/email.wxml-->
-<text>pages/personalData/email/email.wxml</text>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/email/email.wxss

@@ -1 +0,0 @@
-/* pages/personalData/email/email.wxss */

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/index/personalData.js

@@ -1,87 +0,0 @@
-// pages/personalData/index/personalData.js
-Page({
-
-	/**
-	 * 页面的初始数据
-	 */
-	data: {
-
-	},
-
-	toNickname() {
-		wx.navigateTo({
-			url: '../nickname/nickname',
-		})
-	},
-	toEmail() {
-		wx.navigateTo({
-			url: '../email/email',
-		})
-	},
-	toCertification() {
-		wx.navigateTo({
-			url: '../certification/certification',
-		})
-	},
-	toManage() {
-		wx.navigateTo({
-			url: '../manage/manage',
-		})
-	},
-
-	/**
-	 * 生命周期函数--监听页面加载
-	 */
-	onLoad(options) {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面显示
-	 */
-	onShow() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面隐藏
-	 */
-	onHide() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面卸载
-	 */
-	onUnload() {
-
-	},
-
-	/**
-	 * 页面相关事件处理函数--监听用户下拉动作
-	 */
-	onPullDownRefresh() {
-
-	},
-
-	/**
-	 * 页面上拉触底事件的处理函数
-	 */
-	onReachBottom() {
-
-	},
-
-	/**
-	 * 用户点击右上角分享
-	 */
-	onShareAppMessage() {
-
-	}
-})

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/index/personalData.json

@@ -1,4 +0,0 @@
-{
-	"usingComponents": {},
-	"navigationBarTitleText": "个人资料"
-}

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/index/personalData.wxml

@@ -1,64 +0,0 @@
-<!--pages/PersonalData/PersonalData.wxml-->
-<view style="background-color: #F5F5F5;height: 100vh;">
-	<view class="info-list" style="border-top: 1px solid #d2d2d2;">
-		<view>头像</view>
-		<view class="info-right">
-			<view>
-				<image style="width: 70rpx;height: 70rpx;margin: 14rpx 20rpx 0 0;" src="../../images/user.png" alt=""></image>
-			</view>
-			<view class="arrow">
-				<image src="../../images/arrow.png" alt=""></image>
-			</view>
-		</view>
-	</view>
-	<view style="margin-top: 50rpx;">
-		<view class="info-list" bindtap="toNickname">
-			<view>昵称</view>
-			<view class="info-right">
-				<view style="margin-right: 20rpx;">
-					昵称213123
-				</view>
-				<view class="arrow">
-					<image src="../../images/arrow.png" alt=""></image>
-				</view>
-			</view>
-		</view>
-		<view class="info-list" style="border-top: 1px solid #d2d2d2;">
-			<view>性别</view>
-			<view class="info-right">
-				<view style="margin-right: 20rpx;">
-					保密
-				</view>
-				<view class="arrow">
-					<image src="../../images/arrow.png" alt=""></image>
-				</view>
-			</view>
-		</view>
-		<view bindtap="toEmail" class="info-list" style="border-top: 1px solid #d2d2d2;">
-			<view>邮箱</view>
-			<view class="arrow">
-				<image src="../../images/arrow.png" alt=""></image>
-			</view>
-		</view>
-	</view>
-	<view style="margin-top: 50rpx;">
-		<view class="info-list" bindtap="toCertification">
-			<view>实名认证</view>
-			<view class="info-right">
-				<view style="margin-right: 20rpx;">
-					未认证
-				</view>
-				<view class="arrow">
-					<image src="../../images/arrow.png" alt=""></image>
-				</view>
-			</view>
-		</view>
-		<view bindtap="toManage" style="border-top: 1px solid #d2d2d2;" class="info-list">
-			<view>账号管理</view>
-			<view class="arrow">
-				<image src="../../images/arrow.png" alt=""></image>
-			</view>
-		</view>
-	</view>
-
-</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/index/personalData.wxss

@@ -1,19 +0,0 @@
-/* pages/PersonalData/PersonalData.wxss */
-.info-list {
-	background-color: #ffffff;
-	display: flex;
-	justify-content: space-between;
-	padding: 0 20rpx;
-	height: 100rpx;
-	line-height: 100rpx;
-}
-
-.info-right{
-	display: flex;
-}
-
-.arrow image {
-	width: 20rpx;
-	height: 27rpx;
-	background-size: 100% 100%;
-}

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/manage/manage.js

@@ -1,66 +0,0 @@
-// pages/personalData/manage/manage.js
-Page({
-
-	/**
-	 * 页面的初始数据
-	 */
-	data: {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面加载
-	 */
-	onLoad(options) {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面显示
-	 */
-	onShow() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面隐藏
-	 */
-	onHide() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面卸载
-	 */
-	onUnload() {
-
-	},
-
-	/**
-	 * 页面相关事件处理函数--监听用户下拉动作
-	 */
-	onPullDownRefresh() {
-
-	},
-
-	/**
-	 * 页面上拉触底事件的处理函数
-	 */
-	onReachBottom() {
-
-	},
-
-	/**
-	 * 用户点击右上角分享
-	 */
-	onShareAppMessage() {
-
-	}
-})

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/manage/manage.json

@@ -1,4 +0,0 @@
-{
-	"usingComponents": {},
-	"navigationBarTitleText": "账号管理"
-}

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/manage/manage.wxml

@@ -1,2 +0,0 @@
-<!--pages/personalData/manage/manage.wxml-->
-<text>pages/personalData/manage/manage.wxml</text>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/manage/manage.wxss

@@ -1 +0,0 @@
-/* pages/personalData/manage/manage.wxss */

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/nickname/nickname.js

@@ -1,66 +0,0 @@
-// pages/personalData/nickname/nickname.js
-Page({
-
-	/**
-	 * 页面的初始数据
-	 */
-	data: {
-		nickname: '昵称213123'
-	},
-
-	/**
-	 * 生命周期函数--监听页面加载
-	 */
-	onLoad(options) {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面显示
-	 */
-	onShow() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面隐藏
-	 */
-	onHide() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面卸载
-	 */
-	onUnload() {
-
-	},
-
-	/**
-	 * 页面相关事件处理函数--监听用户下拉动作
-	 */
-	onPullDownRefresh() {
-
-	},
-
-	/**
-	 * 页面上拉触底事件的处理函数
-	 */
-	onReachBottom() {
-
-	},
-
-	/**
-	 * 用户点击右上角分享
-	 */
-	onShareAppMessage() {
-
-	}
-})

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/nickname/nickname.json

@@ -1,4 +0,0 @@
-{
-	"usingComponents": {},
-	"navigationBarTitleText": "修改昵称"
-}

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/nickname/nickname.wxml

@@ -1,12 +0,0 @@
-<!--pages/personalData/nickname/nickname.wxml-->
-<view style="background-color: #F5F5F5;height: 100vh;padding-top: 50rpx;">
-	<view class="info-list" bindtap="toNickname">
-		<view class="info-right">
-			<image src="../../images/f-wd2.png" style="width: 50rpx;height: 50rpx;"></image>
-			<input style="margin-left: 20rpx;width: 600rpx;" value="{{nickname}}" type="text" />
-		</view>
-		<view class="arrow">
-			X
-		</view>
-	</view>
-</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/personalData/nickname/nickname.wxss

@@ -1,24 +0,0 @@
-/* pages/personalData/nickname/nickname.wxss */
-.info-list {
-	background-color: #ffffff;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 0 20rpx;
-	height: 100rpx;
-}
-
-.info-right{
-	display: flex;
-	align-items: center;
-}
-
-.arrow {
-	width: 30rpx;
-	height: 30rpx;
-    background-color: gainsboro;
-    border-radius: 50%;
-    color: white;
-    text-align: center;
-    font-size: 22rpx;
-}

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/myCollection/myCollection.js → nngkxxdp/src/main/resources/static/nnzwminiapp/pagesPublic/pages/myCollection/myCollection.js

@@ -1,7 +1,7 @@
 // pages/myCollection/myCollection.js
 import {
 	getFavorite
-} from '../api/user-api'
+} from '../../../pages/api/user-api'
 Page({
 
 	/**

nngkxxdp/src/main/resources/static/nnzwminiapp/pagesPublic/pages/personalData/certification/certification.js

@@ -1,66 +0,0 @@
-// pagesPublic/pages/personalData/certification/certification.js
-Page({
-
-	/**
-	 * 页面的初始数据
-	 */
-	data: {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面加载
-	 */
-	onLoad(options) {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面显示
-	 */
-	onShow() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面隐藏
-	 */
-	onHide() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面卸载
-	 */
-	onUnload() {
-
-	},
-
-	/**
-	 * 页面相关事件处理函数--监听用户下拉动作
-	 */
-	onPullDownRefresh() {
-
-	},
-
-	/**
-	 * 页面上拉触底事件的处理函数
-	 */
-	onReachBottom() {
-
-	},
-
-	/**
-	 * 用户点击右上角分享
-	 */
-	onShareAppMessage() {
-
-	}
-})

nngkxxdp/src/main/resources/static/nnzwminiapp/pagesPublic/pages/personalData/certification/certification.wxml

@@ -1,2 +0,0 @@
-<!--pagesPublic/pages/personalData/certification/certification.wxml-->
-<text>pagesPublic/pages/personalData/certification/certification.wxml</text>

nngkxxdp/src/main/resources/static/nnzwminiapp/pagesPublic/pages/personalData/email/email.js

@@ -1,66 +0,0 @@
-// pagesPublic/pages/personalData/email/email.js
-Page({
-
-	/**
-	 * 页面的初始数据
-	 */
-	data: {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面加载
-	 */
-	onLoad(options) {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面显示
-	 */
-	onShow() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面隐藏
-	 */
-	onHide() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面卸载
-	 */
-	onUnload() {
-
-	},
-
-	/**
-	 * 页面相关事件处理函数--监听用户下拉动作
-	 */
-	onPullDownRefresh() {
-
-	},
-
-	/**
-	 * 页面上拉触底事件的处理函数
-	 */
-	onReachBottom() {
-
-	},
-
-	/**
-	 * 用户点击右上角分享
-	 */
-	onShareAppMessage() {
-
-	}
-})

nngkxxdp/src/main/resources/static/nnzwminiapp/pagesPublic/pages/personalData/email/email.wxml

@@ -1,2 +0,0 @@
-<!--pagesPublic/pages/personalData/email/email.wxml-->
-<text>pagesPublic/pages/personalData/email/email.wxml</text>

nngkxxdp/src/main/resources/static/nnzwminiapp/pagesPublic/pages/personalData/index/personalData.js

@@ -1,66 +0,0 @@
-// pagesPublic/pages/personalData/index/personalData.js
-Page({
-
-	/**
-	 * 页面的初始数据
-	 */
-	data: {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面加载
-	 */
-	onLoad(options) {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面显示
-	 */
-	onShow() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面隐藏
-	 */
-	onHide() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面卸载
-	 */
-	onUnload() {
-
-	},
-
-	/**
-	 * 页面相关事件处理函数--监听用户下拉动作
-	 */
-	onPullDownRefresh() {
-
-	},
-
-	/**
-	 * 页面上拉触底事件的处理函数
-	 */
-	onReachBottom() {
-
-	},
-
-	/**
-	 * 用户点击右上角分享
-	 */
-	onShareAppMessage() {
-
-	}
-})

nngkxxdp/src/main/resources/static/nnzwminiapp/pagesPublic/pages/personalData/index/personalData.wxml

@@ -1,2 +0,0 @@
-<!--pagesPublic/pages/personalData/index/personalData.wxml-->
-<text>pagesPublic/pages/personalData/index/personalData.wxml</text>

nngkxxdp/src/main/resources/static/nnzwminiapp/pagesPublic/pages/personalData/manage/manage.js

@@ -1,66 +0,0 @@
-// pagesPublic/pages/personalData/manage/manage.js
-Page({
-
-	/**
-	 * 页面的初始数据
-	 */
-	data: {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面加载
-	 */
-	onLoad(options) {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面显示
-	 */
-	onShow() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面隐藏
-	 */
-	onHide() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面卸载
-	 */
-	onUnload() {
-
-	},
-
-	/**
-	 * 页面相关事件处理函数--监听用户下拉动作
-	 */
-	onPullDownRefresh() {
-
-	},
-
-	/**
-	 * 页面上拉触底事件的处理函数
-	 */
-	onReachBottom() {
-
-	},
-
-	/**
-	 * 用户点击右上角分享
-	 */
-	onShareAppMessage() {
-
-	}
-})

nngkxxdp/src/main/resources/static/nnzwminiapp/pagesPublic/pages/personalData/manage/manage.wxml

@@ -1,2 +0,0 @@
-<!--pagesPublic/pages/personalData/manage/manage.wxml-->
-<text>pagesPublic/pages/personalData/manage/manage.wxml</text>

nngkxxdp/src/main/resources/static/nnzwminiapp/pagesPublic/pages/personalData/nickname/nickname.js

@@ -1,66 +0,0 @@
-// pagesPublic/pages/personalData/nickname/nickname.js
-Page({
-
-	/**
-	 * 页面的初始数据
-	 */
-	data: {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面加载
-	 */
-	onLoad(options) {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面初次渲染完成
-	 */
-	onReady() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面显示
-	 */
-	onShow() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面隐藏
-	 */
-	onHide() {
-
-	},
-
-	/**
-	 * 生命周期函数--监听页面卸载
-	 */
-	onUnload() {
-
-	},
-
-	/**
-	 * 页面相关事件处理函数--监听用户下拉动作
-	 */
-	onPullDownRefresh() {
-
-	},
-
-	/**
-	 * 页面上拉触底事件的处理函数
-	 */
-	onReachBottom() {
-
-	},
-
-	/**
-	 * 用户点击右上角分享
-	 */
-	onShareAppMessage() {
-
-	}
-})

nngkxxdp/src/main/resources/static/nnzwminiapp/pagesPublic/pages/personalData/nickname/nickname.wxml

@@ -1,2 +0,0 @@
-<!--pagesPublic/pages/personalData/nickname/nickname.wxml-->
-<text>pagesPublic/pages/personalData/nickname/nickname.wxml</text>