From cba7b91907c4db3f79fe0eef51d92443f0725eb7 Mon Sep 17 00:00:00 2001
From: hflllll <violeteverdack@gmail.com>
Date: Sun, 20 Apr 2025 22:43:36 +0800
Subject: [PATCH] =?UTF-8?q?1.1=E4=BF=AE=E6=94=B9=E5=9E=82=E7=9B=B4?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E8=A1=A8=20=E7=99=BB=E5=BD=95=E6=89=93?=
 =?UTF-8?q?=E4=B8=8D=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                            |   6 +
 api/api.js                                         |   4 +-
 api/http.js                                        |   4 +-
 api/model/login.js                                 |  16 +-
 components/base/tabbar.vue                         |   8 +-
 components/config/configPopup.vue                  |  62 +--
 manifest.json                                      |   4 +-
 pages.json                                         |  16 +-
 pages/index/category.vue                           | 287 ++++++++++----
 pages/index/test-vtabs.vue                         | 134 +++++++
 .../auth/loginAndRegisterAndForgetPassword.vue     | 414 ++++++++++-----------
 pages_order/auth/wxLogin.vue                       |  76 ++--
 static/image/中森明菜.webp                     | Bin 0 -> 22608 bytes
 store/store.js                                     |   5 +-
 uni.scss                                           |   5 +-
 uni_modules/uv-ui-tools/libs/util/route.js         |  12 +-
 utils/utils.js                                     |   2 +-
 17 files changed, 681 insertions(+), 374 deletions(-)
 create mode 100644 pages/index/test-vtabs.vue
 create mode 100644 static/image/中森明菜.webp

diff --git a/App.vue b/App.vue
index 9ba8a00..cc5c84b 100644
--- a/App.vue
+++ b/App.vue
@@ -3,9 +3,15 @@
 		onLaunch: function() {
 			this.$store.commit('initConfig')
 			this.$store.commit('getCategoryList')
+			// 注释掉token检查，允许未登录用户访问所有页面
+			/*
 			if(uni.getStorageSync('token')){
 				this.$store.commit('getQrCode')
 			}
+			*/
+			
+			// 无需token，直接获取二维码
+			this.$store.commit('getQrCode')
 		},
 		onShow: function() {
 		},
diff --git a/api/api.js b/api/api.js
index d566315..d852c8f 100644
--- a/api/api.js
+++ b/api/api.js
@@ -45,7 +45,8 @@ export function api(key, data, callback, loadingTitle) {
 		limit[storageKey] = new Date().getTime()
 	}
 
-	//必须登录
+	//必须登录 - 注释掉登录检查
+	/*
 	if (req.auth) {
 		if (!uni.getStorageSync('token')) {
 			utils.toLogin()
@@ -53,6 +54,7 @@ export function api(key, data, callback, loadingTitle) {
 			return Promise.reject()
 		}
 	}
+	*/
 	
 	// 接口防抖
 	if(req.debounce){
diff --git a/api/http.js b/api/http.js
index 6c3da63..b02666d 100644
--- a/api/http.js
+++ b/api/http.js
@@ -1,4 +1,3 @@
-
 import Vue from 'vue'
 import utils from '../utils/utils.js'
 import store from '../store/store.js'
@@ -32,6 +31,8 @@ function http(uri, data, callback, method = 'GET', showLoading, title) {
 				uni.hideLoading();
 			}
 			
+			// 注释掉登录状态检查
+			/*
 			if(res.statusCode == 401 || 
 			res.data.message == '操作失败，token非法无效!' || 
 			res.data.message == '操作失败，用户不存在!'){
@@ -39,6 +40,7 @@ function http(uri, data, callback, method = 'GET', showLoading, title) {
 				console.error('登录过期');
 				utils.toLogin()
 			}
+			*/
 			
 			if(res.statusCode == 200 && res.data.code != 200
 			&& res.data.code != 902){
diff --git a/api/model/login.js b/api/model/login.js
index 4503642..b8f46d1 100644
--- a/api/model/login.js
+++ b/api/model/login.js
@@ -1,33 +1,31 @@
-
-
 // 登录相关接口
 
 const api = {
 	// 微信登录接口
 	wxLogin: {
 		url: '/login_common/appletLogin',
-		method: 'GET', 
-		limit : 500,
+		method: 'GET',
+		limit: 500,
 	},
 	// 获取绑定手机号码
 	bindPhone: {
 		url: '/login_common/bindPhone',
 		method: 'GET',
-		auth: true,
+		// auth: true,
 	},
 	// 修改个人信息接口
 	updateInfo: {
 		url: '/info_common/updateInfo',
 		method: 'POST',
-		auth: true, 
-		limit : 500,
-		showLoading : true,
+		limit: 500,
+		showLoading: true,
+		// auth: true,
 	},
 	// 获取个人信息
 	getInfo: {
 		url: '/info_common/getInfo',
 		method: 'GET',
-		auth: true,
+		// auth: true,
 	},
 }
 
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index 9c70362..7ee54a7 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -28,13 +28,7 @@
 		},
 		data() {
 			return {
-				list: [{
-						"selectedIconPath": "/static/image/tabbar/home-active.png",
-						"iconPath": "/static/image/tabbar/home.png",
-						"pagePath": "/pages/index/index",
-						"title": "首页",
-						key: 'home',
-					},
+				list: [
 					{
 						"selectedIconPath": "/static/image/tabbar/product-list-active.png",
 						"iconPath": "/static/image/tabbar/product-list.png",
diff --git a/components/config/configPopup.vue b/components/config/configPopup.vue
index 6555496..b725e44 100644
--- a/components/config/configPopup.vue
+++ b/components/config/configPopup.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="configPopup">
-		<uv-popup ref="popup" :round="30" :customStyle="{height: '50vh'}">
+		<uv-popup ref="popup" :round="30" :customStyle="{ height: '50vh' }">
 			<view class="content">
 				<uv-parse :content="content"></uv-parse>
 			</view>
@@ -9,41 +9,41 @@
 </template>
 
 <script>
-	import { mapState } from 'vuex'
-	export default {
-		name: 'configPoup',
-		data() {
-			return {
-				content : ''
-			}
-		},
-		onShow(){
+import { mapState } from 'vuex'
+export default {
+	name: 'configPoup',
+	data() {
+		return {
+			content: ''
+		}
+	},
+	onShow() {
+	},
+	methods: {
+		//打开配置信息菜单
+		open(key) {
+			this.content = this.configList[key]
+			this.$refs.popup.open('bottom');
 		},
-		methods: {
-			//打开配置信息菜单
-			open(key){
-				this.content = this.configList[key]
-				this.$refs.popup.open('bottom');
-			},
-			openText(content){
-				this.content = content
-				this.$refs.popup.open('bottom');
-			},
+		openText(content) {
+			this.content = content
+			this.$refs.popup.open('bottom');
 		},
-		
-		computed : {
-			...mapState(['configList'])
-		}
+	},
+
+	computed: {
+		...mapState(['configList'])
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.configPopup {
-		.content{
-			padding: 30rpx 20rpx;
-			overflow: scroll;
-			height: 100%;
-			box-sizing: border-box;
-		}
+.configPopup {
+	.content {
+		padding: 30rpx 20rpx;
+		overflow: scroll;
+		height: 100%;
+		box-sizing: border-box;
 	}
+}
 </style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 3352ade..6c3b6b1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,7 +52,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx28679cb649907e7e",
+        "appid" : "wxe7ae8cbe1673834c",
         "setting" : {
             "urlCheck" : false
         },
@@ -99,5 +99,5 @@
         }
     },
     // i卡不用配置 a卡才要
-    "sassImplementationName": "node-sass"
+    "sassImplementationName" : "node-sass"
 }
diff --git a/pages.json b/pages.json
index c285778..841cd5a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,20 +1,14 @@
 {
-	"pages": [{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true
-			}
-		},
+	"pages": [
 		{
-			"path": "pages/index/order",
+			"path": "pages/index/category",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "首页",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/index/category",
+			"path": "pages/index/order",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": true
@@ -41,7 +35,7 @@
 		}
 	],
 	"preloadRule": {
-		"pages/index/index": {
+		"pages/index/order": {
 			"network": "all",
 			"packages": ["pages_order"]
 		}
diff --git a/pages/index/category.vue b/pages/index/category.vue
index 3beb301..1f0d01e 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -1,75 +1,83 @@
 <template>
 	<view class="page">
 		<!-- 导航栏 -->
-		<navbar title="商品列表" 
-		leftClick 
-		@leftClick="$utils.navigateBack" 
-		bgColor="#E3441A" 
-		color="#fff" />
+		<!-- <navbar   bgColor="#019245" color="#fff" /> -->
 
 		<!-- 搜索栏 -->
 		<view class="search">
-			<uv-search placeholder="搜你喜欢的产品" bgColor="#fff" 
-			@search="search" 
-			@change="search" 
-			@custom="search"
-			v-model="queryParams.title"></uv-search>
+			<image src="/static/image/中森明菜.webp" mode="aspectFill" class="search-img"></image>
+			<view style="position: relative;">
+				<uv-search placeholder="陕西苹果" bgColor="#fff" @search="search" @change="search" @custom="search"
+					v-model="queryParams.title" height="70rpx" :showAction="false" actionText=" "></uv-search>
+				<text class="search-text" @click="search">搜索</text>
+			</view>
 		</view>
-		
+
 		<!-- 商品列表 -->
-		<view style="position: 20rpx;"
-		v-if="queryParams.title">
+		<view style="position: 20rpx;" v-if="queryParams.title">
 			<productList :list="list" />
 		</view>
 
 		<!-- 分类商品列表 -->
-		<view class="category"
-		v-else>
-			
-			<view class="tabs">
-				<uv-tabs 
-				:list="category" 
-				:activeStyle="{color : '#f00', fontWeight : 600}" 
-				lineColor="#f00"
-				:inactiveStyle="{color: 'rgba(0,0,0,.8)'}" 
-				lineHeight="8rpx" 
-				lineWidth="50rpx" 
-				:current="current"
-				@click="clickTabs"></uv-tabs>
-			</view>
-		
-			<uv-vtabs 
-			:list="category[current].children" 
-			:current="currentChildren"
-			keyName="name" 
-			:chain="false"
-			@change="change">
-				<!-- <view class="list"> -->
-					<!-- <template v-for="(item, index) in category[current].children">
-							<uv-vtabs-item :index="index" :key="index">
-								<view class="category-item">
-									<view class="category-title">
-										{{ item.name }}
-									</view>
-									
-									<productItem :item="pro"
-									v-for="(pro, i) in item.shopList" :key="i"
-									@click="$utils.navigateTo(`/pages_order/product/productDetail?id=${pro.id}`)" />
+		<view class="category" v-else>
+
+			<!-- <view class="tabs">
+				<uv-tabs :list="category" :activeStyle="{color : '#f00', fontWeight : 600}" lineColor="#f00"
+					:inactiveStyle="{color: 'rgba(0,0,0,.8)'}" lineHeight="8rpx" lineWidth="50rpx" :current="current"
+					@click="clickTabs"></uv-tabs>
+			</view> -->
+
+			<!-- 原来的选择框 -->
+			<!-- <uv-vtabs :list="category[current].children" :current="currentChildren" keyName="name" :chain="false"
+				@change="change"> -->
+			<!-- 可有可无 -->
+			<!-- <view class="list">
+					<template v-for="(item, index) in category[current].children">
+						<uv-vtabs-item :index="index" :key="index">
+							<view class="category-item">
+								<view class="category-title">
+									{{ item.name }}
 								</view>
+								
+								<productItem :item="pro"
+								v-for="(pro, i) in item.shopList" :key="i"
+								@click="$utils.navigateTo(`/pages_order/product/productDetail?id=${pro.id}`)" />
+							</view>
 						</uv-vtabs-item>
-					</template> -->
-				<!-- </view> -->
-				
-				<uv-vtabs-item>
+					</template>
+				</view> -->
+
+			<!-- <uv-vtabs-item>
 					<view class="category-item">
-						<productItem :item="pro"
-						v-for="(pro, i) in categoryList.shopList" :key="i"
-						@click="$utils.navigateTo(`/pages_order/product/productDetail?id=${pro.id}`)" />
-					
-						<uv-empty v-if="categoryList.shopList.length == 0"  text="还没有呢"/>
+						<productItem :item="pro" v-for="(pro, i) in categoryList.shopList" :key="i"
+							@click="$utils.navigateTo(`/pages_order/product/productDetail?id=${pro.id}`)" />
+
+						<uv-empty v-if="categoryList.shopList.length == 0" text="还没有呢" />
 					</view>
 				</uv-vtabs-item>
-			</uv-vtabs>
+			</uv-vtabs> -->
+			<view class="content">
+				<uv-vtabs :chain="chain" :list="list" :barItemBadgeStyle="{ right: '20rpx', top: '12rpx' }"
+					barStyle="box-shadow: 0 0 6rpx 6rpx rgba(0, 0, 0, 0.1);" @change="tabChange" height="1100rpx">
+					<uv-vtabs-item>
+						<view class="item" v-for="(item2, index2) in list2" :key="index2">
+							<view class="item-title">
+								<text class="text">{{ item2.name }}</text>
+							</view>
+							<view class="item-content">
+								<text class="text">{{ item2.desc }}</text>
+							</view>
+						</view>
+					</uv-vtabs-item>
+					<!-- try -->
+					<view class="category-item">
+						<productItem :item="item2" v-for="(item2, i) in list2" :key="i"
+							@click="$utils.navigateTo(`/pages_order/product/productDetail?id=${item2.id}`)" />
+
+						<uv-empty v-if="list2.length == 0" text="还没有呢" />
+					</view>
+				</uv-vtabs>
+			</view>
 		</view>
 
 		<!-- tabbar -->
@@ -78,6 +86,46 @@
 </template>
 
 <script>
+const getList = [{
+	name: 'uv-ui简介',
+	childrens: [{
+		// name: 'uv-ui简介',
+		desc: '1. uv-ui最初是在uview2.x的基础上进行改进优化，支持vue3等优化，最重要的是支持单独导入直接使用，无需在main.js中进行配置。\n\n2. uv-ui来源于社区，也回归到社区，正是有一群热爱uni-app生态的同学推着它前行，而我们也一如既往的承诺，uv-ui永久开源，永远免费。但是会在下载处进行广告配置，作为开发团队的研发费用的部分来源，所以希望大家理解。'
+	}]
+}, {
+	name: 'uv-ui特点',
+	childrens: [{
+		name: '全端兼容',
+		desc: 'uv-ui支持App（vue）、App（nvue）、H5、小程序、VUE2、VUE3，支持nvue原生渲染。uv-ui的组件都是多端自适应的，底层会抹平很多小程序平台的差异或bug。'
+	}, {
+		name: '集成工具',
+		desc: 'uv-ui中的uv-ui-tools组件集成了强大的网络请求 HTTP 及常用的工具函数，无需自己再去寻找，并且直接挂载在uni上面，方便使用，只需要在mian.js中引入即可，更多工具请参考：https://www.uvui.cn/js/http.html。使用方式请参考：https://www.uvui.cn/components/setting.html。'
+	}, {
+		name: '主题扩展',
+		desc: 'uv-ui中的uv-ui-tools组件下面的theme.scss为主题文件，直接在uni.scss中引入主题即可，可以根据自己的需求进行扩展。下面也有说明具体使用方式。使用方法请参考：https://www.uvui.cn/components/setting.html'
+	}]
+}, {
+	name: '更新日志',
+	badge: {
+		isDot: true
+	},
+	childrens: [{
+		name: '更新日志',
+		desc: 'uv-ui的重大更新在更新日志中都有所说明，如果在开发的过程中遇到文档不完善，可以提供给我们，我们会持续完善，非常感谢大家的支持。更新日志：https://www.uvui.cn/components/changelog.html'
+	}]
+}, {
+	name: '设计规范',
+	childrens: [{
+		name: '设计规范',
+		desc: '为了约束合成更多优秀的组件和模板，打造优质的体验，我们拟定了一些UI界面设计和建议。同时部分之间会有依赖，这是为了减少代码冗余的同时提高开发效率，模块化是我们的基础。如果大家有好的建议，可以提出进行改进。'
+	}]
+}, {
+	name: '交流反馈',
+	childrens: [{
+		name: '交流反馈',
+		desc: 'uv-ui为采用MIT许可证的开源项目，使用完全免费。欢迎加QQ群交流反馈，一起学习，共同进步。QQ群： 549833913'
+	}]
+}]
 	import productItem from '@/components/product/productItem.vue';
 	import mixinsList from '@/mixins/list.js'
 	import {
@@ -97,6 +145,9 @@
 				mixinsListApi: 'getClassShopPageList',
 				current : 0,
 				currentChildren : 0,
+				list: [],
+				chain: false,
+				value: 0
 			}
 		},
 		computed: {
@@ -104,16 +155,35 @@
 			categoryList(){
 				return this.category[this.current].children[this.currentChildren]
 			},
+			list2() {
+				const _list = this.list[this.value]?.childrens;
+				return _list ? _list : [];
+			}
+		},
+		onReady(){
+			// 模拟接口请求数据
+			uni.showLoading({
+				title: '加载中'
+			})
+			setTimeout(() => {
+				this.list = getList;
+				uni.hideLoading();
+			}, 200)
+			
+			
 		},
 		onLoad({
 			search,
 			cid
 		}) {
+			console.log('我是cid', cid);
+			console.log('我是category', this.category);
 			if (search) {
 				this.queryParams.title = search
 			}
 			// this.$store.commit('getCategoryList')
 			if(this.category.length > 0 && cid){
+
 				this.category.forEach((n, i) => {
 					if(n.id == cid){
 						this.current = i
@@ -128,6 +198,11 @@
 			change(e) {
 				// this.queryParams.classId = this.category[e].id
 				this.currentChildren = e
+				
+			},
+			tabChange(index){
+				console.log('选项改变：', index);
+				this.value = index
 			},
 			clickTabs({index}){
 				this.current = index
@@ -147,26 +222,34 @@
 <style scoped lang="scss">
 	.page {
 		/deep/ .uv-vtabs {
-			height: calc(100vh - 600rpx) !important;
+			height: calc(100vh - 470rpx) !important;
 		}
 
-		/deep/ .uv-vtabs__bar {
-			height: calc(100vh - 600rpx) !important;
-		}
+		// /deep/ .uv-vtabs__bar {
+		// 	height: calc(100vh - 600rpx) !important;
+		// }
 
 		/deep/ .uv-vtabs__content {
-			height: calc(100vh - 600rpx) !important;
+			height: calc(100vh - 500rpx) !important;
 		}
 
 		.search {
-			position: relative;
-			background: #FFFFFF;
-			margin: 20rpx;
-			border-radius: 41rpx;
-			padding: 10rpx 20rpx;
-			display: flex;
-			align-items: center;
-
+			background: $uni-color;
+			height: 280rpx;
+			padding-left: 20rpx;
+			.search-img{
+				width: 120rpx;
+				height: 120rpx;
+				margin: 40rpx 0 0 10rpx;
+				border-radius: 50%;
+			}
+			.search-text{
+				position: absolute;
+				right: 80rpx;
+				top: 50%;
+				transform: translateY(-50%);
+				color: $uni-color;
+			}
 			/deep/ .uv-search__action {
 				background-color: $uni-color;
 				color: #FFFFFF;
@@ -181,7 +264,38 @@
 		}
 	}
 
+	.header {
+		padding: 30rpx;
+		font-size: 30rpx;
+		color: #333;
+	}
+	.item {
+		padding: 10rpx 20rpx;
+		&-title {
+			.text {
+				font-weight: 700;
+				font-size: 32rpx;
+				color: #111;
+			}
+		}
+		&-content {
+			padding: 20rpx 0;
+			.text {
+				line-height: 48rpx;
+				font-size: 30rpx;
+				color: #111;
+				/* #ifndef APP-NVUE */
+				word-break: break-all;
+				/* #endif */
+			}
+		}
+	}
+	.gap {
+		padding: 0 30rpx;
+	}
+
 	.category {
+		/* background-color: green; */
 		font-size: 30rpx;
 		color: #333;
 		.category-title{
@@ -219,6 +333,41 @@
 			padding: 0rpx 20rpx;
 			box-sizing: border-box;
 		}
-
+		
 	}
+
+		.header {
+			padding: 30rpx;
+			font-size: 30rpx;
+			color: #333;
+		}
+	
+		.item {
+			padding: 10rpx 20rpx;
+	
+			&-title {
+				.text {
+					font-weight: 700;
+					font-size: 32rpx;
+					color: #111;
+				}
+			}
+	
+			&-content {
+				padding: 20rpx 0;
+	
+				.text {
+					line-height: 48rpx;
+					font-size: 30rpx;
+					color: #111;
+					/* #ifndef APP-NVUE */
+					word-break: break-all;
+					/* #endif */
+				}
+			}
+		}
+	
+		.gap {
+			padding: 0 30rpx;
+		}
 </style>
\ No newline at end of file
diff --git a/pages/index/test-vtabs.vue b/pages/index/test-vtabs.vue
new file mode 100644
index 0000000..ce7e549
--- /dev/null
+++ b/pages/index/test-vtabs.vue
@@ -0,0 +1,134 @@
+<template>
+    <view class="content">
+        <view
+            style="height: 100rpx;background: #ecf5ff;color: #909193;display: flex;justify-content: center;text-align: center;">
+            <text style="font-size: 28rpx;">欢迎使用多功能组件uv-vtabs，这是头部内容，有头部内容必须传hdHeight参数</text>
+        </view>
+        <uv-vtabs :chain="chain" :list="list" :height="height" hdHeight="100rpx" @change="change">
+            <template v-for="(item, index) in list">
+                <uv-vtabs-item :index="index" :key="index">
+                    <view class="item" v-for="(item2, index2) in item.childrens" :key="index2">
+                        <view class="item-title">
+                            <text class="text">{{ item2.name }}</text>
+                        </view>
+                        <view class="item-content">
+                            <text class="text">{{ item2.desc }}</text>
+                        </view>
+                    </view>
+                    <view class="gap" v-if="index < list.length - 1">
+                        <uv-gap bg-color="#f1f1f1" height="4"></uv-gap>
+                    </view>
+                </uv-vtabs-item>
+            </template>
+            <uv-gap bg-color="#fff" height="600"></uv-gap>
+        </uv-vtabs>
+    </view>
+</template>
+
+<script>
+const getList = [{
+    name: 'uv-ui简介',
+    childrens: [{
+        name: 'uv-ui简介',
+        desc: '1. uv-ui最初是在uview2.x的基础上进行改进优化，支持vue3等优化，最重要的是支持单独导入直接使用，无需在main.js中进行配置。\n\n2. uv-ui来源于社区，也回归到社区，正是有一群热爱uni-app生态的同学推着它前行，而我们也一如既往的承诺，uv-ui永久开源，永远免费。但是会在下载处进行广告配置，作为开发团队的研发费用的部分来源，所以希望大家理解。'
+    }]
+}, {
+    name: 'uv-ui特点',
+    childrens: [{
+        name: '全端兼容',
+        desc: 'uv-ui支持App（vue）、App（nvue）、H5、小程序、VUE2、VUE3，支持nvue原生渲染。uv-ui的组件都是多端自适应的，底层会抹平很多小程序平台的差异或bug。'
+    }, {
+        name: '集成工具',
+        desc: 'uv-ui中的uv-ui-tools组件集成了强大的网络请求 HTTP 及常用的工具函数，无需自己再去寻找，并且直接挂载在uni上面，方便使用，只需要在mian.js中引入即可，更多工具请参考：https://www.uvui.cn/js/http.html。使用方式请参考：https://www.uvui.cn/components/setting.html。'
+    }, {
+        name: '主题扩展',
+        desc: 'uv-ui中的uv-ui-tools组件下面的theme.scss为主题文件，直接在uni.scss中引入主题即可，可以根据自己的需求进行扩展。下面也有说明具体使用方式。使用方法请参考：https://www.uvui.cn/components/setting.html'
+    }]
+}, {
+    name: '更新日志',
+    badge: {
+        show: true,
+        value: 5
+    },
+    childrens: [{
+        name: '更新日志',
+        desc: 'uv-ui的重大更新在更新日志中都有所说明，如果在开发的过程中遇到文档不完善，可以提供给我们，我们会持续完善，非常感谢大家的支持。更新日志：https://www.uvui.cn/components/changelog.html'
+    }]
+}, {
+    name: '设计规范',
+    childrens: [{
+        name: '设计规范',
+        desc: '为了约束合成更多优秀的组件和模板，打造优质的体验，我们拟定了一些UI界面设计和建议。同时部分之间会有依赖，这是为了减少代码冗余的同时提高开发效率，模块化是我们的基础。如果大家有好的建议，可以提出进行改进。'
+    }]
+}, {
+    name: '交流反馈',
+    childrens: [{
+        name: '交流反馈',
+        desc: 'uv-ui为采用MIT许可证的开源项目，使用完全免费。欢迎加QQ群交流反馈，一起学习，共同进步。QQ群： 549833913'
+    }]
+}]
+export default {
+    data() {
+        return {
+            list: [],
+            chain: true
+        }
+    },
+    computed: {
+        height() {
+            return uni.getSystemInfoSync().windowHeight - uni.upx2px(100);
+        }
+    },
+    onReady() {
+        // 模拟接口请求数据
+        uni.showLoading({
+            title: '加载中'
+        })
+        setTimeout(() => {
+            this.list = getList;
+            uni.hideLoading();
+        }, 500)
+    },
+    methods: {
+        change(index) {
+            console.log('选项改变：', index)
+        }
+    }
+}
+</script>
+<style scoped lang="scss">
+.header {
+    padding: 30rpx;
+    font-size: 30rpx;
+    color: #333;
+}
+
+.item {
+    padding: 10rpx 20rpx;
+
+    &-title {
+        .text {
+            font-weight: 700;
+            font-size: 32rpx;
+            color: #111;
+        }
+    }
+
+    &-content {
+        padding: 20rpx 0;
+
+        .text {
+            line-height: 48rpx;
+            font-size: 30rpx;
+            color: #111;
+            /* #ifndef APP-NVUE */
+            word-break: break-all;
+            /* #endif */
+        }
+    }
+}
+
+.gap {
+    padding: 0 30rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pages_order/auth/loginAndRegisterAndForgetPassword.vue b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
index 1680203..5424344 100644
--- a/pages_order/auth/loginAndRegisterAndForgetPassword.vue
+++ b/pages_order/auth/loginAndRegisterAndForgetPassword.vue
@@ -4,9 +4,9 @@
 
 		<view class="frame">
 			<!-- 登录和注册 -->
-			<view class="loginRegister" v-if='titleIndex!=2'>
+			<view class="loginRegister" v-if='titleIndex != 2'>
 				<!-- 标题 -->
-				<view class="title">{{titleList[titleIndex]}}</view>
+				<view class="title">{{ titleList[titleIndex] }}</view>
 
 				<!-- 头像 -->
 				<view class="userIamge">
@@ -18,12 +18,12 @@
 				<!-- 用户名&密码&隐私条款 -->
 				<view class="form">
 					<view>
-						<uv-input v-model="form.account" placeholder="请输入账号" border="surround" shape='circle'
-							clearable :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
+						<uv-input v-model="form.account" placeholder="请输入账号" border="surround" shape='circle' clearable
+							:customStyle="{ backgroundColor: '#f6f6f6' }"></uv-input>
 					</view>
 					<view>
 						<uv-input v-model="form.password" password placeholder="请输入密码" border="surround" shape='circle'
-							clearable :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
+							clearable :customStyle="{ backgroundColor: '#f6f6f6' }"></uv-input>
 					</view>
 					<view>
 						<uv-checkbox-group v-model="checkboxValue" shape="circle">
@@ -31,7 +31,7 @@
 								<view style="display: flex;flex-wrap: wrap;">
 									<uv-checkbox size="30rpx" :name="1"></uv-checkbox>
 									请你阅读并同意我们的<span style="color: #fd5100"
-									@click="$refs.popup.open('getPrivacyPolicy')">《隐私条款》</span>和<span
+										@click="$refs.popup.open('getPrivacyPolicy')">《隐私条款》</span>和<span
 										style="color: #fd5100"
 										@click="$refs.popup.open('getUserAgreement')">《服务协议》</span>
 								</view>
@@ -44,20 +44,20 @@
 			</view>
 
 			<!-- 忘记密码 -->
-			<view class='forgetPassword' v-if='titleIndex==2'>
+			<view class='forgetPassword' v-if='titleIndex == 2'>
 				<!-- 标题 -->
-				<view class="title">{{titleList[titleIndex]}}</view>
+				<view class="title">{{ titleList[titleIndex] }}</view>
 
 				<!-- 表单 -->
 				<view class="form1">
 					<view class="userName">
 						<uv-input v-model="form1.userName" placeholder="请输入手机号/用户/邮箱" border="surround" shape='circle'
-							clearable :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
+							clearable :customStyle="{ backgroundColor: '#f6f6f6' }"></uv-input>
 					</view>
 					<view class="code">
 						<view class="left">
 							<uv-input v-model="form1.code" placeholder="请输入验证码" border="surround" shape='circle'
-								clearable :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
+								clearable :customStyle="{ backgroundColor: '#f6f6f6' }"></uv-input>
 						</view>
 						<view class="right">
 							<view>
@@ -65,29 +65,28 @@
 								<uv-code :seconds="seconds" @end="end" @start="start" ref="code"
 									@change="codeChange"></uv-code>
 								<uv-button @tap="getCode" iconSize='10rpx' color='#fd5100'
-									shape='circle'>{{tips}}</uv-button>
+									shape='circle'>{{ tips }}</uv-button>
 							</view>
 						</view>
 					</view>
 					<view class="password1">
 						<uv-input v-model="form1.password1" placeholder="设置您的新密码(6到50个字符)" password clearable
-							border="surround" shape='circle' :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
+							border="surround" shape='circle' :customStyle="{ backgroundColor: '#f6f6f6' }"></uv-input>
 					</view>
 					<view class="password2">
 						<uv-input v-model="form1.password2" placeholder="重新确认密码" password clearable border="surround"
-							shape='circle' :customStyle="{ backgroundColor: '#f6f6f6'}"></uv-input>
+							shape='circle' :customStyle="{ backgroundColor: '#f6f6f6' }"></uv-input>
 					</view>
 				</view>
 
 			</view>
-			
-			
+
+
 			<!-- 按钮 -->
-			<view class="btn"
-			@click="submit">
-				<button class='a'>{{titleList[titleIndex]}}</button>
+			<view class="btn" @click="submit">
+				<button class='a'>{{ titleList[titleIndex] }}</button>
 			</view>
-			
+
 			<!-- tab -->
 			<!-- <view class="bottomTab">
 				<span :class="titleIndex==0 ? 'tabbarItemActive' : 'tabbarItemNoActive'"
@@ -99,7 +98,7 @@
 				<span :class="titleIndex==2 ? 'tabbarItemActive' : 'tabbarItemNoActive'"
 					@click='changePage(2)'>忘记密码</span>
 			</view> -->
-			
+
 		</view>
 
 
@@ -109,239 +108,240 @@
 </template>
 
 <script>
-	import configPopup from '@/components/config/configPopup.vue';
-	export default {
-		components: {
-			configPopup
-		},
-		onLoad(option) {
-			this.titleIndex = option.index || 1
-		},
-		data() {
-			return {
-				titleIndex: 0,
-				titleList: ['注册', '登录', '重置密码'],
-				checkboxValue: [],
-				form: {
-					account: '13135294009',
-					password: 'lzx123456',
-				},
-				form1: {
-					userName: '',
-					code: '',
-					password1: '',
-					password2: '',
-				},
-				tips: '获取验证码',
-				seconds: 60,
-			}
-		},
-		methods: {
-			submit(){
-				if(!this.checkboxValue.length){
-					return uni.showToast({
-						title: '请先同意隐私协议',
-						icon:'none'
-					})
-				}
-				
-				if(this.$utils.verificationAll(this.form, {
-					account: '请输入账号',
-					password: '请输入密码',
-				})){
-					return
-				}
-				
-				this.$store.commit('accountLogin', this.form)
+import configPopup from '@/components/config/configPopup.vue';
+export default {
+	components: {
+		configPopup
+	},
+	onLoad(option) {
+		this.titleIndex = option.index || 1
+	},
+	data() {
+		return {
+			titleIndex: 0,
+			titleList: ['注册', '登录', '重置密码'],
+			checkboxValue: [],
+			form: {
+				account: '13135294009',
+				password: 'lzx123456',
 			},
-			// 切换页面
-			changePage(index) {
-				this.titleIndex = index
+			form1: {
+				userName: '',
+				code: '',
+				password1: '',
+				password2: '',
 			},
+			tips: '获取验证码',
+			seconds: 60,
+		}
+	},
+	methods: {
+		submit() {
+			if (!this.checkboxValue.length) {
+				return uni.showToast({
+					title: '请先同意隐私协议',
+					icon: 'none'
+				})
+			}
 
-			confirm() {
+			if (this.$utils.verificationAll(this.form, {
+				account: '请输入账号',
+				password: '请输入密码',
+			})) {
+				return
+			}
 
-			},
-			codeChange(text) {
-				this.tips = text;
-			},
-			getCode() {
-				if (this.$refs.code.canGetCode) {
-					// 模拟向后端请求验证码
-					uni.showLoading({
-						title: '正在获取验证码'
-					})
-					setTimeout(() => {
-						uni.hideLoading();
-						// 这里此提示会被this.start()方法中的提示覆盖
-						uni.$uv.toast('验证码已发送');
-						// 通知验证码组件内部开始倒计时
-						this.$refs.code.start();
-					}, 2000);
-				} else {
-					uni.$uv.toast('请勿重复发送');
-				}
-			},
-			end() {
-				// uni.$uv.toast('倒计时结束');
-			},
-			start() {
-				// uni.$uv.toast('倒计时开始');
+			this.$store.commit('accountLogin', this.form)
+		},
+		// 切换页面
+		changePage(index) {
+			this.titleIndex = index
+		},
+
+		confirm() {
+
+		},
+		codeChange(text) {
+			this.tips = text;
+		},
+		getCode() {
+			if (this.$refs.code.canGetCode) {
+				// 模拟向后端请求验证码
+				uni.showLoading({
+					title: '正在获取验证码'
+				})
+				setTimeout(() => {
+					uni.hideLoading();
+					// 这里此提示会被this.start()方法中的提示覆盖
+					uni.$uv.toast('验证码已发送');
+					// 通知验证码组件内部开始倒计时
+					this.$refs.code.start();
+				}, 2000);
+			} else {
+				uni.$uv.toast('请勿重复发送');
 			}
+		},
+		end() {
+			// uni.$uv.toast('倒计时结束');
+		},
+		start() {
+			// uni.$uv.toast('倒计时开始');
 		}
 	}
+}
 </script>
 
 
 <style lang="scss" scoped>
-	* {
-		box-sizing: border-box;
-	}
+* {
+	box-sizing: border-box;
+}
+
+.refundsOrExchange {
+	background-color: #FFF;
+	height: 100vh;
 
-	.refundsOrExchange {
+	.frame {
 		background-color: #FFF;
-		height: 100vh;
-		
-		.frame {
-			background-color: #FFF;
 
-			.loginRegister {
+		.loginRegister {
+			display: flex;
+			flex-direction: column;
+			gap: 40rpx;
+
+			.title {
 				display: flex;
-				flex-direction: column;
-				gap: 40rpx;
+				justify-content: center;
+				align-items: flex-end;
+				height: 10vh;
+				color: #000;
+				font-size: 40rpx;
+				font-weight: 700;
+			}
 
-				.title {
-					display: flex;
-					justify-content: center;
-					align-items: flex-end;
-					height: 10vh;
-					color: #000;
-					font-size: 40rpx;
-					font-weight: 700;
+			.userIamge {
+				display: flex;
+				justify-content: center;
+				height: 10vh;
+
+				>view:nth-of-type(1) {
+					width: 25%;
+					height: 100%;
+					border-radius: 50%;
+					overflow: hidden;
 				}
+			}
 
-				.userIamge {
-					display: flex;
-					justify-content: center;
-					height: 10vh;
+			.form {
+				line-height: 50rpx;
 
-					>view:nth-of-type(1) {
-						width: 25%;
-						height: 100%;
-						border-radius: 50%;
-						overflow: hidden;
-					}
+				>view:nth-of-type(1) {
+					padding: 20rpx 100rpx;
 				}
 
-				.form {
-					line-height: 50rpx;
-					>view:nth-of-type(1) {
-						padding: 20rpx 100rpx;
-					}
-
-					>view:nth-of-type(2) {
-						padding: 0 100rpx;
-					}
+				>view:nth-of-type(2) {
+					padding: 0 100rpx;
+				}
 
-					>view:nth-of-type(3) {
-						display: flex;
-						padding: 30rpx 100rpx 0 100rpx;
-						font-size: 22rpx
-					}
+				>view:nth-of-type(3) {
+					display: flex;
+					padding: 30rpx 100rpx 0 100rpx;
+					font-size: 22rpx
 				}
 			}
-			
-			
-			.btn {
-				// height: 5vh;
+		}
+
+
+		.btn {
+			// height: 5vh;
+			display: flex;
+			justify-content: center;
+			margin: 90rpx 0 0 0;
+
+			.a {
 				display: flex;
 				justify-content: center;
-				margin: 90rpx 0 0 0;
-			
-				.a {
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					width: 70%;
-					height: 80rpx;
-					color: #FFF;
-					background-color: $uni-color;
-					border: 1px solid red;
-					border-radius: 100rpx;
-					font-size: 30rpx;
-				}
+				align-items: center;
+				width: 70%;
+				height: 80rpx;
+				color: #FFF;
+				background-color: $uni-color;
+				border: 1px solid red;
+				border-radius: 100rpx;
+				font-size: 30rpx;
+			}
+		}
+
+		.bottomTab {
+			display: flex;
+			justify-content: space-between;
+			height: 10vh;
+			padding: 0 80rpx;
+			margin-top: 30rpx;
+
+			.tabbarItemActive {
+				color: $uni-color;
+			}
+
+			.tabbarItemNoActive {
+				color: #9c9fa4;
 			}
-		
-			.bottomTab {
+		}
+
+		.forgetPassword {
+			padding: 100rpx 40rpx 0 40rpx;
+
+			.title {
 				display: flex;
-				justify-content: space-between;
+				justify-content: center;
+				align-items: flex-end;
 				height: 10vh;
-				padding: 0 80rpx;
-				margin-top: 30rpx;
-			
-				.tabbarItemActive {
-					color: $uni-color;
-				}
-			
-				.tabbarItemNoActive {
-					color: #9c9fa4;
-				}
+				color: #000;
+				font-size: 40rpx;
+				font-weight: 700;
 			}
 
-			.forgetPassword {
-				padding: 100rpx 40rpx 0 40rpx;
+			.form1 {
+				display: flex;
+				flex-direction: column;
+				gap: 30rpx;
+				margin-top: 20rpx;
+				padding: 20rpx 80rpx;
 
-				.title {
-					display: flex;
-					justify-content: center;
-					align-items: flex-end;
-					height: 10vh;
-					color: #000;
-					font-size: 40rpx;
-					font-weight: 700;
+				.userName {
+					// padding: 20rpx 100	rpx;
 				}
 
-				.form1 {
+				.code {
 					display: flex;
-					flex-direction: column;
-					gap: 30rpx;
-					margin-top: 20rpx;
-					padding: 20rpx 80rpx;
+					width: 100%;
 
-					.userName {
-						// padding: 20rpx 100	rpx;
+					.left {
+						width: 55%;
 					}
 
-					.code {
-						display: flex;
-						width: 100%;
-
-						.left {
-							width: 55%;
-						}
-
-						.right {
-							width: 45%;
-							height: 100%;
+					.right {
+						width: 45%;
+						height: 100%;
 
-							>view:nth-of-type(1) {
-								display: flex;
-								justify-content: center;
-								align-items: center;
-								width: 100%;
-							}
+						>view:nth-of-type(1) {
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							width: 100%;
 						}
 					}
+				}
 
-					.password1 {}
+				.password1 {}
 
-					.password2 {}
-
-				}
+				.password2 {}
 
 			}
+
 		}
+	}
 
 
-	}
+}
 </style>
\ No newline at end of file
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 0cc5df2..17ce7fc 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -4,10 +4,17 @@
 			<image :src="configList.logo_image" mode=""></image>
 		</view>
 		
-		<view class="title">
+		<!-- <view class="title">
 			欢迎使用{{ configList.logo_name }}
+		</view> -->
+		<view class="title">
+			<!-- 欢迎使用{{ configList.logo_name }} -->
+			敢为人鲜
 		</view>
 		
+			
+		
+		
 		<view class="btn mt"
 			@click="wxLogin">
 			<!-- <view class="icon">
@@ -21,7 +28,7 @@
 		<view class="btn b2"
 		@click="qux">
 			取消登录
-		</view>
+		
 		
 		<view class="config">
 			<uv-checkbox-group
@@ -29,21 +36,24 @@
 				shape="circle">
 				<view class="content">
 					<view
-					style="display: flex;">
-						<uv-checkbox
-							size="40rpx"
-							icon-size="30rpx"
-							activeColor="#E3441A"
-							:name="1"
-						></uv-checkbox>
-						阅读并同意我们的<text @click="$refs.popup.open('user_xy')">“用户协议”</text>
+					style="display: flex; align-items: start;">
+							<uv-checkbox
+								size="34rpx"
+								icon-size="26rpx"
+								activeColor="#019245"
+								:name="1"
+								style="margin-top: 6rpx;"
+							></uv-checkbox>
+							
+							<text class="text-privacy">阅读并同意我们的<text @click="$refs.popup.open('user_xy')">《服务协议与隐私条款》</text>以及<text @click="$refs.popup.open('user_ys')">《个人信息保护指引》</text></text>
 					</view>
-					<view class="">
+					<!-- <view class="">
 						以及<text @click="$refs.popup.open('user_ys')">隐私政策</text>
-					</view>
+					</view> -->
 				</view>
 			</uv-checkbox-group>
 		</view>
+		</view>
 		
 		<configPopup ref="popup"></configPopup>
 		
@@ -61,10 +71,10 @@
 		},
 		onLoad(query) {
 			if (query.shareId) {
-				uni.setStorageSync('shareId', query.shareId)
+				uni.setStorageSync('shareId', query.shareId) // 存储分享Id
 			}
 			if(query.path){
-				this.config = query
+				this.config = query // 从路由拿取配置？
 			}
 		},
 		methods: {
@@ -132,13 +142,11 @@
 		all: unset;
 		width: 80%;
 		height: 100rpx;
-		background-color: $uni-color;
-		color: #fff;
 		display: flex;
 		justify-content: center;
 		align-items: center;
 		margin: 20rpx 0;
-		border-radius: 20rpx;
+		border-radius: 50rpx;
 		border: none;
 		&::after{
 			
@@ -152,22 +160,32 @@
 		}
 	}
 	.b2{
-		background-color: rgba($uni-color, 0.2);
-		color: $uni-color;
+		// background-color: rgba($uni-color, 0.2);
+		color: #999;
+		border: 2rpx solid;
+		position: relative;
+		.config{
+			position: absolute;
+			bottom: -110%;
+			font-size: 24rpx;
+			text-align: center;
+			line-height: 40rpx;
+			width: 100%;
+			.text-privacy{
+				color: inherit;
+				text-align: left;
+			}
+			text{
+				color: $uni-color;
+			}
+		}
 	}
 	.mt{
+		color: #fff;
+		background-color: $uni-color;
 		margin-top: 200rpx;
 	}
 	
-	.config{
-		position: absolute;
-		bottom: 0;
-		font-size: 24rpx;
-		text-align: center;
-		line-height: 40rpx;
-		text{
-			color: $uni-color;
-		}
-	}
+
 }
 </style>
diff --git a/static/image/中森明菜.webp b/static/image/中森明菜.webp
new file mode 100644
index 0000000000000000000000000000000000000000..2a200c2eab184c12b618638a802815a1fb8c5cc0
GIT binary patch
literal 22608
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

literal 0
HcmV?d00001

diff --git a/store/store.js b/store/store.js
index 0151305..e7e45a0 100644
--- a/store/store.js
+++ b/store/store.js
@@ -153,16 +153,19 @@ const store = new Vuex.Store({
 			
 			if(reLaunch){
 				uni.reLaunch({
-					url: '/pages/index/index'
+					url: '/pages/index/category'
 				})
 			}
 			
 		},
 		getQrCode(state) {
 			let that = this;
+			// 注释掉登录检查
+			/*
 			if(!uni.getStorageSync('token')){
 				return
 			}
+			*/
 			uni.getImageInfo({
 				src: `${Vue.prototype.$config.baseUrl}/info_common/getInviteCode?token=${uni.getStorageSync('token')}`,
 				success : res => {
diff --git a/uni.scss b/uni.scss
index 323ba6f..6b6a8aa 100644
--- a/uni.scss
+++ b/uni.scss
@@ -12,7 +12,7 @@
  * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
  */
 /* 颜色变量 */
-$uni-color: #eb3300;
+$uni-color: #019245;
 
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
@@ -75,6 +75,9 @@ $uni-font-size-subtitle:26px;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:15px;
 
+// 更改uv插件的主要颜色位主题颜色
+$uv-primary: $uni-color;
+
 
 .uni-color-btn{
 	border-radius: 40rpx;
diff --git a/uni_modules/uv-ui-tools/libs/util/route.js b/uni_modules/uv-ui-tools/libs/util/route.js
index 80c0afd..cf6689c 100644
--- a/uni_modules/uv-ui-tools/libs/util/route.js
+++ b/uni_modules/uv-ui-tools/libs/util/route.js
@@ -30,7 +30,7 @@ class Router {
 	mixinParam(url, params) {
 		url = url && this.addRootPath(url)
 
-		// 使用正则匹配，主要依据是判断是否有"/","?","="等，如“/page/index/index?name=mary"
+		// 使用正则匹配，主要依据是判断是否有"/","?","="等，如"page/index/index?name=mary"
 		// 如果有url中有get参数，转换后无需带上"?"
 		let query = ''
 		if (/.*\/.*\?.*=.*/.test(url)) {
@@ -61,13 +61,13 @@ class Router {
 		// 如果本次跳转的路径和本页面路径一致，不执行跳转，防止用户快速点击跳转按钮，造成多次跳转同一个页面的问题
 		if (mergeConfig.url === page()) return
 
-		if (params.intercept) {
-			mergeConfig.intercept = params.intercept
-		}
 		// params参数也带给拦截器
 		mergeConfig.params = params
 		// 合并内外部参数
 		mergeConfig = deepMerge(this.config, mergeConfig)
+		
+		// 注释掉拦截器逻辑，直接执行跳转
+		/*
 		// 判断用户是否定义了拦截器
 		if (typeof mergeConfig.intercept === 'function') {
 			// 定一个promise，根据用户执行resolve(true)或者resolve(false)来决定是否进行路由跳转
@@ -79,6 +79,10 @@ class Router {
 		} else {
 			this.openPage(mergeConfig)
 		}
+		*/
+		
+		// 直接执行页面跳转，不进行拦截
+		this.openPage(mergeConfig)
 	}
 
 	// 执行路由跳转
diff --git a/utils/utils.js b/utils/utils.js
index b418508..9a2017d 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -200,7 +200,7 @@ export function navigateTo(...args){
 export function navigateBack(num = -1){
 	if(getCurrentPages().length == 1){
 		uni.reLaunch({
-			url: '/pages/index/index'
+			url: '/pages/index/category'
 		})
 		return
 	}