zhengkaixin 3 лет назад
Родитель
Сommit
bfc56d380d

+ 1 - 2
.env.dev.js

@@ -7,8 +7,7 @@ const UNI_APP = {
 	//openId:"oHjCawgwCGen5k1-hAsimdEX5lZo",
 	//openId:"oHjCawgwCGen5k1-hAsimdEX5lZo",
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
-	//小鹏管家appid
-	VUE_APP_WXAPPID:"wxa8954f417fa7c32f"
+
 }  
 
 module.exports = UNI_APP;

+ 1 - 2
.env.prod.js

@@ -3,8 +3,7 @@ const UNI_APP = {
 	NODE_ENV :"prod",
 	SIMPLE_RUN:false,
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
-	//小鹏管家appid
-	VUE_APP_WXAPPID:"wxa8954f417fa7c32f"
+
 }  
 
 module.exports = UNI_APP;

+ 1 - 2
.env.test.js

@@ -8,8 +8,7 @@ const UNI_APP = {
 	SIMPLE_RUN:false,
 	//openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//测试用openId
 	//openId:"oHjCawmHqG44pqUW54iBlenaHYB8",
-	//小鹏管家appid
-	VUE_APP_WXAPPID:"wxa8954f417fa7c32f",
+
 	//zkx的测试openId
 	openId:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
 	//zq的测试openId oHjCawsxTJkxixR74OVp7aCKahj8

+ 0 - 472
console.js

@@ -1,472 +0,0 @@
- var list =[ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages	
-		
-		{
-			"name":"IndexIndex",
-			"path": "pages/index/index",
-			"style": {
-	
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		}
-
-      
-        ,{//微信登录
-            "path" : "pages/login/wxLogin/wxLogin",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "微信登录",
-                
-            }
-            
-        }
-        ,{//手机号登录
-            "path" : "pages/login/phoneLogin/phoneLogin",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "手机号登录",
-                
-            }
-            
-        }
-        ,{//填写验证码
-            "path" : "pages/login/vCode/vCode",
-            "style" :                                                                                    
-            {           
-                "navigationBarTitleText": "填写验证码",
-                
-            }
-            
-        }
-        ,{//密码登录
-            "path" : "pages/login/passwordLogin/passwordLogin",
-            "style" :                                                                                    
-            {              
-                "navigationBarTitleText": "密码登录",
-                
-            }
-            
-        }
-      
-        ,{
-            "path" : "pages/job/index/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "求职主页",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/index/recruitInfo/recruitInfo",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "招聘详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/index/companyInfo/companyInfo",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "企业详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/query/query",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "搜索",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/query/queryResult/queryResult",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "搜索结果",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/newsIndex/newsIndex",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "分类消息",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/newsIndex/newsList/newsList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "消息列表",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/newsIndex/newsRecommend/newsRecommend",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "推荐职位",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/newsIndex/newsInvitationPhone/newsInvitationPhone",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "沟通邀请通知",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/newsIndex/newsInvitationBefore/newsInvitationBefore",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "面试邀请通知",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/newsIndex/newsEntry/newsEntry",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "录用意向书详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/personal",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "个人中心",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/my/my",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-     
-        ,{
-            "path" : "pages/job/personal/my/resumeMy/resumeMy",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的简历",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/my/resumeAdd/resumeAdd",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "创建简历",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/job/personal/my/resumeAdd/resumeSelect/resumeSelect",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "选择职位输入",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/job/personal/my/resumeAdd/resumeEdit/resumeEdit",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "编辑自我介绍",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-		,{
-		    "path" : "pages/job/personal/my/resumeAdd/resumeSucc/resumeSucc",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "简历提交成功",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/job/personal/my/resumeList/resumeList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "投递记录",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/my/resumeLook/resumeLook",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "看过的职位",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/my/resumeCollect/resumeCollect",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "职位收藏",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/my/resumeAuth/resumeAuth",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "个人认证",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		,{
-		    "path" : "pages/job/personal/install/install",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "设置",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}
-        ,{
-            "path" : "pages/job/personal/install/myInfo/myInfo",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "个人信息",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/install/account/account",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "账号管理",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/install/account/passwordA/passwordA",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "忘记密码",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/install/account/passwordB/passwordB",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "验证码找回",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/install/account/passwordC/passwordC",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "重设密码",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/install/account/phoneA/phoneA",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "填写验证码",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/install/account/phoneB/phoneB",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "绑定手机号",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/install/account/phoneC/phoneC",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "绑定验证码 Copy",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/job/personal/about/about",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "关于我们",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/index/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "招聘主页",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/index/resumeInfo/resumeInfo",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "简历详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/query/query",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "搜索",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/query/queryResult/queryResult",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "搜索结果",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/newsIndex/newsIndex",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "消息分类",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/newsIndex/newsList/newsList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "消息列表",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/newsIndex/newsRecommend/newsRecommend",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "推荐简历",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-       
-        ,{
-            "path" : "pages/hr/newsIndex/servicesList/servicesList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "劳务对接列表",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/newsIndex/servicesInfo/servicesInfo",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "劳务对接详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/my/my",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "我的",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/my/position/position",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "职位管理",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/my/follow/follow",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "对您感兴趣",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/my/enroll/enroll",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "求职管理",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/hr/my/collection/collection",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "收藏简历",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ];
-	var my=[];
-	for(var i in list){
-		var obj=list[i];
-		my.push(obj.style.navigationBarTitleText);
-	}
-	console.log(my);

+ 1 - 1
manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxa8954f417fa7c32f",
+        "appid" : "wxb5c9df63664d7627",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

+ 80 - 73
pages.json

@@ -96,81 +96,88 @@
 			"style": {
 				//"navigationStyle": "custom" // 隐藏系统导航栏
 			}
-		},
-		{
-			"name":"登录",
-			"path": "pages/login/index",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name":"注册",
-			"path": "pages/login/register",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name":"更换手机号",
-			"path": "pages/login/change",
-			"style": { 
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name":"用户协议",
-			"path": "pages/login/agreement",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name":"查找工会",
-			"path": "pages/login/search",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name":"暂无搜索结果",
-			"path": "pages/login/searchNone",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name":"1.填写基础资料",
-			"path": "pages/login/step1",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name":"2.完善个人信息",
-			"path": "pages/login/step2",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name":"3.我的择偶标准",
-			"path": "pages/login/step3",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
-		},
-		{
-			"name":"4.上传头像",
-			"path": "pages/login/step4",
-			"style": {
-				//"navigationStyle": "custom" // 隐藏系统导航栏
-			}
 		}
-		
-
-      
+		
     ],
+	"subPackages":[
+		{
+			//注册包 
+			"root":"pagesA",
+			"pages":[
+				{
+					"name":"登录",
+					"path": "pages/login/index",
+					"style": {
+						//"navigationStyle": "custom" // 隐藏系统导航栏
+					}
+				},
+				{
+					"name":"注册",
+					"path": "pages/login/register",
+					"style": {
+						//"navigationStyle": "custom" // 隐藏系统导航栏
+					}
+				},
+				{
+					"name":"更换手机号",
+					"path": "pages/login/change",
+					"style": { 
+						//"navigationStyle": "custom" // 隐藏系统导航栏
+					}
+				},
+				{
+					"name":"用户协议",
+					"path": "pages/login/agreement",
+					"style": {
+						//"navigationStyle": "custom" // 隐藏系统导航栏
+					}
+				},
+				{
+					"name":"查找工会",
+					"path": "pages/login/search",
+					"style": {
+						//"navigationStyle": "custom" // 隐藏系统导航栏
+					}
+				}
+				
+			]
+		},
+		{
+			//注册包 
+			"root":"pagesB",
+			"pages":[
+				
+				{
+					"name":"1.填写基础资料",
+					"path": "pages/login/step1",
+					"style": {
+						//"navigationStyle": "custom" // 隐藏系统导航栏
+					}
+				},
+				{
+					"name":"2.完善个人信息",
+					"path": "pages/login/step2",
+					"style": {
+						//"navigationStyle": "custom" // 隐藏系统导航栏
+					}
+				},
+				{
+					"name":"3.我的择偶标准",
+					"path": "pages/login/step3",
+					"style": {
+						//"navigationStyle": "custom" // 隐藏系统导航栏
+					}
+				},
+				{
+					"name":"4.上传头像",
+					"path": "pages/login/step4",
+					"style": {
+						//"navigationStyle": "custom" // 隐藏系统导航栏
+					}
+				}
+			]
+		}
+	],
  
 	"globalStyle": {
 			"navigationStyle": "custom", // 隐藏系统导航栏

+ 1 - 1
pages/index/main-zkx.vue

@@ -23,7 +23,7 @@
 			gotoMain(k){
 				if(k){
 					uni.navigateTo({
-						url:"/pages/login/index"
+						url:"pagesA/pages/login/index"
 					})
 				}else{
 					uni.switchTab({

+ 0 - 0
pages/login/agreement.vue → pagesA/pages/login/agreement.vue


+ 1 - 1
pages/login/change.vue → pagesA/pages/login/change.vue

@@ -156,7 +156,7 @@
 					newPhone: this.form.newPhone
 				}).then((response) => {				
 					uni.redirectTo({
-						url: '/pages/login/index'
+						url: 'pagesA/pages/login/index'
 					});
 				}).catch(error => {
 					uni.showToast({

+ 5 - 5
pages/login/index.vue → pagesA/pages/login/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
-		<view class="jpLogin">
-			<u-navbar :background="navbarBg" :border-bottom="false"></u-navbar>
+		<view class="jpLogin">
+			<u-navbar :background="navbarBg" :border-bottom="false"></u-navbar>
 			
 			<view class="jpLogin-title">
 				<h2>会员登录</h2>
@@ -86,12 +86,12 @@
 			},
 			getRegister() {
 				uni.navigateTo({
-					url: '/pages/login/register'
+					url: 'pagesA/pages/login/register'
 				});
 			},
 			getAgreement() {
 				uni.navigateTo({
-					url: '/pages/login/agreement'
+					url: 'pagesA/pages/login/agreement'
 				});
 			},
 			codeChange(text) {
@@ -301,4 +301,4 @@
 			font-size: 14px;
 		}
 	}
-</style>
+</style>

+ 4 - 4
pages/login/register.vue → pagesA/pages/login/register.vue

@@ -116,17 +116,17 @@
 			},
 			getSearch() {
 				uni.navigateTo({
-					url: '/pages/login/search'
+					url: 'pagesA/pages/login/search'
 				})
 			},
 			getLogin() {
 				uni.navigateBack({
-					url: '/pages/login/index'
+					url: 'pagesA/pages/login/index'
 				});
 			},
 			getAgreement() {
 				uni.navigateTo({
-					url: '/pages/login/agreement'
+					url: 'pagesA/pages/login/agreement'
 				});
 			},
 			codeChange(text) {
@@ -253,7 +253,7 @@
 					var token = response ? response.data.token : '';
 					this.carhelp.setToken(token);
 					this.carhelp.setPersonInfo(response.data.memberInfo);
-					this.gotoUrl("pages/login/step1")
+					this.gotoUrl("pagesA/pages/login/step1")
 					// uni.switchTab({
 					// 	url: '/pages/index/index'
 					// })

+ 1 - 1
pages/login/search.vue → pagesA/pages/login/search.vue

@@ -44,7 +44,7 @@
 			getRegister(item) {
 				this.carhelp.set("searchOrgItem",item)
 				uni.navigateBack({
-					url: '/pages/login/register'
+					url: 'pagesA/pages/login/register'
 				})
 			},
 			getList() {

+ 0 - 0
pages/login/searchNone.vue → pagesA/pages/login/searchNone.vue


+ 0 - 0
components/mpvue-citypicker/city-data/province.js → pagesB/components/mpvue-citypicker/city-data/province.js


+ 0 - 0
components/mpvue-citypicker/mpvueCityPicker.vue → pagesB/components/mpvue-citypicker/mpvueCityPicker.vue


+ 0 - 0
components/mpvue-datepicker/mpvue-datepicker.vue → pagesB/components/mpvue-datepicker/mpvue-datepicker.vue


+ 0 - 0
pages/login/step1.vue → pagesB/pages/login/step1.vue


+ 0 - 0
pages/login/step2.vue → pagesB/pages/login/step2.vue


+ 0 - 0
pages/login/step3.vue → pagesB/pages/login/step3.vue


+ 0 - 0
pages/login/step4.vue → pagesB/pages/login/step4.vue


+ 1 - 1
utils/requestSon.js

@@ -41,7 +41,7 @@ const request = (options) => {
 			if (res.data.code == 415&&res.data.message=='请先注册信息') {
 				carhelp.signOut()
 				uni.redirectTo({
-					url: 'pages/login/index'
+					url: 'pagesA/pages/login/index'
 				})
 				return;
 			}

+ 1 - 1
utils/requestWhite.js

@@ -42,7 +42,7 @@ const request = (options) => {
 			if (res.data.code == 415&&res.data.message=='请先注册信息') {
 				carhelp.signOut()
 				uni.redirectTo({
-					url: '/pages/login/index'
+					url: 'pagesA/pages/login/index'
 				})
 				return;
 			}