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 0000000..2a200c2
Binary files /dev/null and b/static/image/中森明菜.webp differ
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
 	}