diff --git a/README.md b/README.md
index 3d81106..dd52660 100644
--- a/README.md
+++ b/README.md
@@ -318,10 +318,10 @@ be imported.
 ```
 此时升级微信开发者工具，或者安装`@babel/plugin-proposal-private-property-in-object`依赖即可解决问题。
 
-### 捐赠
+<!-- ### 捐赠
 
 如果你觉得这个项目对你有帮助，你可以请作者喝饮料🍹
 
 <p align='center'>
 <img alt="微信收款码" src="./src/static/images/pay.png" height="330" style="display:inline-block; height:330px;">
-</p>
+</p> -->
diff --git a/src/api/user/index.ts b/src/api/user/index.ts
index 3c2b9c8..eb46fe5 100644
--- a/src/api/user/index.ts
+++ b/src/api/user/index.ts
@@ -2,21 +2,23 @@
  * 用户信息相关接口
  */
 import type { CommonRes } from '@/api/common/types';
-import type { LoginByCodeReq, LoginByCodeRes, LoginReq, LoginRes, ProfileReq, ProfileRes } from './types';
+import type { LoginByCodeReq, LoginByCodeRes, LoginReq, LoginRes, ProfileRes } from './types';
 import { get, post } from '@/utils/request';
 
 /** 获取用户信息 */
-export const profile = (params?: ProfileReq) => get<ProfileRes>('/user/profile', { params });
+// export const profile = (params?: ProfileReq) => get<ProfileRes>('/user/profile', { params });
+export const profile = (data: any) => get<ProfileRes>('/api/user', { data, custom: { toast: false } });
 
 /** 登录 */
-export const login = (data: LoginReq) => post<LoginRes>('/user/login', { data, custom: { auth: false } });
+export const login = (data: LoginReq) => post<LoginRes>('/api/auth/login', { data, custom: { auth: false } });
+// 账号登录
+export const passwordLogin = (data: any) => post('/api/auth/login', { data, custom: { toast: false } });
 
 /** 验证码登录 */
 export const loginByCode = (data: LoginByCodeReq) => post<LoginByCodeRes>('/user/loginByCode', { data });
 
 /** 退出登录 */
-export const logout = () => post<CommonRes>('/user/logout');
-
+export const logout = () => post<CommonRes>('/api/logout');
 
 export const goodsMenu = () => get<CommonRes>('/api/config');
 // export const goodsMenu = (data:any) => get<CommonRes>('/api/config', { data, custom: { toast: false } });
diff --git a/src/api/user/types.ts b/src/api/user/types.ts
index 6867b1d..82db2cb 100644
--- a/src/api/user/types.ts
+++ b/src/api/user/types.ts
@@ -7,12 +7,16 @@ export interface ProfileRes {
   user_name?: string;
   avatar?: string;
   token?: string;
+  user?: any;
 }
-
 export interface LoginReq {
   phone: string;
   code: string;
 }
+export interface LoginReqPassword {
+  account: string;
+  password: string;
+}
 
 export interface LoginRes {
   token: string;
diff --git a/src/pages/common/goods/order.vue b/src/pages/common/goods/order.vue
index d0fd70b..21022e4 100644
--- a/src/pages/common/goods/order.vue
+++ b/src/pages/common/goods/order.vue
@@ -1,12 +1,15 @@
 <style>
 .ellipsis {
-	white-space: nowrap;
-	/* 防止文字换行 */
-	overflow: hidden;
-	/* 隐藏超出部分的文字 */
-	text-overflow: ellipsis;
 	/* 在末尾显示省略号 */
 	width: 420rpx;
+
+	/* 防止文字换行 */
+	overflow: hidden;
+
+	/* 隐藏超出部分的文字 */
+	text-overflow: ellipsis;
+	white-space: nowrap;
+
 	/* 确保元素有宽度 */
 }
 </style>
@@ -15,9 +18,11 @@
 		<up-navbar class="  " :autoBack="true" style="font-weight: bold;" leftIcon="arrow-left" title="提交订单"
 			titleColor="#303133" bgColor="#FFFFFFFF" titleWidth="600rpx" height="80rpx" leftIconSize="40rpx"
 			leftIconColor="#303133" :safeAreaInsetTop="true" :placeholder="true" :fixed="true"></up-navbar>
-		<view class="address_box"> 
+		<view class="address_box">
 			<view class=" pt-2 pb-2 ps-2 pe-2" style="">
-				<text class="ellipsis" style="margin: 0rpx 0rpx 0rpx 40rpx;text-align:left;display: inline-block;width: calc(100% - 100rpx);" >江阳区学校2016工作室放假咯解fafsf方法 <span>18181941463</span> </text>
+				<text class="ellipsis"
+					style="display: inline-block;width: calc(100% - 100rpx);margin: 0rpx 0rpx 0rpx 40rpx;text-align:left;">江阳区学校2016工作室放假咯解fafsf方法
+					<span>18181941463</span> </text>
 			</view>
 			<view class="flex box-border flex-row pb-2 ps-2 pe-2" style="" @click="getopenLocation">
 				<up-text class="" size="26rpx" :text="'四川省泸州市江阳区龙马大道海吉星农贸市场32号附一号2楼307号'" :flex1="true" align="left"
@@ -27,14 +32,14 @@
 				<u-icon slot="right" name="arrow-right"></u-icon>
 			</view>
 			<view class="flex box-border flex-row pb-2 ps-2 pe-2" style="">
-				<up-text class="" size="26rpx" color="#59CB56"
-					:text="'配送时间 7月17日(周三) 19:00-21:00 送达'" :flex1="true" align="left" prefixIcon="clock" wordWrap="normal"
-					:show="true" iconStyle="font-size:32rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
+				<up-text class="" size="26rpx" color="#59CB56" :text="'配送时间 7月17日(周三) 19:00-21:00 送达'" :flex1="true"
+					align="left" prefixIcon="clock" wordWrap="normal" :show="true"
+					iconStyle="font-size:32rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
 				</up-text>
 				<u-icon slot="right" name="arrow-right"></u-icon>
 			</view>
 		</view>
-		<z-paging ref="pagingRefSC" v-model="matchedItems_sc" @query="changeSC('')" style="bottom: 110rpx;top:300rpx"
+		<z-paging ref="pagingRefSC" v-model="matchedItems_sc" @query="changeSC('')" style="top:300rpx;bottom: 110rpx"
 			class="fv-page  flex-col px-2">
 			<view v-for="(item, index) in matchedItems_sc" :key="index">
 				<u-cell>
@@ -47,9 +52,10 @@
 					<template #title>
 						<view class="h-60 flex">
 							<text class=" ellipsis" style="font-size: 24rpx;font-weight: bold;">营养：{{ item.name
-								}}</text>
-							<up-text style="margin-right: 10rpx;" class="text-black" size="24rpx" :text="item.num + item.unit_name" :flex1="true"
-								suffixIcon="" align="right" wordWrap="normal" :show="true" type="#59CB56"
+							}}</text>
+							<up-text style="margin-right: 10rpx;" class="text-black" size="24rpx"
+								:text="item.num + item.unit_name" :flex1="true" suffixIcon="" align="right"
+								wordWrap="normal" :show="true" type="#59CB56"
 								iconStyle="font-size: 36rpx;font-weight: bold;" decoration="none">
 							</up-text>
 						</view>
@@ -76,234 +82,130 @@
 
 </template>
 
-<!-- 食谱清单 -->
-<script setup lang="ts">
+<script lang="ts">
+import { CommonApi } from '@/api';
+// const { openLocation } = useLocation();
+import { useLocation } from '@/hooks';
+import { defineComponent } from 'vue';
 
-import { useShare,useLocation } from '@/hooks';
-const {openLocation } = useLocation();
-// 打开地图
-function getopenLocation(){
-     openLocation(32.05,  32.05);
-}
+const { openLocation } = useLocation();
 
-import {
-	ref,
-	reactive,
-} from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
-import { func } from "@/uni_modules/uview-plus/libs/function/test";
 
-// 页面加载
-onLoad((options) => {
-	// loadData();
-});
+export default defineComponent({
+	data () {
+		return {
+			aloneChecked: false, // 是否全选
+			checkboxValueNum: 0, // 选中菜谱数量
+			checkboxValue: [],
+			propShow: false,
+			currentTab: 0, // tab索引
+			menu_list: [{ name: '食谱清单' }, { name: '食菜配置' }],
+			totalNum: 0,
+			keyword_sc: '',
+			goods_info: {},
+			menuIndex: 0,
+			matchedItems_sc: [],
+			goods_list_info:
+			{
+				total_num: 1,
+				info: [
+					{
+						id: 1,
+						name: '猪肉',
+						label: '青椒肉丝',
+						image: ' ',
+						disabled: true,
+						num: 88,
+						unit_name: 'g',
+						default_num: 88,
+					},
+					{
+						id: 2,
+						name: '毛豆',
+						label: '青椒肉丝',
+						image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
+						disabled: false,
+						num: 100,
+						unit_name: 'ml',
+						default_num: 100,
+					},
+					{
+						id: 3,
+						name: '食用油',
+						label: '青椒肉丝',
+						image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
+						disabled: false,
+						num: 100,
+						unit_name: 'g',
+						default_num: 100,
+					},
+					{
+						id: 4,
+						name: '豆瓣酱',
+						label: '青椒肉丝',
+						image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
+						disabled: false,
+						num: 100,
+						unit_name: 'ml',
+						default_num: 100,
+					},
+				],
+			},
+		};
+	},
+	created () {
+		// 加载数据
+		this.goodList();
+	},
+	methods: {
+		goodList () {
+			CommonApi.goodsMenu({ key: 123 }).catch((res) => {
+				if (res.status === 200) {
+					//  this.goods_list_info = res.data;
+					console.log(res);
+				}
+				else {
+					uni.$u.toast(res.message);
+				}
+			});
+		},
 
-onShow(() => { });
- 
-
-const goods_list = [
-	{
-		id: 1,
-		name: "大份芒果芒果",
-		label: "描述信息",
-		image: " ",
-		disabled: true,
-		num: 100,
-		unit_name: "个",
-		default_num: 100,
-	},
-	{
-		id: 2,
-		name: "新鲜西瓜不甜不要钱，随便吃哦,华友很多方式JFK了就爱上基金大幅方法是飞机离开房间发士大夫十分恐惧撒发范德萨发生",
-		label: "描述信息，新鲜西瓜不甜不要钱，随便吃哦,华友很多方式JFK了就爱上基金大幅方法是飞机",
-		image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-		disabled: false,
-		num: 100,
-		unit_name: "个",
-		default_num: 100,
-	},
-	{
-		id: 3,
-		name: "大份芒果芒果",
-		label: "描述信息",
-		image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-		disabled: false,
-		num: 100,
-		unit_name: "个",
-		default_num: 100,
-	},
-	{
-		id: 4,
-		name: "新鲜西瓜不甜不要钱，随便吃哦",
-		label: "描述信息",
-		image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-		disabled: false,
-		num: 100,
-		unit_name: "个",
-		default_num: 100,
-	},
-	{
-		id: 5,
-		name: "大份芒果芒果",
-		label: "描述信息",
-		image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-		disabled: false,
-		num: 100,
-		unit_name: "个",
-		default_num: 100,
-	},
-	{
-		id: 6,
-		name: "新鲜西瓜不甜不要钱，随便吃哦",
-		label: "描述信息",
-		image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-		disabled: false,
-		num: 100,
-		unit_name: "个",
-		default_num: 100,
-	},
-	{
-		id: 7,
-		name: "大份芒果芒果",
-		label: "描述信息",
-		image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-		disabled: false,
-		num: 100,
-		unit_name: "个",
-		default_num: 100,
-	},
-	{
-		id: 8,
-		name: "新鲜西瓜不甜不要钱，随便吃哦",
-		label: "描述信息",
-		image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-		disabled: false,
-		num: 100,
-		unit_name: "个",
-		default_num: 100,
-	},
-	{
-		id: 9,
-		name: "大份芒果芒果",
-		label: "描述信息",
-		image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-		disabled: false,
-		num: 100,
-		unit_name: "个",
-		default_num: 100,
-	},
-	{
-		id: 10,
-		name: "新鲜西瓜不甜不要钱，随便吃哦",
-		label: "描述信息",
-		image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-		disabled: false,
-		num: 100,
-		unit_name: "个",
-		default_num: 100,
-	},
-];
-// const menu_list =[{'name':'食谱清单','icon':'photo'},{'name':'食菜配置','icon':'photo'}]
-const menu_list = [{ name: "食谱清单" }, { name: "食菜配置" }];
-const listLoading = ref(false);
-const dataPage = ref({
-	page: 0,
-	limit: 10,
-	total: 0,
-});
-//索引对象
-const keyword_sp = ref("");
-const keyword_sc = ref("");
-// 食谱分页器
-const pagingRefSP = ref<InstanceType<typeof zPaging> | null>(null);
-const pagingRefSC = ref<InstanceType<typeof zPaging> | null>(null);
-function changeSC (e) {
-	// console.log(e);
-	try {
-		// 创建正则表达式进行匹配，忽略大小写
-		const regex = new RegExp(e, "i");
-		// 直接对 goods_list 使用 filter 进行匹配，并赋值给 matchedItems_sp.value
-		matchedItems_sc.value = goods_list.filter((item) => regex.test(item.name));
-	} catch (error) {
-		console.error("匹配过程中发生错误:", error);
-		matchedItems_sc.value = []; // 发生错误时，将 matchedItems 清空
-	}
-	// console.log(matchedItems_sc.value);
-	pagingRefSC.value?.complete([]);
-	pagingRefSC.value?.complete(matchedItems_sc.value);
-}
-function changeSP (e) {
-	// console.log(e);
-	try {
-		// 创建正则表达式进行匹配，忽略大小写
-		const regex = new RegExp(e, "i");
-		// 直接对 goods_list 使用 filter 进行匹配，并赋值给 matchedItems_sp.value
-		matchedItems_sp.value = goods_list.filter((item) => regex.test(item.name));
-		// console.log(matchedItems_sp.value);
-	} catch (error) {
-		console.error("匹配过程中发生错误:", error);
-		matchedItems_sp.value = []; // 发生错误时，将 matchedItems 清空
-	}
-	pagingRefSP.value?.complete([]);
-	pagingRefSP.value?.complete(matchedItems_sp.value);
-}
-// 食谱checkbox
-const checkboxValueNum = ref(0);
-const checkboxValue = reactive([]);
-const matchedItems_sp = reactive(goods_list);
-const matchedItems_sc = reactive(goods_list);
-const aloneChecked = ref(false);
-function checkboxChange (e) {
-	checkboxValue.length = 0;
-	e.forEach((item) => {
-		if (!checkboxValue.includes(item)) {
-			checkboxValue.push(item);
-		}
-	});
-	console.log(checkboxValue);
-	checkboxValueNum.value = checkboxValue.length;
-}
-function handleAllCheckChange (e) {
-	checkboxValue.length = 0;
-	if (e) {
-		// 如果全选， 将所有 matchedItems_sp 的 id 添加到 checkboxValue
-		matchedItems_sp.forEach((item) => {
-			if (!checkboxValue.includes(item.id)) {
-				checkboxValue.push(item.id);
+		changeSC () {
+			console.log('请求食谱数据');
+			try {
+				// 创建正则表达式进行匹配，忽略大小写
+				const regex = new RegExp(this.keyword_sc, 'i');
+				// 直接对 goods_list 使用 filter 进行匹配，并赋值给 matchedItems_sp.value
+				this.matchedItems_sc = this.goods_list_info.info.filter(item => regex.test(item.name));
+				// console.log(matchedItems_sp.value);
 			}
-		});
-	}
-	console.log(e);
-	console.log(checkboxValue);
-	checkboxValueNum.value = checkboxValue.length;
-}
-// // 加载数据
-// const loadData = (refresh = false) => {
-//   listLoading.value = true;
-//   // 请求接口
-//   listLoading.value = false;
-// };
-const currentTab1 = ref(0);
-// 切换tab
-function changeTab (e) {
-	console.log(e);
-}
-//点击详情
-function handleClick (value) {
-	console.log(value);
-	uni.navigateTo({
-		url: `/pages/common/goods/detail?id=${value.name}`
-	});
-}
-//提交订单
-function handleSubmit () {
-	// uni.navigateTo({
-	// 	url: `/pages/common/goods/order`
-	// });
-	console.log('提交订单');	
-}
+			catch (error) {
+				console.error('匹配过程中发生错误:', error);
+				this.matchedItems_sc = []; // 发生错误时，将 matchedItems 清空
+			}
+			this.$refs.pagingRefSC.complete();
+			this.$refs.pagingRefSC.complete(this.matchedItems_sc);
+		},
 
+		// 点击详情
+		handleClick (value) {
+			console.log(value);
+			uni.navigateTo({
+				url: `/pages/common/goods/detail?id=${value.name}`,
+			});
+		},
+		// 提交订单
+		handleSubmit () {
+			uni.navigateTo({
+				url: `/pages/common/goods/order`,
+			});
+		},
 
+		// 打开地图
+		getopenLocation () {
+			openLocation(32.05, 32.05);
+		}
 
-
-</script>
\ No newline at end of file
+	},
+});
+</script>
diff --git a/src/pages/common/login/index.vue b/src/pages/common/login/index.vue
index 369e773..d0833ee 100644
--- a/src/pages/common/login/index.vue
+++ b/src/pages/common/login/index.vue
@@ -4,22 +4,32 @@
       <view class="title">
         欢迎登录
       </view>
-      <input v-model="tel" class="u-border-bottom" type="number" placeholder="请输入手机号">
-      <view class="u-border-bottom my-40rpx flex">
-        <input v-model="code" class="flex-1" type="number" placeholder="请输入验证码">
+      <!-- <input v-model="account" class="u-border-bottom" type="number" placeholder="请输入手机号"> -->
+      <u--input v-model="account" placeholder="请输入手机号" type="number" />
+      <view v-if="loginType" class="u-border-bottom my-40rpx flex">
+        <!-- <input v-model="code" class="flex-1" type="number" placeholder="请输入验证码"> -->
+        <u--input v-model="code" placeholder="请输入验证码" type="number" />
         <view>
           <u-code ref="uCodeRef" @change="codeChange" />
           <u-button :text="tips" type="success" size="mini" @click="getCode" />
         </view>
       </view>
+      <view v-if="!loginType" class="u-border-bottom my-40rpx flex">
+        <u--input v-model="password" placeholder="请输密码" type="password" />
+        <!-- <input v-model="password" class="flex-1" type="password" placeholder="请输密码"> -->
+      </view>
+
       <button class="login-btn" :style="[inputStyle]" @tap="submit">
         登录 <text class="i-mdi-login" />
       </button>
-
       <view class="alternative">
-        <view class="password">
+        <view v-if="loginType" class="password" @click="changLoginType(0)">
           密码登录
         </view>
+        <view v-if="!loginType" class="password" @click="changLoginType(1)">
+          验证码登录
+        </view>
+
         <view class="issue flex items-center">
           遇到问题 <text class="i-mdi-help" />
         </view>
@@ -52,20 +62,24 @@
 <script setup lang="ts">
 import type { CSSProperties } from 'vue';
 import { HOME_PATH, isTabBarPath, LOGIN_PATH, removeQueryString } from '@/router';
-import { setToken } from '@/utils/auth';
+import { useUserStore } from '@/store';
+import { setToken ,getToken , isLogin } from '@/utils/auth';
 import uCode from 'uview-plus/components/u-code/u-code.vue';
-// import { useUserStore } from '@/store';
 
-// const userStore = useUserStore();
-const tel = ref<string>('18502811111');
+const userStore = useUserStore();
+
+const loginType = ref(0);
+const account = ref<string>('18181941463');
 const code = ref<string>('1234');
+const password = ref<string>('123456');
+
 const tips = ref<string>();
 const uCodeRef = ref<InstanceType<typeof uCode> | null>(null);
 let redirect = HOME_PATH;
 
 const inputStyle = computed<CSSProperties>(() => {
   const style = {} as CSSProperties;
-  if (tel.value && code.value) {
+  if (account.value && code.value) {
     style.color = '#fff';
     style.backgroundColor = uni.$u.color.warning;
   }
@@ -76,6 +90,10 @@ function codeChange(text: string) {
   tips.value = text;
 }
 
+function changLoginType(text: number) {
+  loginType.value = text;
+}
+
 function getCode() {
   if (uCodeRef.value?.canGetCode) {
     // 模拟向后端请求验证码
@@ -94,26 +112,56 @@ function getCode() {
   }
 }
 async function submit() {
-  if (!uni.$u.test.mobile(Number(tel.value))) {
+  if (!uni.$u.test.mobile(Number(account.value))) {
     uni.$u.toast('请输入正确的手机号');
     return;
   }
-  if (!code.value) {
-    uni.$u.toast('请输入验证码');
-    return;
-  }
-  // 登录请求
-  // const res = await userStore.login({ phone: tel.value, code: code.value }).catch(() => {
-  //   uni.$u.toast('登录失败');
-  // });
-  // if (!res) return;
-  setToken('1234567890');
-  setTimeout(() => {
-    uni.$u.route({
-      type: isTabBarPath(redirect) ? 'switchTab' : 'redirectTo',
-      url: redirect,
+  if (loginType.value === 0) {
+    if (!password.value) {
+      uni.$u.toast('请输入密码');
+      return;
+    }
+    await userStore.passwordLogin({ account: account.value, password: password.value }).catch((res) => {
+      console.log(res);
+      if (res.status === 200) {
+        setToken(res.data.token);
+        uni.$u.toast('登录成功');
+      }
+      else {
+        uni.$u.toast(`登录失败,${res.message}`);
+      }
     });
-  }, 800);
+  }
+  else {
+    if (!code.value) {
+      uni.$u.toast('请输入验证码');
+      return;
+    }
+    await userStore.login({ account: account.value, code: password.value }).catch(() => {
+      if (res.status === 200) {
+        setToken(res.data.token);
+        uni.$u.toast('登录成功');
+      }
+      else {
+        uni.$u.toast(`登录失败,${res.message}`);
+      }
+    });
+  }
+  if(isLogin()){
+    await userStore.info()
+    setTimeout(() => {
+      uni.$u.route({
+        type: isTabBarPath(redirect) ? 'switchTab' : 'redirectTo',
+        url: redirect,
+      });
+    }, 800);
+  }else{
+     uni.$u.toast('登录失败,请重新登录 ');
+    setToken('');
+  }
+  
+  // setToken('1234567890');
+
 }
 
 onLoad((options: any) => {
@@ -123,6 +171,13 @@ onLoad((options: any) => {
 });
 </script>
 
+<style>
+html,
+body {
+  height: 0;
+}
+</style>
+
 <style lang="scss" scoped>
 .login-form-wrap {
   @apply mt-80rpx mx-auto mb-0 w-600rpx;
diff --git a/src/pages/tab/list/index.vue b/src/pages/tab/list/index.vue
index d0453a5..11f4f0f 100644
--- a/src/pages/tab/list/index.vue
+++ b/src/pages/tab/list/index.vue
@@ -1,229 +1,238 @@
-<style>
-.ellipsis {
-  white-space: nowrap;
-  /* 防止文字换行 */
-  overflow: hidden;
-  /* 隐藏超出部分的文字 */
-  text-overflow: ellipsis;
-  /* 在末尾显示省略号 */
-  width: 280rpx;
-  /* 确保元素有宽度 */
-}
-</style>
-
 <template>
   <view>
     <u-popup :show="propShow" :round="10" mode="bottom" @close="close" @open="open">
       <view style="padding: 20rpx;">
-
         <u-cell class="" style="line-height: 60rpx;" :border="true">
           <template #title>
             <view class="h-50 flex" @click="close">
-              <text class=" ellipsis" style="font-size: 26rpx;font-weight: bold;">{{ goods_info.name }}</text>
-              <up-text class="pe-2" size="22rpx" text="收起" :flex1="true" suffixIcon="arrow-up" align="right"
-                wordWrap="normal" :show="true" type="#59CB56" iconStyle="font-size: 22rpx; " decoration="none">
-              </up-text>
+              <text class="ellipsis" style="font-size: 26rpx;font-weight: bold;">
+                {{ goods_info.name }}
+              </text>
+              <up-text
+                class="pe-2" size="22rpx" text="收起" :flex1="true" suffix-icon="arrow-up" align="right"
+                word-wrap="normal" :show="true" type="#59CB56" icon-style="font-size: 22rpx; " decoration="none"
+              />
             </view>
           </template>
           <template #icon>
-            <up-image class="flex flex-row" style="border:1px solid #59CB56;border-radius: 8rpx;"
+            <up-image
+              class="flex flex-row" style="border:1px solid #59CB56;border-radius: 8rpx;"
               :src="goods_info.image" mode="aspectFill" width="140rpx" height="140rpx" shape="square" radius="4px"
-              :lazyLoad="true" duration="500" bgColor="#f3f4f6NaN" :showMenuByLongpress="true">
-            </up-image>
+              :lazy-load="true" duration="500" bg-color="#f3f4f6NaN" :show-menu-by-longpress="true"
+            />
           </template>
           <template #label>
-            <view class="h-50  ">
-              <text class="text-gray ellipsis" style="font-size: 22rpx;">主料：{{ goods_info.name }}</text>
+            <view class="h-50">
+              <text class="ellipsis text-gray" style="font-size: 22rpx;">
+                主料：{{ goods_info.name }}
+              </text>
             </view>
             <view class="h-50 flex">
-              <text class="  text-gray ellipsis" style="font-size: 22rpx;">营养：{{ goods_info.name }}</text>
-
+              <text class="ellipsis text-gray" style="font-size: 22rpx;">
+                营养：{{ goods_info.name }}
+              </text>
             </view>
           </template>
         </u-cell>
 
         <scroll-view style="height: 580rpx;" scroll-y="true">
           <view class="p-2">
-            <text class="ellipsis" style="font-size: 30rpx;">食材配置</text>
+            <text class="ellipsis" style="font-size: 30rpx;">
+              食材配置
+            </text>
           </view>
-          <view class="flex  p-2 " style="" v-for="(item, index) in goods_info.info" :key="index">
-            <up-text class="" size="26rpx" color="#9b9b9b" :text="item.name + item.label" :flex1="true" align="left"
-              wordWrap="normal" :show="true" lines="1" decoration="none">
-            </up-text>
-            <up-text class="" color="#9b9b9b" size="24rpx" :text="item.num + item.unit_name" :flex1="true" align="right"
-              wordWrap="normal" :show="true"
-              iconStyle="font-size: 28rpx;font-weight: bold;margin-right:10rpx;color: #59CB56;" decoration="none">
-            </up-text>
+          <view v-for="(item, index) in goods_info.info" :key="index" class="flex p-2" style="">
+            <up-text
+              class="" size="26rpx" color="#9b9b9b" :text="item.name + item.label" :flex1="true" align="left"
+              word-wrap="normal" :show="true" lines="1" decoration="none"
+            />
+            <up-text
+              class="" color="#9b9b9b" size="24rpx" :text="item.num + item.unit_name" :flex1="true" align="right"
+              word-wrap="normal" :show="true"
+              icon-style="font-size: 28rpx;font-weight: bold;margin-right:10rpx;color: #59CB56;" decoration="none"
+            />
           </view>
-          <view class="pb-4"></view>
+          <view class="pb-4" />
         </scroll-view>
       </view>
     </u-popup>
 
-    <up-navbar class="" style="font-weight: bold;font-size: 28rpx;" leftIcon="arrow-left" titleColor="#FFFFFFFF"
-      bgColor="#FFFFFFFF" titleWidth="600rpx" height="80rpx" leftIconSize="40rpx" leftIconColor="#303133"
-      :safeAreaInsetTop="true" :placeholder="true" :fixed="true">
-      <template v-slot:left>
-
-        <view class="flex box-border flex-column" style=""> </view>
+    <up-navbar
+      class="" style="font-size: 28rpx;font-weight: bold;" left-icon="arrow-left" title-color="#FFFFFFFF"
+      bg-color="#FFFFFFFF" title-width="600rpx" height="80rpx" left-icon-size="40rpx" left-icon-color="#303133"
+      :safe-area-inset-top="true" :placeholder="true" :fixed="true"
+    >
+      <template #left>
+        <view class="flex-column box-border flex" style="" />
       </template>
-      <template v-slot:center>
-        <up-tabs class="" style="font-weight: bold;" :list="menu_list" keyName="name" lineColor="#18C936"
-          lineWidth="40rpx" lineHeight="6rpx" lineBgSize="cover" :scrollable="true" v-model:current="currentTab"
-          @change="changeTab">
-        </up-tabs>
+      <template #center>
+        <up-tabs
+          v-model:current="currentTab" style="font-weight: bold;" :list="menu_list" key-name="name"
+          line-color="#18C936" line-width="40rpx" line-height="6rpx" line-bg-size="cover" :scrollable="true"
+        />
       </template>
     </up-navbar>
-    <view v-show="currentTab === 1" class="flex-col  ">
-      <up-search class="flex,flex-row  p-1" style="" shape="round" bgColor="#f2f2f2" placeholder="输入食材"
-        :clearabled="true" :showAction="false" inputAlign="left" borderColor="transparent" searchIconColor="#909399"
-        color="#606266" placeholderColor="#909399" searchIcon="search" margin="0rpx 20rpx" maxlength="-1" height="60rpx"
-        v-model="keyword_sc" @change="changeSC">
-      </up-search>
+    <view v-show="currentTab" class="flex-col">
+      <up-search
+        v-model="keyword_sc" class="flex,flex-row p-1" style="" shape="round" bg-color="#f2f2f2" placeholder="输入食材"
+        :clearabled="true" :show-action="false" input-align="left" border-color="transparent" search-icon-color="#909399"
+        color="#606266" placeholder-color="#909399" search-icon="search" margin="0rpx 20rpx" maxlength="-1" height="60rpx"
+        @change="changeSC"
+      />
 
-      <view class="flex box-border flex-row p-2 ps-4 pe-4" style="">
-
-        <up-text class="" size="28rpx" :text="'当前用餐人数(' + totalNum + ')人份'" :flex1="true" align="left" wordWrap="normal"
-          :show="true" iconStyle="22rpx" decoration="none">
-        </up-text>
-
-
-        <u-number-box inputWidth="80rpx" v-model="totalNum" @change="editNum" :name="0"></u-number-box>
+      <view class="box-border flex flex-row p-2 pe-4 ps-4" style="">
+        <up-text
+          class="" size="28rpx" :text="`当前用餐人数(${totalNum})人份`" :flex1="true" align="left" word-wrap="normal"
+          :show="true" icon-style="22rpx" decoration="none"
+        />
+        <u-number-box v-model="totalNum" input-width="80rpx" :name="0" @change="editNum" />
         <!-- <up-text class="" color="#59CB56" size="24rpx" :text="totalNum + '人份'" :flex1="true" prefixIcon="edit-pen"
           align="right" wordWrap="normal" :show="true" iconStyle="font-size: 36rpx;font-weight: bold;color:#59CB56;"
           decoration="none" @click="editNum(0, totalNum)">
         </up-text> -->
       </view>
-
     </view>
-    <view v-show="currentTab === 0" class="flex-col  ">
-      <up-search class="flex,flex-row p-1" style="" shape="round" bgColor="#f2f2f2" placeholder="输入食谱"
-        :clearabled="true" :showAction="false" inputAlign="left" borderColor="transparent" searchIconColor="#909399"
-        color="#606266" placeholderColor="#909399" searchIcon="search" margin="0rpx 20rpx" maxlength="-1" height="60rpx"
-        v-model="keyword_sp" @change="changeSP">
-      </up-search>
-      <view class="flex box-border flex-row p-2 ps-4 pe-4" style="">
+    <view v-show="!currentTab" class="flex-col">
+      <up-search
+        v-model="keyword_sp" class="flex,flex-row p-1" style="" shape="round" bg-color="#f2f2f2" placeholder="输入食谱"
+        :clearabled="true" :show-action="false" input-align="left" border-color="transparent" search-icon-color="#909399"
+        color="#606266" placeholder-color="#909399" search-icon="search" margin="0rpx 20rpx" maxlength="-1" height="60rpx"
+        @change="changeSP"
+      />
+      <view class="box-border flex flex-row p-2 pe-4 ps-4" style="">
         <up-checkbox-group>
-          <up-checkbox class="" shape="circle" activeColor="#59CB56" v-model:checked="aloneChecked"
-            @change="handleAllCheckChange">
-          </up-checkbox>
+          <up-checkbox
+            v-model:checked="aloneChecked" class="" shape="circle" active-color="#59CB56"
+            @change="handleAllCheckChange"
+          />
         </up-checkbox-group>
-        <up-text class="" size="24rpx" :text="'食谱清单(' + checkboxValueNum + ')'" :flex1="true" align="left"
-          wordWrap="normal" :show="true" iconStyle="22rpx" decoration="none">
-        </up-text>
-        <up-text class="" color="#59CB56" size="24rpx" text="删除已选" :flex1="true" prefixIcon="trash" align="right"
-          wordWrap="normal" :show="true" iconStyle="font-size: 36rpx;font-weight: bold;color:#59CB56;" decoration="none"
-          @click="deleteSelected">
-        </up-text>
+        <up-text
+          class="" size="24rpx" :text="`食谱清单(${checkboxValueNum})`" :flex1="true" align="left"
+          word-wrap="normal" :show="true" icon-style="22rpx" decoration="none"
+        />
+        <up-text
+          class="" color="#59CB56" size="24rpx" text="删除已选" :flex1="true" prefix-icon="trash" align="right"
+          word-wrap="normal" :show="true" icon-style="font-size: 36rpx;font-weight: bold;color:#59CB56;" decoration="none"
+          @click="deleteSelected"
+        />
       </view>
     </view>
 
-    <z-paging v-show="currentTab === 0" ref="pagingRefSP" v-model="matchedItems_sp" @query="changeSP"
-      style="bottom: 100rpx;top:240rpx" class="fv-page  flex-col px-4">
+    <z-paging
+      v-show="!currentTab" ref="pagingRefSP" v-model="matchedItems_sp" style="top:240rpx;bottom: 100rpx"
+      class="fv-page flex-col px-4" @query="changeSP"
+    >
       <up-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
         <up-cell-group class=" " style="" :border="true">
           <view v-for="(item, index) in matchedItems_sp" :key="index">
             <u-cell class="" style="line-height: 60rpx;" :border="true" :name="item.id" @click="handleClick">
               <template #title>
                 <view class="h-50 flex">
-                  <text class=" ellipsis" style="font-size: 26rpx;font-weight: bold;">{{ item.name }}</text>
-
+                  <text class="ellipsis" style="font-size: 26rpx;font-weight: bold;">
+                    {{ item.name }}
+                  </text>
                 </view>
               </template>
 
               <template #icon>
-                <up-checkbox class="" style="" shape="circle" :name="item.id" activeColor="#59CB56">
-                </up-checkbox>
-                <up-image class="flex flex-row" style="border:1px solid #59CB56;border-radius: 8rpx;" :src="item.image"
-                  mode="aspectFill" width="140rpx" height="140rpx" shape="square" radius="4px" :lazyLoad="true"
-                  duration="500" bgColor="#f3f4f6NaN" :showMenuByLongpress="true">
-                </up-image>
-
+                <up-checkbox class="" style="" shape="circle" :name="item.id" active-color="#59CB56" />
+                <up-image
+                  class="flex flex-row" style="border:1px solid #59CB56;border-radius: 8rpx;" :src="item.image"
+                  mode="aspectFill" width="140rpx" height="140rpx" shape="square" radius="4px" :lazy-load="true"
+                  duration="500" bg-color="#f3f4f6NaN" :show-menu-by-longpress="true"
+                />
               </template>
 
               <template #label>
-                <view class="h-50  ">
-                  <text class="text-gray ellipsis" style="font-size: 22rpx;">主料：{{ item.name }}</text>
+                <view class="h-50">
+                  <text class="ellipsis text-gray" style="font-size: 22rpx;">
+                    主料：{{ item.name }}
+                  </text>
                 </view>
                 <view class="h-50 flex">
-                  <text class="  text-gray ellipsis" style="font-size: 22rpx;">营养：{{ item.name }}</text>
-                  <up-text class="" size="22rpx" text="食材配置" :flex1="true" suffixIcon="arrow-right" align="right"
-                    wordWrap="normal" :show="true" type="#59CB56" iconStyle="font-size: 22rpx; " decoration="none"
-                    @click.stop="handleClickPropSC(item.id)">
-                  </up-text>
+                  <text class="ellipsis text-gray" style="font-size: 22rpx;">
+                    营养：{{ item.name }}
+                  </text>
+                  <up-text
+                    class="" size="22rpx" text="食材配置" :flex1="true" suffix-icon="arrow-right" align="right"
+                    word-wrap="normal" :show="true" type="#59CB56" icon-style="font-size: 22rpx; " decoration="none"
+                    @click.stop="handleClickPropSC(item.id)"
+                  />
                 </view>
               </template>
             </u-cell>
           </view>
-
         </up-cell-group>
-
       </up-checkbox-group>
     </z-paging>
 
-    <z-paging v-show="currentTab === 1" ref="pagingRefSC" v-model="matchedItems_sc" @query="changeSC"
-      style="bottom: 100rpx;top:240rpx" class="fv-page  flex-col px-4">
+    <z-paging
+      v-show="currentTab" ref="pagingRefSC" v-model="matchedItems_sc" style="top:240rpx;bottom: 100rpx"
+      class="fv-page flex-col px-4" @query="changeSC"
+    >
       <view v-for="(item, index) in matchedItems_sc" :key="index">
         <u-cell>
           <template #icon>
-            <up-image class="flex flex-row" style="border:1px solid #59CB56;border-radius: 100%;" :src="item.image"
-              mode="aspectFill" width="120rpx" height="120rpx" shape="circle" :lazyLoad="true" duration="500"
-              bgColor="#f3f4f6NaN" :showMenuByLongpress="true">
-            </up-image>
+            <up-image
+              class="flex flex-row" style="border:1px solid #59CB56;border-radius: 100%;" :src="item.image"
+              mode="aspectFill" width="120rpx" height="120rpx" shape="circle" :lazy-load="true" duration="500"
+              bg-color="#f3f4f6NaN" :show-menu-by-longpress="true"
+            />
           </template>
           <template #title>
             <view class="h-60 flex">
-              <text class=" ellipsis" style="font-size: 26rpx;font-weight: bold;">{{ item.name }}</text>
-              <up-text class="text-black" size="24rpx" :text="'默认配比：' + item.default_num + item.unit_name" :flex1="true"
-                suffixIcon="" align="right" wordWrap="normal" :show="true" type="#59CB56"
-                iconStyle="font-size: 36rpx;font-weight: bold;" decoration="none">
-              </up-text>
+              <text class="ellipsis" style="font-size: 26rpx;font-weight: bold;">
+                {{ item.name }}
+              </text>
+              <up-text
+                class="text-black" size="24rpx" :text="`默认：${item.default_num}${item.unit_name}/人份`"
+                :flex1="true" suffix-icon="" align="right" word-wrap="normal" :show="true" type="#59CB56"
+                icon-style="font-size: 36rpx;font-weight: bold;" decoration="none"
+              />
             </view>
           </template>
           <template #label>
             <view class="h-60 flex">
-              <text class="  text-gray ellipsis" style="font-size: 22rpx;">菜谱：{{ item.label }}</text>
-              <u-number-box inputWidth="80rpx" v-model="item.num" @change="editNum" :name="item.id"></u-number-box>
+              <text class="ellipsis text-gray" style="font-size: 22rpx;">
+                菜谱：{{ item.label }}
+              </text>
+              <u-number-box v-model="item.num" input-width="80rpx" :name="item.id" @change="editNum" />
             </view>
           </template>
         </u-cell>
-
       </view>
     </z-paging>
 
-    <view class="flex box-border flex-sub">
-      <u-text class="" style="margin: 0rpx 0rpx 0rpx 20rpx;" color="#59CB56" size="26rpx"
-        :text="'已选菜谱' + checkboxValueNum + '个'" :flex1="true" align="left" wordWrap="normal" :show="true"
-        iconStyle="26rpx" decoration="none">
-      </u-text>
-      <up-button class="" style="" text="提交订单" type="primary" color="#59CB56" shape="circle" size="normal"
-        custom-style="width:200rpx" @click="handleSubmit">
-      </up-button>
+    <view class="flex-sub box-border flex">
+      <u-text
+        class="" style="margin: 0rpx 0rpx 0rpx 20rpx;" color="#59CB56" size="26rpx"
+        :text="`已选菜谱${checkboxValueNum}个`" :flex1="true" align="left" word-wrap="normal" :show="true"
+        icon-style="26rpx" decoration="none"
+      />
+      <up-button
+        class="" style="" text="提交订单" type="primary" color="#59CB56" shape="circle" size="normal"
+        custom-style="width:200rpx" @click="handleSubmit"
+      />
     </view>
-
   </view>
-
 </template>
 
-
-
-
-<!-- 食谱清单 -->
 <script lang="ts">
-
-import { useModal, useLocation } from '@/hooks';
+import { CommonApi } from '@/api';
 // const { openLocation } = useLocation();
-const { showModal } = useModal()
-import { defineComponent } from "vue";
-import { CommonApi, UserApi } from "@/api";
+import { useModal } from '@/hooks';
+import { defineComponent } from 'vue';
+
+const { showModal } = useModal();
 export default defineComponent({
-  data () {
+  data() {
     return {
+      aloneChecked: false, // 是否全选
       checkboxValueNum: 0, // 选中菜谱数量
       checkboxValue: [],
       propShow: false,
-      currentTab: 0, //tab索引
-      menu_list: [{ name: "食谱清单" }, { name: "食菜配置" }],
+      currentTab: 0, // tab索引
+      menu_list: [{ name: '食谱清单' }, { name: '食菜配置' }],
       totalNum: 0,
       keyword_sc: '',
       keyword_sp: '',
@@ -233,21 +242,20 @@ export default defineComponent({
       matchedItems_sc: [],
       tabList: [],
       list1: [{
-        title: "白菜",
+        title: '白菜',
         children: [
           {
-            title: "水煮肉片",
-            cover: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+            title: '水煮肉片',
+            cover: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
             price: 88,
           },
         ],
-      },
-      {
-        title: "配料",
+      }, {
+        title: '配料',
         children: [
           {
-            title: "酸菜鱼",
-            cover: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+            title: '酸菜鱼',
+            cover: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
             price: 99,
           },
         ],
@@ -255,713 +263,661 @@ export default defineComponent({
       goods_list: [
         {
           id: 1,
-          name: "大份芒果芒果",
-          label: "描述信息,大份芒果芒果,加多加糖",
-          image: " ",
+          name: '大份芒果芒果',
+          label: '描述信息,大份芒果芒果,加多加糖',
+          image: ' ',
           disabled: true,
           num: 22,
-          unit_name: "斤",
+          unit_name: '斤',
           default_num: 100,
           info: [
             {
               id: 1,
-              name: "猪肉",
-              label: "",
-              image: " ",
+              name: '猪肉',
+              label: '',
+              image: ' ',
               disabled: true,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 2,
-              name: "毛豆",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '毛豆',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 3,
-              name: "食用油",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '食用油',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 4,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
-          ]
+          ],
         },
         {
           id: 2,
-          name: "新鲜西瓜不甜不要钱，随便吃哦",
-          label: "描述信息",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+          name: '新鲜西瓜不甜不要钱，随便吃哦',
+          label: '描述信息',
+          image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
           disabled: false,
           num: 44,
-          unit_name: "件",
+          unit_name: '件',
           default_num: 100,
           info: [
             {
               id: 1,
-              name: "猪肉",
-              label: "",
-              image: " ",
+              name: '猪肉',
+              label: '',
+              image: ' ',
               disabled: true,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 2,
-              name: "毛豆",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '毛豆',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 3,
-              name: "食用油",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '食用油',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 4,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 5,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 6,
-              name: "食用油",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '食用油',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 7,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 8,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 9,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 10,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
-          ]
+          ],
         },
         {
           id: 3,
-          name: "大份芒果芒果",
-          label: "描述信息",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+          name: '大份芒果芒果',
+          label: '描述信息',
+          image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
           disabled: false,
           num: 42,
-          unit_name: "份",
+          unit_name: '份',
           default_num: 100,
           info: [
             {
               id: 1,
-              name: "猪肉",
-              label: "",
-              image: " ",
+              name: '猪肉',
+              label: '',
+              image: ' ',
               disabled: true,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 2,
-              name: "毛豆",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '毛豆',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 3,
-              name: "食用油",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '食用油',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 4,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
-          ]
+          ],
         },
         {
           id: 4,
-          name: "新鲜西瓜不甜不要钱，随便吃哦",
-          label: "描述信息",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+          name: '新鲜西瓜不甜不要钱，随便吃哦',
+          label: '描述信息',
+          image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
           disabled: false,
           num: 34236,
-          unit_name: "个",
+          unit_name: '个',
           default_num: 100,
           info: [
             {
               id: 1,
-              name: "猪肉",
-              label: "青椒肉丝",
-              image: " ",
+              name: '猪肉',
+              label: '青椒肉丝',
+              image: ' ',
               disabled: true,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 2,
-              name: "毛豆",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '毛豆',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 3,
-              name: "食用油",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '食用油',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 4,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
-          ]
+          ],
         },
         {
           id: 5,
-          name: "大份芒果芒果",
-          label: "描述信息",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+          name: '大份芒果芒果',
+          label: '描述信息',
+          image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
           disabled: false,
           num: 100,
-          unit_name: "个",
+          unit_name: '个',
           default_num: 100,
           info: [
             {
               id: 1,
-              name: "猪肉",
-              label: "",
-              image: " ",
+              name: '猪肉',
+              label: '',
+              image: ' ',
               disabled: true,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 2,
-              name: "毛豆",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '毛豆',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 3,
-              name: "食用油",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '食用油',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 4,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
-          ]
+          ],
         },
         {
           id: 6,
-          name: "新鲜西瓜不甜不要钱，随便吃哦",
-          label: "描述信息",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+          name: '新鲜西瓜不甜不要钱，随便吃哦',
+          label: '描述信息',
+          image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
           disabled: false,
           num: 100,
-          unit_name: "个",
+          unit_name: '个',
           default_num: 100,
           info: [
             {
               id: 1,
-              name: "猪肉",
-              label: "",
-              image: " ",
+              name: '猪肉',
+              label: '',
+              image: ' ',
               disabled: true,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 2,
-              name: "毛豆",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '毛豆',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 3,
-              name: "食用油",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '食用油',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 4,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
-          ]
+          ],
         },
         {
           id: 7,
-          name: "大份芒果芒果",
-          label: "描述信息",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+          name: '大份芒果芒果',
+          label: '描述信息',
+          image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
           disabled: false,
           num: 100,
-          unit_name: "个",
+          unit_name: '个',
           default_num: 100,
           info: [
             {
               id: 1,
-              name: "猪肉",
-              label: "",
-              image: " ",
+              name: '猪肉',
+              label: '',
+              image: ' ',
               disabled: true,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 2,
-              name: "毛豆",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '毛豆',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 3,
-              name: "食用油",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '食用油',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 4,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
-          ]
+          ],
         },
         {
           id: 8,
-          name: "新鲜西瓜不甜不要钱，随便吃哦",
-          label: "描述信息",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+          name: '新鲜西瓜不甜不要钱，随便吃哦',
+          label: '描述信息',
+          image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
           disabled: false,
           num: 100,
-          unit_name: "个",
+          unit_name: '个',
           default_num: 100,
           info: [
             {
               id: 1,
-              name: "猪肉",
-              label: "",
-              image: " ",
+              name: '猪肉',
+              label: '',
+              image: ' ',
               disabled: true,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 2,
-              name: "毛豆",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '毛豆',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 3,
-              name: "食用油",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '食用油',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 4,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
-          ]
+          ],
         },
         {
           id: 9,
-          name: "大份芒果芒果",
-          label: "描述信息",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+          name: '大份芒果芒果',
+          label: '描述信息',
+          image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
           disabled: false,
           num: 100,
-          unit_name: "个",
+          unit_name: '个',
           default_num: 100,
           info: [
             {
               id: 1,
-              name: "猪肉",
-              label: "",
-              image: " ",
+              name: '猪肉',
+              label: '',
+              image: ' ',
               disabled: true,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 2,
-              name: "毛豆",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '毛豆',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 3,
-              name: "食用油",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '食用油',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 4,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
-          ]
+          ],
         },
         {
           id: 10,
-          name: "新鲜西瓜不甜不要钱，随便吃哦",
-          label: "描述信息",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+          name: '新鲜西瓜不甜不要钱，随便吃哦',
+          label: '描述信息',
+          image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
           disabled: false,
           num: 100,
-          unit_name: "个",
+          unit_name: '个',
           default_num: 100,
           info: [
             {
               id: 1,
-              name: "猪肉",
-              label: "",
-              image: " ",
+              name: '猪肉',
+              label: '',
+              image: ' ',
               disabled: true,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 2,
-              name: "毛豆",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '毛豆',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
             {
               id: 3,
-              name: "食用油",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '食用油',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "g",
+              unit_name: 'g',
               default_num: 100,
             },
             {
               id: 4,
-              name: "豆瓣酱",
-              label: "(建议食材)",
-              image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
+              name: '豆瓣酱',
+              label: '(建议食材)',
+              image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
               disabled: false,
               num: 100,
-              unit_name: "ml",
+              unit_name: 'ml',
               default_num: 100,
             },
-          ]
+          ],
         },
       ],
 
-      goods_list_info: [
-        {
-          name: "全部",
-          image: "",
-        },
-        {
-          name: "水果1",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品2",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品3",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品4",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        }, {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-        {
-          name: "商品5",
-          image: "https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png",
-        },
-
-      ],
+      goods_list_info:
+      {
+        total_num: 1,
+        info: [
+          {
+            id: 1,
+            name: '猪肉',
+            label: '青椒肉丝',
+            image: ' ',
+            disabled: true,
+            num: 88,
+            unit_name: 'g',
+            default_num: 88,
+          },
+          {
+            id: 2,
+            name: '毛豆',
+            label: '青椒肉丝',
+            image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
+            disabled: false,
+            num: 100,
+            unit_name: 'ml',
+            default_num: 100,
+          },
+          {
+            id: 3,
+            name: '食用油',
+            label: '青椒肉丝',
+            image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
+            disabled: false,
+            num: 100,
+            unit_name: 'g',
+            default_num: 100,
+          },
+          {
+            id: 4,
+            name: '豆瓣酱',
+            label: '青椒肉丝',
+            image: 'https://s3.bmp.ovh/imgs/2024/12/16/35bc6d28ab1c8bc7.png',
+            disabled: false,
+            num: 100,
+            unit_name: 'ml',
+            default_num: 100,
+          },
+        ],
+      },
     };
   },
-  created () {
-    this.handleClick(0)
-    // this. totalNum = goods_list_info.total_num
+  created() {
+    // 加载数据
+    this.goodList();
   },
   methods: {
-    open () {
+    // 弹窗
+    open() {
       this.propShow = true;
-      console.log('open');
     },
-    close () {
-      // this.show = false
+    close() {
       this.propShow = false;
-      console.log('close');
     },
-    // handleClick (index: number) {
-    //   // menuIndex.value = index;
-    //   this.menuIndex = index;
-    //   CommonApi.goodsMenu({ key: 123 }).catch((res) => {
-    //     if (res.status == 200) {
-    //       //  this.tabList = res.data.menuList;
-    //       this.tabList = this.list1
-    //       console.log(res);
-    //     } else {
-    //       uni.$u.toast(res.message);
-    //     }
-    //   });
+    goodList() {
+      CommonApi.goodsMenu({ key: 123 }).catch((res) => {
+        if (res.status === 200) {
+          //  this.goods_list = res.data;
+          console.log(res);
+        }
+        else {
+          uni.$u.toast(res.message);
+        }
+      });
+    },
 
-    // },
-    // //点击详情
-    // goodsDetail (id: number) {
-    //   console.log(id);
-    //   uni.navigateTo({
-    //     url: `/pages/common/goods/detail?id=${id}`
-    //   });
-    // },
-    // 食谱checkbox
-    // const checkboxValueNum = ref(0);
-    // const checkboxValue = reactive([]);
-    // const matchedItems_sp = reactive(goods_list);
-    // const matchedItems_sc = reactive(goods_list_info.info);
-    // const aloneChecked = ref(false);
-    checkboxChange (e) {
-      this.checkboxValue.length = 0;
+    // 选中bcheckbox
+    checkboxChange(e) {
+      console.log(e);
       e.forEach((item) => {
         if (!this.checkboxValue.includes(item)) {
           this.checkboxValue.push(item);
@@ -970,7 +926,7 @@ export default defineComponent({
       console.log(this.checkboxValue);
       this.checkboxValueNum = this.checkboxValue.length;
     },
-    handleAllCheckChange (e) {
+    handleAllCheckChange(e) {
       this.checkboxValue.length = 0;
       if (e) {
         // 如果全选， 将所有 matchedItems_sp 的 id 添加到 checkboxValue
@@ -981,55 +937,62 @@ export default defineComponent({
         });
       }
       console.log(e);
-      console.log(checkboxValue);
+      console.log(this.checkboxValue);
       this.checkboxValueNum = this.checkboxValue.length;
     },
-    changeSC () {
-      console.log("请求食谱数据");
+    changeSC() {
+      console.log('请求食谱数据');
       try {
         // 创建正则表达式进行匹配，忽略大小写
-        const regex = new RegExp(this.keyword_sc, "i");
+        const regex = new RegExp(this.keyword_sc, 'i');
         // 直接对 goods_list 使用 filter 进行匹配，并赋值给 matchedItems_sp.value
-        this.matchedItems_sc = this.goods_list.filter((item) => regex.test(item.name));
+        this.matchedItems_sc = this.goods_list_info.info.filter(item => regex.test(item.name));
         // console.log(matchedItems_sp.value);
-      } catch (error) {
-        console.error("匹配过程中发生错误:", error);
+      }
+      catch (error) {
+        console.error('匹配过程中发生错误:', error);
         this.matchedItems_sc = []; // 发生错误时，将 matchedItems 清空
       }
       this.$refs.pagingRefSC.complete();
       this.$refs.pagingRefSC.complete(this.matchedItems_sc);
-
     },
-    changeSP () {
-      console.log("请求食谱数据");
+    changeSP() {
+      console.log('请求食谱数据');
       try {
         // 创建正则表达式进行匹配，忽略大小写
-        const regex = new RegExp(this.keyword_sp, "i");
+        const regex = new RegExp(this.keyword_sp, 'i');
         // 直接对 goods_list 使用 filter 进行匹配，并赋值给 matchedItems_sp.value
-        this.matchedItems_sp = this.goods_list.filter((item) => regex.test(item.name));
+        this.matchedItems_sp = this.goods_list.filter(item => regex.test(item.name));
         // console.log(matchedItems_sp.value);
-      } catch (error) {
-        console.error("匹配过程中发生错误:", error);
+      }
+      catch (error) {
+        console.error('匹配过程中发生错误:', error);
         this.matchedItems_sp = []; // 发生错误时，将 matchedItems 清空
       }
       this.$refs.pagingRefSP.complete();
       this.$refs.pagingRefSP.complete(this.matchedItems_sp);
-
     },
-    //点击详情
-    handleClick (value) {
+    // 点击详情
+    handleClick(value) {
       console.log(value);
       uni.navigateTo({
-        url: `/pages/common/goods/detail?id=${value.name}`
+        url: `/pages/common/goods/detail?id=${value.name}`,
       });
     },
-    //提交订单
-    handleSubmit () {
+    // 提交订单
+    handleSubmit() {
       uni.navigateTo({
-        url: `/pages/common/goods/order`
+        url: `/pages/common/goods/order`,
       });
     },
-    deleteSelected () {
+    deleteSelected() {
+      if (this.checkboxValue.length === 0) {
+        showModal('error', {
+          title: '删除提示',
+          content: '请选择要删除的选项',
+        });
+        return;
+      }
       showModal('success', {
         title: '删除提示',
         content: '确定删除选中商品？',
@@ -1040,42 +1003,52 @@ export default defineComponent({
           if (res.confirm) {
             // console.log('用户点击确定');
             // deleteSelected();
-            //删除后刷新
-            changeSP();
-          } else if (res.cancel) {
+            // 删除后刷新
+            this.changeSP();
+          }
+          else if (res.cancel) {
             // console.log('用户点击取消');
           }
-        }
+        },
       });
-
     },
-    // const totalNum = ref(goods_list_info.total_num);
-    editNum (e) {
-      console.log('修改数量', e)
+
+    // 修改数量
+    editNum(e) {
+      // console.log('修改数量', e)
       if (!e.name) {
-        goods_list_info.total_num = e.value
-        goods_list_info.info.forEach((item) => {
-          item.num = item.default_num * e.value
+        this.goods_list_info.total_num = e.value;
+        this.goods_list_info.info.forEach((item, index) => {
+          // this.$set(this.goods_list_info.info[index], 'num', item.default_num * e.value)
+          this.goods_list_info.info[index].num = item.default_num * e.value;
         });
-        changeSC();
       }
-      console.log('提交修改结果', goods_list_info.total_num, goods_list_info.info)
+      console.log('提交修改结果', this.goods_list_info.total_num, this.goods_list_info.info);
     },
 
-    handleClickPropSC (id) {
-      console.log('查看配置食材', id)
-      // this.goods_info = this.goods_list.find(item => item.id === id);
-      // this.propShow.value = true;
+    handleClickPropSC(id) {
+      // console.log('查看配置食材', id)
+      this.goods_info = this.goods_list.find(item => item.id === id);
+      this.propShow = true;
     },
 
-
-
-
-
-
   },
 });
+</script>
 
+<!-- 食谱清单 -->
+<style>
+.ellipsis {
+  /* 在末尾显示省略号 */
+  width: 280rpx;
 
+  /* 防止文字换行 */
+  overflow: hidden;
 
-</script>
\ No newline at end of file
+  /* 隐藏超出部分的文字 */
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  /* 确保元素有宽度 */
+}
+</style>
diff --git a/src/pages/tab/user/index.vue b/src/pages/tab/user/index.vue
index 40c8498..6b4a8a0 100644
--- a/src/pages/tab/user/index.vue
+++ b/src/pages/tab/user/index.vue
@@ -1,26 +1,15 @@
-<style>
-.detail_box {
-  border: 1rpx solid #dfdfdf;
-  border-radius: 20rpx;
-  margin: 20rpx;
-  background-color: #ffffff;
-}
-html, body {
-  height: 0px;
-}
-</style>
 <template>
   <view class="page-wrap p-2">
-    <view class="flex detail_box p-4  bg-white">
+    <view class="detail-box flex bg-white p-4">
       <view class="mr-10rpx">
-        <u-avatar src="/static/images/logo.png" size="70" />
+        <u-avatar :src="userStore.user.avatar " size="70" />
       </view>
       <view class="flex-1">
         <view class="pb-20rpx font-size-36rpx">
-          uni-app
+          {{ userStore.user.nickname }}
         </view>
         <view class="u-tips-color font-size-28rpx" @click="toCopy">
-          微信号:uni-app
+          {{ userStore.user.phone }}
         </view>
       </view>
       <view class="ml-10rpx p-10rpx">
@@ -31,49 +20,88 @@ html, body {
       </view>
     </view>
 
-    <view class="detail_box  bg-white">
-        <u-cell icon="" title="昵称" is-link rightIcon="lock" value="小花猫" :border="false" size="large"
-          customStyle="padding:20rpx;font-size:28rpx" />
+    <view class="detail-box bg-white">
+      <u-cell
+        icon="" title="昵称" is-link right-icon="lock" :value="userStore.user.nickname" :border="false" size="large"
+        custom-style="padding:20rpx;font-size:28rpx"
+      />
 
-        <u-cell icon="" title="ID" is-link rightIcon="lock" value="26" :border="false" size="large"
-          customStyle="padding:20rpx;font-size:28rpx" />
+      <u-cell
+        icon="" title="ID" is-link right-icon="lock" :value="userStore.user.uid" :border="false" size="large"
+        custom-style="padding:20rpx;font-size:28rpx"
+      />
 
-        <u-cell icon="" title="手机号" is-link rightIcon="lock" value="18181941463" :border="false" size="large"
-          customStyle="padding:20rpx;font-size:28rpx" />
+      <u-cell
+        icon="" title="手机号" is-link right-icon="lock" :value="userStore.user.phone" :border="false" size="large"
+        custom-style="padding:20rpx;font-size:28rpx"
+      />
 
-        <u-cell icon="order" title="订单详情" is-link value="" :border="false" size="large"
-          customStyle="padding:20rpx;font-size:28rpx" />
+      <u-cell
+        icon="order" title="订单详情" is-link value="" :border="false" size="large"
+        custom-style="padding:20rpx;font-size:28rpx"
+      />
     </view>
 
-    <view class="p-2  bg-white">
-      <u-button class="p-2" size="large" text="退出登录" type="primary" color="#59CB56" shape="circle" 
-        custom-style="width:100%;" @click="loginOut">
-      </u-button>
+    <view class="bg-white p-2">
+      <u-button
+        class="p-2" size="large" text="退出登录" type="primary" color="#59CB56" shape="circle"
+        custom-style="width:100%;" @click="loginOut"
+      />
     </view>
-
   </view>
 </template>
 
 <script setup lang="ts">
-import { HOME_PATH, isTabBarPath, LOGIN_PATH, removeQueryString } from '@/router';
-import { useClipboard, usePermission } from '@/hooks';
+import { useClipboard, useModal, usePermission } from '@/hooks';
+
+import { HOME_PATH, isTabBarPath } from '@/router';
+import { useUserStore } from '@/store';
 import { setToken } from '@/utils/auth';
-// import { useUserStore } from '@/store';
-// const userStore = useUserStore();
-let redirect = HOME_PATH;
-async function loginOut() {
+
+const { showModal } = useModal();
+const { setClipboardData, getClipboardData } = useClipboard();
+
+const userStore = useUserStore();
+const redirect = HOME_PATH;
+
+console.log('userStore', userStore);
+console.log('userStore', userStore.user_name);
+// import { CommonApi, UserApi } from "@/api";
+// profile
+// 复制
+const toCopy = async () => {
+  await setClipboardData({ data: '1234567890' });
+  const data = await getClipboardData();
+  console.log('[ data ] >', data);
+};
+
+function loginOut() {
+  showModal('success', {
+    title: '提示',
+    content: '确定退出登录？',
+    showCancel: true,
+    confirmText: '确定',
+    cancelText: '取消',
+    success: (res) => {
+      if (res.confirm) {
+        // 退出请求
+        loginOuts();
+      }
+    },
+  });
+}
+// userStore.info()
+async function loginOuts() {
   // 退出请求
-  // const res = await userStore.logout().catch(() => {
-  //   uni.$u.toast('退出失败');
-  // });
-  // if (!res) return;
-  setToken('');
-  setTimeout(() => {
-    uni.$u.route({
-      type: isTabBarPath(redirect) ? 'switchTab' : 'redirectTo',
-      url: redirect,
-    });
-  }, 800);
+  await userStore.logout().catch(() => {
+    setToken('');
+    setTimeout(() => {
+      uni.$u.route({
+        type: isTabBarPath(redirect) ? 'switchTab' : 'redirectTo',
+        url: redirect,
+      });
+    }, 800);
+  });
 }
 // 登录鉴权，微信小程序端点击tabbar的底层逻辑不触发uni.switchTab，需要在页面onShow生命周期中校验权限
 onShow(async () => {
@@ -81,3 +109,17 @@ onShow(async () => {
   console.log(hasPermission ? '已登录' : '未登录，拦截跳转');
 });
 </script>
+
+<style scoped>
+.detail-box {
+  margin: 20rpx;
+  background-color: #fff;
+  border: 1rpx solid #dfdfdf;
+  border-radius: 20rpx;
+}
+
+html,
+body {
+  height: 0;
+}
+</style>
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index 4b035cc..7bd7b59 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -1,4 +1,4 @@
-import type { LoginReq } from '@/api/user/types';
+import type { LoginReq, LoginReqPassword } from '@/api/user/types';
 import type { providerType, UserState } from './types';
 import { UserApi } from '@/api';
 import { clearToken, setToken } from '@/utils/auth';
@@ -9,8 +9,9 @@ const useUserStore = defineStore('user', {
   state: (): UserState => ({
     user_id: '0',
     user_name: '游客登录',
-    avatar: '',
+    avatar: 'https://test.shop.lihaink.cn/static/f.png',
     token: '',
+    user: {},
   }),
   getters: {
     userInfo(state: UserState): UserState {
@@ -27,9 +28,12 @@ const useUserStore = defineStore('user', {
       this.$reset();
     },
     // 获取用户信息
-    async info() {
-      const result = await UserApi.profile();
-      this.setInfo(result);
+    info() {
+      UserApi.profile().catch((res) => {
+        console.log('登录信息',res.data);
+        // reject(error);
+        this.setInfo({ user: res.data });
+      });
     },
     // 异步登录并存储token
     login(loginForm: LoginReq) {
@@ -45,6 +49,20 @@ const useUserStore = defineStore('user', {
         });
       });
     },
+    passwordLogin(loginForm: LoginReqPassword) {
+      return new Promise((resolve, reject) => {
+        UserApi.passwordLogin(loginForm).then((res) => {
+          const token = res.token;
+          if (token) {
+            setToken(token);
+          }
+          resolve(res);
+        }).catch((error) => {
+          reject(error);
+        });
+      });
+    },
+
     // Logout
     async logout() {
       await UserApi.logout();
diff --git a/src/store/modules/user/types.ts b/src/store/modules/user/types.ts
index aac7cd4..94eced3 100644
--- a/src/store/modules/user/types.ts
+++ b/src/store/modules/user/types.ts
@@ -4,6 +4,7 @@ export interface UserState {
   user_name?: string;
   avatar?: string;
   token?: string;
+  user?: any;
 }
 
 export type providerType =