调整为app版本

pages.json

@@ -2,14 +2,12 @@
 	"pages": [{
 			"path": "pages/index/index",
 			"name": "Index",
-			"aliasPath": "/",
 			"style": {
 				"navigationBarTitleText": "发现能量"
 			}
 		}, {
 			"path": "pages/found/index",
 			"name": "Found",
-			"aliasPath": "/found",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "发现更多"
@@ -17,7 +15,6 @@
 		}, {
 			"path": "pages/user/index",
 			"name": "User",
-			"aliasPath": "/user",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "节点中心"
@@ -25,7 +22,6 @@
 		}, {
 			"path": "pages/user/code",
 			"name": "userCode",
-			"aliasPath": "/user/code",
 			"auth": false,
 			"style": {
 				"navigationBarTitleText": "邀请好友"
@@ -33,7 +29,6 @@
 		}, {
 			"path": "pages/user/help",
 			"name": "userHelp",
-			"aliasPath": "/user/help",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "帮助中心"
@@ -41,7 +36,6 @@
 		}, {
 			"path": "pages/user/partner",
 			"name": "userPartner",
-			"aliasPath": "/user/partner",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "我的伙伴"
@@ -49,7 +43,6 @@
 		}, {
 			"path": "pages/user/clause",
 			"name": "userClause",
-			"aliasPath": "/user/clause",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "服务条款"
@@ -57,7 +50,6 @@
 		}, {
 			"path": "pages/user/followOfficial",
 			"name": "Official",
-			"aliasPath": "/user/followOfficial",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "关注公众号"
@@ -65,28 +57,24 @@
 		}, {
 			"path": "pages/vip/vip",
 			"name": "vipIndex",
-			"aliasPath": "/vip",
 			"style": {
 				"navigationBarTitleText": "开通节点"
 			}
 		}, {
 			"path": "pages/vip/agree",
 			"name": "vipAgree",
-			"aliasPath": "/vip/agree",
 			"style": {
 				"navigationBarTitleText": "用户协议"
 			}
 		}, {
 			"path": "pages/vip/examine",
 			"name": "Examine",
-			"aliasPath": "/vip/examine",
 			"style": {
 				"navigationBarTitleText": "提交成功"
 			}
 		}, {
 			"path": "pages/setting/setting",
 			"name": "setting",
-			"aliasPath": "/setting",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "设置中心"
@@ -94,84 +82,72 @@
 		}, {
 			"path": "pages/goods/management",
 			"name": "goodsManagement",
-			"aliasPath": "/goods/management",
 			"style": {
 				"navigationBarTitleText": "商品权证管理"
 			}
 		}, {
 			"path": "pages/goods/addClassify",
 			"name": "goodsaddClassify",
-			"aliasPath": "/goods/add-classify",
 			"style": {
 				"navigationBarTitleText": "发布商品类目"
 			}
 		}, {
 			"path": "pages/goods/add",
 			"name": "goodsAdd",
-			"aliasPath": "/goods/add",
 			"style": {
 				"navigationBarTitleText": "商品权证创建"
 			}
 		}, {
 			"path": "pages/goods/goodsAuth",
 			"name": "goodsAddAuth",
-			"aliasPath": "/goods/goods-auth",
 			"style": {
 				"navigationBarTitleText": "商品权证认证"
 			}
 		}, {
 			"path": "pages/coupons/management",
 			"name": "couponsManagement",
-			"aliasPath": "/coupons/management",
 			"style": {
 				"navigationBarTitleText": "创建优惠券"
 			}
 		}, {
 			"path": "pages/coupons/add",
 			"name": "couponsAdd",
-			"aliasPath": "/coupons/add",
 			"style": {
 				"navigationBarTitleText": "创建优惠券"
 			}
 		}, {
 			"path": "pages/coupons/magDetails",
 			"name": "couponsDetails",
-			"aliasPath": "/coupons/mag-details",
 			"style": {
 				"navigationBarTitleText": "优惠券详情"
 			}
 		}, {
 			"path": "pages/coupons/selectGoods",
 			"name": "couponsSelectGoods",
-			"aliasPath": "/coupons/select-goods",
 			"style": {
 				"navigationBarTitleText": "关联产品"
 			}
 		}, {
 			"path": "pages/login/login",
 			"name": "Login",
-			"aliasPath": "/login",
 			"style": {
 				"navigationBarTitleText": "登录"
 			}
 		}, {
 			"path": "pages/login/guide",
 			"name": "loginGuide",
-			"aliasPath": "/login/guide",
 			"style": {
 				"navigationBarTitleText": "引导页"
 			}
 		}, {
 			"path": "pages/login/agreement",
 			"name": "agreement",
-			"aliasPath": "/login/agreement",
 			"style": {
 				"navigationBarTitleText": "用户隐藏协议"
 			}
 		}, {
 			"path": "pages/certification/personal",
 			"name": "Personal",
-			"aliasPath": "/personal",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "个人认证"
@@ -179,7 +155,6 @@
 		}, {
 			"path": "pages/setting/aboutUs",
 			"name": "aboutUs",
-			"aliasPath": "/setting/about-us",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "关于我们"
@@ -187,7 +162,6 @@
 		}, {
 			"path": "pages/company/approve",
 			"name": "companyApprove",
-			"aliasPath": "/company/approve",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "企业认证"
@@ -195,7 +169,6 @@
 		}, {
 			"path": "pages/news/index",
 			"name": "news",
-			"aliasPath": "/news/index",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "消息中心"
@@ -203,7 +176,6 @@
 		}, {
 			"path": "pages/news/detail",
 			"name": "newsDetail",
-			"aliasPath": "/news/detail",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "消息列表"
@@ -211,7 +183,6 @@
 		}, {
 			"path": "pages/wallet/property",
 			"name": "walletProperty",
-			"aliasPath": "/wallet/property",
 			"style": {
 				"navigationBarTitleText": "能量钱包",
 				"enablePullDownRefresh": false,
@@ -220,7 +191,6 @@
 		}, {
 			"path": "pages/wallet/extract",
 			"name": "Extract",
-			"aliasPath": "/wallet/extract",
 			"style": {
 				"navigationBarTitleText": "提现能量",
 				"enablePullDownRefresh": false,
@@ -230,7 +200,6 @@
 		}, {
 			"path": "pages/verification/index",
 			"name": "verificationIndex",
-			"aliasPath": "/verification/index",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "扫码核销"
@@ -238,7 +207,6 @@
 		}, {
 			"path": "pages/verification/history",
 			"name": "verificationHistory",
-			"aliasPath": "/verification/history",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "核销记录"
@@ -246,7 +214,6 @@
 		}, {
 			"path": "pages/shop/lists",
 			"name": "shopLists",
-			"aliasPath": "/shop/lists",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "部门/门店"
@@ -254,7 +221,6 @@
 		}, {
 			"path": "pages/shop/create",
 			"name": "shopCreate",
-			"aliasPath": "/shop/create",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "创建部门/门店"
@@ -262,7 +228,6 @@
 		}, {
 			"path": "pages/employees/list",
 			"name": "employeesList",
-			"aliasPath": "/employees/list",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "员工管理"
@@ -270,7 +235,6 @@
 		}, {
 			"path": "pages/employees/add",
 			"name": "employeesAdd",
-			"aliasPath": "/employees/add",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "添加员工"
@@ -278,7 +242,6 @@
 		}, {
 			"path": "pages/instrument/Spread",
 			"name": "instrumentSpread",
-			"aliasPath": "/instrument/spread",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "营销推广码"
@@ -286,7 +249,6 @@
 		}, {
 			"path": "pages/instrument/basics",
 			"name": "instrumentBasics",
-			"aliasPath": "/instrument/basics",
 			"auth": true,
 			"style": {
 				"navigationBarTitleText": "基础信息"
@@ -294,7 +256,6 @@
 		}, {
 			"path": "pages/wallet/fragment",
 			"name": "Fragment",
-			"aliasPath": "/wallet/fragment",
 			"style": {
 				"navigationBarTitleText": "能量碎片记录",
 				"enablePullDownRefresh": false,
@@ -310,8 +271,7 @@
 				"navigationBarBackgroundColor": "#774ffd",
 				"navigationBarTextStyle": "white"
 			},
-			"name": "addBank",
+			"name": "addBank"
-			"aliasPath": "/wallet/add-bank"
 		}, {
 			"path": "pages/wallet/bankList",
 			"style": {
@@ -320,8 +280,7 @@
 				"navigationBarBackgroundColor": "#774ffd",
 				"navigationBarTextStyle": "white"
 			},
-			"name": "bankList",
+			"name": "bankList"
-			"aliasPath": "/wallet/bank/list"
 		}, {
 			"path": "pages/wallet/withdrawList",
 			"style": {
@@ -330,20 +289,17 @@
 				"navigationBarBackgroundColor": "#774ffd",
 				"navigationBarTextStyle": "white"
 			},
-			"name": "withdrawList",
+			"name": "withdrawList"
-			"aliasPath": "/wallet/withdraw/list"
 		}, {
             "path" : "pages/wxAuth/wxAuth",
-			"name" : "wxAuth",
+			"name" : "wxAuth"
-			"aliasPath": "/wechat-auth"
         },{
             "path" : "pages/clearOpen/clearOpen",
             "style" : {
                 "navigationBarTitleText": "提现记录",
                 "enablePullDownRefresh": false
             },
-			"name": "clearOpen",
+			"name": "clearOpen"
-			"aliasPath": "/inside/clear-open"
         }
     ],
 	"globalStyle": {

pages/login/login.vue

@@ -68,11 +68,10 @@
 					parent_id	: this.parentId
 				}).then(res => {
 					this.$store.commit('setToken', res.token_type + ' ' + res.access_token)
-					
 					if(this.$Route.toName){
 						this.$Router.back()
 					}else{
-						this.$Router.replace({name: 'Index'})
+						this.$Router.replaceAll({name: 'Index'})
 					}
 				}).catch(err => {
 					uni.showToast({

pages/setting/setting.vue

@@ -282,7 +282,7 @@
 			},
 			loginOut() {
 				this.$store.commit('setToken', '')
-				this.$Router.push({name: 'Index'})
+				this.$Router.replaceAll({name: 'Index'})
 			},
 			// 上传头像
 			updImgs(type) {

pages/user/index.vue

@@ -10,7 +10,6 @@
 		    <image class="customerClose" src="/static/user/user-customer-close.png" mode="aspectFill" @click="custEject"></image>
 		</view>
 		<!-- 专属客服弹出 end -->
-		
 		<!-- 消息列表弹出 start -->
 		<view class="newBack" v-if="newState"></view>
 		<view class="newCont" v-if="newState">
@@ -644,6 +643,7 @@ export default {
 		height: 334px;
 		// user工具
 		.user-tool {
+			padding-top: 200rpx;
 			text-align: right;
 			line-height: 40px;
 		    .user-tool-name {

router/index.js

@@ -23,16 +23,12 @@ const router = createRouter({
 // 全局路由前置守卫
 router.beforeEach((to, from, next) => {
 	const token  = store.getters.getToken || uni.getStorageSync('token')
-	// 检查是否需要微信授权
+	
-	if(store.getters.getCode === '' && to.name != 'wxAuth'){
-		next({
-			name: 'wxAuth'
-		})
-	}
 	// 检查是否需要登录
 	if(to.auth && token === ''){
 		next({
 			name: 'Login',
+			NAVTYPE: 'push',
 			params: {
 				toName: to.name
 			}