From 1cff08c0d4a7a672608a565674ef3a5c041ad65e Mon Sep 17 00:00:00 2001
From: iuu <2167162990@qq.com>
Date: Fri, 16 Jan 2026 16:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/config/goodsAdd.vue         |  413 ----------
 pages/config/goodsDetail.vue      |  341 --------
 pages/config/goodsEdit.vue        |  339 --------
 pages/config/goodsList.vue        |  705 ----------------
 pages/config/price.vue            | 1238 -----------------------------
 pages/config/shopOrder/detail.vue |  188 -----
 pages/config/shopOrder/index.vue  |  632 ---------------
 pages/config/store.vue            |  318 --------
 8 files changed, 4174 deletions(-)
 delete mode 100644 pages/config/goodsAdd.vue
 delete mode 100644 pages/config/goodsDetail.vue
 delete mode 100644 pages/config/goodsEdit.vue
 delete mode 100644 pages/config/goodsList.vue
 delete mode 100644 pages/config/price.vue
 delete mode 100644 pages/config/shopOrder/detail.vue
 delete mode 100644 pages/config/shopOrder/index.vue
 delete mode 100644 pages/config/store.vue

diff --git a/pages/config/goodsAdd.vue b/pages/config/goodsAdd.vue
deleted file mode 100644
index 7e9c7e6..0000000
--- a/pages/config/goodsAdd.vue
+++ /dev/null
@@ -1,413 +0,0 @@
-<template>
-
-	<view class="page-content">
-		<view style=" padding: 20rpx;">
-			<nut-form>
-				<nut-form-item label="名称">
-					<nut-input v-model="form.goods_name" class="nut-input-text" placeholder="请输入名称" type="text" />
-				</nut-form-item>
-
-				<nut-form-item label="串号">
-					<nut-input v-model="form.goods_no" class="nut-input-text" placeholder="请输入串号" type="text">
-						<template #right>
-							<nut-icon @click="onScan" name="scan2" size="30" custom-color="#000000" />
-						</template>
-					</nut-input>
-				</nut-form-item>
-
-				<nut-form-item label="售价">
-					<nut-input v-model="form.goods_price" class="nut-input-text" placeholder="请输入售价" type="nubmer" />
-				</nut-form-item>
-
-
-				<nut-form-item label="说明">
-					<nut-textarea v-model="form.content" autosize placeholder="请输入说明" type="text" />
-				</nut-form-item>
-
-				<nut-form-item label="介绍">
-					<nut-textarea v-model="form.details_content" autosize placeholder="请输入介绍" type="text" />
-				</nut-form-item>
-
-
-				<!-- 	<nut-form-item label="上架人">
-					<nut-input v-model="form.add_person" class="nut-input-text" placeholder="请输入上架人" type="text" />
-				</nut-form-item> -->
-				<!-- 	<nut-form-item label="排序">
-					<nut-input v-model="form.goods_sort" class="nut-input-text" placeholder="请输入排序" type="number" />
-				</nut-form-item> -->
-
-
-
-				<nut-form-item label="状态">
-					<nut-radio-group direction="horizontal" v-model="form.status">
-						<nut-radio label="10">下架</nut-radio>
-						<nut-radio label="20">上架</nut-radio>
-					</nut-radio-group>
-				</nut-form-item>
-
-				<nut-form-item>
-					<template v-slot:label>成色</template>
-					<template v-slot:default>
-						<view style="color: black;" @click="show_degree_popup = true">
-							<text>{{form.degree_name}}</text>
-						</view>
-					</template>
-				</nut-form-item>
-
-
-				<nut-form-item>
-					<template v-slot:label>机型</template>
-					<template v-slot:default>
-						<view style="color: black;" @click="show_product_cascader = true">
-							<text>{{form.type_name}},{{form.brand_name}},{{form.product_name}}</text>
-						</view>
-					</template>
-				</nut-form-item>
-
-				<nut-form-item>
-					<template v-slot:label>商品图片</template>
-					<template v-slot:default>
-						<shmily-drag-image v-model="form.images" :number=9 :add-image="addGoodsImg"
-							keyName="file_path"></shmily-drag-image></template>
-				</nut-form-item>
-
-
-				<!-- 		<nut-form-item>
-					<template v-slot:label>商品视频</template>
-					<template v-slot:default>
-						<nut-uploader :url="uploadVideoUrl" name="iFile" v-model:file-list="uploadVideoList"
-							:source-type="['album','camera']" :media-type="['video']" maximum="1" :multiple="false"
-							@success="onUploadSuccess" @fail="onUploadFail" @delete="onDeleteFile" :timeout="1000*60">
-						</nut-uploader>
-					</template>
-				</nut-form-item> -->
-
-
-				<view style="align-items: center;text-align: center; padding: 20rpx 60rpx;">
-					<nut-button type="primary" block @click="onSubmit">
-						新增商品
-					</nut-button>
-				</view>
-			</nut-form>
-
-		</view>
-
-		<nut-popup v-model:visible="show_degree_popup" position="bottom" safe-area-inset-bottom>
-			<nut-picker v-model="popup_degree_val" :columns="filter_params.degree_list"
-				:field-names="{text:'degree_name',value:'degree_id'}" title="选择成色" @confirm="onConfirmDegree"
-				@cancel="show_degree_popup = false">
-			</nut-picker>
-		</nut-popup>
-
-		<nut-cascader title="机型选择" v-model:visible="show_product_cascader" v-model="cascader_product_val"
-			@change="onProductChange" @pathChange="onProcutPathChange" text-key="label" value-key="value"
-			:title-ellipsis="false" children-key="children" :options="filter_params.drop_down_options"></nut-cascader>
-	</view>
-</template>
-
-<script setup>
-	import {
-		onMounted,
-		reactive,
-		ref,
-		toValue
-	} from 'vue';
-	import {
-		fetchFilterParmas,
-		fetchGoodsAdd,
-	} from '@/api/goods';
-	import {
-		getUploadImageUrl,
-	} from '@/api/request';
-
-
-	// import {
-	// 	fetchControlAddGoods,
-	// } from '@/api/control';
-
-
-	// const uploadVideoUrl = ref('')
-	// uploadVideoUrl.value = getUploadVideoUrl()
-	// const uploadVideoOk = ref('https://qnxsd.19year.cn/wechat_2025-08-12_130250_716.png')
-	// const uploadVideoList = ref([])
-	// const videoUrl = ref('')
-
-	// const onUploadSuccess = (res) => {
-	// 	uploadVideoList.value[0].url = uploadVideoOk
-	// 	let respStr = res.data.data
-	// 	let resp = JSON.parse(respStr)
-	// 	if (resp.code === 1) {
-	// 		form.video_url = resp.data.url
-	// 		uni.showToast({
-	// 			title: '上传成功',
-	// 			icon: 'success'
-	// 		})
-	// 	} else {
-	// 		uni.showToast({
-	// 			title: '上传失败',
-	// 			icon: 'none'
-	// 		})
-	// 	}
-	// }
-
-	// const onDeleteFile = (files, fileList, index) => {
-	// 	uploadVideoList.value = []
-	// 	form.video_url = ""
-	// 	console.log('uploadVideoList3', uploadVideoList)
-	// 	console.log('form3', form)
-	// }
-	// const onUploadFail = (err) => {
-	// 	console.error('上传失败:', err)
-	// 	uni.showToast({
-	// 		title: '上传失败',
-	// 		icon: 'none'
-	// 	})
-	// }
-
-
-
-	// 扫码
-	const onScan = () => {
-		uni.scanCode({
-			onlyFromCamera: true,
-			success: (res) => {
-				console.log(res);
-				form.goods_no = res.result
-			},
-			fail: () => {
-				uni.showToast({
-					icon: 'none',
-					title: '扫码失败'
-				})
-			}
-		})
-	}
-
-
-
-	const filter_params = reactive({})
-
-
-
-	// const report_tags = reactive([])
-
-	// const all_report_tag_ids = ref([])
-
-	// 默认展开
-	// const defaultExpandKeys = ref([0])
-
-	// 显示机型选择
-	const show_product_cascader = ref(false)
-	// 显示成色
-	const show_degree_popup = ref(false)
-
-	// const show_disk_popup = ref(false)
-	// 显示验机报告
-	// const show_report_tags_popup = ref(false)
-
-
-	const popup_degree_val = ref([])
-	const cascader_product_val = ref([])
-
-	// const popup_disk_val = ref(["未选择"])
-
-
-
-	const form = reactive({
-		// goods_id: 0,
-		goods_name: '',
-		goods_no: '',
-
-
-		goods_price: '',
-		goods_stock: '',
-		content: '',
-		details_content: '',
-		status: '10',
-		images: [],
-		add_person: '',
-
-		// disk: '未选择',
-
-		degree_id: 0,
-		degree_name: '未选择',
-		type_id: 0,
-		type_name: '未选择',
-		brand_id: 0,
-		brand_name: '未选择',
-		product_id: 0,
-		product_name: '未选择',
-
-
-
-		// video_url: ''
-
-
-		// goods_no: '',
-
-
-		// goods_status: '10',
-		// goods_sort: 0,
-
-
-
-
-	})
-
-
-
-
-
-
-
-
-	const onProductChange = (...args) => {
-
-	}
-
-
-
-	const onSubmit = () => {
-		console.log('form====>', form);
-		fetchGoodsAdd(form).then(res => {
-			uni.showToast({
-				icon: 'none',
-				title: '新增商品成功'
-			})
-			// setTimeout(() => {
-			// 	uni.switchTab({
-			// 		url: '/pages/mine/index'
-			// 	});
-			// }, 500)
-
-			setTimeout(() => {
-				// uni.switchTab({
-				// 	url: '/pages/mine/index'
-				// });
-				uni.navigateBack({
-					delta: 1 // 返回上一页
-				});
-			}, 500)
-
-		})
-	}
-
-
-
-	// 选择机型
-	const onProcutPathChange = (args) => {
-		console.log(args);
-		form.type_id = 0
-		form.type_name = ''
-		form.brand_id = 0
-		form.brand_name = ''
-		form.product_id = 0
-		form.product_name = ''
-		if (args.length >= 1 && args[0] !== null) {
-			form.type_id = args[0].value
-			form.type_name = args[0].text
-		}
-		if (args.length >= 2 && args[1] !== null) {
-			form.brand_id = args[1].value
-			form.brand_name = args[1].text
-		}
-		if (args.length >= 3 && args[2] !== null) {
-			form.product_id = args[2].value
-			form.product_name = args[2].text
-		}
-	}
-	// 选择成色
-	const onConfirmDegree = () => {
-		form.degree_id = popup_degree_val.value[0]
-		filter_params.degree_list.forEach(item => {
-			if (item.degree_id === form.degree_id) {
-				form.degree_name = item.degree_name
-			}
-		})
-		show_degree_popup.value = false
-	}
-	// const onConfirmDisk = () => {
-	// 	form.disk = popup_disk_val.value[0]
-	// 	console.log('form.disk', form.disk);
-	// 	console.log('popup_disk_val.value', popup_disk_val.value);
-	// 	// filter_params.disk_list.forEach(item => {
-	// 	// 	if (item.value === form.disk) {
-	// 	// 		form.disk = item.value
-	// 	// 	}
-	// 	// })
-	// 	show_disk_popup.value = false
-	// }
-
-	onMounted(() => {
-		fetchFilterParmas(1).then(res => {
-			Object.assign(filter_params, res)
-			filter_params.degree_list.unshift({
-				degree_id: 0,
-				degree_name: '未选择'
-			})
-			console.log('filter_params', filter_params)
-			// console.log('filter_params.disk_list', filter_params.disk_list)
-
-
-			// filter_params.disk_list.unshift({
-			// 	// id: 0,
-			// 	value: '未选择'
-			// })
-
-
-		})
-	})
-
-	// 上传商品图片
-	const addGoodsImg = () => {
-		uni.chooseImage({
-			count: 9 - (form.image?.length || 0),
-			sourceType: ['album', 'camera'],
-			success: res => {
-				res.tempFiles.forEach(file => {
-					uni.uploadFile({
-						url: getUploadImageUrl(),
-						filePath: file.path,
-						name: 'iFile',
-						formData: {
-							group_id: 1,
-						},
-						success: (res) => {
-							let data = JSON.parse(res.data).data
-							form.images.push({
-								id: parseInt(data.file_id),
-								file_path: data.file_path,
-							})
-						}
-					})
-				})
-			}
-		})
-	}
-</script>
-
-<style lang="scss" scoped>
-	.page-content {
-		min-height: 100vh;
-		background-color: #f2f3f5;
-
-	}
-
-
-	.list {
-		display: flex;
-		justify-content: center;
-		flex-direction: column;
-		background: #ffffff;
-		align-items: center;
-		max-height: 300rpx;
-		overflow-y: scroll;
-		padding: 10px;
-
-		.list-item {
-			border-bottom: 1px solid #eee;
-			padding: 20rpx 10rpx;
-
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/config/goodsDetail.vue b/pages/config/goodsDetail.vue
deleted file mode 100644
index 0bdc429..0000000
--- a/pages/config/goodsDetail.vue
+++ /dev/null
@@ -1,341 +0,0 @@
-<template>
-	<view class="content">
-
-
-		<nut-watermark v-if="detail.status?.value === 10" class="mark1" :z-index="1" content="此商品已下架"></nut-watermark>
-		<nut-watermark v-if="detail.status?.value === 30" class="mark1" :z-index="1" content="此商品已锁定"></nut-watermark>
-		<nut-watermark v-if="detail.status?.value === 40" class="mark1" :z-index="1" content="此商品已售出"></nut-watermark>
-
-
-		<swiper class="swiper" circular indicator-dots autoplay>
-			<swiper-item @click="showGoodsImages(idx)" v-for="(item,idx) in detail.image" :key="idx">
-				<image :src="item.file_path" mode="aspectFill"></image>
-			</swiper-item>
-		</swiper>
-
-
-
-		<view class='goods_info'>
-			<nut-cell-group>
-				<view class="price">
-					<text class="unit">￥</text>
-					<text class="value">{{detail.goods_price}}</text>
-				</view>
-			</nut-cell-group>
-			<nut-cell-group>
-				<view class="name">
-					<view class="top">
-						<view class="tag">
-							<text>{{detail.degree?.degree_name}}</text>
-						</view>
-						<text class="title">{{detail.goods_name}}</text>
-					</view>
-					<view>
-						<text class="info">{{detail.content}}</text>
-					</view>
-				</view>
-			</nut-cell-group>
-			<view class="service">
-				<view class="info">
-					<text class="title">服务</text>
-					<text class="value">{{serviceTxt}}</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		reactive,
-		ref
-	} from 'vue';
-	import {
-		navigateTo,
-		switchTab,
-		goToLoginPage
-	} from '@/utils/helper';
-	import {
-		onShareAppMessage,
-		onShareTimeline,
-		onLoad
-	} from '@dcloudio/uni-app'
-	import {
-		fetchGoodsDetail,
-	} from '@/api/goods';
-
-
-	import {
-		fetchGetConfig,
-	} from '@/api/config';
-
-	// 审核模式 默认开启 true
-	// const audit = ref(true);
-	const serviceTxt = ref('')
-
-
-
-	const id = ref(0)
-	const detail = reactive({})
-
-
-	onLoad(options => {
-		console.log('init');
-		// 获取配置
-		getConfig()
-
-		// 获取商品详情
-		id.value = options.id
-		fetchGoodsDetail(id.value).then(res => {
-			Object.assign(detail, res)
-		})
-	})
-
-
-
-
-
-
-	// 获取配置
-	const getConfig = () => {
-		fetchGetConfig().then(res => {
-			console.log('getConfig=====>', res)
-			// audit.value = res.appConfig.is_audit == 1
-			serviceTxt.value = res.appConfig.service_txt
-		})
-	}
-
-	// 分享给朋友圈
-	onShareTimeline((res) => {
-		return {
-			title: detail.goods_name,
-			path: '/pages/mall/detail?id=' + detail.goods_id,
-			imageUrl: detail.image[0].file_path
-		};
-	})
-
-
-	// 分享
-	onShareAppMessage((res) => {
-		return {
-			title: detail.goods_name,
-			path: '/pages/mall/detail?id=' + detail.goods_id,
-			imageUrl: detail.image[0].file_path
-		}
-	})
-
-
-
-	// 显示图片
-	const showGoodsImages = (index) => {
-		uni.previewImage({
-			current: index, // 指定当前显示的图片索引
-			urls: detail.image.map(e => {
-				return e.file_path
-			}),
-		});
-	}
-</script>
-
-<style scoped lang="scss">
-	.bottom-action {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		height: 50px;
-		background: #fff;
-		width: calc(100% - 20px);
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		margin: 0 auto;
-		padding: 5px 10px;
-
-		.bottom-action-icon {
-			align-items: center;
-			display: flex;
-			justify-content: center;
-
-			.bottom-action-icon-item {
-				align-items: center;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-
-				text {
-					color: rgba(0, 0, 0, .5);
-					font-size: 11px;
-				}
-			}
-
-		}
-
-		.bottom-action-btn {
-			-ms-flex-align: center;
-			-ms-flex-pack: end;
-			-webkit-align-items: center;
-			align-items: center;
-			display: -webkit-flex;
-			display: -ms-flexbox;
-			display: flex;
-			gap: 5px;
-			-webkit-justify-content: flex-end;
-			justify-content: flex-end;
-		}
-	}
-
-	.content {
-		display: flex;
-		flex-direction: column;
-		min-height: calc(100vh - 50px); //100vh;
-		/* align-items: center; */
-		// justify-content: center;
-		background-color: #f2f3f5;
-		// height: calc(100% - 50px);
-		--nut-cell-group-title-color: #000;
-		--nut-collapse-item-padding: 10px 10px 10px 10px;
-		--nut-collapse-wrapper-content-padding: 10px 10px 10px 10px;
-		--nut-collapse-item-color: #000;
-		padding-bottom: 50px;
-	}
-
-	.report-inner {
-		display: flex;
-		flex-direction: column;
-		gap: 5px;
-
-		.report-item {
-			.report-item-name {
-				color: rgba(0, 0, 0, .9);
-				font-weight: 700;
-			}
-
-			.report-item-content {
-				display: flex;
-				flex-wrap: wrap;
-
-				.report-item-content-item {
-					padding-top: 2px;
-					padding-bottom: 2px;
-					width: 50%;
-					display: flex;
-					align-items: center;
-				}
-			}
-		}
-
-	}
-
-	.count-item {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		gap: 2px;
-	}
-
-	.swiper {
-		width: 100%;
-		height: 414px;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.goods_info {
-		padding: 5px;
-		color: #000;
-
-		.price {
-			border-radius: 5px;
-			padding: 10px;
-			background: #fff;
-
-			.unit {
-				font-size: 12px;
-			}
-
-			.value {
-				font-size: 24px;
-			}
-		}
-
-		.name {
-			border-radius: 5px;
-			padding: 10px;
-			background: #fff;
-
-			display: flex;
-			gap: 5px;
-			flex-direction: column;
-
-			.top {
-				display: flex;
-				gap: 5px;
-
-				.tag {
-					background: #000;
-					padding: 1px 2px;
-					justify-content: center;
-					align-items: center;
-					display: flex;
-					border-radius: 2px;
-
-					text {
-						font-size: 10px;
-						color: #fff;
-					}
-				}
-
-				.title {
-					font-size: 16px;
-				}
-			}
-
-			.info {
-				color: rgba(0, 0, 0, .7);
-				font-size: 13px;
-			}
-		}
-
-		.service {
-			border-radius: 5px;
-			padding: 10px;
-			background: #fff;
-
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-
-			.info {
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				gap: 5px;
-
-				.title {
-					font-size: 16px;
-				}
-
-				.value {
-					color: rgba(0, 0, 0, .7);
-					font-size: 13px;
-				}
-			}
-
-			.right_icon {
-				background-color: currentColor;
-				mask: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDI0IDEwMjQiPjxwYXRoIGZpbGw9IiMxQTFBMUEiIGQ9Ik0zNTMuODMgMTU4LjE3YTQyLjY3IDQyLjY3IDAgMSAxIDYwLjM0LTYwLjM0bDM4NCAzODRhNDIuNjcgNDIuNjcgMCAwIDEgMCA2MC4zNmwtMzg0IDM4NGE0Mi42NyA0Mi42NyAwIDEgMS02MC4zNC02MC4zNkw3MDcuNjcgNTEyeiIvPjwvc3ZnPg==') 0 0/100% 100% no-repeat;
-				width: 12px;
-				height: 12px;
-			}
-		}
-
-		.report {
-			border-radius: 5px;
-			padding: 1px;
-			background: #fff;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/config/goodsEdit.vue b/pages/config/goodsEdit.vue
deleted file mode 100644
index aa4e7a4..0000000
--- a/pages/config/goodsEdit.vue
+++ /dev/null
@@ -1,339 +0,0 @@
-<template>
-
-	<view class="page-content">
-
-		<view v-if="is_show_edit" style=" padding: 20rpx;">
-
-
-			<nut-form>
-				<nut-form-item label="名称">
-					<nut-input v-model="form.goods_name" class="nut-input-text" placeholder="请输入名称" type="text" />
-				</nut-form-item>
-
-				<nut-form-item label="串号">
-					<nut-input v-model="form.goods_no" class="nut-input-text" placeholder="请输入串号" type="text">
-						<template #right>
-							<nut-icon @click="onScan" name="scan2" size="30" custom-color="#000000" />
-						</template>
-					</nut-input>
-				</nut-form-item>
-
-				<nut-form-item label="售价">
-					<nut-input v-model="form.goods_price" class="nut-input-text" placeholder="请输入售价" type="nubmer" />
-				</nut-form-item>
-
-
-				<nut-form-item label="说明">
-					<nut-textarea v-model="form.content" autosize placeholder="请输入说明" type="text" />
-				</nut-form-item>
-
-				<nut-form-item label="介绍">
-					<nut-textarea v-model="form.details_content" autosize placeholder="请输入介绍" type="text" />
-				</nut-form-item>
-
-
-				<!-- 	<nut-form-item label="上架人">
-					<nut-input v-model="form.add_person" class="nut-input-text" placeholder="请输入上架人" type="text" />
-				</nut-form-item> -->
-				<!-- 	<nut-form-item label="排序">
-					<nut-input v-model="form.goods_sort" class="nut-input-text" placeholder="请输入排序" type="number" />
-				</nut-form-item> -->
-
-
-
-				<nut-form-item label="状态">
-					<nut-radio-group direction="horizontal" v-model="form.status">
-						<nut-radio label="10">下架</nut-radio>
-						<nut-radio label="20">上架</nut-radio>
-					</nut-radio-group>
-				</nut-form-item>
-
-				<nut-form-item>
-					<template v-slot:label>成色</template>
-					<template v-slot:default>
-						<view style="color: black;" @click="show_degree_popup = true">
-							<text>{{form.degree_name}}</text>
-						</view>
-					</template>
-				</nut-form-item>
-
-
-				<nut-form-item>
-					<template v-slot:label>机型</template>
-					<template v-slot:default>
-						<view style="color: black;" @click="show_product_cascader = true">
-							<text>{{form.type_name}},{{form.brand_name}},{{form.product_name}}</text>
-						</view>
-					</template>
-				</nut-form-item>
-
-				<nut-form-item>
-					<template v-slot:label>商品图片</template>
-					<template v-slot:default>
-						<shmily-drag-image v-model="form.images" :number=9 :add-image="addGoodsImg"
-							keyName="file_path"></shmily-drag-image></template>
-				</nut-form-item>
-
-
-
-
-				<view style="align-items: center;text-align: center; padding: 20rpx 60rpx;">
-					<nut-button type="primary" block @click="onSubmit">
-						保存修改
-					</nut-button>
-				</view>
-			</nut-form>
-
-		</view>
-
-
-		<nut-popup v-model:visible="show_degree_popup" position="bottom" safe-area-inset-bottom>
-			<nut-picker v-model="popup_degree_val" :columns="filter_params.degree_list"
-				:field-names="{text:'degree_name',value:'degree_id'}" title="选择成色" @confirm="onConfirmDegree"
-				@cancel="show_degree_popup = false">
-			</nut-picker>
-		</nut-popup>
-
-		<nut-cascader title="机型选择" v-model:visible="show_product_cascader" v-model="cascader_product_val"
-			@change="onProductChange" @pathChange="onProcutPathChange" text-key="label" value-key="value"
-			:title-ellipsis="false" children-key="children" :options="filter_params.drop_down_options"></nut-cascader>
-	</view>
-</template>
-
-<script setup>
-	import {
-		onMounted,
-		reactive,
-		ref,
-		toValue,
-		computed
-	} from 'vue';
-	import {
-		onLoad
-	} from '@dcloudio/uni-app'
-
-
-	import {
-		fetchFilterParmas,
-		fetchGoodsEdit,
-		fetchGoodsDetail,
-	} from '@/api/goods';
-	import {
-		getUploadImageUrl,
-	} from '@/api/request';
-
-	const id = ref(0)
-	// 是否显示结果页
-	const is_show_edit = ref(false);
-	// 显示机型选择
-	const show_product_cascader = ref(false)
-	// 显示成色
-	const show_degree_popup = ref(false)
-	const popup_degree_val = ref([])
-	const cascader_product_val = ref([])
-	const filter_params = reactive({})
-	const form = reactive({
-		goods_id: 0,
-		goods_name: '',
-		goods_no: '',
-		goods_price: '',
-		goods_stock: '',
-		content: '',
-		details_content: '',
-		status: '10',
-		images: [],
-		add_person: '',
-		degree_id: 0,
-		degree_name: '未选择',
-		type_id: 0,
-		type_name: '未选择',
-		brand_id: 0,
-		brand_name: '未选择',
-		product_id: 0,
-		product_name: '未选择',
-	})
-
-
-
-	// 
-	onMounted(() => {
-		fetchFilterParmas(1).then(res => {
-			Object.assign(filter_params, res)
-			filter_params.degree_list.unshift({
-				degree_id: 0,
-				degree_name: '未选择'
-			})
-			console.log('filter_params', filter_params)
-		})
-	})
-
-	onLoad(options => {
-		console.log("goods_id===>", options.id);
-		// 获取商品详情
-		id.value = options.id
-		is_show_edit.value = false;
-		fetchGoodsDetail(id.value).then(res => {
-			is_show_edit.value = true;
-			console.log("====>", res);
-			form.goods_id = res.goods_id
-			form.goods_name = res.goods_name
-			form.goods_no = res.goods_no
-			form.goods_price = res.goods_price
-			// form.goods_stock = res.goods_stock
-			form.content = res.content
-			form.details_content = res.details_content
-			form.status = res.status.value.toString()
-	
-			form.degree_id = res.degree?.degree_id ?? 0
-			form.degree_name = res.degree?.degree_name ?? '未选择'
-			form.type_id = res.type?.type_id ?? 0
-			form.type_name = res.type?.name ?? '未选择'
-			form.brand_id = res.brand?.brand_id ?? 0
-			form.brand_name = res.brand?.name ?? '未选择'
-			form.product_id = res.product?.product_id ?? 0
-			form.product_name = res.product?.name ?? '未选择'
-			popup_degree_val.value = [res.degree?.degree_id ?? 0]
-			cascader_product_val.value = [res.type?.type_id ?? 0, res.brand?.brand_id ?? 0, res.product
-				?.product_id ?? 0
-			]
-			form.images = []
-			res.image?.forEach(item => {
-				form.images.push({
-					id: item.image_id,
-					file_path: item.file_path,
-				})
-			})
-		})
-	})
-
-	const onProductChange = (...args) => {
-		console.log(0, ...args)
-		console.log(cascader_product_val)
-	}
-
-	const onSubmit = () => {
-		console.log('form===>', form);
-		fetchGoodsEdit(form).then(res => {
-			uni.showToast({
-				icon: 'none',
-				title: '编辑商品成功'
-			})
-			setTimeout(() => {
-				uni.navigateBack({
-					delta: 1 // 返回上一页
-				});
-			}, 500)
-		})
-	}
-
-
-
-
-	// 扫码
-	const onScan = () => {
-		uni.scanCode({
-			onlyFromCamera: true,
-			success: (res) => {
-				console.log(res);
-				form.goods_no = res.result
-			},
-			fail: () => {
-				uni.showToast({
-					icon: 'none',
-					title: '扫码失败'
-				})
-			}
-		})
-	}
-
-	const onProcutPathChange = (args) => {
-		console.log(args);
-		form.type_id = 0
-		form.type_name = ''
-		form.brand_id = 0
-		form.brand_name = ''
-		form.product_id = 0
-		form.product_name = ''
-		if (args.length >= 1 && args[0] !== null) {
-			form.type_id = args[0].value
-			form.type_name = args[0].text
-		}
-		if (args.length >= 2 && args[1] !== null) {
-			form.brand_id = args[1].value
-			form.brand_name = args[1].text
-		}
-		if (args.length >= 3 && args[2] !== null) {
-			form.product_id = args[2].value
-			form.product_name = args[2].text
-		}
-	}
-	const onConfirmDegree = () => {
-		form.degree_id = popup_degree_val.value[0]
-		filter_params.degree_list.forEach(item => {
-			if (item.degree_id === form.degree_id) {
-				form.degree_name = item.degree_name
-			}
-		})
-		show_degree_popup.value = false
-	}
-
-
-	
-	// 上传商品图片
-	const addGoodsImg = () => {
-		uni.chooseImage({
-			count: 9 - (form.image?.length || 0),
-			sourceType: ['album', 'camera'],
-			success: res => {
-				res.tempFiles.forEach(file => {
-					uni.uploadFile({
-						url: getUploadImageUrl(),
-						filePath: file.path,
-						name: 'iFile',
-						formData: {
-							group_id: 1,
-						},
-						success: (res) => {
-							let data = JSON.parse(res.data).data
-							form.images.push({
-								id: parseInt(data.file_id),
-								file_path: data.file_path,
-							})
-						}
-					})
-				})
-			}
-		})
-	}
-	
-</script>
-
-<style lang="scss" scoped>
-	.page-content {
-		min-height: 100vh;
-		background-color: #f2f3f5;
-		--nut-searchbar-input-height: 40px;
-	}
-
-
-
-
-
-
-	// .list {
-	// 	display: flex;
-	// 	justify-content: center;
-	// 	flex-direction: column;
-	// 	background: #ffffff;
-	// 	align-items: center;
-	// 	max-height: 300rpx;
-	// 	overflow-y: scroll;
-	// 	padding: 10px;
-
-	// 	.list-item {
-	// 		border-bottom: 1px solid #eee;
-	// 		padding: 20rpx 10rpx;
-
-	// 	}
-	// }
-</style>
\ No newline at end of file
diff --git a/pages/config/goodsList.vue b/pages/config/goodsList.vue
deleted file mode 100644
index 9df4f3c..0000000
--- a/pages/config/goodsList.vue
+++ /dev/null
@@ -1,705 +0,0 @@
-<template>
-	<view class="page-content">
-		<z-paging ref="paging" :refresher-enabled="false" :auto-clean-list-when-reload="false"
-			:auto-scroll-to-top-when-reload="false" v-model="dataList" @query="queryList">
-			<view style="z-index: 10000;position: sticky;" :style="'top:0px'">
-				<view class="top-bar">
-					<nut-button type="primary" block plain @click="navigateTo('/pages/config/goodsAdd')">
-						新增订单
-					</nut-button>
-				</view>
-			</view>
-
-			<view class="goods-item" v-for="(item, index) in dataList" :key="index">
-				<view class="goods-item-image">
-					<!-- @click="showGoodsImages(item)" -->
-					<image class="goods-item-image-img" :src="getImg(item)"  @click="navigateTo('/pages/config/goodsDetail?id=' + item.goods_id)"
-						mode="scaleToFill">
-					</image>
-				</view>
-				<view class="goods-item-content">
-					<!-- @click="navigateTo('/pages/control/goods/edit?id=' + item.goods_id)" -->
-					<view class="goods-item-content-header">
-						<nut-tag custom-color="#1a1a1a">{{ item.degree.degree_name }}</nut-tag>
-						<view>{{item.goods_name}}</view>
-					</view>
-					<!-- @click="navigateTo('/pages/control/goods/edit?id=' + item.goods_id)" -->
-					<view class="goods-item-content-body">
-						<view class="goods-item-content-body-desc">
-							{{item.content}}
-						</view>
-					</view>
-					<view class="goods-item-content-footer">
-						<view style="font-size: 24rpx;color: red;">
-							<text>¥{{item.goods_price}}</text>
-						</view>
-						<view style="font-size: 24rpx;">
-							状态:<text>{{item.status.text}}</text>
-						</view>
-						<view class="goods-item-content-footer-btn">
-							<nut-button size="small" type="primary"
-								v-if="item.status.value == 10 || item.status.value == 20"
-								@click="navigateTo('/pages/config/goodsEdit?id=' + item.goods_id)">
-								编辑商品
-							</nut-button>
-							<nut-button size="small" type="primary" v-if="item.status.value == 40 "
-								@click="navigateTo('/pages/config/goodsEdit?id=' + item.goods_id)">
-								售后(重新上架)
-							</nut-button>
-						</view>
-					</view>
-				</view>
-			</view>
-		</z-paging>
-	</view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		reactive,
-		onMounted,
-		computed
-	} from 'vue'
-
-	import {
-		onLoad,
-		onShow,
-	} from '@dcloudio/uni-app'
-	// import {
-
-	// 	fetchFilterParmas
-	// } from '@/api/goods';
-	import {
-		fetchFilterParmas,
-		fetchSysGoodsList
-	} from '@/api/goods';
-
-	import {
-		navigateTo,
-		// switchTab,
-		// goToOtherMiniProgram
-	} from '@/utils/helper';
-
-
-	// 显示商品图片
-	const showGoodsImages = (goods) => {
-		console.log(goods);
-		uni.previewImage({
-			// current: index,  // 指定当前显示的图片索引
-			urls: goods?.image.map(e => {
-				return e.file_path
-			}),
-		});
-	}
-
-	const getImg = (goods) => {
-		const url = goods?.image?.[0]?.file_path
-		return url ? url + '?imageView2/1/w/200/h/200' : ''
-	}
-
-
-	// zp
-	const paging = ref(null);
-	// 商品列表
-	const dataList = ref([]);
-
-	// 价格排序
-	const selectPriceSortRef = ref(null);
-	// 成色选择
-	const selectDegreeRef = ref(null);
-	// 机型选择
-	const selectProductRef = ref(null)
-
-	const state = reactive({
-		type_params: [], // 产品类型
-		drop_down_options: [], // 产品类型下的品牌列表
-		o_drop_down_options: [],
-		// 价格排序
-		price_sort_params: [{
-				text: '默认排序',
-				value: ''
-			},
-			{
-				text: '价格升序',
-				value: 'ascend'
-			},
-			{
-				text: '价格降序',
-				value: 'descend'
-			}
-		],
-		// 成色所有选项
-		degree_params: [],
-		price_sort: '',
-		price_sort_name: "默认排序",
-		degree_ids: [],
-		degree_name: "成色",
-		product_name: "机型",
-		type_id: 1, // 产品类型id 默认 1 手机
-		type_name: '手机',
-		brand_id: 0, // 品牌id // 默认 0 全部
-		brand_name: '全部',
-		product_ids: [0], // 机型ids 默认 0 全部
-		search_val: '', // 搜索
-	});
-
-
-
-
-
-	// 搜索
-	const onSearch = () => {
-		console.log("搜索：", state.search_val);
-		paging.value.reload();
-
-	}
-	// 清空搜索框
-	const onClear = () => {
-		console.log("搜索：", state.search_val);
-		paging.value.reload();
-	}
-
-
-
-	// 机型重置
-	const onResetProduct = () => {
-		console.log("重置产品");
-		state.type_id = 1
-		state.type_name = '手机'
-		state.brand_id = 0
-		state.brand_name = '全部'
-		state.product_ids = [0]
-		state.product_name = '机型'
-	}
-	// 机型确定
-	const onConfirmProduct = () => {
-		console.log("当前产品类型", {
-			"type_id": state.type_id,
-			"type_name": state.type_name,
-			"brand_id": state.brand_id,
-			"brand_name": state.brand_name,
-			"product_ids": state.product_ids,
-		});
-		selectProductRef.value?.toggle(false);
-		// 4. 刷新数据
-		paging.value.reload();
-	}
-
-	// 选择机型
-	const selectProduct = (product) => {
-		if (product.value === 0) {
-			state.product_ids = [0]
-		} else {
-			state.product_ids = state.product_ids.filter(e => e != 0)
-			// 判断是否存在
-			const index = state.product_ids.indexOf(product.value);
-			if (index > -1) {
-				state.product_ids.splice(index, 1); // 存在则删除
-				if (state.product_ids.length === 0) {
-					state.product_ids = [0]
-				}
-			} else {
-				state.product_ids.push(product.value); // 新增
-			}
-		}
-		console.log(product);
-	}
-
-	const productOptions = computed(() => {
-		return state?.o_drop_down_options[state.type_id]?.children[state.brand_id].children
-	})
-
-
-	// 选择品牌
-	const selectBrand = (brand) => {
-		console.log(brand);
-		// 选中的品牌id
-		state.brand_id = brand.value;
-		state.brand_name = brand.label
-		// 品牌下的产品ids
-		state.product_ids = [0];
-		state.product_name = brand.label
-	}
-	// 选择type
-	const selectType = (type) => {
-		console.log(type);
-		// 选中产品类型id
-		state.type_id = type.type_id;
-		state.type_name = type.name;
-		// 选中的品牌id
-		state.brand_id = 0;
-		state.brand_name = '全部';
-		// 品牌下的产品ids
-		state.product_ids = [0];
-	}
-
-	// 选择价格排序
-	const selectPriceSort = (item) => {
-		if (state.price_sort !== item.value) {
-			state.price_sort = item.value
-			state.price_sort_name = item.text
-		} else {
-			state.price_sort_name = '默认排序'
-			state.price_sort = ''
-		}
-		selectPriceSortRef.value?.toggle(false);
-		// 4. 刷新数据
-		paging.value.reload();
-	};
-
-	// 选择成色
-	const selectDegree = (item) => {
-		const index = state.degree_ids.indexOf(item.value);
-		if (index > -1) {
-			state.degree_ids.splice(index, 1);
-		} else {
-			state.degree_ids.push(item.value);
-		}
-		if (state.degree_ids.length > 0) {
-			state.degree_name = '已选' + state.degree_ids.length.toString() + '项'
-		} else {
-			state.degree_name = '成色'
-		}
-	}
-
-	// 重置选择成色
-	const onResetDegree = () => {
-		state.degree_ids = [];
-		state.degree_name = '成色'
-		selectDegreeRef.value?.toggle(false);
-		// 4. 刷新数据
-		paging.value.reload();
-	}
-	// 确认选择成色
-	const onConfirmDegree = () => {
-		if (state.degree_ids.length > 0) {
-			state.degree_name = '已选' + state.degree_ids.length.toString() + '项'
-		} else {
-			state.degree_name = '成色'
-		}
-		selectDegreeRef.value?.toggle(false);
-		// 4. 刷新数据
-		paging.value.reload();
-	}
-
-
-	// 获取列表
-	const queryList = (pageNo, pageSize) => {
-		const params = {
-			pageSize,
-			page: pageNo,
-			price_sort: state.price_sort,
-			degree_ids: state.degree_ids,
-			type_id: state.type_id,
-			brand_id: state.brand_id,
-			product_ids: state.product_ids,
-			search: state.search_val,
-		}
-		console.log(params);
-		fetchSysGoodsList(params).then(res => {
-			console.log('res=>', res.list);
-			paging.value.complete(res.list);
-
-		}).catch(res => {
-			paging.value.complete(false);
-
-		});
-	};
-
-
-
-
-
-
-
-
-	const init = () => {
-		console.log('init111');
-		// 加载默认筛选项内容
-		fetchFilterParmas().then(res => {
-			console.log(res);
-			// 处理成色
-			let degree_params = res.degree_list;
-			state.degree_params = degree_params.reduce((it, cit) => {
-				it.push({
-					text: cit.degree_name,
-					value: cit.degree_id
-				});
-				return it;
-			}, state.degree_params) || [];
-			// 产品类型
-			state.type_params = res.type_list
-			// 产品下品牌列表
-			state.drop_down_options = res.drop_down_options
-			state.o_drop_down_options = res.o_drop_down_options
-		})
-	}
-
-	onShow(() => {
-		console.log("onshow---");
-		console.log('paging.value', paging.value);
-		if (paging.value) {
-			// paging.value.pageNo = 1; 
-			paging.value.refresh();
-			// paging.value.refreshToPage(1)
-			// paging.value.reload();
-		}
-
-	});
-	onMounted(() => {
-		init();
-	})
-</script>
-
-<style scoped lang="scss">
-	.page-content {
-		min-height: 100vh;
-		background-color: #f2f3f5;
-		--nut-menu-bar-box-shadow: none;
-		--nut-menu-item-content-padding: 20rpx;
-		--nut-menu-item-content-max-height: 900rpx;
-
-
-
-		// --nut-searchbar-input-padding:5px 0 5px 13px;
-		--nut-searchbar-input-height: 40px;
-	}
-
-	:deep(.titleClass) .nut-menu__title-text {
-		font-size: 30rpx;
-		font-weight: bold;
-		color: black;
-	}
-
-	.top-bar {
-		background: #fff;
-		// padding: 20rpx;
-		align-items: center;
-		text-align: center;
-		padding: 20rpx 60rpx;
-		// display: flex;
-		// justify-content: space-between;
-		// border-top: 1px solid #eee;
-		// position: sticky;
-		// bottom: 0;
-		// z-index: 999;
-	}
-
-
-	.goods-item {
-
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-		padding: 20rpx;
-		background-color: #ffffff;
-		// border-radius: 20rpx;
-		margin-bottom: 20rpx;
-		gap: 20rpx;
-
-		.goods-item-image {
-			width: 180rpx;
-			height: 180rpx;
-
-			.goods-item-image-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.goods-item-content {
-			// width: 100%;
-			display: flex;
-			flex: 1;
-			flex-direction: column;
-			justify-content: space-between;
-			/* 首尾贴边，中间均分 */
-
-			// gap: 15px;
-			.goods-item-content-header {
-				display: flex;
-				align-items: center;
-				padding: 6rpx 0;
-				gap: 20rpx;
-			}
-
-			.goods-item-content-body {
-				padding: 6rpx 0;
-
-				.goods-item-content-body-desc {
-					color: #7c7c7c;
-					font-size: 26rpx;
-					/* 关键属性 */
-					display: -webkit-box;
-					/* 使用弹性盒子布局 */
-					-webkit-box-orient: vertical;
-					/* 垂直方向排列 */
-					-webkit-line-clamp: 2;
-					/* 限制显示两行 */
-					overflow: hidden;
-					/* 超出部分隐藏 */
-					text-overflow: ellipsis;
-					/* 超出时显示省略号 */
-				}
-			}
-
-			.goods-item-content-stock {
-				display: flex;
-				justify-content: space-between;
-
-				.goods-item-content-stock-desc {
-					font-size: 26rpx;
-					color: #999999;
-				}
-
-				.goods-item-content-status-desc {
-					font-size: 26rpx;
-					color: red;
-				}
-			}
-
-			.goods-item-content-footer {
-				padding: 6rpx 0;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				// 	width: 100%;
-				// 	flex-direction: row;
-
-				.goods-item-content-footer-btn {
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					gap: 10rpx;
-
-					.share-btn {
-						border-radius: 50rpx;
-						border: 2rpx solid red;
-						font-size: 26rpx;
-						align-items: center;
-						height: 54rpx;
-						color: red;
-						display: flex;
-						justify-content: center;
-					}
-				}
-			}
-		}
-	}
-
-
-
-	.filter-types {
-
-		display: flex;
-		justify-content: flex-start;
-		flex-direction: row;
-		align-items: center;
-		overflow: auto;
-		gap: 10rpx;
-		padding: 10rpx;
-		// position: fixed;
-		// top: 0;
-		height: 60rpx;
-		// z-index: 9999;
-		background-color: #fff;
-		border-bottom: 2rpx solid gainsboro;
-		border-top: 2rpx solid gainsboro;
-
-		.filter-type-inner {
-			align-items: center;
-			background-color: rgba(0, 0, 0, .05);
-			border-radius: 16rpx;
-			box-sizing: border-box;
-			display: -webkit-flex;
-			display: -ms-flexbox;
-			display: flex;
-			flex: 0 0 auto;
-			font-size: 28rpx;
-			gap: 15rpx;
-			padding: 10rpx 20rpx;
-
-			// image {
-			// 	height: 22px;
-			// 	width: 22px;
-			// }
-		}
-
-		.filter-type-inner.active {
-			background-color: rgba(250, 44, 25, .1);
-			color: var(--nutui-color-primary);
-		}
-	}
-
-	.tabs-container {
-		display: flex;
-
-		.tab-pane-inner {
-			height: 600rpx;
-		}
-
-		.tabs-inner {
-			overflow-y: scroll;
-			height: 600rpx;
-			width: 160rpx;
-			background-color: #F5F5F5;
-
-			.tab-inner {
-				display: flex;
-				height: 60rpx;
-				padding: 10rpx;
-				font-size: 28rpx;
-				display: flex;
-				align-items: center;
-				background: #F5F5F5;
-
-				text {
-					width: 100%;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					text-align: center;
-				}
-			}
-
-			.tab-inner-active {
-				// background: #FFF;
-				background-color: rgba(250, 44, 25, .1);
-				color: var(--nutui-color-primary);
-			}
-		}
-	}
-
-
-
-	.degree-inner {
-		display: flex;
-		flex: 1;
-		flex-wrap: wrap;
-		// gap: 20rpx;
-		gap: 10rpx;
-		// padding: 11px;
-		width: 100%;
-		margin-bottom: 60rpx;
-	}
-
-	.degree-item {
-		align-items: center;
-		background-color: rgba(0, 0, 0, .05);
-		border-radius: 10rpx;
-		box-sizing: border-box;
-		display: flex;
-		flex: 0 0 auto;
-		font-size: 26rpx;
-		gap: 10rpx;
-		justify-content: center;
-		min-height: 80rpx;
-		width: calc(50% - 10rpx);
-	}
-
-	.degree-item.active {
-		background-color: rgba(250, 44, 25, .1);
-		color: var(--nutui-color-primary);
-	}
-
-	.product-btns {
-		display: flex;
-		width: 100%;
-		padding: 20rpx 0;
-
-		// border-bottom: 2rpx solid gainsboro;
-		// border-top: 2rpx solid gainsboro;
-
-		.reset {
-			flex: 1;
-
-		}
-
-		.confirm {
-			flex: 2;
-
-		}
-
-	}
-
-	.degree-btns {
-		display: flex;
-		width: 100%;
-
-		.reset {
-			flex: 1;
-			/* 重置按钮占 1 份 */
-		}
-
-		.confirm {
-			flex: 2;
-			/* 确认按钮占 2 份 */
-		}
-
-	}
-
-
-	.main-nav-container {
-		display: flex;
-		justify-content: space-between;
-		background-color: #fff;
-		padding: 20rpx;
-	}
-
-	.nav-button {
-		display: flex;
-		align-items: center;
-		width: 45%;
-		height: 160rpx;
-		border-radius: 20rpx;
-		overflow: hidden;
-		padding: 0 10rpx;
-	}
-
-	.phone-button {
-		background: linear-gradient(135deg, #6a5ae0, #8d7bfb);
-		color: white;
-	}
-
-	.parts-button {
-		background: linear-gradient(135deg, #ff6b6b, #ee5253);
-		color: white;
-	}
-
-	.nav-button-bg {
-		position: absolute;
-		right: 0;
-		top: 0;
-		height: 100%;
-		width: 50%;
-		opacity: 0.2;
-		object-fit: cover;
-	}
-
-	.nav-button-icon {
-		width: 90rpx;
-		height: 90rpx;
-		margin-right: 20rpx;
-		// border-radius: 20rpx;
-		z-index: 2;
-	}
-
-	.nav-button-content {
-		z-index: 2;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.nav-button-title {
-		font-size: 34rpx;
-		font-weight: bold;
-		margin-bottom: 8rpx;
-	}
-
-	.nav-button-desc {
-		font-size: 24rpx;
-		opacity: 0.85;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/config/price.vue b/pages/config/price.vue
deleted file mode 100644
index b39e770..0000000
--- a/pages/config/price.vue
+++ /dev/null
@@ -1,1238 +0,0 @@
-<template>
-	<view class="page-content">
-
-		<!-- 固定顶部 Tabs -->
-		<view class="tabs-wrapper">
-			<z-tabs :list="tabList" active-color="rgba(233, 100, 67, 1)" @change="tabsChange" />
-			<nut-noticebar v-if="tabIndex==0" text="区间调价：可以针对价格区间进行批量固定加价，或者按照原价的百分比加价"
-				:background="`rgba(251, 248, 220, 1)`" :custom-color="`#D9500B`"></nut-noticebar>
-			<nut-noticebar v-if="tabIndex==1" text="单机调价：针对某款机器进行固定加价，或者按照原价的百分比加价"
-				:background="`rgba(251, 248, 220, 1)`" :custom-color="`#D9500B`"></nut-noticebar>
-			<nut-noticebar v-if="tabIndex==2" text="整仓调价：针对整个仓库进行固定加价，或者按照原价的百分比加价"
-				:background="`rgba(251, 248, 220, 1)`" :custom-color="`#D9500B`"></nut-noticebar>
-		</view>
-
-
-		<!-- 区间调价 -->
-		<view v-if="tabIndex==0">
-			<!-- 滚动内容区 -->
-			<scroll-view class="scroll-area" scroll-y="true" scroll-with-animation="true">
-				<!-- 固定顶部按钮 -->
-				<view class="top-bar">
-					<nut-button type="primary" plain @click="addRule">新增规则</nut-button>
-					<nut-button type="primary" @click="saveRangeRule">保存配置</nut-button>
-				</view>
-				<view class="rule-item" v-for="(item, index) in rangeRule" :key="index">
-					<!-- 第一行：最低价 + 最高价 -->
-					<view class="row">
-						<view class="field">
-							<text class="label">最低价</text>
-							<nut-input v-model="item.min_price" type="number" placeholder="0" input-align="right" />
-						</view>
-						<view class="field">
-							<text class="label">最高价</text>
-							<nut-input v-model="item.max_price" type="number" placeholder="0" input-align="right" />
-						</view>
-					</view>
-					<!-- 第二行：加价金额 + 加价类型（单选） -->
-					<view class="row">
-						<view class="field">
-							<text class="label">加价金额/百分比</text>
-							<nut-input v-model="item.val" type="number" placeholder="0" input-align="right" />
-						</view>
-						<view class="field">
-							<text class="label">加价类型</text>
-							<nut-radio-group v-model="item.val_type" direction="horizontal">
-								<nut-radio :label="1">固定加价</nut-radio>
-								<nut-radio :label="2">百分比加价</nut-radio>
-							</nut-radio-group>
-						</view>
-					</view>
-					<!-- 删除按钮 -->
-					<view class="delete-btn">
-						<nut-button type="danger" size="mini" @click="removeRule(index)">删除</nut-button>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-
-		<!-- 单机调价 -->
-		<view v-if="tabIndex==1">
-			<view class="top-select">
-				<nut-menu title-class="titleClass">
-					<!-- 价格排序 -->
-					<nut-menu-item :title="state.price_sort_name" ref="selectPriceSortRef">
-						<view style="display: flex;flex-direction: column;width: 100%;padding: 0px 12px;">
-							<view class="degree-inner">
-								<view class="degree-item" :class="{active: state.price_sort === item.value}"
-									v-for="(item,idx) in state.price_sort_params" :key="idx"
-									@click="selectPriceSort(item)">
-									<text>{{item.text}}</text>
-								</view>
-							</view>
-						</view>
-					</nut-menu-item>
-					<!-- 价格排序 -->
-					<!-- 机型选择 -->
-					<nut-menu-item :title="state.product_name" ref="selectProductRef">
-						<view style="display: flex;flex-direction: column;width: 100%;padding: 0px 0px;">
-							<view class="filter-types">
-								<view class="filter-type-inner" v-for="(type,idx) in state.type_params" :key="idx"
-									@click="selectType(type)" :class="{active: state.type_id == type.type_id}">
-									<text>{{type.name}}</text>
-								</view>
-							</view>
-							<view class="tabs-container">
-								<scroll-view :show-scrollbar="false" scroll-y class="tabs-inner" enable-flex>
-									<view class="tab-inner"
-										v-for="(item,idx) in state?.drop_down_options[state.type_id]?.children"
-										:key="idx" @click="selectBrand(item)"
-										:class="{'tab-inner-active':item.value == state.brand_id}">
-										<view class="line"></view>
-										<text>{{item.label}}</text>
-									</view>
-								</scroll-view>
-								<scroll-view scroll-y class="tab-pane-inner" enable-flex>
-									<view style="display: flex;flex-direction: column;width: 100%;padding: 10rpx;">
-										<view class="degree-inner">
-											<view class="degree-item" v-for="(item,idx) in productOptions" :key="idx"
-												:class="{active: state.product_ids.includes(item.value)}"
-												@click="selectProduct(item)">
-												<text>{{item.label}}</text>
-											</view>
-										</view>
-									</view>
-								</scroll-view>
-							</view>
-							<view class="product-btns">
-								<view class="reset">
-									<nut-button plain @click="onResetProduct()" type="default">重置</nut-button>
-								</view>
-								<view class="confirm">
-									<nut-button block @click="onConfirmProduct()" type="primary">确认</nut-button>
-								</view>
-							</view>
-						</view>
-					</nut-menu-item>
-					<!-- 机型选择 -->
-					<!-- 成色选择 -->
-					<nut-menu-item :title="state.degree_name" ref="selectDegreeRef">
-						<view style="display: flex;flex-direction: column;width: 100%;padding: 0px 12px;">
-							<view class="degree-inner">
-								<view class="degree-item" :class="{active: state.degree_ids.includes(item.value)}"
-									v-for="(item,idx) in state.degree_params" :key="idx" @click="selectDegree(item)">
-									<text>{{item.text}}</text>
-								</view>
-							</view>
-							<view class="degree-btns">
-								<view class="reset">
-									<nut-button plain @click="onResetDegree()" type="default">重置</nut-button>
-								</view>
-								<view class="confirm">
-									<nut-button block @click="onConfirmDegree()" type="primary">确认</nut-button>
-								</view>
-							</view>
-						</view>
-					</nut-menu-item>
-					<!-- 成色选择 -->
-				</nut-menu>
-			</view>
-
-			<view style="height: 80vh;">
-				<z-paging :fixed="false" ref="paging" :refresher-enabled="false" :auto-clean-list-when-reload="false"
-					:auto-scroll-to-top-when-reload="false" v-model="dataList" @query="queryList">
-					<view class="goods-item" v-for="(item, index) in dataList" :key="index">
-						<view class="goods-item-image">
-							<image class="goods-item-image-img" :src="getImg(item)" @click="showGoodsImages(item)"
-								mode="scaleToFill">
-							</image>
-						</view>
-						<view class="goods-item-content">
-							<view class="goods-item-content-header">
-								<nut-tag custom-color="#1a1a1a">{{ item.goods_house.degree.degree_name }}</nut-tag>
-								<view>{{item.goods_house.goods_name}}</view>
-							</view>
-							<view class="goods-item-content-body">
-								<view class="goods-item-content-body-desc">
-									{{item.goods_house.content}}
-								</view>
-							</view>
-
-							<view class="goods-item-content-footer">
-								<view>
-									<view>
-										<text style="font-size: 24rpx;">原价：
-											<text>{{item.goods_house.goods_price}}</text>
-										</text>
-									</view>
-									<view>
-										<text style="font-size: 24rpx;">售价：
-											<text>{{getPrice(item)}}</text>
-										</text>
-									</view>
-								</view>
-
-
-
-								<view class="goods-item-content-footer-btn">
-									<nut-button
-										v-if="!goods_cart_ids.includes(item.goods_id) && !user_goods_cart_ids.includes(item.goods_id)"
-										size="small" type="primary" @click="onEdit(item)">调价</nut-button>
-									<nut-button size="small" plain v-else>机器已锁定</nut-button>
-								</view>
-
-
-
-							</view>
-						</view>
-					</view>
-				</z-paging>
-
-
-			</view>
-
-		</view>
-
-
-
-		<!-- 弹出 -->
-		<nut-popup :custom-style="{ height: '45%' }" v-model:visible="showEdit" position="bottom" safe-area-inset-bottom
-			@close="onClosePopup">
-			<view>
-				<view class="goods-popup">
-					<view class="goods-card">
-						<view class="goods-card-left">
-							<image mode="aspectFill" :src="getImg(detail)" @click="showGoodsImages(detail)" />
-						</view>
-						<view class="goods-card-right">
-							<view class="goods-card-right-top">
-								<nut-tag custom-color="#1a1a1a">{{ detail?.goods_house?.degree?.degree_name }}</nut-tag>
-								<view> {{detail?.goods_house?.goods_name}}</view>
-							</view>
-							<view class="goods-card-right-middle">
-								{{detail?.goods_house?.content}}
-							</view>
-							<view>
-								<text style="font-size: 24rpx;">原价：
-									<text>{{detail?.goods_house?.goods_price}}</text>
-								</text>
-							</view>
-							<view>
-								<text style="font-size: 24rpx;">售价：
-									<text>{{getPrice(detail)}}</text>
-								</text>
-							</view>
-						</view>
-					</view>
-					<view class="goods-card-edit">
-						<view class="row">
-							<view class="field">
-								<text class="label">加价金额/百分比</text>
-								<nut-input v-model="tempSingleRule.val" type="number" placeholder="0"
-									input-align="right" />
-							</view>
-							<view class="field">
-								<text class="label">加价类型</text>
-								<nut-radio-group v-model="tempSingleRule.val_type" direction="horizontal">
-									<nut-radio :label="1">固定加价</nut-radio>
-									<nut-radio :label="2">百分比加价</nut-radio>
-								</nut-radio-group>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="wechat-img-inner" style="margin-top: 60rpx; padding: 0rpx 80rpx;">
-					<nut-button type="primary" block @click="saveSingleRule()">
-						调整价格
-					</nut-button>
-				</view>
-			</view>
-		</nut-popup>
-
-
-
-		<!-- 整仓调价 -->
-		<view style="padding: 20rpx;" v-if="tabIndex==2">
-			<view>
-				<h2 class="switch-lab">
-					是否开启整仓调价
-				</h2>
-				<nut-cell>
-					<nut-switch v-model="isWarehouse" @change="onIsWarehouseChange" />
-				</nut-cell>
-				<view class="warehouse">
-					<view class="warehouse-edit">
-						<view class="row">
-							<view class="field">
-								<text class="label">加价金额/百分比</text>
-								<nut-input v-model="warehouseRule.val" type="number" placeholder="0"
-									input-align="right" />
-							</view>
-							<view class="field">
-								<text class="label">加价类型</text>
-								<nut-radio-group v-model="warehouseRule.val_type" direction="horizontal">
-									<nut-radio :label="1">固定加价</nut-radio>
-									<nut-radio :label="2">百分比加价</nut-radio>
-								</nut-radio-group>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view style="margin-top: 60rpx; padding: 0rpx 80rpx;">
-					<nut-button type="primary" block @click="saveWarehouseRule()">
-						保存规则
-					</nut-button>
-				</view>
-				<view style="margin-top: 60rpx; padding: 0rpx 80rpx;">
-					注意：如果开启了整仓调价，那么区间调价将不会生效（不影响单机调价），如果需要区间调价请关闭整仓调价。
-				</view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script setup>
-	import {
-		onMounted,
-		reactive,
-		computed,
-		ref
-	} from 'vue'
-	import {
-		onLoad
-	} from '@dcloudio/uni-app';
-	import {
-		fetchSetPriceRules,
-		fetchGetPriceRules,
-		fetchGetConfig,
-		fetchSetConfig,
-	} from '@/api/config';
-
-
-	import {
-		houseFetchGoodsList,
-		houseFetchFilterParmas,
-	} from  '@/api/house_goods';
-
-
-	onLoad((options) => {})
-
-	const getImg = (goods) => {
-		const url = goods?.goods_house?.image?.[0]?.file_path
-		return url ? url + '?imageView2/1/w/200/h/200' : ''
-	}
-
-	// 获取配置
-	const getConfig = () => {
-		fetchGetConfig().then(res => {
-			console.log('getConfig=====>', res)
-			isWarehouse.value = res.appConfig.is_warehouse == 1
-		})
-	}
-
-	// 设置配置
-	const setConfig = () => {
-		let form = {
-			is_warehouse: Number(isWarehouse.value)
-		}
-		fetchSetConfig(form).then(res => {
-			uni.showToast({
-				icon: 'none',
-				title: '操作成功'
-			})
-		})
-	}
-
-
-
-
-	const getPrice = (goods) => {
-		const list = singleRule.value || singleRule; // 兼容 ref 和 reactive
-		// 根据 product_id 找对应规则
-		const rule = list.find(item => item.product_id === goods.goods_id);
-		if (!rule) {
-			return "未单独设置";
-		}
-		const basePrice = Number(goods.goods_price);
-		const val = Number(rule.val);
-		let finalPrice = basePrice;
-		// val_type 处理
-		if (rule.val_type == 1) {
-			// 固定加价
-			finalPrice = basePrice + val;
-		} else if (rule.val_type == 2) {
-			// 按百分比加
-			finalPrice = basePrice + (basePrice * val / 100);
-		}
-		// 保留两位小数
-		return finalPrice.toFixed(2);
-
-	}
-
-
-
-	// zp
-	const paging = ref(null);
-	// 商品列表
-	const dataList = ref([]);
-	// 用户购物车商品列表
-	const user_goods_cart_ids = ref([]);
-	// 全部购物车商品列表
-	const goods_cart_ids = ref([]);
-	// 价格排序
-	const selectPriceSortRef = ref(null);
-	// 成色选择
-	const selectDegreeRef = ref(null);
-	// 机型选择
-	const selectProductRef = ref(null)
-	const state = reactive({
-		type_params: [], // 产品类型
-		drop_down_options: [], // 产品类型下的品牌列表
-		o_drop_down_options: [],
-		// 价格排序
-		price_sort_params: [{
-				text: '默认排序',
-				value: ''
-			},
-			{
-				text: '价格升序',
-				value: 'ascend'
-			},
-			{
-				text: '价格降序',
-				value: 'descend'
-			}
-		],
-		// 成色所有选项
-		degree_params: [],
-		price_sort: '',
-		price_sort_name: "默认排序",
-		degree_ids: [],
-		degree_name: "成色",
-		product_name: "机型",
-		type_id: 1, // 产品类型id 默认 1 手机
-		type_name: '手机',
-		brand_id: 0, // 品牌id // 默认 0 全部
-		brand_name: '全部',
-		product_ids: [0], // 机型ids 默认 0 全部
-		// search_val: '', // 搜索
-	});
-
-
-
-
-	// 机型重置
-	const onResetProduct = () => {
-		console.log("重置产品");
-		state.type_id = 1
-		state.type_name = '手机'
-		state.brand_id = 0
-		state.brand_name = '全部'
-		state.product_ids = [0]
-		state.product_name = '机型'
-	}
-	// 机型确定
-
-	const onConfirmProduct = () => {
-		console.log("当前产品类型", {
-			"type_id": state.type_id,
-			"type_name": state.type_name,
-			"brand_id": state.brand_id,
-			"brand_name": state.brand_name,
-			"product_ids": state.product_ids,
-		});
-		selectProductRef.value?.toggle(false);
-		// 4. 刷新数据
-		paging.value.reload();
-	}
-	// 选择机型
-	const selectProduct = (product) => {
-		if (product.value === 0) {
-			state.product_ids = [0]
-		} else {
-			state.product_ids = state.product_ids.filter(e => e != 0)
-			// 判断是否存在
-			const index = state.product_ids.indexOf(product.value);
-			if (index > -1) {
-				state.product_ids.splice(index, 1); // 存在则删除
-				if (state.product_ids.length === 0) {
-					state.product_ids = [0]
-				}
-			} else {
-				state.product_ids.push(product.value); // 新增
-			}
-		}
-		console.log(product);
-	}
-
-	const productOptions = computed(() => {
-		return state?.o_drop_down_options[state.type_id]?.children[state.brand_id].children
-	})
-
-	// 选择品牌
-	const selectBrand = (brand) => {
-		console.log(brand);
-		// 选中的品牌id
-		state.brand_id = brand.value;
-		state.brand_name = brand.label
-		// 品牌下的产品ids
-		state.product_ids = [0];
-
-		state.product_name = brand.label
-
-	}
-	// 选择type
-	const selectType = (type) => {
-		console.log(type);
-		// 选中产品类型id
-		state.type_id = type.type_id;
-		state.type_name = type.name;
-		// 选中的品牌id
-		state.brand_id = 0;
-		state.brand_name = '全部';
-		// 品牌下的产品ids
-		state.product_ids = [0];
-	}
-
-	// 选择价格排序
-	const selectPriceSort = (item) => {
-		if (state.price_sort !== item.value) {
-			state.price_sort = item.value
-			state.price_sort_name = item.text
-		} else {
-			state.price_sort_name = '默认排序'
-			state.price_sort = ''
-		}
-		selectPriceSortRef.value?.toggle(false);
-		// 4. 刷新数据
-		paging.value.reload();
-	};
-
-	// 选择成色
-	const selectDegree = (item) => {
-		const index = state.degree_ids.indexOf(item.value);
-		if (index > -1) {
-			state.degree_ids.splice(index, 1);
-		} else {
-			state.degree_ids.push(item.value);
-		}
-		if (state.degree_ids.length > 0) {
-			state.degree_name = '已选' + state.degree_ids.length.toString() + '项'
-		} else {
-			state.degree_name = '成色'
-		}
-	}
-
-	// 重置选择成色
-	const onResetDegree = () => {
-		state.degree_ids = [];
-		state.degree_name = '成色'
-		selectDegreeRef.value?.toggle(false);
-		// 4. 刷新数据
-		paging.value.reload();
-	}
-	// 确认选择成色
-	const onConfirmDegree = () => {
-		if (state.degree_ids.length > 0) {
-			state.degree_name = '已选' + state.degree_ids.length.toString() + '项'
-		} else {
-			state.degree_name = '成色'
-		}
-		selectDegreeRef.value?.toggle(false);
-		// 4. 刷新数据
-		paging.value.reload();
-	}
-
-
-	// 获取列表
-	const queryList = (pageNo, pageSize) => {
-		const params = {
-			pageSize,
-			page: pageNo,
-			price_sort: state.price_sort,
-			degree_ids: state.degree_ids,
-			type_id: state.type_id,
-			brand_id: state.brand_id,
-			product_ids: state.product_ids,
-			search: state.search_val,
-		}
-		houseFetchGoodsList(params).then(res => {
-			console.log(res);
-			paging.value.complete(res.list);
-			user_goods_cart_ids.value = res.user_cart_goods_ids;
-			goods_cart_ids.value = res.cart_goods_ids;
-
-			// uni.setTabBarBadge({
-			// 	index: 1,
-			// 	text: user_goods_cart_ids.value.length.toString()
-			// })
-
-		}).catch(res => {
-			paging.value.complete(false);
-			user_goods_cart_ids.value = [];
-			goods_cart_ids.value = [];
-		});
-	};
-
-
-
-
-	onMounted(() => {
-		init();
-	})
-
-
-	const init = () => {
-		console.log('init');
-
-		// 获取配置
-		getConfig()
-
-		// 获取全部调价规则
-		fetchGetPriceRules().then(res => {
-			console.log('res', res);
-			// 区间调价
-			rangeRule.value = res?.range ?? [];
-			// 单机调价
-			singleRule.value = res?.single ?? [];
-			// 整仓调价
-			Object.assign(warehouseRule, res?.warehouse?.[0] ?? {
-				val: '',
-				val_type: 1,
-			})
-		})
-
-
-		// 加载默认筛选项内容
-		houseFetchFilterParmas().then(res => {
-			console.log(res);
-			// 处理成色
-			let degree_params = res.degree_list;
-			state.degree_params = degree_params.reduce((it, cit) => {
-				it.push({
-					text: cit.degree_name,
-					value: cit.degree_id
-				});
-				return it;
-			}, state.degree_params) || [];
-			// 产品类型
-			state.type_params = res.type_list
-			// 产品下品牌列表
-			state.drop_down_options = res.drop_down_options
-			state.o_drop_down_options = res.o_drop_down_options
-		})
-
-
-	}
-
-
-
-	// 显示商品图片
-	const showGoodsImages = (goods) => {
-		console.log(goods.goods_house);
-		uni.previewImage({
-			// current: index,  // 指定当前显示的图片索引
-			urls: goods?.goods_house?.image.map(e => {
-				return e.file_path
-			}),
-		});
-	}
-
-
-
-
-
-
-
-
-	// TAB 选项
-	const tabList = ref(['区间调价', '单机调价', '整仓调价'])
-	const tabIndex = ref(0)
-	const tabsChange = (index) => {
-		tabIndex.value = index
-	}
-
-	// 是否开启整仓调价
-	const isWarehouse = ref(false)
-
-	// 整仓规则
-	const warehouseRule = reactive({
-		val: '',
-		val_type: 1,
-	})
-
-	// 是否开启整仓调价
-	const onIsWarehouseChange = (val) => {
-		console.log(isWarehouse.value);
-		setConfig();
-	}
-
-	// 保存整仓规则
-	const saveWarehouseRule = () => {
-		console.log(warehouseRule);
-		let data = {
-			warehouseRule: {
-				...warehouseRule
-			}
-		}
-		console.log(data);
-		submit(data, 3);
-	}
-	// 
-
-
-
-
-	// 单个商品规格列表
-	const singleRule = ref([])
-	// 单个商品临时规则
-	const tempSingleRule = reactive({
-		val: '',
-		val_type: 1,
-		product_id: 0
-	})
-	const showEdit = ref(false)
-	const detail = reactive({})
-	const onEdit = (goods) => {
-		console.log("----", goods);
-		Object.assign(detail, goods)
-		showEdit.value = true
-		console.log("----", detail.value);
-	}
-	const onClosePopup = () => {
-		// 重置 tempSingleRule
-		Object.assign(detail, {})
-		Object.assign(tempSingleRule, {
-			val: '',
-			val_type: 1,
-			product_id: 0
-		})
-		showEdit.value = false
-		console.log("关闭");
-	};
-
-
-	// 保存单个商品价格规则
-	const saveSingleRule = () => {
-		tempSingleRule.product_id = detail.goods_id
-		console.log('tempSingleRule.value', tempSingleRule);
-		let data = {
-			singleRule: {
-				...tempSingleRule
-			}
-		}
-		console.log(data);
-		submit(data, 2);
-	}
-
-
-
-	// 价格区间规则列表
-	const rangeRule = ref([])
-	// 添加规则
-	const addRule = () => {
-		console.log(rangeRule.value);
-		rangeRule.value.unshift({
-			min_price: '',
-			max_price: '',
-			val: '',
-			val_type: 1
-		})
-	}
-	// 删除规则
-	const removeRule = (index) => {
-		rangeRule.value.splice(index, 1)
-	}
-	// 保存区间调价
-	const saveRangeRule = () => {
-		console.log(rangeRule.value);
-		let data = {
-			rangeRule: rangeRule.value
-		}
-		console.log(data);
-		submit(data, 1);
-	}
-
-
-	// 提交规则
-	const submit = (data, type) => {
-		fetchSetPriceRules(data).then(res => {
-			uni.showToast({
-				icon: 'none',
-				title: '规则配置成功'
-			})
-			// 获取全部调价规则
-			fetchGetPriceRules().then(res => {
-				console.log('res', res);
-				// 区间调价
-				rangeRule.value = res?.range ?? [];
-				// 单机调价
-				singleRule.value = res?.single ?? [];
-				// 整仓调价
-				Object.assign(warehouseRule, res?.warehouse?.[0] ?? {
-					val: '',
-					val_type: 1,
-				})
-
-
-				if (type == 1) {
-
-				}
-				if (type == 2) {
-					onClosePopup()
-					paging.value.refresh();
-				}
-				if (type == 3) {
-					getConfig()
-				}
-			})
-		})
-	}
-</script>
-
-<style lang="scss" scoped>
-	.page-content {
-		height: 100vh;
-		display: flex;
-		flex-direction: column;
-		--nut-menu-bar-box-shadow: none;
-		--nut-menu-item-content-padding: 20rpx;
-		--nut-menu-item-content-max-height: 900rpx;
-
-	}
-
-	/* Tabs 固定在顶部 */
-	.tabs-wrapper {
-		position: sticky;
-		top: 0;
-		z-index: 999;
-		background-color: #fff;
-	}
-
-	/* 滚动区域撑满剩余高度 */
-	.scroll-area {
-		flex: 1;
-		background-color: #f2f3f5;
-		/* 灰色背景 */
-		// padding: 20rpx;
-	}
-
-	.top-bar {
-		background: #fff;
-		padding: 20rpx;
-		display: flex;
-		justify-content: space-between;
-		border-top: 1px solid #eee;
-		// position: sticky;
-		// bottom: 0;
-		// z-index: 999;
-	}
-
-	/* 规则样式 */
-	.rule-item {
-		background: #fff;
-		padding: 20rpx;
-		margin: 20rpx;
-		border-radius: 12rpx;
-		margin-bottom: 20rpx;
-	}
-
-	.row {
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 10rpx;
-	}
-
-	.field {
-		width: 48%;
-	}
-
-	.label {
-		font-size: 26rpx;
-		color: #333;
-		margin-bottom: 6rpx;
-		display: inline-block;
-	}
-
-	.delete-btn {
-		text-align: right;
-		margin-top: 10rpx;
-	}
-
-	// .add-btn {
-	// 	text-align: center;
-	// 	margin-top: 30rpx;
-	// }
-
-
-
-
-
-
-	:deep(.titleClass) .nut-menu__title-text {
-		font-size: 30rpx;
-		font-weight: bold;
-		color: black;
-	}
-
-	.filter-types {
-
-		display: flex;
-		justify-content: flex-start;
-		flex-direction: row;
-		align-items: center;
-		overflow: auto;
-		gap: 10rpx;
-		padding: 10rpx;
-		// position: fixed;
-		// top: 0;
-		height: 60rpx;
-		// z-index: 9999;
-		background-color: #fff;
-		border-bottom: 2rpx solid gainsboro;
-		border-top: 2rpx solid gainsboro;
-
-		.filter-type-inner {
-			align-items: center;
-			background-color: rgba(0, 0, 0, .05);
-			border-radius: 16rpx;
-			box-sizing: border-box;
-			display: -webkit-flex;
-			display: -ms-flexbox;
-			display: flex;
-			flex: 0 0 auto;
-			font-size: 28rpx;
-			gap: 15rpx;
-			padding: 10rpx 20rpx;
-
-			// image {
-			// 	height: 22px;
-			// 	width: 22px;
-			// }
-		}
-
-		.filter-type-inner.active {
-			background-color: rgba(250, 44, 25, .1);
-			color: var(--nutui-color-primary);
-		}
-	}
-
-	.tabs-container {
-		display: flex;
-
-		.tab-pane-inner {
-			height: 600rpx;
-		}
-
-		.tabs-inner {
-			overflow-y: scroll;
-			height: 600rpx;
-			width: 160rpx;
-			background-color: #F5F5F5;
-
-			.tab-inner {
-				display: flex;
-				height: 60rpx;
-				padding: 10rpx;
-				font-size: 28rpx;
-				display: flex;
-				align-items: center;
-				background: #F5F5F5;
-
-				text {
-					width: 100%;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					text-align: center;
-				}
-			}
-
-			.tab-inner-active {
-				// background: #FFF;
-				background-color: rgba(250, 44, 25, .1);
-				color: var(--nutui-color-primary);
-			}
-		}
-	}
-
-
-
-	.degree-inner {
-		display: flex;
-		flex: 1;
-		flex-wrap: wrap;
-		// gap: 20rpx;
-		gap: 10rpx;
-		// padding: 11px;
-		width: 100%;
-		margin-bottom: 60rpx;
-	}
-
-	.degree-item {
-		align-items: center;
-		background-color: rgba(0, 0, 0, .05);
-		border-radius: 10rpx;
-		box-sizing: border-box;
-		display: flex;
-		flex: 0 0 auto;
-		font-size: 26rpx;
-		gap: 10rpx;
-		justify-content: center;
-		min-height: 80rpx;
-		width: calc(50% - 10rpx);
-	}
-
-	.degree-item.active {
-		background-color: rgba(250, 44, 25, .1);
-		color: var(--nutui-color-primary);
-	}
-
-	.product-btns {
-		display: flex;
-		width: 100%;
-		padding: 20rpx 0;
-
-		// border-bottom: 2rpx solid gainsboro;
-		// border-top: 2rpx solid gainsboro;
-
-		.reset {
-			flex: 1;
-
-		}
-
-		.confirm {
-			flex: 2;
-
-		}
-
-	}
-
-	.degree-btns {
-		display: flex;
-		width: 100%;
-
-		.reset {
-			flex: 1;
-			/* 重置按钮占 1 份 */
-		}
-
-		.confirm {
-			flex: 2;
-			/* 确认按钮占 2 份 */
-		}
-
-	}
-
-
-
-
-
-
-
-
-	.goods-item {
-
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-		padding: 20rpx;
-		background-color: #ffffff;
-		// border-radius: 20rpx;
-		margin-bottom: 20rpx;
-		gap: 20rpx;
-
-		.goods-item-image {
-			width: 170rpx;
-			height: 170rpx;
-
-			.goods-item-image-img {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.goods-item-content {
-			// width: 100%;
-			display: flex;
-			flex: 1;
-			flex-direction: column;
-			justify-content: space-between;
-			/* 首尾贴边，中间均分 */
-
-			// gap: 15px;
-			.goods-item-content-header {
-				display: flex;
-				align-items: center;
-				padding: 10rpx 0;
-				gap: 20rpx;
-			}
-
-			.goods-item-content-body {
-				padding: 10rpx 0;
-
-				.goods-item-content-body-desc {
-					color: #7c7c7c;
-					font-size: 26rpx;
-				}
-			}
-
-			.goods-item-content-footer {
-				padding: 10rpx 0;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				// 	width: 100%;
-				// 	flex-direction: row;
-
-				.goods-item-content-footer-btn {
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					gap: 10rpx;
-
-					.share-btn {
-						border-radius: 50rpx;
-						border: 2rpx solid red;
-						font-size: 26rpx;
-						align-items: center;
-						height: 54rpx;
-						color: red;
-						display: flex;
-						justify-content: center;
-					}
-				}
-			}
-		}
-	}
-
-
-
-
-
-
-
-
-
-	/** 商品弹出改价 **/
-	.goods-popup {
-
-		.goods-card-edit {
-			background: #fff;
-			padding: 20rpx;
-			margin: 20rpx;
-			border-radius: 12rpx;
-			margin-bottom: 20rpx;
-
-			.row {
-				display: flex;
-				justify-content: space-between;
-				margin-bottom: 10rpx;
-			}
-
-			.field {
-				width: 48%;
-			}
-
-			.label {
-				font-size: 26rpx;
-				color: #333;
-				margin-bottom: 6rpx;
-				display: inline-block;
-			}
-		}
-
-		.goods-card {
-			display: flex;
-			flex-direction: row;
-			justify-content: space-between;
-			align-items: center;
-			padding: 20rpx;
-			background-color: #ffffff;
-			margin-bottom: 20rpx;
-
-			.goods-card-left {
-				width: 190rpx;
-				height: 190rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-				}
-			}
-
-			.goods-card-right {
-				flex: 1;
-				padding-left: 20rpx;
-
-				.goods-card-right-top {
-					display: flex;
-					align-items: center;
-					padding: 10rpx 0;
-					gap: 20rpx;
-				}
-
-				.goods-card-right-middle {
-					margin-top: 10rpx;
-					margin-bottom: 10rpx;
-					color: #7c7c7c;
-					font-size: 26rpx;
-				}
-
-				.goods-card-right-bottom {
-					display: flex;
-					flex-direction: row;
-					justify-content: space-between;
-					align-items: center;
-				}
-			}
-		}
-	}
-
-
-
-
-
-
-
-	/******/
-	.switch-lab {
-		padding: 0 10px;
-		margin-bottom: 10px;
-		font-size: 14px;
-		font-weight: 400;
-		color: #909ca4;
-	}
-
-	.warehouse {
-
-		.warehouse-edit {
-			background: #fff;
-			padding: 20rpx;
-			margin: 20rpx;
-			border-radius: 12rpx;
-			margin-bottom: 20rpx;
-
-			.row {
-				display: flex;
-				justify-content: space-between;
-				margin-bottom: 10rpx;
-			}
-
-			.field {
-				width: 48%;
-			}
-
-			.label {
-				font-size: 26rpx;
-				color: #333;
-				margin-bottom: 6rpx;
-				display: inline-block;
-			}
-		}
-
-
-	}
-</style>
\ No newline at end of file
diff --git a/pages/config/shopOrder/detail.vue b/pages/config/shopOrder/detail.vue
deleted file mode 100644
index 1135731..0000000
--- a/pages/config/shopOrder/detail.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-	<view class="page-content">
-		<nut-steps :current="detail.progress">
-			<nut-step title="待付款">1</nut-step>
-			<nut-step title="待发货">2</nut-step>
-			<nut-step title="待收货">3</nut-step>
-			<nut-step title="已完成">4</nut-step>
-		</nut-steps>
-
-		<nut-cell-group>
-			<nut-cell>
-				<view class="address-inner" v-if="detail.address_info">
-					<text>{{detail.address_info.user_name}} - {{detail.address_info.tel_number}}</text>
-					<text>{{detail.address_info.province_name + detail.address_info.city_name + detail.address_info.county_name + detail.address_info.street_name + detail.address_info.detail_info_new}}</text>
-				</view>
-			</nut-cell>
-		</nut-cell-group>
-
-
-		<nut-cell-group>
-			<nut-cell v-for="(goods,index) in detail.goods" :key="index" center
-				@click="navigateTo('/pages/mall/detail?id=' + goods.goods_id)">
-				<template #title>
-					<view class="goods-info-row">
-						<view class="left-text">
-							<view class="goods-name">
-								<nut-tag custom-color="#1a1a1a">{{goods.snapshot_info.degree.degree_name}}</nut-tag>
-								<text style="margin-left: 10rpx;">{{goods.goods_name}}</text>
-							</view>
-							<text class="goods-no">串号：{{goods.goods_no}}</text>
-						</view>
-					</view>
-				</template>
-				<template #link>
-					<nut-price :price="goods.goods_price" size="small" :need-symbol="true" />
-				</template>
-			</nut-cell>
-		</nut-cell-group>
-
-
-
-		<nut-cell-group>
-			<nut-cell>
-				<view class="total-price-inner">
-					<text>商品总额</text>
-					<nut-price :price="detail.pay_price" size="normal" :need-symbol="true" />
-				</view>
-			</nut-cell>
-		</nut-cell-group>
-
-		<nut-cell-group>
-			<nut-cell title="订单编号" :desc="detail.order_no" />
-			<nut-cell title="下单时间" :desc="detail.create_time" />
-		</nut-cell-group>
-
-		<nut-cell-group v-if="detail.progress >= 3">
-			<nut-cell title="物流公司" :desc="detail.express_company" />
-			<nut-cell title="物流单号" :desc="detail.express_no" />
-		</nut-cell-group>
-
-
-	<!-- 	<view v-if="detail.progress === 1 && !audit" class="wechat-img-inner">
-			<nut-button type="primary" block @click="showPayImgs()">
-				点我付款
-			</nut-button>
-		</view> -->
-	</view>
-</template>
-
-
-
-<script setup>
-	import {
-		reactive,
-		ref
-	} from 'vue';
-	import {
-		onLoad,
-		onShow
-	} from '@dcloudio/uni-app'
-	import {
-		fetchOrderDetail
-	} from '@/api/order';
-	import {
-		navigateTo,
-	} from '@/utils/helper';
-
-
-	import {
-		fetchGetConfig
-	} from '@/api/config';
-
-	// 审核模式 默认开启 true
-	const audit = ref(true);
-
-	// 订单ID
-	const id = ref(0)
-	// 订单详情
-	const detail = reactive({})
-	// 支付码
-	const images = ref([]);
-
-	onLoad((options) => {
-		id.value = options.id
-	})
-
-
-
-	/**
-	 * 页面显示生命周期钩子
-	 * 每次页面显示时都会执行
-	 */
-	onShow(() => {
-		// 获取配置
-		getConfig()
-        // 获取订单详情
-		fetchOrderDetail(id.value).then(res => {
-			Object.assign(detail, res)
-		})
-	})
-
-
-	// 获取配置
-	const getConfig = () => {
-		fetchGetConfig().then(res => {
-			console.log('getConfig=====>', res)
-			audit.value = res.appConfig.is_audit == 1
-			console.log(res.appConfig.pay_imgs);
-			let pay_imgs = JSON.parse(res.appConfig.pay_imgs) || [];
-			let wechat_imgs = JSON.parse(res.appConfig.wechat_imgs) || [];
-			let pay_imgs_arr = pay_imgs.map(item => item.file_path) || [];
-			let wechat_imgs_arr = wechat_imgs.map(item => item.file_path) || [];
-			const merged_imgs_arr = pay_imgs_arr.concat(wechat_imgs_arr);
-			images.value = merged_imgs_arr;
-		})
-	}
-
-	// // 显示支付码
-	// const showPayImgs = () => {
-	// 	if (images.value.length === 0) {
-	// 		uni.showToast({
-	// 			title: '暂无图片',
-	// 			icon: 'none'
-	// 		});
-	// 		return;
-	// 	}
-	// 	console.log('preview images:', images);
-	// 	uni.previewImage({
-	// 		urls: images.value
-	// 	});
-	// }
-</script>
-
-<style scoped lang="scss">
-	.page-content {
-		min-height: 100vh;
-		background-color: #f2f3f5;
-		padding: 20rpx;
-	}
-
-	.address-inner {
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-	}
-
-	.total-price-inner {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-
-		// flex-direction: row;
-		view:nth-child(2) {
-			color: #fa2c19;
-		}
-	}
-
-	.wechat-img-inner {
-		margin-top: 60rpx;
-		padding: 0rpx 80rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		// gap: 5px;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/config/shopOrder/index.vue b/pages/config/shopOrder/index.vue
deleted file mode 100644
index 2de60f8..0000000
--- a/pages/config/shopOrder/index.vue
+++ /dev/null
@@ -1,632 +0,0 @@
-<template>
-	<view class="page-content">
-		<nut-dialog title="取消订单" content="确认取消吗?此操作不可恢复!" v-model:visible="visibleCancelOrderDialog"
-			@cancel="visibleCancelOrderDialog = false" @ok="onClickCancelOrder" />
-
-
-		<nut-dialog title="标记付款" content="确认标记吗?此操作不可恢复!" v-model:visible="visiblePayOrderDialog"
-			@cancel="visiblePayOrderDialog = false" @ok="onClickPayOrder" />
-
-
-		<nut-sticky>
-			<nut-searchbar placeholder="请输入商品串号" clearable v-model="search_val" input-background="#eee"
-				@search="onSearch" @clear="onClear">
-				<template #rightout>
-					<nut-button size="small" type="primary" @click="onSearch">搜索</nut-button>
-				</template>
-			</nut-searchbar>
-			<nut-tabs v-model="current_tab_idx" background="#fff">
-				<template #titles>
-					<div class="title-list">
-						<view v-for="(item,idx) in tabs_config" :key="idx" class="title-item"
-							:class="{ 'tabs-active': idx === current_tab_idx }" @click="onChangeTab(item,idx)">
-							<view class="nut-tabs__titles-item__text">
-								{{item.title}}
-							</view>
-							<view class="item__line" />
-						</view>
-					</div>
-				</template>
-			</nut-tabs>
-		</nut-sticky>
-
-		<z-paging ref="paging" :fixed="false" style="height: 88vh;" class="order-list" v-model="dataList"
-			@query="apiFetchOrderList">
-
-			<view class="order-inner" v-for="(order,index) in dataList" :key="index">
-				<view class="order-inner-header">
-					<text>{{order.create_time}}</text>
-					<nut-tag custom-color="#1a1a1a">{{getStatusText(order)}}</nut-tag>
-					<!-- <text>{{order.order_no}}</text> -->
-				</view>
-
-				<view class="goods-info-row" v-for="(goods,iidx) in order.goods" :key="iidx"
-					@click="navigateToDetail(order.order_id)">
-					<view class="left-text">
-						<view class="goods-name">
-							<nut-tag custom-color="#1a1a1a">{{goods.snapshot_info.degree.degree_name}}</nut-tag>
-							<text style="margin-left: 10rpx;">{{goods.goods_name}}</text>
-						</view>
-						<text class="goods-no">串号：{{goods.goods_no}}</text>
-					</view>
-					<view class="price">
-						<nut-price :price="goods.goods_price" size="small" :need-symbol="true" />
-					</view>
-				</view>
-
-
-				<view class="footer">
-					<view class="order-inner-price">
-						总计:<nut-price :price="order.total_price" size="normal" :need-symbol="true" />
-					</view>
-					<view class="order-inner-action" v-if="order.order_status.value === 10">
-						<view style="margin-left:10rpx;">
-							<!-- v-if="order.pay_status.value === 10 " -->
-							<nut-button plain size="small" v-if="order.delivery_status.value !== 20 "
-								@click="visibleCancelOrderDialog = true;current_cancel_order_id=order.order_id;">
-								取消订单
-							</nut-button>
-						</view>
-
-
-						<view style="margin-left:10rpx;">
-							<nut-button type="primary" size="small"
-								@click="visiblePayOrderDialog = true;current_pay_order_id=order.order_id;"
-								v-if="order.pay_status.value === 10 && !audit">
-								标记付款
-							</nut-button>
-						</view>
-
-
-						<view style="margin-left:10rpx;">
-							<nut-button type="primary" size="small" @click="onClickDeliveryOrder(order)"
-								v-if="order.pay_status.value === 20 && order.delivery_status.value === 10">
-								去发货
-							</nut-button>
-						</view>
-
-
-
-
-					</view>
-				</view>
-			</view>
-		</z-paging>
-
-
-
-
-		<!-- 弹出 -->
-		<nut-popup :custom-style="{ height: '65%' }" v-model:visible="openDeliveryPopup" position="bottom"
-			safe-area-inset-bottom @close="onCloseDeliveryPopup">
-			<view>
-				<view class="order-popup">
-					<nut-cell-group>
-						<nut-cell>
-							<view class="address-inner" v-if="orderDetail.address_info">
-								<text>
-									{{orderDetail.address_info.user_name}} -
-									{{orderDetail.address_info.tel_number}}
-								</text>
-								<text>
-									{{orderDetail.address_info.province_name + 
-								orderDetail.address_info.city_name + 
-								orderDetail.address_info.county_name + 
-								orderDetail.address_info.street_name + 
-								orderDetail.address_info.detail_info_new}}
-								</text>
-							</view>
-						</nut-cell>
-					</nut-cell-group>
-					<nut-cell-group>
-						<nut-cell v-for="(goods,index) in orderDetail.goods" :key="index" center>
-							<template #title>
-								<view class="goods-info-row">
-									<view class="left-text">
-										<view class="goods-name">
-											<nut-tag
-												custom-color="#1a1a1a">{{goods.snapshot_info.degree.degree_name}}</nut-tag>
-											<text style="margin-left: 10rpx;">{{goods.goods_name}}</text>
-										</view>
-										<text class="goods-no">串号：{{goods.goods_no}}</text>
-									</view>
-								</view>
-							</template>
-							<template #link>
-								<nut-price :price="goods.goods_price" size="small" :need-symbol="true" />
-							</template>
-						</nut-cell>
-					</nut-cell-group>
-					<nut-cell-group>
-						<nut-cell>
-							<view class="total-price-inner">
-								<text>商品总额</text>
-								<nut-price :price="orderDetail.pay_price" size="normal" :need-symbol="true" />
-							</view>
-						</nut-cell>
-					</nut-cell-group>
-
-					<nut-cell-group>
-						<nut-cell title="订单编号" :desc="orderDetail.order_no" />
-						<nut-cell title="下单时间" :desc="orderDetail.create_time" />
-					</nut-cell-group>
-
-
-					<nut-form>
-						<nut-form-item label="物流公司名称">
-							<nut-input v-model="form.express_company" class="nut-input-text" placeholder="请输入物流公司"
-								type="text" />
-						</nut-form-item>
-
-						<nut-form-item label="物流单号">
-							<nut-input v-model="form.express_no" class="nut-input-text" placeholder="请输入物流单号"
-								type="text" />
-						</nut-form-item>
-					</nut-form>
-				</view>
-
-
-				<view class="wechat-img-inner">
-					<nut-button type="primary" block @click="deliveryOrder">
-						确定发货
-					</nut-button>
-				</view>
-			</view>
-		</nut-popup>
-
-
-	</view>
-</template>
-
-
-
-
-
-
-<script setup>
-	import {
-		onMounted,
-		reactive,
-		ref
-	} from 'vue';
-	import {
-		onLoad,
-		onShow
-	} from '@dcloudio/uni-app';
-
-
-	import {
-		navigateTo,
-	} from '@/utils/helper';
-	import {
-		fetchDeliveryOrder,
-		fetchPayOrder,
-		fetchCancelOrder,
-		fetchOrderList,
-		fetchReceiptOrder
-	} from '@/api/order';
-
-	import {
-		fetchGetConfig
-	} from '@/api/config';
-
-	// 审核模式 默认开启 true
-	const audit = ref(true);
-
-	// 支付码
-	const images = ref([]);
-
-
-	// 展示发货弹窗
-	const openDeliveryPopup = ref(false)
-	// 发货订单
-	const orderDetail = reactive({})
-	const form = reactive({
-		order_id: 0,
-		express_company: '',
-		express_no: '',
-	})
-
-	// 发货
-	const deliveryOrder = () => {
-		form.order_id = orderDetail.order_id
-		console.log('form===>', form);
-		fetchDeliveryOrder(form).then(res => {
-			uni.showToast({
-				icon: 'none',
-				title: '发货成功'
-			})
-			onCloseDeliveryPopup()
-			paging.value.reload();
-		})
-	}
-
-	// 打开发货弹窗
-	const onClickDeliveryOrder = (order) => {
-		console.log(order);
-		Object.assign(orderDetail, order)
-		openDeliveryPopup.value = true
-
-	}
-
-	// 关闭发货弹窗
-	const onCloseDeliveryPopup = () => {
-		// 重置 发货订单
-		Object.assign(orderDetail, {})
-		Object.assign(form, {
-			order_id: 0,
-			express_company: '',
-			express_no: '',
-		})
-		openDeliveryPopup.value = false
-		console.log("关闭");
-	};
-
-
-
-
-	// 默认tab
-	const current_tab_idx = ref(0);
-	// 定义tab切换
-	const tabs_config = [{
-			title: '进行中',
-			status: 'all'
-		},
-		{
-			title: '今日',
-			status: 'payment'
-		},
-		{
-			title: '昨日',
-			status: 'delivery'
-		},
-		{
-			title: '全部',
-			status: 'received'
-		},
-		
-	]
-	// 订单列表数据
-	const dataList = ref([]);
-	// zp
-	const paging = ref(null);
-
-
-
-
-	// 取消订单弹窗
-	const visibleCancelOrderDialog = ref(false);
-	// 被取消订单id
-	const current_cancel_order_id = ref(0);
-
-	// 订单付款弹窗
-	const visiblePayOrderDialog = ref(false);
-	// 付款订单id
-	const current_pay_order_id = ref(0);
-
-
-
-
-
-
-	// 搜索内容
-	const search_val = ref('')
-	// tab切换
-	const onChangeTab = (item, idx) => {
-		current_tab_idx.value = idx
-		paging.value.reload();
-	}
-
-
-	// 获取配置
-	const getConfig = () => {
-		fetchGetConfig().then(res => {
-			console.log('getConfig=====>', res)
-			audit.value = res.appConfig.is_audit == 1
-			console.log(res.appConfig.pay_imgs);
-			let pay_imgs = JSON.parse(res.appConfig.pay_imgs) || [];
-			let wechat_imgs = JSON.parse(res.appConfig.wechat_imgs) || [];
-			let pay_imgs_arr = pay_imgs.map(item => item.file_path) || [];
-			let wechat_imgs_arr = wechat_imgs.map(item => item.file_path) || [];
-			const merged_imgs_arr = pay_imgs_arr.concat(wechat_imgs_arr);
-			images.value = merged_imgs_arr;
-		})
-	}
-
-	// 显示支付码
-	const showPayImgs = () => {
-		if (images.value.length === 0) {
-			uni.showToast({
-				title: '暂无图片',
-				icon: 'none'
-			});
-			return;
-		}
-		console.log('preview images:', images);
-		uni.previewImage({
-			urls: images.value
-		});
-	}
-
-	// 跳转详情页面
-	const navigateToDetail = (id) => {
-		console.log(id);
-		if (!id) {
-			console.warn('导航ID不能为空')
-			return
-		}
-		uni.navigateTo({
-			url: `/pages/config/shopOrder/detail?id=${encodeURIComponent(id)}`
-		})
-	}
-
-
-	// 取消订单
-	const onClickCancelOrder = () => {
-		fetchCancelOrder(current_cancel_order_id.value).then(res => {
-			uni.showToast({
-				title: '取消成功',
-				icon: 'none'
-			})
-			paging.value.reload();
-		})
-	}
-
-	// 标记付款
-	const onClickPayOrder = () => {
-		fetchPayOrder(current_pay_order_id.value).then(res => {
-			uni.showToast({
-				title: '标记付款成功',
-				icon: 'none'
-			})
-			paging.value.reload();
-		})
-	}
-
-
-
-
-
-
-	// 获取订单列表
-	const apiFetchOrderList = (pageNo = 1, pageSize = 10) => {
-		console.log(tabs_config[current_tab_idx.value]['status']);
-		const params = {
-			page: pageNo,
-			pageSize: 10,
-			status: tabs_config[current_tab_idx.value]['status'],
-			goods_no: search_val.value,
-		}
-		fetchOrderList(params).then(res => {
-			console.log(res);
-			paging.value.complete(res.list);
-		}).catch(res => {
-			paging.value.complete(false);
-		})
-	}
-
-	onLoad((options) => {
-		current_tab_idx.value = parseInt(options.tab)
-	})
-
-
-	/**
-	 * 页面显示生命周期钩子
-	 * 每次页面显示时都会执行
-	 */
-	onShow(() => {
-		// 获取配置
-		getConfig()
-		if (paging.value) {
-			// paging.value.pageNo = 1; 
-			paging.value.refresh();
-			// paging.value.refreshToPage(1)
-			// paging.value.reload();
-		}
-
-	})
-
-	// 搜索
-	const onSearch = () => {
-		console.log("搜索：", search_val.value);
-		paging.value.reload();
-
-	}
-	// 清空搜索框
-	const onClear = () => {
-		console.log("搜索：", search_val.value);
-		paging.value.reload();
-	}
-
-
-
-	// 订单状态
-	const getStatusText = (order) => {
-		if (order.order_status.value == 20) {
-			return order.order_status.text
-		} else if (order.order_status.value == 30) {
-			return order.order_status.text
-		} else if (order.order_status.value == 10) {
-			if (order.pay_status.value == 10) {
-				return order.pay_status.text
-			} else if (order.pay_status.value == 20) {
-				if (order.delivery_status.value == 10) {
-					return order.delivery_status.text
-				} else if (order.delivery_status.value == 20) {
-					return order.receipt_status.text
-				}
-			}
-		}
-	}
-</script>
-
-
-
-<style scoped lang="scss">
-	.page-content {
-		min-height: 100vh;
-		background-color: #f2f3f5;
-	}
-
-	.order-popup {
-
-		.address-inner {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-		}
-
-		.total-price-inner {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			// flex-direction: row;
-			view:nth-child(2) {
-				color: #fa2c19;
-			}
-		}
-
-
-	}
-
-	.wechat-img-inner {
-		margin-top: 60rpx;
-		padding: 0rpx 80rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		// gap: 5px;
-	}
-
-
-	.order-list {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-
-	}
-
-	.order-inner {
-		display: flex;
-		flex-direction: column;
-		background: #fff;
-		border-radius: 15rpx;
-		overflow: hidden;
-		margin: 20rpx;
-
-		.order-inner-header {
-			display: flex;
-			align-items: center;
-			background-color: #dcdcdc;
-			color: rgba(0, 0, 0, .5);
-			font-size: 24rpx;
-			justify-content: space-between;
-			line-height: 45rpx;
-			padding: 15rpx 20rpx;
-		}
-
-
-		/* 信息行布局 */
-		.goods-info-row {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 20rpx;
-			border-bottom: 2rpx solid #f2f3f5;
-
-			/* 左侧文字样式 */
-			.left-text {
-				flex: 1;
-			}
-
-			.goods-name {
-				font-size: 30rpx;
-				color: #000000;
-				display: block;
-				margin-bottom: 8rpx;
-			}
-
-			.goods-no {
-				font-size: 26rpx;
-				color: #000000;
-				display: block;
-			}
-
-			/* 右侧价格样式 */
-			.price {
-				margin-left: 20rpx;
-				align-self: center;
-				/* 垂直居中在两行文字之间 */
-			}
-
-		}
-
-
-		.footer {
-			display: flex;
-			flex-direction: column;
-
-			.order-inner-price {
-				display: flex;
-				justify-content: flex-end;
-				padding-top: 10rpx;
-				padding-right: 20rpx;
-				padding-bottom: 20rpx;
-				font-size: 24rpx;
-				align-items: center;
-			}
-
-			.order-inner-action {
-				display: flex;
-				padding-top: 10rpx;
-				padding-bottom: 30rpx;
-				align-items: center;
-				justify-content: flex-end;
-			}
-		}
-	}
-
-
-
-
-
-	.title-list {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		width: 100%;
-
-		.title-item {
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			position: relative;
-		}
-
-		.tabs-active {
-			font-weight: bold;
-			color: $tabs-titles-item-active-color;
-			opacity: $tabs-titles-item-line-opacity;
-			transition: width 0.3s ease;
-
-			.item__line {
-				position: absolute;
-				bottom: -10%;
-				left: 50%;
-				overflow: hidden;
-				content: ' ';
-				border-radius: $tabs-titles-item-line-border-radius;
-				opacity: $tabs-titles-item-line-opacity;
-				transition: width 0.3s ease;
-				transform: translate(-50%, 0);
-				width: $tabs-horizontal-titles-item-active-line-width;
-				height: 3px;
-				content: ' ';
-				background: $tabs-horizontal-tab-line-color;
-			}
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/config/store.vue b/pages/config/store.vue
deleted file mode 100644
index e4965fd..0000000
--- a/pages/config/store.vue
+++ /dev/null
@@ -1,318 +0,0 @@
-<template>
-
-	<view class="page-content">
-		<view style=" padding: 20rpx;">
-
-			<nut-cell-group>
-				<nut-cell v-if="!form.address_info?.address_id" title="收货地址" is-link @click="chooseAddress"></nut-cell>
-				<nut-cell v-else :title="form.address_info.user_name + ' ' + form.address_info.tel_number" is-link
-					:sub-title="
-			  form.address_info.province_name +
-			  form.address_info.city_name +
-			  form.address_info.county_name +
-			  form.address_info.street_name +
-			  form.address_info.detail_info_new
-			" @click="chooseAddress"></nut-cell>
-			</nut-cell-group>
-
-
-			<view class="wechat-img-inner">
-				<nut-button type="primary" block @click="saveAddress()">
-					保存收货地址
-				</nut-button>
-			</view>
-
-			<nut-form>
-				<nut-form-item label="商城名称">
-					<nut-input v-model="form.shop_name" class="nut-input-text" placeholder="请输入店铺名称" type="text" />
-				</nut-form-item>
-				<nut-form-item label="商城介绍">
-					<nut-textarea v-model="form.shop_desc" autosize placeholder="请输入店铺介绍" type="text" />
-				</nut-form-item>
-				<nut-form-item label="手机号码">
-					<nut-input v-model="form.shop_phone" class="nut-input-text" placeholder="请输入手机号码" type="text" />
-				</nut-form-item>
-
-
-				<nut-form-item label="首页公告">
-					<nut-textarea v-model="form.bulletin_txt" autosize placeholder="请输入首页公告" type="text" />
-				</nut-form-item>
-
-				<nut-form-item label="服务描述">
-					<nut-textarea v-model="form.service_txt" autosize placeholder="请输入服务描述" type="text" />
-				</nut-form-item>
-				<nut-form-item label="是否审核模式">
-					<nut-switch v-model="isAudit" @change="onIsAuditChange" />
-					<!-- <nut-switch v-model:modelValue="isAudit" @change="onIsAuditChange" /> -->
-				</nut-form-item>
-				<nut-form-item v-if="isBucket">
-					<template v-slot:label>收款二维码</template>
-					<template v-slot:default>
-						<shmily-drag-image v-model="form.pay_imgs" :number=9 :add-image="addPayImg"
-							keyName="file_path"></shmily-drag-image></template>
-				</nut-form-item>
-
-				<nut-form-item v-if="isBucket">
-					<template v-slot:label>微信二维码</template>
-					<template v-slot:default>
-						<shmily-drag-image v-model="form.wechat_imgs" :number=9 :add-image="addWechatImg"
-							keyName="file_path"></shmily-drag-image></template>
-				</nut-form-item>
-
-
-
-
-
-				<view style="align-items: center;text-align: center; padding: 20rpx 80rpx;">
-					<nut-button type="primary" block @click="onSubmit">
-						保存配置
-					</nut-button>
-				</view>
-			</nut-form>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import {
-		onMounted,
-		reactive,
-		ref,
-		toValue
-	} from 'vue';
-	import {
-		fetchGetConfig,
-		fetchSetConfig,
-	} from '@/api/config';
-	import {
-		getUploadImageUrl
-	} from '@/api/request';
-	
-	import {
-		houseFetchUpdateAddress
-	} from '@/api/house_order';
-	
-	
-
-	const isBucket = ref(false);
-	// 是否开启审核模式
-	const isAudit = ref(false)
-
-	const form = reactive({
-		shop_name: '',
-		shop_desc: '',
-		shop_phone: '',
-		is_audit: 0,
-		bulletin_txt: '',
-		service_txt: '',
-		pay_imgs: [],
-		wechat_imgs: [],
-		address_info: {}
-	})
-
-
-	// 是否开启整仓调价
-	const onIsAuditChange = (val) => {
-		form.is_audit = Number(isAudit.value)
-		console.log(form);
-	}
-
-
-	const chooseAddress = () => {
-		uni.chooseAddress({
-			success(res) {
-				console.log(res);
-				form.address_info = {
-					address_id: res.addressID || 1,
-					user_name: res.userName,
-					tel_number: res.telNumber,
-					city_name: res.cityName || '',
-					county_name: res.countyName || '',
-					detail_info: res.detailInfo || '',
-					detail_info_new: res.detailInfoNew || '',
-					national_code: res.nationalCode || '',
-					national_code_full: res.nationalCodeFull || '',
-					postal_code: res.postalCode || '',
-					province_name: res.provinceName || '',
-					street_name: res.streetName || '',
-				}
-			},
-		});
-	};
-
-
-
-
-	// 获取配置
-	const getConfig = () => {
-		fetchGetConfig().then(res => {
-			console.log('res=====>', res)
-			form.shop_name = res.appConfig.shop_name
-			form.shop_desc = res.appConfig.shop_desc
-			form.shop_phone = res.appConfig.shop_phone
-
-			form.bulletin_txt = res.appConfig.bulletin_txt
-			form.service_txt = res.appConfig.service_txt
-
-
-			form.address_info = res.appConfig.address_info
-
-			form.is_audit = res.appConfig.is_audit
-			isAudit.value = res.appConfig.is_audit == 1
-
-			if (res.appConfig.bucket) {
-				isBucket.value = true
-			}
-			let pay_imgs = JSON.parse(res.appConfig.pay_imgs)
-			let wechat_imgs = JSON.parse(res.appConfig.wechat_imgs)
-			pay_imgs.forEach(item => {
-				form.pay_imgs.push({
-					id: item.image_id,
-					file_path: item.file_path,
-				})
-			})
-			wechat_imgs.forEach(item => {
-				form.wechat_imgs.push({
-					id: item.image_id,
-					file_path: item.file_path,
-				})
-			})
-			console.log('form=====>', form)
-		})
-	}
-
-
-	const onSubmit = () => {
-		fetchSetConfig(form).then(res => {
-			uni.showToast({
-				icon: 'none',
-				title: '更新商城配置成功'
-			})
-			setTimeout(() => {
-				uni.redirectTo({
-					url: '/pages/config/store',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			}, 500)
-		})
-	}
-
-
-	// 保存收货地址
-	const saveAddress = () => {
-		houseFetchUpdateAddress({
-			address: form.address_info,
-		}).then(res => {
-			uni.showToast({
-				icon: 'none',
-				title: '保存收货地址成功'
-			})
-			setTimeout(() => {
-				uni.redirectTo({
-					url: '/pages/config/store',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			}, 500)
-		})
-	}
-
-
-	onMounted(() => {
-		getConfig()
-	})
-
-	// 上传支付图片
-	const addPayImg = () => {
-		uni.chooseImage({
-			count: 9 - (form.pay_imgs.length || 0),
-			sourceType: ['album', 'camera'],
-			success: res => {
-				res.tempFiles.forEach(file => {
-					uni.uploadFile({
-						url: getUploadImageUrl(),
-						filePath: file.path,
-						name: 'iFile',
-						formData: {
-							group_id: 1,
-						},
-						success: (res) => {
-							let data = JSON.parse(res.data).data
-							form.pay_imgs.push({
-								id: parseInt(data.file_id),
-								file_path: data.file_path,
-							})
-						}
-					})
-				})
-			}
-		})
-	}
-
-
-
-	// 上传微信图片
-	const addWechatImg = () => {
-		uni.chooseImage({
-			count: 9 - (form.wechat_imgs.length || 0),
-			sourceType: ['album', 'camera'],
-			success: res => {
-				res.tempFiles.forEach(file => {
-					uni.uploadFile({
-						url: getUploadImageUrl(),
-						filePath: file.path,
-						name: 'iFile',
-						formData: {
-							group_id: 1,
-						},
-						success: (res) => {
-							let data = JSON.parse(res.data).data
-							form.wechat_imgs.push({
-								id: parseInt(data.file_id),
-								file_path: data.file_path,
-							})
-						}
-					})
-				})
-			}
-		})
-	}
-</script>
-
-<style lang="scss" scoped>
-	.page-content {
-		min-height: 100vh;
-		background-color: #f2f3f5;
-
-	}
-
-	.wechat-img-inner {
-		// margin-top: 60rpx;
-		padding: 0rpx 80rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		// gap: 5px;
-	}
-
-	.list {
-		display: flex;
-		justify-content: center;
-		flex-direction: column;
-		background: #ffffff;
-		align-items: center;
-		max-height: 300rpx;
-		overflow-y: scroll;
-		padding: 10px;
-
-		.list-item {
-			border-bottom: 1px solid #eee;
-			padding: 20rpx 10rpx;
-
-		}
-	}
-</style>
\ No newline at end of file