From a54f8c3f0a55c4cedad887e878edf7fad108f59e Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Fri, 26 Jan 2024 09:28:51 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/packageIntegral/orderList.js              |  17 +
 packageIntegral/orderDetails/index.vue        | 322 ++++++++++++++
 packageIntegral/orderList/index.vue           | 279 ++++++++++++
 packageIntegral/productList/index.vue         | 323 ++++++++++++++
 packageIntegral/takeGoods/index.vue           | 298 +++++++++++++
 pages.json                                    |  16 +
 pages/home/home.vue                           |  18 +
 pages/index/index.vue                         | 118 ++---
 uni_modules/xt-verify-code/changelog.md       |  46 ++
 .../components/xt-verify-code/config.js       |  51 +++
 .../components/xt-verify-code/util.js         |  35 ++
 .../xt-verify-code/xt-verify-code.vue         | 408 ++++++++++++++++++
 uni_modules/xt-verify-code/package.json       |  79 ++++
 uni_modules/xt-verify-code/readme.md          |  20 +
 14 files changed, 1971 insertions(+), 59 deletions(-)
 create mode 100644 api/packageIntegral/orderList.js
 create mode 100644 packageIntegral/orderDetails/index.vue
 create mode 100644 packageIntegral/orderList/index.vue
 create mode 100644 packageIntegral/productList/index.vue
 create mode 100644 packageIntegral/takeGoods/index.vue
 create mode 100644 uni_modules/xt-verify-code/changelog.md
 create mode 100644 uni_modules/xt-verify-code/components/xt-verify-code/config.js
 create mode 100644 uni_modules/xt-verify-code/components/xt-verify-code/util.js
 create mode 100644 uni_modules/xt-verify-code/components/xt-verify-code/xt-verify-code.vue
 create mode 100644 uni_modules/xt-verify-code/package.json
 create mode 100644 uni_modules/xt-verify-code/readme.md

diff --git a/api/packageIntegral/orderList.js b/api/packageIntegral/orderList.js
new file mode 100644
index 0000000..078d334
--- /dev/null
+++ b/api/packageIntegral/orderList.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export default{
+	getByPageCloudMini(data) {
+		return request({
+			url: `/oil-mall/mallOrderInfo/getByPageCloudMini`,
+			method: 'post',
+			data
+		})
+	},
+	get(id) {
+		return request({
+			url: `/oil-mall/mallOrderInfo/get/${id}`,
+			method: 'get',
+		})
+	}
+}
\ No newline at end of file
diff --git a/packageIntegral/orderDetails/index.vue b/packageIntegral/orderDetails/index.vue
new file mode 100644
index 0000000..e4559a7
--- /dev/null
+++ b/packageIntegral/orderDetails/index.vue
@@ -0,0 +1,322 @@
+<template>
+	<view class="container">
+		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
+			<block slot="backText">返回</block>
+			<block slot="content">订单详情</block>
+		</cu-custom>
+
+		<view class="status-frame">
+			<view v-if="info.orderStatus">{{statusEnum[info.orderStatus].value}}</view>
+			<view>提货码: <text>{{info.takeCode}}</text></view>
+			<view>提货时间：2024-1-9</view>
+		</view>
+
+
+		<view class="info-frame">
+			<view class="header">用户手机: 18879008955<text>用户名: 张小明</text></view>
+			<view class="introduce" v-for="item,index in info.mallOrderInfoDetails" :key="index">
+				<image :src="item.oderDetailImg"></image>
+				<view>{{item.productName}}</view>
+				<view>规格：{{handler(item.attributeJson)}}</view>
+				<view>￥120.61 X1</view>
+			</view>
+			<view class="detial">
+				<view>订单编号: <text>{{info.orderCode}}</text></view>
+				<view>下单时间: <text>{{info.createTime}}</text></view>
+				<view>站点电话: <text>18879008956</text></view>
+				<view>支付方式: <text>积分</text></view>
+				<view>商品金额: <text>￥{{info.marketPrice}}</text></view>
+				<view>支付积分: <text>{{info.integral}}</text></view>
+			</view>
+			<view class="footer">
+				<view class="button" @click="determine">确定提货</view>
+			</view>
+		</view>
+
+		<uni-popup ref="popup">
+			<view class="determine-frame">
+				<view class="title">是否立即提货</view>
+				<view class="buttons">
+					<view @click="$refs.popup.close()">取消</view>
+					<view @click="submit">确认</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/packageIntegral/orderList.js'
+
+	export default {
+		options: {
+			styleIsolation: 'shared'
+		},
+		data() {
+			return {
+				info: {
+					mallOrderInfoDetails: []
+				},
+				statusEnum: {
+					'-1': {
+						color: 'red',
+						value: "已取消"
+					},
+					0: {
+						color: 'blue',
+						value: "订单新建"
+					},
+					1: {
+						color: 'orange',
+						value: "待核销"
+					},
+					2: {
+						color: 'blue',
+						value: "已核销"
+					},
+				}
+			}
+		},
+
+		onLoad(options) {
+			this.get(options.orderId)
+		},
+		methods: {
+			determine() {
+				this.$refs.popup.open('center')
+			},
+			handler(json) {
+				json = json.replace(/'/g, '"')
+				let res = JSON.parse(json)
+				let values = Object.values(res)
+				let text = values.reduce((prev, item, index) => {
+					let _text = `${index == 0 ? '' :','}${item}`
+					return prev += _text
+				}, '')
+				return text
+			},
+			get(orderId) {
+				serve.get(orderId).then(res => {
+					if (res.code === 20000) {
+						this.info = res.data
+					}
+				})
+			},
+			confirm() {
+				this.controlWindows.code = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background: #F1F2F7;
+
+		>.status-frame {
+			position: relative;
+			margin-top: 20rpx;
+			padding-top: 37rpx;
+			padding-right: 30rpx;
+			width: 100%;
+			height: 170rpx;
+			background: #fff;
+
+			>view {
+				&:nth-of-type(1) {
+					position: absolute;
+					top: 50%;
+					transform: translateY(-50%);
+					left: 34rpx;
+					font-size: 40rpx;
+					font-weight: 550;
+					color: #333;
+				}
+
+				&:nth-of-type(2) {
+					text-align: right;
+					font-size: 36rpx;
+					font-weight: 550;
+					color: #333;
+
+					>text {
+						color: #F83D3D;
+					}
+				}
+
+				&:nth-of-type(3) {
+					margin-top: 12rpx;
+					text-align: right;
+					font-size: 28rpx;
+					color: #666;
+				}
+			}
+		}
+
+
+		.determine-frame {
+			padding-top: 85rpx;
+			width: 681rpx;
+			height: 340rpx;
+			background: #FFFFFF;
+			border-radius: 15rpx;
+
+			>.title {
+				text-align: center;
+				font-size: 38rpx;
+				color: #000;
+
+			}
+
+			>.buttons {
+
+				display: flex;
+				justify-content: space-evenly;
+				margin-top: 80rpx;
+
+				>view {
+					width: 250rpx;
+					height: 76rpx;
+					text-align: center;
+					line-height: 76rpx;
+					border-radius: 10rpx;
+					font-size: 28rpx;
+
+					&:nth-of-type(1) {
+						background: #FFFFFF;
+						border: 1rpx solid #B6B6B6;
+						color: #333;
+					}
+
+					&:nth-of-type(2) {
+						background: #FE0505;
+						color: #fff;
+					}
+				}
+			}
+		}
+
+
+		.info-frame {
+			margin-top: 20rpx;
+			position: relative;
+			background: #fff;
+			border-bottom: 12rpx solid #F1F2F7;
+
+			&:nth-last-of-type(1) {
+				border-bottom: none
+			}
+
+			.header {
+				padding: 35rpx 30rpx 0 34rpx;
+				height: 83rpx;
+				width: 100%;
+				font-size: 28rpx;
+				color: #666;
+				border-bottom: 1rpx solid #D7D7D7;
+
+				>text {
+					float: right;
+				}
+			}
+
+			.introduce {
+				position: relative;
+				padding: 28rpx 29rpx 0 268rpx;
+				min-height: 233rpx;
+
+				&:nth-last-of-type(1) {
+					margin-bottom: 0;
+				}
+
+				>image {
+					position: absolute;
+					top: 13rpx;
+					left: 32rpx;
+					width: 220rpx;
+					height: 220rpx;
+					// border: 1px solid #333;
+				}
+
+				>view {
+					&:nth-of-type(1) {
+						font-size: 28rpx;
+						color: #000;
+					}
+
+					&:nth-of-type(2),
+					&:nth-of-type(3) {
+						margin-top: 11rpx;
+						font-size: 24rpx;
+						color: #999;
+					}
+
+					&:nth-of-type(3) {
+						margin-top: 18rpx;
+
+					}
+				}
+			}
+
+			>.detial {
+				margin-top: 26rpx;
+				padding: 0 32rpx;
+
+				>view {
+
+					font-size: 28rpx;
+
+					>text {
+						float: right;
+					}
+
+					&:nth-of-type(1),
+					&:nth-of-type(2),
+						{
+						margin-bottom: 17rpx;
+						color: #999;
+					}
+
+					&:nth-of-type(3) {
+						color: #999;
+					}
+
+					&:nth-of-type(4) {
+						margin-top: 30rpx;
+						color: #000;
+					}
+
+					&:nth-of-type(5) {
+						margin-top: 17rpx;
+						color: #000;
+					}
+
+					&:nth-of-type(6) {
+						margin-top: 17rpx;
+						color: #F83D3D;
+					}
+				}
+			}
+
+			>.footer {
+				position: relative;
+				margin-top: 40rpx;
+
+				.button {
+					position: absolute;
+					top: 0;
+					right: 32rpx;
+					width: 198rpx;
+					height: 78rpx;
+					line-height: 78rpx;
+					text-align: center;
+					font-size: 28rpx;
+					color: #FFF;
+					background: #FE0606;
+					border-radius: 10rpx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/packageIntegral/orderList/index.vue b/packageIntegral/orderList/index.vue
new file mode 100644
index 0000000..b209ace
--- /dev/null
+++ b/packageIntegral/orderList/index.vue
@@ -0,0 +1,279 @@
+<template>
+	<view class="container">
+		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
+			<block slot="backText">返回</block>
+			<block slot="content">订单列表</block>
+		</cu-custom>
+
+		<view class="search">
+			<uni-easyinput prefixIcon="search" borderColor="#DCDFE6" v-model="paramter.customerphone" placeholder="请输入手机号后四位"
+				@confirm="search" maxlength="4" />
+		</view>
+
+		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
+			<view class="item" v-for="item,index in dataList" :key="index" @click="toDetails(item)">
+				<view class="header">用户手机：{{item.customerPhone}}<text
+						:style="{color:statusEnum[item.orderStatus].color}">{{statusEnum[item.orderStatus].value}}</text>
+				</view>
+				<view class="introduce">
+					<image :src="item.oderDetailImg"></image>
+					<view>{{item.productName}}</view>
+					<view>规格：{{handler(item.attributeJson)}}</view>
+					<view>￥{{item.marketPrice}} X{{item.orderNum}}</view>
+					<view>共{{item.orderNum}}件商品已支付积分：{{item.payIntegral}}</view>
+				</view>
+			</view>
+			<view style="height: 30rpx; background: #fff;"></view>
+		</scroll-view>
+		<view v-else class="empty">
+			<image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/yunsite-empty.png"></image>
+			<view>还没有订单哦~</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/packageIntegral/orderList.js'
+
+	export default {
+		options: {
+			styleIsolation: 'shared'
+		},
+		data() {
+			return {
+				code: '',
+				controlWindows: {
+					code: false
+				},
+				paramter: {
+					currentPage: 1,
+					pagesize: 20,
+					params: {
+						customerphone: ''
+					},
+				},
+				dataList: [],
+				statusEnum: {
+					'-1': {
+						color: 'red',
+						value: "已取消"
+					},
+					0: {
+						color: 'blue',
+						value: "订单新建"
+					},
+					1: {
+						color: 'orange',
+						value: "待核销"
+					},
+					2: {
+						color: 'blue',
+						value: "已核销"
+					},
+				}
+			}
+		},
+
+		onLoad() {
+			this.getByPageCloudMini()
+		},
+
+		methods: {
+			handler(json) {
+				json = json.replace(/'/g, '"')
+				let res = JSON.parse(json)
+				let values = Object.values(res)
+				let text =values.reduce((prev,item,index) => {
+					let _text = `${index == 0 ? '' :','}${item}`
+					return prev += _text
+				},'')
+				return text
+				// let text = ''
+				// values.forEach((item, index) => {
+				// 	let _text = `${index == 0 ? '' :','}${item}`
+				// 	text += _text
+				// })
+				// return text
+				// console.log('values',values)
+			},
+			toDetails(item) {
+				uni.navigateTo({
+					url: `../orderDetails/index?orderId=${item.orderId}`
+				})
+			},
+			search() {
+
+				this.paramter.currentPage = 1
+				this.getByPageCloudMini()
+			},
+			getByPageCloudMini() {
+				serve.getByPageCloudMini(this.paramter).then(res => {
+					if (res.code === 20000) {
+						if (!res.data.list.length) {
+							uni.showToast({
+								title: '没有更多订单啦~',
+								icon: 'none'
+							})
+							return
+						}
+						if (this.paramter.currentPage == 1) {
+							this.dataList = []
+						}
+						this.dataList = this.dataList.concat(res.data.list)
+						// console.log(this.dataList)
+					}
+				})
+			},
+			lower() {
+				this.paramter.currentPage += 1
+				this.getByPageCloudMini()
+			},
+			determine() {
+				this.$refs.popup.open('center')
+			},
+			confirm() {
+				this.controlWindows.code = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/deep/ .xt__verify-code .xt__input-ground .xt__box {
+		width: 146rpx;
+		height: 146rpx;
+		border-width: 1rpx;
+		border-radius: 14rpx;
+	}
+
+
+
+
+	.container {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #F1F2F7;
+
+		>.search {
+			margin: 50rpx auto 0;
+			width: 689rpx;
+			height: 74rpx;
+			background: #FFF;
+
+		}
+
+		>.list {
+			margin-top: 35rpx;
+			flex: 1;
+			overflow-y: hidden;
+
+			.item {
+				position: relative;
+				margin-top: 20rpx;
+				background: #fff;
+				// min-height: 106rpx;
+				// border-bottom: 12rpx solid #F1F2F7;
+
+				&:nth-of-type(1) {
+					margin-top: 0
+				}
+
+				.header {
+					padding: 26rpx 23rpx 0;
+					height: 80rpx;
+					// line-height: 83rpx;
+					width: 100%;
+					font-size: 30rpx;
+					color: #666;
+					border-bottom: 1rpx solid #D7D7D7;
+
+					>text {
+						float: right;
+						// color: #F83D3D;
+					}
+				}
+
+				.introduce {
+					position: relative;
+					padding: 24rpx 29rpx 31rpx 268rpx;
+					min-height: 220rpx;
+
+					>image {
+						position: absolute;
+						top: 13rpx;
+						left: 34rpx;
+						width: 220rpx;
+						height: 220rpx;
+						// border: 1px solid #333;
+					}
+
+					>view {
+						&:nth-of-type(1) {
+							font-size: 28rpx;
+							color: #000;
+						}
+
+						&:nth-of-type(2),
+						&:nth-of-type(3) {
+							margin-top: 11rpx;
+							font-size: 24rpx;
+							color: #999;
+						}
+						&:nth-of-type(3) {
+							margin-top: 18rpx;
+							
+						}
+
+						&:nth-of-type(4) {
+							margin-top: 11rpx;
+							font-size: 26rpx;
+							color: #333;
+						}
+					}
+				}
+
+				>.footer {
+					position: relative;
+					margin-top: 40rpx;
+					line-height: 78rpx;
+					padding: 0 34rpx 40rpx;
+					font-size: 32rpx;
+					color: #000;
+					font-weight: 550;
+
+					.button {
+						position: absolute;
+						top: 0;
+						right: 40rpx;
+						width: 198rpx;
+						height: 78rpx;
+						line-height: 78rpx;
+						text-align: center;
+						font-size: 28rpx;
+						color: #FFF;
+						background: #FE0606;
+						border-radius: 10rpx;
+					}
+				}
+			}
+		}
+
+		>.empty {
+			margin: 218rpx auto 0;
+
+			>image {
+				width: 473rpx;
+				height: 404rpx;
+			}
+
+			>view {
+				margin-top: 45rpx;
+				text-align: center;
+				font-size: 28rpx;
+				color: #999;
+			}
+		}
+
+	}
+</style>
diff --git a/packageIntegral/productList/index.vue b/packageIntegral/productList/index.vue
new file mode 100644
index 0000000..c27b988
--- /dev/null
+++ b/packageIntegral/productList/index.vue
@@ -0,0 +1,323 @@
+<template>
+	<view class="container">
+		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
+			<block slot="backText">返回</block>
+			<block slot="content">商品列表</block>
+		</cu-custom>
+
+		<view class="options-frame">
+			<view v-for="item,index in optionsList" :key="index" :class="index == currentIndex ? 'active':''"
+				@click="selectOptions(index)">{{item.text}}<text>({{item.count}})</text></view>
+		</view>
+
+		<view class="search">
+			<uni-easyinput prefixIcon="search"  v-model="paramter.customerphone" placeholder="请输入手机号后四位"
+				@confirm="search" maxlength="4" />
+		</view>
+
+		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
+			<view class="item" v-for="item,index in dataList" :key="index" @click="toDetails(item)">
+				<view class="header">用户手机：{{item.customerPhone}}<text
+						:style="{color:statusEnum[item.orderStatus].color}">{{statusEnum[item.orderStatus].value}}</text>
+				</view>
+				<view class="introduce">
+					<image :src="item.oderDetailImg"></image>
+					<view>{{item.productName}}</view>
+					<view>规格：1</view>
+					<view>￥{{item.marketPrice}} X{{item.orderNum}}</view>
+					<view>共{{item.orderNum}}件商品已支付积分：{{item.payIntegral}}</view>
+				</view>
+			</view>
+			<view style="height: 30rpx; background: #fff;"></view>
+		</scroll-view>
+		<view v-else class="empty">
+			<image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/yunsite-empty.png"></image>
+			<view>还没有订单哦~</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/packageIntegral/orderList.js'
+
+	export default {
+		options: {
+			styleIsolation: 'shared'
+		},
+		data() {
+			return {
+	
+				currentIndex: 0,
+				code: '',
+				controlWindows: {
+					code: false
+				},
+				paramter: {
+					currentPage: 1,
+					pagesize: 20,
+					params: {
+						customerphone: ''
+					},
+				},
+				dataList: [{},{}],
+				optionsList: [{
+					text: '全部',
+					count: 0,
+					value: ''
+				}, {
+					text: '已上架',
+					count: 0,
+					value: ''
+				}, {
+					text: '未上架',
+					count: 0,
+					value: ''
+				}, {
+					text: '待审核',
+					count: 0,
+					value: ''
+				}],
+				statusEnum: {
+					'-1': {
+						color: 'red',
+						value: "已取消"
+					},
+					0: {
+						color: 'blue',
+						value: "订单新建"
+					},
+					1: {
+						color: 'orange',
+						value: "待核销"
+					},
+					2: {
+						color: 'blue',
+						value: "已核销"
+					},
+				}
+			}
+		},
+
+		onLoad() {
+			// this.getByPageCloudMini()
+		},
+
+		methods: {
+			selectOptions(index) {
+				this.currentIndex = index
+			},
+			handler(json) {
+				json = json.replace(/'/g, '"')
+				let res = JSON.parse(json)
+				let values = Object.values(res)
+				let text = values.reduce((prev, item, index) => {
+					let _text = `${index == 0 ? '' :','}${item}`
+					return prev += _text
+				}, '')
+				return text
+			},
+			toDetails(item) {
+				uni.navigateTo({
+					url: `../orderDetails/index?orderId=${item.orderId}`
+				})
+			},
+			search() {
+				this.paramter.currentPage = 1
+				this.getByPageCloudMini()
+			},
+			getByPageCloudMini() {
+				serve.getByPageCloudMini(this.paramter).then(res => {
+					if (res.code === 20000) {
+						if (!res.data.list.length) {
+							uni.showToast({
+								title: '没有更多订单啦~',
+								icon: 'none'
+							})
+							return
+						}
+						if (this.paramter.currentPage == 1) {
+							this.dataList = []
+						}
+						this.dataList = this.dataList.concat(res.data.list)
+					}
+				})
+			},
+			lower() {
+				this.paramter.currentPage += 1
+				this.getByPageCloudMini()
+			},
+			determine() {
+				this.$refs.popup.open('center')
+			},
+			confirm() {
+				this.controlWindows.code = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/deep/ .uni-easyinput__content {
+		background: #F7F7F7 !important;
+	}
+
+	.container {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #fff;
+
+		>.options-frame {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 43rpx;
+			padding: 0 31rpx;
+
+
+			>view {
+				width: 144rpx;
+				height: 66rpx;
+				font-size: 25rpx;
+				line-height: 66rpx;
+				text-align: center;
+				color: #000000;
+				background: #F7F7F7;
+
+				>text {
+					color: #F83D3D;
+				}
+
+				&.active {
+					color: #FFF;
+					background: #F83D3D;
+
+					>text {
+						color: #fff;
+					}
+				}
+			}
+		}
+
+		>.search {
+			margin: 50rpx auto 0;
+			width: 689rpx;
+			height: 74rpx;
+			background: #F7F7F7;
+
+		}
+
+		>.list {
+			margin-top: 35rpx;
+			flex: 1;
+			overflow-y: hidden;
+
+			.item {
+				position: relative;
+				margin-top: 20rpx;
+				background: #fff;
+				// min-height: 106rpx;
+				// border-bottom: 12rpx solid #F1F2F7;
+
+				&:nth-of-type(1) {
+					margin-top: 0
+				}
+
+				.header {
+					padding: 26rpx 23rpx 0;
+					height: 80rpx;
+					// line-height: 83rpx;
+					width: 100%;
+					font-size: 30rpx;
+					color: #666;
+					border-bottom: 1rpx solid #D7D7D7;
+
+					>text {
+						float: right;
+						// color: #F83D3D;
+					}
+				}
+
+				.introduce {
+					position: relative;
+					padding: 24rpx 29rpx 31rpx 268rpx;
+					min-height: 220rpx;
+
+					>image {
+						position: absolute;
+						top: 13rpx;
+						left: 34rpx;
+						width: 220rpx;
+						height: 220rpx;
+						// border: 1px solid #333;
+					}
+
+					>view {
+						&:nth-of-type(1) {
+							font-size: 28rpx;
+							color: #000;
+						}
+
+						&:nth-of-type(2),
+						&:nth-of-type(3) {
+							margin-top: 11rpx;
+							font-size: 24rpx;
+							color: #999;
+						}
+
+						&:nth-of-type(3) {
+							margin-top: 18rpx;
+
+						}
+
+						&:nth-of-type(4) {
+							margin-top: 11rpx;
+							font-size: 26rpx;
+							color: #333;
+						}
+					}
+				}
+
+				>.footer {
+					position: relative;
+					margin-top: 40rpx;
+					line-height: 78rpx;
+					padding: 0 34rpx 40rpx;
+					font-size: 32rpx;
+					color: #000;
+					font-weight: 550;
+
+					.button {
+						position: absolute;
+						top: 0;
+						right: 40rpx;
+						width: 198rpx;
+						height: 78rpx;
+						line-height: 78rpx;
+						text-align: center;
+						font-size: 28rpx;
+						color: #FFF;
+						background: #FE0606;
+						border-radius: 10rpx;
+					}
+				}
+			}
+		}
+
+		>.empty {
+			margin: 218rpx auto 0;
+
+			>image {
+				width: 473rpx;
+				height: 404rpx;
+			}
+
+			>view {
+				margin-top: 45rpx;
+				text-align: center;
+				font-size: 28rpx;
+				color: #999;
+			}
+		}
+
+	}
+</style>
diff --git a/packageIntegral/takeGoods/index.vue b/packageIntegral/takeGoods/index.vue
new file mode 100644
index 0000000..871f00d
--- /dev/null
+++ b/packageIntegral/takeGoods/index.vue
@@ -0,0 +1,298 @@
+<template>
+	<view class="container">
+		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
+			<block slot="backText">返回</block>
+			<block slot="content">订单提货</block>
+		</cu-custom>
+
+		<view class="code">提货码: 1899</view>
+
+		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
+			<view class="item" v-for="item,index in dataList" :key="index">
+				<view class="header">用户手机：18879008955<text>待提货</text></view>
+				<view class="introduce">
+					<image></image>
+					<view>康师傅方便面 经典红烧牛肉面*5+番茄鸡蛋牛肉*1</view>
+					<view>规格：默认</view>
+					<view>￥120.61 X1</view>
+					<view>共1件商品已支付积分：20000</view>
+				</view>
+				<view class="footer">
+					提货码：1899
+					<view class="button" @click="determine">确定提货</view>
+				</view>
+			</view>
+		</scroll-view>
+		<view v-else class="empty">
+			<image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/yunsite-empty.png"></image>
+			<view>还没有订单哦~</view>
+		</view>
+
+
+		<view class="take-frame" v-if="controlWindows.code">
+			<view>请输入提货码</view>
+			<view>提货码或手机后四位</view>
+			<view class="code">
+				<xt-verify-code v-model="code" cursorColor="#333" boxNormalColor="#EAEAEA" boxActiveColor="#EAEAEA"
+					@confirm="confirm" :size="4" :isFocus="false"></xt-verify-code>
+			</view>
+		</view>
+
+		<!-- <button class="button" type="primary" @click="toggle('center')"><text class="button-text">居中</text></button> -->
+
+
+
+
+		<uni-popup ref="popup">
+			<view class="determine-frame">
+				<view class="title">是否立即提货</view>
+				<view class="buttons">
+					<view>取消</view>
+					<view>确认</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/packageBill/push.js'
+
+	export default {
+		options: {
+			styleIsolation: 'shared'
+		},
+		data() {
+			return {
+				code: '',
+				controlWindows: {
+					code: false
+				},
+				dataList: [1]
+			}
+		},
+
+		onLoad() {},
+
+		methods: {
+			determine() {
+				this.$refs.popup.open('center')
+			},
+			confirm() {
+				this.controlWindows.code = false
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	/deep/ .xt__verify-code .xt__input-ground .xt__box {
+		width: 146rpx;
+		height: 146rpx;
+		border-width: 1rpx;
+		border-radius: 14rpx;
+	}
+
+	.determine-frame {
+		padding-top: 85rpx;
+		width: 681rpx;
+		height: 340rpx;
+		background: #FFFFFF;
+		border-radius: 15rpx;
+
+		>.title {
+			text-align: center;
+			font-size: 38rpx;
+			color: #000;
+
+		}
+
+		>.buttons {
+
+			display: flex;
+			justify-content: space-evenly;
+			margin-top: 80rpx;
+
+			>view {
+				width: 250rpx;
+				height: 76rpx;
+				text-align: center;
+				line-height: 76rpx;
+				border-radius: 10rpx;
+				font-size: 28rpx;
+
+				&:nth-of-type(1) {
+					background: #FFFFFF;
+					border: 1rpx solid #B6B6B6;
+					color: #333;
+				}
+
+				&:nth-of-type(2) {
+					background: #FE0505;
+					color: #fff;
+				}
+			}
+		}
+	}
+
+	.take-frame {
+		position: fixed;
+		top: 84px;
+		left: 0;
+		z-index: 100;
+		padding-top: 94rpx;
+		height: calc(100vh - 84px);
+		width: 100%;
+		background: #fff;
+
+		>view {
+			padding-left: 31rpx;
+
+			&:nth-of-type(1) {
+				font-size: 48rpx;
+				font-weight: 550;
+				color: #000;
+			}
+
+			&:nth-of-type(2) {
+				margin-top: 18rpx;
+				font-size: 36rpx;
+				color: #999;
+			}
+		}
+
+		>.code {
+			padding-right: 31rpx;
+			margin-top: 61rpx;
+		}
+	}
+
+	.container {
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		background: #fff;
+
+		>.code {
+			margin: 37rpx auto 0;
+			width: 686rpx;
+			height: 88rpx;
+			line-height: 88rpx;
+			text-align: center;
+			font-size: 32rpx;
+			color: #000;
+			background: #F7F7F7;
+		}
+
+		>.list {
+			margin-top: 23rpx;
+			flex: 1;
+			overflow-y: hidden;
+
+			.item {
+				position: relative;
+				background: #fff;
+				border-bottom: 12rpx solid #F1F2F7;
+
+				&:nth-last-of-type(1) {
+					border-bottom: none
+				}
+
+				.header {
+					padding: 26rpx 23rpx 0;
+					height: 80rpx;
+					width: 100%;
+					font-size: 30rpx;
+					color: #666;
+					border-bottom: 1rpx solid #D7D7D7;
+
+					>text {
+						float: right;
+						color: #F83D3D;
+					}
+				}
+
+				.introduce {
+					position: relative;
+					padding: 24rpx 29rpx 0 268rpx;
+					min-height: 220rpx;
+
+					>image {
+						position: absolute;
+						top: 13rpx;
+						left: 34rpx;
+						width: 220rpx;
+						height: 220rpx;
+						// border: 1px solid #333;
+					}
+
+					>view {
+						&:nth-of-type(1) {
+							font-size: 28rpx;
+							color: #000;
+						}
+
+						&:nth-of-type(2),
+						&:nth-of-type(3) {
+							margin-top: 11rpx;
+							font-size: 24rpx;
+							color: #999;
+						}
+
+						&:nth-of-type(3) {
+							margin-top: 18rpx;
+
+						}
+
+						&:nth-of-type(4) {
+							margin-top: 11rpx;
+							font-size: 26rpx;
+							color: #333;
+						}
+					}
+				}
+
+				>.footer {
+					position: relative;
+					margin-top: 40rpx;
+					line-height: 78rpx;
+					padding: 0 34rpx 40rpx;
+					font-size: 32rpx;
+					color: #000;
+					font-weight: 550;
+
+					.button {
+						position: absolute;
+						top: 0;
+						right: 40rpx;
+						width: 198rpx;
+						height: 78rpx;
+						line-height: 78rpx;
+						text-align: center;
+						font-size: 28rpx;
+						color: #FFF;
+						background: #FE0606;
+						border-radius: 10rpx;
+					}
+				}
+			}
+		}
+
+		>.empty {
+			margin: 218rpx auto 0;
+
+			>image {
+				width: 473rpx;
+				height: 404rpx;
+			}
+
+			>view {
+				margin-top: 45rpx;
+				text-align: center;
+				font-size: 28rpx;
+				color: #999;
+			}
+		}
+
+	}
+</style>
diff --git a/pages.json b/pages.json
index cd74b1b..311b280 100644
--- a/pages.json
+++ b/pages.json
@@ -87,6 +87,22 @@
 		}
 	],
 	"subPackages": [{
+			"root": "packageIntegral",
+			"pages": [{
+				"path": "takeGoods/index",
+				"style": {}
+			},{
+				"path": "orderDetails/index",
+				"style": {}
+			},{
+				"path": "orderList/index",
+				"style": {}
+			},{
+				"path": "productList/index",
+				"style": {}
+			}]
+		},
+		{
 			"root": "packageOrders",
 			"pages": [{
 					"path": "pages/orderList/OrderDetail/OrderDetail",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 9147611..6d29304 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -421,6 +421,24 @@
 						obj.color = 'blue',
 						obj.badge = 0
 					obj.name = list.roleName
+				} else if (list.roleName == '订单提货') {
+					obj.cuIcon = 'punch',
+						obj.path = '/packageIntegral/takeGoods/index',
+						obj.color = 'blue',
+						obj.badge = 0
+					obj.name = list.roleName
+				} else if (list.roleName == '商城订单') {
+					obj.cuIcon = 'punch',
+						obj.path = '/packageIntegral/orderList/index',
+						obj.color = 'blue',
+						obj.badge = 0
+					obj.name = list.roleName
+				}else if (list.roleName == '商品列表') {
+					obj.cuIcon = 'punch',
+						obj.path = '/packageIntegral/productList/index',
+						obj.color = 'blue',
+						obj.badge = 0
+					obj.name = list.roleName
 				}
 				return obj
 			},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a0aca94..72499a2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -173,65 +173,65 @@
 
 				})
 			},
-			Splicing(list) {
-				let obj = {
-					cuIcon: '',
-					path: '',
-					color: '',
-					badge: 0,
-					name: ''
-				}
-				if (list.roleName == '扫码加油') {
-					obj.cuIcon = 'scan',
-						obj.path = '/pages/station-info/scan-camera/scan-camera',
-						obj.color = 'olive',
-						obj.badge = 0,
-						obj.name = list.roleName
-				} else if (list.roleName == '经营分析') {
-					obj.cuIcon = 'new',
-						obj.path = '',
-						obj.color = 'orange',
-						obj.badge = 0,
-						obj.name = list.roleName
-				} else if (list.roleName == '加油订单') {
-					obj.cuIcon = 'form',
-						obj.path = '/packageOrders/pages/orderList/orderList',
-						obj.color = 'yellow',
-						obj.badge = 0,
-						obj.name = list.roleName
-				} else if (list.roleName == '油站二维码') {
-					obj.cuIcon = 'qr_code',
-						obj.path = '/packageQr/pages/qrsite/QrCode_xy',
-						obj.color = 'cyan',
-						obj.badge = 0,
-						obj.name = list.roleName
-				} else if (list.roleName == '员工管理') {
-					obj.cuIcon = 'expressman',
-						obj.path = '/packageStaff/pages/staff/List/List',
-						obj.color = 'mauve',
-						obj.badge = 0,
-						obj.name = list.roleName
-				} else if (list.roleName == '油站信息') {
-					obj.cuIcon = 'punch',
-						obj.path = '/packageQr/pages/partnership/partnership',
-						obj.color = 'blue',
-						obj.badge = 0,
-						obj.name = list.roleName
-				} else if (list.roleName == '交易统计') {
-					obj.cuIcon = 'punch',
-						obj.path = '/pages/TransactionStatistics/TransactionStatistics',
-						obj.color = 'blue',
-						obj.badge = 0,
-						obj.name = list.roleName
-				} else if (list.roleName == '星油云站超级管理员') {
-					obj.cuIcon = 'punch',
-						obj.path = ' ',
-						obj.color = 'blue',
-						obj.badge = 0,
-						obj.name = list.roleName
-				}
-				return obj
-			},
+			// Splicing(list) {
+			// 	let obj = {
+			// 		cuIcon: '',
+			// 		path: '',
+			// 		color: '',
+			// 		badge: 0,
+			// 		name: ''
+			// 	}
+			// 	if (list.roleName == '扫码加油') {
+			// 		obj.cuIcon = 'scan',
+			// 			obj.path = '/pages/station-info/scan-camera/scan-camera',
+			// 			obj.color = 'olive',
+			// 			obj.badge = 0,
+			// 			obj.name = list.roleName
+			// 	} else if (list.roleName == '经营分析') {
+			// 		obj.cuIcon = 'new',
+			// 			obj.path = '',
+			// 			obj.color = 'orange',
+			// 			obj.badge = 0,
+			// 			obj.name = list.roleName
+			// 	} else if (list.roleName == '加油订单') {
+			// 		obj.cuIcon = 'form',
+			// 			obj.path = '/packageOrders/pages/orderList/orderList',
+			// 			obj.color = 'yellow',
+			// 			obj.badge = 0,
+			// 			obj.name = list.roleName
+			// 	} else if (list.roleName == '油站二维码') {
+			// 		obj.cuIcon = 'qr_code',
+			// 			obj.path = '/packageQr/pages/qrsite/QrCode_xy',
+			// 			obj.color = 'cyan',
+			// 			obj.badge = 0,
+			// 			obj.name = list.roleName
+			// 	} else if (list.roleName == '员工管理') {
+			// 		obj.cuIcon = 'expressman',
+			// 			obj.path = '/packageStaff/pages/staff/List/List',
+			// 			obj.color = 'mauve',
+			// 			obj.badge = 0,
+			// 			obj.name = list.roleName
+			// 	} else if (list.roleName == '油站信息') {
+			// 		obj.cuIcon = 'punch',
+			// 			obj.path = '/packageQr/pages/partnership/partnership',
+			// 			obj.color = 'blue',
+			// 			obj.badge = 0,
+			// 			obj.name = list.roleName
+			// 	} else if (list.roleName == '交易统计') {
+			// 		obj.cuIcon = 'punch',
+			// 			obj.path = '/pages/TransactionStatistics/TransactionStatistics',
+			// 			obj.color = 'blue',
+			// 			obj.badge = 0,
+			// 			obj.name = list.roleName
+			// 	} else if (list.roleName == '星油云站超级管理员') {
+			// 		obj.cuIcon = 'punch',
+			// 			obj.path = ' ',
+			// 			obj.color = 'blue',
+			// 			obj.badge = 0,
+			// 			obj.name = list.roleName
+			// 	}
+			// 	return obj
+			// },
 			// getSiteInfo() {
 			// 	//获取油站基本资料
 			// 	oliSiteApi.getSiteDetail(this.channelId)
diff --git a/uni_modules/xt-verify-code/changelog.md b/uni_modules/xt-verify-code/changelog.md
new file mode 100644
index 0000000..99a0317
--- /dev/null
+++ b/uni_modules/xt-verify-code/changelog.md
@@ -0,0 +1,46 @@
+## 1.3.1（2023-06-08）
+- 修改验证码过小 出现两个光标的问题
+## 1.3.0（2023-05-20）
+- 增加自定义输入文字的颜色
+## 1.2.6（2023-05-17）
+- 光标增加层级
+## 1.2.5（2023-05-14）
+- 处理多次触犯confirm 问题
+## 1.2.4（2023-05-07）
+- 兼容vue3 h5打包后运行找到createSelectorQuery 函数的问题
+## 1.2.3（2023-04-25）
+- 双向绑定v-model 写法兼容性
+## 1.2.2（2023-03-31）
+- 抽离公共代码，部分优化
+## 1.2.1（2023-03-19）
+- 处理vue2情况下，出现引入vue3api bug
+## 1.2.0（2023-03-19）
+- 增加vue3 环境
+## 1.1.6（2023-01-01）
+- scss样式修改成css
+- size 去除 数量限制，限制只能输入正整数
+## 1.1.5（2022-12-08）
+- 修复支付宝小程序，因input组件遮蔽的问题。显示样式不一致问题
+## 1.1.4（2022-12-02）
+- 修复密码形式ios手机失去焦点后再聚焦，不能删除的问题
+## 1.1.3（2022-12-02）
+- 撤销对ios手机的特殊处理
+## 1.1.2（2022-11-13）
+- 处理ios问题，添加ios机型判断
+## 1.1.1（2022-10-11）
+- 优化对ios的input组件bug的处理
+## 1.1.0（2022-10-11）
+- 修复ios环境下input组件，失去焦点后再次输入会自动清空bug
+## 1.0.4（2021-12-27）
+## 修改文档
+## 1.0.3（2021-10-18）
+修改说明文档
+## 1.0.2（2021-10-18）
+修改size 传入值，可以传入1~6 的值
+
+## 1.0.1（2021-09-02）
+- type 属性参数修改 box、middle、bottom 三种
+- 新增middle模式
+## 1.0.0（2021-08-31）
+- 验证码输入
+- 提供两种显示模式
diff --git a/uni_modules/xt-verify-code/components/xt-verify-code/config.js b/uni_modules/xt-verify-code/components/xt-verify-code/config.js
new file mode 100644
index 0000000..fbd5e1f
--- /dev/null
+++ b/uni_modules/xt-verify-code/components/xt-verify-code/config.js
@@ -0,0 +1,51 @@
+export const propsMap = {
+	// #ifdef VUE2
+	value: {
+		type: String,
+		default: () => ''
+	},
+	// #endif
+	
+	// #ifdef VUE3
+	modelValue: {
+		type: String,
+		default: () => ''
+	},
+	// #endif
+	type: {
+		type: String,
+		default: () => 'box'
+	},
+	inputType: {
+		type: String,
+		default: () => 'number'
+	},
+	size: {
+		type: Number,
+		default: () => 6
+	},
+	isFocus: {
+		type: Boolean,
+		default: () => true
+	},
+	isPassword: {
+		type: Boolean,
+		default: () => false
+	},
+	cursorColor: {
+		type: String,
+		default: () => '#cccccc'
+	},
+	boxNormalColor: {
+		type: String,
+		default: () => '#cccccc'
+	},
+	boxActiveColor: {
+		type: String,
+		default: () => '#000000'
+	},
+	color: {
+		type: String,
+		default: () => '#333333'
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/xt-verify-code/components/xt-verify-code/util.js b/uni_modules/xt-verify-code/components/xt-verify-code/util.js
new file mode 100644
index 0000000..e73d1ad
--- /dev/null
+++ b/uni_modules/xt-verify-code/components/xt-verify-code/util.js
@@ -0,0 +1,35 @@
+/**
+ * @description 获取元素节点 - 大小等信息
+ * @param {string} elm - 节点的id、class 相当于 document.querySelect的参数 -eg: #id
+ * @param {string} type = [single|array] - 单个元素获取多个元素 默认是单个元素
+ * @param {Function} callback - 回调函数
+ * @param {object} that - 上下文环境 vue2：this ,vue3: getCurrentInstance();
+ */
+export const getElementRect = (that) => (elm, type = 'single', callback) => {
+
+	// #ifndef H5
+	uni
+		.createSelectorQuery()
+		.in(that)[type === 'array' ? 'selectAll' : 'select'](elm)
+		.boundingClientRect()
+		.exec(data => {
+			callback(data[0]);
+		});
+	// #endif
+
+	// #ifdef H5
+	let elmArr = [];
+	const result = [];
+	if (type === 'array') {
+		elmArr = document.querySelectorAll(elm);
+	} else {
+		elmArr.push(document.querySelector(elm));
+	}
+
+	for (let elm of elmArr) {
+		result.push(elm.getBoundingClientRect());
+	}
+	console.log('result', result)
+	callback(type === 'array' ? result : result[0]);
+	// #endif
+}
\ No newline at end of file
diff --git a/uni_modules/xt-verify-code/components/xt-verify-code/xt-verify-code.vue b/uni_modules/xt-verify-code/components/xt-verify-code/xt-verify-code.vue
new file mode 100644
index 0000000..7559358
--- /dev/null
+++ b/uni_modules/xt-verify-code/components/xt-verify-code/xt-verify-code.vue
@@ -0,0 +1,408 @@
+<template>
+	<!-- #ifdef VUE2 -->
+	<view class="xt__verify-code">
+		<!-- 输入框 -->
+		<input id="xt__input" :value="code" class="xt__input" :focus="isFocus" :type="inputType" :maxlength="itemSize" @input="onInput" @focus="inputFocus" @blur="inputBlur" />
+
+		<!-- 光标 -->
+		<view
+			id="xt__cursor"
+			v-if="cursorVisible && type !== 'middle'"
+			class="xt__cursor"
+			:style="{ left: codeCursorLeft[code.length] + 'px', height: cursorHeight + 'px', backgroundColor: cursorColor }"
+		></view>
+
+		<!-- 输入框 - 组 -->
+		<view id="xt__input-ground" class="xt__input-ground">
+			<view
+				v-for="(item, index) in itemSize"
+				:key="index"
+				:style="{ borderColor: code.length === index && cursorVisible ? boxActiveColor : boxNormalColor }"
+				:class="['xt__box', `xt__box-${type + ''}`, `xt__box::after`]"
+			>
+				<view :style="{ borderColor: boxActiveColor }" class="xt__middle-line" v-if="type === 'middle' && !code[index]"></view>
+
+				<text :style="{ color: color }" class="xt__code-text">{{ code[index] | codeFormat(isPassword) }}</text>
+			</view>
+		</view>
+	</view>
+	<!-- #endif -->
+
+	<!-- #ifdef VUE3 -->
+	<view class="xt__verify-code">
+		<!-- 输入框 -->
+		<input
+			id="xt__input"
+			:value="code"
+			class="xt__input"
+			:focus="props.isFocus"
+			:type="props.inputType"
+			:maxlength="itemSize"
+			@input="onInput"
+			@focus="inputFocus"
+			@blur="inputBlur"
+		/>
+
+		<!-- 光标 -->
+		<view
+			id="xt__cursor"
+			v-if="cursorVisible && props.type !== 'middle'"
+			class="xt__cursor"
+			:style="{ left: codeCursorLeft[code.length] + 'px', height: cursorHeight + 'px', backgroundColor: props.cursorColor }"
+		></view>
+
+		<!-- 输入框 - 组 -->
+		<view id="xt__input-ground" class="xt__input-ground">
+			<view
+				v-for="(item, index) in itemSize"
+				:key="index"
+				:style="{ borderColor: code.length === index && cursorVisible ? props.boxActiveColor : props.boxNormalColor }"
+				:class="['xt__box', `xt__box-${props.type + ''}`, `xt__box::after`]"
+			>
+				<view :style="{ borderColor: props.boxActiveColor }" class="xt__middle-line" v-if="props.type === 'middle' && !code[index]"></view>
+				<text :style="{ color: props.color }" class="xt__code-text">{{ codeFormat(code[index], props.isPassword) }}</text>
+			</view>
+		</view>
+	</view>
+	<!-- #endif -->
+</template>
+
+<!-- #ifdef VUE3 -->
+<script setup>
+/**
+ * @description 输入验证码组件
+ * @property {string} type = [box|middle|bottom] - 显示类型 默认：box -eg:bottom
+ * @property {string} inputType = [text|number] - 输入框类型 默认：number -eg:number
+ * @property {number} size - 验证码输入框数量 默认：6 -eg:6
+ * @property {boolean} isFocus - 是否立即聚焦 默认：true
+ * @property {boolean} isPassword - 是否以密码形式显示 默认false -eg: false
+ * @property {string} cursorColor - 光标颜色 默认：#cccccc
+ * @property {string} boxNormalColor - 光标未聚焦到的框的颜色 默认：#cccccc
+ * @property {string} boxActiveColor - 光标聚焦到的框的颜色 默认：#000000
+ * @property {string} color - 光标聚焦到的框的颜色 默认：#333333
+ * @event {Function(data)} confirm - 输入完成回调函数
+ */
+import { defineProps, onMounted, ref, getCurrentInstance, watch } from 'vue';
+import { propsMap } from './config.js';
+import { getElementRect } from './util.js';
+
+const props = defineProps(propsMap);
+const emits = defineEmits(['update:modelValue', 'confirm']);
+
+// 获取当前组件的实例
+const currentInstance = getCurrentInstance();
+
+const getElement = getElementRect(currentInstance);
+
+const cursorVisible = ref(false);
+const cursorHeight = ref(35);
+const code = ref(''); // 输入的验证码
+const codeCursorLeft = ref([]); // 向左移动的距离数组,
+const itemSize = ref(6);
+const isPatch = ref(false);
+
+/**
+ * 设置验证码框数量
+ */
+function validatorSize() {
+	if (props.size > 0) {
+		itemSize.value = Math.floor(props.size);
+	} else {
+		throw "methods of 'size' is integer";
+	}
+}
+/**
+ * @description 初始化
+ */
+function init() {
+	getCodeCursorLeft();
+	setCursorHeight();
+}
+
+/**
+ * @description 计算光标的高度
+ */
+function setCursorHeight() {
+	getElement('.xt__box', 'single', boxElm => {
+		cursorHeight.value = boxElm.height * 0.6;
+	});
+}
+/**
+ * @description 获取光标在每一个box的left位置
+ */
+function getCodeCursorLeft() {
+	// 获取父级框的位置信息
+	getElement('#xt__input-ground', 'single', parentElm => {
+		const parentLeft = parentElm.left;
+		// 获取各个box信息
+		getElement('.xt__box', 'array', elms => {
+			codeCursorLeft.value = [];
+			elms.forEach(elm => {
+				codeCursorLeft.value.push(elm.left - parentLeft + elm.width / 2);
+			});
+		});
+	});
+}
+
+// 输入框输入变化的回调
+function onInput(e) {
+	let { value, keyCode } = e.detail;
+	cursorVisible.value = value.length < itemSize.value;
+	code.value = value;
+	emits('update:modelValue', value);
+	inputSuccess(value);
+}
+
+// 输入完成回调
+function inputSuccess(value) {
+	if (value.length === itemSize.value && !isPatch.value) {
+		isPatch.value = true;
+		emits('confirm', value);
+	} else {
+		isPatch.value = false;
+	}
+}
+// 输入聚焦
+function inputFocus() {
+	cursorVisible.value = code.value.length < itemSize.value;
+}
+// 输入失去焦点
+function inputBlur() {
+	cursorVisible.value = false;
+}
+
+// 判断文本如何显示
+function codeFormat(val, isPassword) {
+	return val ? (isPassword ? '*' : val) : '';
+}
+
+onMounted(() => {
+	cursorVisible.value = props.isFocus;
+	validatorSize();
+	init();
+});
+
+watch(
+	() => props.modelValue,
+	val => {
+		if (val !== code.value) {
+			code.value = val;
+		}
+	}
+);
+</script>
+<!-- #endif -->
+
+<!-- #ifdef VUE2 -->
+<script>
+/**
+ * @description 输入验证码组件
+ * @property {string} type = [box|middle|bottom] - 显示类型 默认：box -eg:bottom
+ * @property {string} inputType = [text|number] - 输入框类型 默认：number -eg:number
+ * @property {number} size - 验证码输入框数量 默认：6 -eg:6
+ * @property {boolean} isFocus - 是否立即聚焦 默认：true
+ * @property {boolean} isPassword - 是否以密码形式显示 默认false -eg: false
+ * @property {string} cursorColor - 光标颜色 默认：#cccccc
+ * @property {string} boxNormalColor - 光标未聚焦到的框的颜色 默认：#cccccc
+ * @property {string} boxActiveColor - 光标聚焦到的框的颜色 默认：#000000
+ * @property {string} color - 光标聚焦到的框的颜色 默认：#333333
+ * @event {Function(data)} confirm - 输入完成回调函数
+ */
+import { propsMap } from './config.js';
+import { getElementRect } from './util.js';
+export default {
+	name: 'xt-verify-code',
+	props: propsMap,
+	model: {
+		prop: 'value',
+		event: 'input'
+	},
+	data() {
+		return {
+			cursorVisible: false,
+			cursorHeight: 35,
+			code: '', // 输入的验证码
+			codeCursorLeft: [], // 向左移动的距离数组,
+			itemSize: 6,
+			getElement: getElementRect(this),
+			isPatch: false
+		};
+	},
+	created() {
+		this.cursorVisible = this.isFocus;
+		this.validatorSize();
+	},
+	mounted() {
+		this.init();
+	},
+	methods: {
+		/**
+		 * 设置验证码框数量
+		 */
+		validatorSize() {
+			if (this.size > 0) {
+				this.itemSize = Math.floor(this.size);
+			} else {
+				throw "methods of 'size' is integer";
+			}
+		},
+		/**
+		 * @description 初始化
+		 */
+		init() {
+			this.getCodeCursorLeft();
+			this.setCursorHeight();
+		},
+		/**
+		 * @description 计算光标的高度
+		 */
+		setCursorHeight() {
+			this.getElement('.xt__box', 'single', boxElm => {
+				this.cursorHeight = boxElm.height * 0.6;
+			});
+		},
+		/**
+		 * @description 获取光标在每一个box的left位置
+		 */
+		getCodeCursorLeft() {
+			// 获取父级框的位置信息
+			this.getElement('#xt__input-ground', 'single', parentElm => {
+				const parentLeft = parentElm.left;
+				// 获取各个box信息
+				this.getElement('.xt__box', 'array', elms => {
+					this.codeCursorLeft = [];
+					elms.forEach(elm => {
+						this.codeCursorLeft.push(elm.left - parentLeft + elm.width / 2);
+					});
+				});
+			});
+		},
+
+		// 输入框输入变化的回调
+		onInput(e) {
+			let { value, keyCode } = e.detail;
+			this.cursorVisible = value.length < this.itemSize;
+			this.code = value;
+			this.$emit('input', value);
+			this.inputSuccess(value);
+		},
+
+		// 输入完成回调
+		inputSuccess(value) {
+			if (value.length === this.itemSize && !this.isPatch) {
+				this.$emit('confirm', value);
+			} else {
+				this.isPatch = false;
+			}
+		},
+		// 输入聚焦
+		inputFocus() {
+			this.cursorVisible = this.code.length < this.itemSize;
+		},
+		// 输入失去焦点
+		inputBlur() {
+			this.cursorVisible = false;
+		}
+	},
+	watch: {
+		value(val) {
+			if (val !== this.code) {
+				this.code = val;
+			}
+		}
+	},
+	filters: {
+		codeFormat(val, isPassword) {
+			return val ? (isPassword ? '*' : val) : '';
+		}
+	}
+};
+</script>
+<!-- #endif -->
+
+<style >
+.xt__verify-code {
+	position: relative;
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.xt__verify-code .xt__input {
+	height: 100%;
+	width: 200vw;
+	position: absolute;
+	left: -100vw;
+	z-index: 1;
+	color: transparent;
+	caret-color: transparent;
+	background-color: rgba(0, 0, 0, 0);
+}
+.xt__verify-code .xt__cursor {
+	position: absolute;
+	top: 50%;
+	transform: translateY(-50%);
+	display: inline-block;
+	width: 2px;
+	animation-name: xt__cursor;
+	animation-duration: 0.8s;
+	animation-iteration-count: infinite;
+	z-index: 1;
+}
+
+.xt__verify-code .xt__input-ground {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.xt__verify-code .xt__input-ground .xt__box {
+	position: relative;
+	display: inline-block;
+	width: 100rpx;
+	height: 140rpx;
+}
+
+.xt__verify-code .xt__input-ground .xt__box-bottom {
+	border-bottom-width: 2px;
+	border-bottom-style: solid;
+}
+
+.xt__verify-code .xt__input-ground .xt__box-box {
+	border-width: 2px;
+	border-style: solid;
+}
+
+.xt__verify-code .xt__input-ground .xt__box-middle {
+	border: none;
+}
+
+.xt__input-ground .xt__box .xt__middle-line {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	width: 50%;
+	transform: translate(-50%, -50%);
+	border-bottom-width: 2px;
+	border-bottom-style: solid;
+}
+
+.xt__input-ground .xt__box .xt__code-text {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	font-size: 80rpx;
+	transform: translate(-50%, -50%);
+}
+
+@keyframes xt__cursor {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0;
+	}
+}
+</style>
diff --git a/uni_modules/xt-verify-code/package.json b/uni_modules/xt-verify-code/package.json
new file mode 100644
index 0000000..856a562
--- /dev/null
+++ b/uni_modules/xt-verify-code/package.json
@@ -0,0 +1,79 @@
+{
+	"id": "xt-verify-code",
+	"displayName": "xt-verify-code验证码输入",
+	"version": "1.3.1",
+	"description": "xt-verify-code验证码输入组件，提供三种显示模式",
+	"keywords": [
+        "xt-verify-code",
+        "verify",
+        "验证码"
+    ],
+	"repository": "https://github.com/xiaodaweb/xt-ui/tree/main/uni_modules/xt-verify-code",
+	"engines": {
+		"HBuilderX": "^3.1.0"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": "1010161292"
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "y",
+					"vue3": "y"
+				},
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "u"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "y",
+					"联盟": "y"
+				}
+			}
+		}
+	}
+}
diff --git a/uni_modules/xt-verify-code/readme.md b/uni_modules/xt-verify-code/readme.md
new file mode 100644
index 0000000..f347b56
--- /dev/null
+++ b/uni_modules/xt-verify-code/readme.md
@@ -0,0 +1,20 @@
+# 验证码输入框
+## 使用方法
+```vue
+<xt-verify-code v-model="verifyCode" @confirm="confirm"></xt-verify-code>
+```
+
+## 参数
+|属性						|类型		|说明																								|默认值	|
+|--							|--			|--																									|--			|
+|value(v-model)	|string	|值(可双向绑定)																			|''			|
+|type						|string	|验证输入框类型可选值: box、middle、bottom					|box		|
+|inputType			|string	|输入类型 可选值：text、number											|number	|
+|size						|number	|验证码框数量																				|6			|
+|isFocus				|boolean|是否一开始聚焦																			|true		|
+|isPassword			|boolean|是否使用密码方式显示																|false	|
+|cursorColor		|string	|光标颜色																						|#cccccc|
+|boxNormalColor	|string	|显示框未选中的颜色																	|#cccccc|
+|boxActiveColor	|string	|显示框选中的颜色如果type='middle' 则是线的默认样式	|#000000|
+|color					|string	|输入文字的颜色																			|#333333|
+|@confirm				|event	|输入完成的回调事件  {(code)=>{}}										|				|
\ No newline at end of file

From 72472034f95dd124964f3ba313b82290128733de Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Fri, 26 Jan 2024 17:04:25 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageIntegral/productList/index.vue | 178 +++++++++++++++++++++-----
 packageIntegral/takeGoods/index.vue   |   3 +-
 2 files changed, 145 insertions(+), 36 deletions(-)

diff --git a/packageIntegral/productList/index.vue b/packageIntegral/productList/index.vue
index c27b988..c598dcb 100644
--- a/packageIntegral/productList/index.vue
+++ b/packageIntegral/productList/index.vue
@@ -16,16 +16,22 @@
 		</view>
 
 		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
-			<view class="item" v-for="item,index in dataList" :key="index" @click="toDetails(item)">
-				<view class="header">用户手机：{{item.customerPhone}}<text
-						:style="{color:statusEnum[item.orderStatus].color}">{{statusEnum[item.orderStatus].value}}</text>
+			<view class="item" v-for="item,index in dataList" :key="index">
+				<view class="header" @click="toDetails(item)">
+					<view class="identifying" :style="{background:identifying[1].background,opacity:identifying[1].opacity}">已上架</view>
 				</view>
-				<view class="introduce">
+				<view class="introduce" @click="toDetails(item)">
 					<image :src="item.oderDetailImg"></image>
 					<view>{{item.productName}}</view>
-					<view>规格：1</view>
+					<view>规格：默认</view>
 					<view>￥{{item.marketPrice}} X{{item.orderNum}}</view>
-					<view>共{{item.orderNum}}件商品已支付积分：{{item.payIntegral}}</view>
+					<view>库存：{{item.orderNum}}</view>
+				</view>
+				<view class="examine" :style="{background:statusEnum[1].color}" >{{statusEnum[1].value}}</view>
+				<view class="footer">
+					<view class="button" @click="orderDelete">删除</view>
+					<view class="button">编辑</view>
+					<view class="button" @click="upDownFrame">上架</view>
 				</view>
 			</view>
 			<view style="height: 30rpx; background: #fff;"></view>
@@ -34,6 +40,27 @@
 			<image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/yunsite-empty.png"></image>
 			<view>还没有订单哦~</view>
 		</view>
+		
+		<uni-popup ref="delete">
+			<view class="determine-frame">
+				<view class="title">是否删除该商品？</view>
+				<view class="buttons">
+					<view @click="$refs.delete.close()">取消</view>
+					<view>确认</view>
+				</view>
+			</view>
+		</uni-popup>
+		
+		<uni-popup ref="popup">
+			<view class="determine-frame">
+				<view class="title">是否上架/下架该商品？</view>
+				<view class="buttons">
+					<view @click="$refs.popup.close()">取消</view>
+					<view>确认</view>
+				</view>
+			</view>
+		</uni-popup>
+		
 	</view>
 </template>
 
@@ -59,7 +86,7 @@
 						customerphone: ''
 					},
 				},
-				dataList: [{},{}],
+				dataList: [{},{},{}],
 				optionsList: [{
 					text: '全部',
 					count: 0,
@@ -77,22 +104,30 @@
 					count: 0,
 					value: ''
 				}],
-				statusEnum: {
-					'-1': {
-						color: 'red',
-						value: "已取消"
-					},
+				identifying:{
 					0: {
-						color: 'blue',
-						value: "订单新建"
+						background: '#F83D3D',
+						opacity: 1,
+						value: "已上架"
 					},
 					1: {
-						color: 'orange',
-						value: "待核销"
+						background: '#F83D3D',
+						opacity: 0.5,
+						value: "待上架"
+					}
+				},
+				statusEnum: {
+					'-1': {
+						color: '#F83D3D',
+						value: "已驳回"
+					},
+					1: {
+						color: '#8D38FC',
+						value: "待审核"
 					},
 					2: {
-						color: 'blue',
-						value: "已核销"
+						color: '#FCB438',
+						value: "已审核"
 					},
 				}
 			}
@@ -146,7 +181,10 @@
 				this.paramter.currentPage += 1
 				this.getByPageCloudMini()
 			},
-			determine() {
+			orderDelete(){
+				this.$refs.delete.open('center')
+			},
+			upDownFrame() {
 				this.$refs.popup.open('center')
 			},
 			confirm() {
@@ -223,17 +261,22 @@
 				}
 
 				.header {
-					padding: 26rpx 23rpx 0;
-					height: 80rpx;
+					// padding: 26rpx 23rpx 0;
+					height: 60rpx;
 					// line-height: 83rpx;
 					width: 100%;
 					font-size: 30rpx;
 					color: #666;
-					border-bottom: 1rpx solid #D7D7D7;
+					border-top: 1rpx solid #D7D7D7;
 
-					>text {
-						float: right;
-						// color: #F83D3D;
+					.identifying{
+						width: 120rpx;
+						height: 60rpx;
+						line-height: 60rpx;
+						// background-color: #F83D3D;
+						color: #FFF;
+						text-align: center;
+						border-bottom-right-radius: 30rpx;
 					}
 				}
 
@@ -271,16 +314,26 @@
 
 						&:nth-of-type(4) {
 							margin-top: 11rpx;
-							font-size: 26rpx;
-							color: #333;
+							font-size: 28rpx;
+							color: #F83D3D;
 						}
 					}
 				}
+				.examine{
+					width: 120rpx;
+					height: 45rpx;
+					color: #FFF;
+					text-align: center;
+					line-height: 45rpx;
+					position: absolute;
+					right: 50rpx;
+					top: 180rpx;
+				}
 
 				>.footer {
 					position: relative;
-					margin-top: 40rpx;
-					line-height: 78rpx;
+					height: 58rpx;
+					line-height: 58rpx;
 					padding: 0 34rpx 40rpx;
 					font-size: 32rpx;
 					color: #000;
@@ -289,16 +342,71 @@
 					.button {
 						position: absolute;
 						top: 0;
-						right: 40rpx;
-						width: 198rpx;
-						height: 78rpx;
-						line-height: 78rpx;
+						width: 128rpx;
+						height: 58rpx;
+						line-height: 58rpx;
 						text-align: center;
 						font-size: 28rpx;
-						color: #FFF;
-						background: #FE0606;
+						color: #999;
+						background: #FFF;
+						border: 1px solid #999;
 						border-radius: 10rpx;
 					}
+				
+					>.button{
+						&:nth-of-type(1){
+							right: 360rpx;
+						}
+						&:nth-of-type(2){
+							right: 200rpx;
+						}
+						&:nth-of-type(3){
+							right: 40rpx;
+						}
+						
+					}
+				}
+			}
+		}
+		
+		.determine-frame {
+			padding-top: 85rpx;
+			width: 681rpx;
+			height: 340rpx;
+			background: #FFFFFF;
+			border-radius: 15rpx;
+		
+			>.title {
+				text-align: center;
+				font-size: 38rpx;
+				color: #000;
+		
+			}
+		
+			>.buttons {
+		
+				display: flex;
+				justify-content: space-evenly;
+				margin-top: 80rpx;
+		
+				>view {
+					width: 250rpx;
+					height: 76rpx;
+					text-align: center;
+					line-height: 76rpx;
+					border-radius: 10rpx;
+					font-size: 28rpx;
+		
+					&:nth-of-type(1) {
+						background: #FFFFFF;
+						border: 1rpx solid #B6B6B6;
+						color: #333;
+					}
+		
+					&:nth-of-type(2) {
+						background: #FE0505;
+						color: #fff;
+					}
 				}
 			}
 		}
diff --git a/packageIntegral/takeGoods/index.vue b/packageIntegral/takeGoods/index.vue
index 871f00d..f4d7e50 100644
--- a/packageIntegral/takeGoods/index.vue
+++ b/packageIntegral/takeGoods/index.vue
@@ -47,7 +47,7 @@
 			<view class="determine-frame">
 				<view class="title">是否立即提货</view>
 				<view class="buttons">
-					<view>取消</view>
+					<view @click="$refs.popup.close()">取消</view>
 					<view>确认</view>
 				</view>
 			</view>
@@ -78,6 +78,7 @@
 			determine() {
 				this.$refs.popup.open('center')
 			},
+		
 			confirm() {
 				this.controlWindows.code = false
 			}

From ac634dfaf87b25facc22e7ad09acf09dbd276ebf Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Fri, 2 Feb 2024 13:44:55 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/packageIntegral/orderList.js              |   9 +-
 packageIntegral/components/mulpicker.vue      | 172 +++++++++++
 packageIntegral/orderDetails/index.vue        |  22 +-
 packageIntegral/orderList/index.vue           |   8 +-
 packageIntegral/productAddition/index.vue     | 281 ++++++++++++++++++
 .../productAddition/productAddStep2.vue       |  55 ++++
 packageIntegral/productList/index.vue         | 130 +++++++-
 packageIntegral/takeGoods/index.vue           |  85 +++++-
 pages.json                                    |   3 +
 pages/home/home.vue                           |   6 +
 10 files changed, 732 insertions(+), 39 deletions(-)
 create mode 100644 packageIntegral/components/mulpicker.vue
 create mode 100644 packageIntegral/productAddition/index.vue
 create mode 100644 packageIntegral/productAddition/productAddStep2.vue

diff --git a/api/packageIntegral/orderList.js b/api/packageIntegral/orderList.js
index 078d334..5967824 100644
--- a/api/packageIntegral/orderList.js
+++ b/api/packageIntegral/orderList.js
@@ -13,5 +13,12 @@ export default{
 			url: `/oil-mall/mallOrderInfo/get/${id}`,
 			method: 'get',
 		})
-	}
+	},
+	takeOrder(data) {
+		return request({
+			url: `/oil-mall/mallOrderInfo/takeOrder`,
+			method: 'post',
+			data
+		})
+	},
 }
\ No newline at end of file
diff --git a/packageIntegral/components/mulpicker.vue b/packageIntegral/components/mulpicker.vue
new file mode 100644
index 0000000..eb1b465
--- /dev/null
+++ b/packageIntegral/components/mulpicker.vue
@@ -0,0 +1,172 @@
+<!-- 多列选择器 -->
+<template>
+    <picker mode="multiSelector" @columnchange="handleColumnChange" @change="pickerChange" :value="multiIndex" :range="multiArray" :range-key="rangekey">
+        <view class="uni-input space-between" hover-class="hover-color">
+            <slot name="before"></slot>
+            <text class="input-content ellipsis" :class="name?'':'color-placeholder'">{{name?name:placeholder}}</text>
+            <slot name="after"></slot>
+        </view>
+    </picker>
+</template>
+<script>
+    export default {
+        props: {
+            value: { default: ''}, // 必须要使用value
+            list: {type: Array, default: [] },
+            rangekey: { default: 'name' },        // 对应name取值
+            childkey: { default: 'children' },    // 子集
+            code: { default: 'code' },            // 对应value取值
+            pidkey: { default: 'pid' },            // 对应父id取值
+            placeholder: { default: '请选择' },
+            emitPath: { default: false, type: Boolean },  // 是否子父级关联 ，是的时候返回的是逗号分隔的父子code
+            level: { default: 3, type: Number }    // 列数 2或者3
+        },
+        data() {
+            return {
+                multiArray: [[],],
+                multiIndex: [0, 0, 0],
+                name: "",
+            }
+        },
+        methods: {
+            handleColumnChange(e) {
+                
+                let columnindex = e.detail.value; // 拖动列索引
+                switch (e.detail.column) {
+                    case 0: //拖动第1列
+                    
+                        // 第二级
+                        let arr1 = this.multiArray[0];
+                        this.multiArray[1] = arr1[columnindex][this.childkey]||[];
+                        
+                        if(this.level === 3) {
+                            // 第三级
+                            let arr2 = this.multiArray[1];
+                            this.multiArray[2] = arr2[0][this.childkey]||[];
+                        }
+                        
+                        this.multiIndex.splice(0, 1, columnindex)
+                        this.multiIndex.splice(1, 1, 0)
+                        this.multiIndex.splice(2, 1, 0)
+                        break
+                    case 1: //拖动第2列
+                        if (this.level === 3) {
+                            // 第三级
+                            let arr3 = this.multiArray[1];
+                            this.multiArray[2] = arr3[columnindex][this.childkey]||[];
+                        }
+                        
+                        this.multiIndex.splice(1, 1, columnindex)
+                        this.multiIndex.splice(2, 1, 0)
+                        break
+                }
+                
+            },
+            // 
+            pickerChange(e) {
+                let multiIndex = e.detail.value;
+                if(this.emitPath) {
+                    let codeArr = [], nameArr = [];
+                    for(let i = 0; i < multiIndex.length; i++ ) {
+                        if(this.multiArray[i] && this.multiArray[i][multiIndex[i]]) {
+                            codeArr.push(this.multiArray[i][multiIndex[i]][this.code]);
+                            nameArr.push(this.multiArray[i][multiIndex[i]][this.rangekey]);
+                        }
+                    }
+                    let code = codeArr.join(',');
+                    this.name = nameArr.join('/');
+                    console.log('code1',code);
+                    this.$emit('input', code)
+                }else {
+            
+                    let curArr = this.multiArray[2], code='';
+                    if(curArr && curArr.length) {
+                        code = curArr[multiIndex[2]][this.code];
+                        this.name = curArr[multiIndex[2]][this.rangekey];
+                    }else { 
+                        curArr = this.multiArray[1]
+                        code = curArr[multiIndex[1]][this.code];
+                        this.name = curArr[multiIndex[1]][this.rangekey];
+                    }
+                    
+                    console.log('code2',code);
+                    this.$emit('input', code)
+                }
+            },
+            // 初始化级联数据
+            dataInit() {
+                // 第一级
+                this.multiArray[0] = this.list;
+                // 第二级
+                let arr1 = this.multiArray[0];
+                this.multiArray.push(arr1[this.multiIndex[0]][this.childkey]||[]);
+                if(this.level === 3) {
+                    // 第三级
+                    let arr2 = this.multiArray[1];
+                    this.multiArray.push(arr2[this.multiIndex[1]][this.childkey]||[]);
+                    
+                }
+            },
+            curDataFind (data, code) {
+                let result;
+                if (!data) {
+                    data = this.list;
+                }
+                for (var i = 0; i < data.length; i++) {
+                    let item = data[i]
+                    if (result) {
+                        return result;
+                    }
+                    if (Number(item[this.code]) === code) {
+                        result = item;
+                        break;
+                    } else if (item[this.childkey] && item[this.childkey].length > 0) {
+                        result = this.curDataFind(item[this.childkey], code);
+                    }
+                }
+                return result;
+            },
+            initName() {
+                if(this.list.length && this.value) {
+                    if(this.emitPath) {
+                        let nameArr = [], codeArr = this.value.split(',');
+                        for(let i = 0; i < codeArr.length; i++ ) {
+                            codeArr[i] = codeArr[i] - 0;
+                        }
+                        for(let i = 0; i < codeArr.length; i++ ) {
+                            let item = this.curDataFind(this.list, codeArr[i]);
+                            nameArr.push(item[this.rangekey]);
+                        }
+                        this.name = nameArr.join('/');
+                    } else {
+                        let item = this.curDataFind(this.list, this.value);
+                        this.name = item[this.rangekey];
+                    }
+                }else {
+                    this.name = '';
+                }
+            }
+        },
+        watch: {
+          list: {
+                immediate: true,
+                handler(val) {
+					console.log(val)
+                    this.dataInit();
+                    this.initName();
+                }
+            },
+          value: {
+                // immediate: true,
+                handler(val) {
+					console.log(val)
+                    this.initName();                
+                }
+          },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    
+</style>
\ No newline at end of file
diff --git a/packageIntegral/orderDetails/index.vue b/packageIntegral/orderDetails/index.vue
index e4559a7..339fbd1 100644
--- a/packageIntegral/orderDetails/index.vue
+++ b/packageIntegral/orderDetails/index.vue
@@ -23,13 +23,12 @@
 			<view class="detial">
 				<view>订单编号: <text>{{info.orderCode}}</text></view>
 				<view>下单时间: <text>{{info.createTime}}</text></view>
-				<view>站点电话: <text>18879008956</text></view>
 				<view>支付方式: <text>积分</text></view>
 				<view>商品金额: <text>￥{{info.marketPrice}}</text></view>
 				<view>支付积分: <text>{{info.integral}}</text></view>
 			</view>
 			<view class="footer">
-				<view class="button" @click="determine">确定提货</view>
+				<view class="button"  v-if="info.orderStatus=='1'" @click="determine">确定提货</view>
 			</view>
 		</view>
 
@@ -103,8 +102,23 @@
 					}
 				})
 			},
-			confirm() {
-				this.controlWindows.code = false
+			submit(){
+				
+				let data = {}
+				data.id = this.dataList[0].orderId
+				data.takeCode = this.dataList[0].takeCode
+				serve.takeOrder(data).then(res => {
+					if (res.code === 20000) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+						this.$refs.popup.close();
+						this.get(options.orderId)
+						
+					}
+				})
+				
 			}
 		}
 	}
diff --git a/packageIntegral/orderList/index.vue b/packageIntegral/orderList/index.vue
index b209ace..a13f107 100644
--- a/packageIntegral/orderList/index.vue
+++ b/packageIntegral/orderList/index.vue
@@ -6,8 +6,8 @@
 		</cu-custom>
 
 		<view class="search">
-			<uni-easyinput prefixIcon="search" borderColor="#DCDFE6" v-model="paramter.customerphone" placeholder="请输入手机号后四位"
-				@confirm="search" maxlength="4" />
+			<uni-easyinput prefixIcon="search" borderColor="#DCDFE6" v-model="paramter.params.customerPhone" placeholder="请输入手机号后四位"
+				@confirm="search" maxlength="4" @clear="search" />
 		</view>
 
 		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
@@ -49,7 +49,7 @@
 					currentPage: 1,
 					pagesize: 20,
 					params: {
-						customerphone: ''
+						customerPhone: ''
 					},
 				},
 				dataList: [],
@@ -109,7 +109,7 @@
 			getByPageCloudMini() {
 				serve.getByPageCloudMini(this.paramter).then(res => {
 					if (res.code === 20000) {
-						if (!res.data.list.length) {
+						if (!res.data.list.length && this.paramter.currentPage != 1) {
 							uni.showToast({
 								title: '没有更多订单啦~',
 								icon: 'none'
diff --git a/packageIntegral/productAddition/index.vue b/packageIntegral/productAddition/index.vue
new file mode 100644
index 0000000..04a0c16
--- /dev/null
+++ b/packageIntegral/productAddition/index.vue
@@ -0,0 +1,281 @@
+<template>
+	<view class="container">
+		<cu-custom class="main-totextbar bg-main-oil" :isBack="true" bgColor="bg-main-oil">
+			<block slot="backText">返回</block>
+			<block slot="content">新增商品</block>
+		</cu-custom>
+    <view id="chooseType" :class="currentBoxId == 'chooseType' ? 'show' : 'hidden'">
+		<uni-forms ref="productForm" :modelValue="productDate" label-width="200rpx">
+					<uni-forms-item label="商品分类:" name="name">
+						<mulpicker
+						        v-model="productDate.demandRegion"
+						        :list="productList" 
+						    rangekey="name"
+						    code="id"
+						    pidkey="pid" 
+						    childkey="city" 
+						    :emitPath="true"
+						    :level="2"
+						    :placeholder="'选择商品分类'"
+						/>
+						<uni-icons color="#666666" type="right" size="22" style="position: absolute;right: 0;top: 10rpx;"></uni-icons>
+					</uni-forms-item>
+					<uni-forms-item label="商品名称:" name="age">
+						<input type="text" v-model="productDate.age" placeholder="请输入" />
+					</uni-forms-item>
+					<uni-forms-item label="关键词:" name="age">
+						<input type="text" v-model="productDate.age" placeholder="请输入" />
+					</uni-forms-item>
+					<uni-forms-item label="商品品牌:" name="age">
+						<input type="text" v-model="productDate.age" placeholder="请输入" />
+					</uni-forms-item>
+					<uni-forms-item label="商品售价:" name="age">
+						<input type="text" v-model="productDate.age" placeholder="请输入" />
+					</uni-forms-item>
+					<uni-forms-item label="商品上架:" name="age">
+						<switch color="#FE0606" checked style="transform:scale(0.7)" />
+					</uni-forms-item>
+					<uni-forms-item label="商品推荐:" name="age">
+						<view class='checkbox-con'>
+						 <radio-group @change="checkboxChange">
+						  <label :class="item.checked?'checkbox checked':'checkbox'" @click="checkbox(index)" v-for="(item, index) in radioItem" :key="item.value">
+						  <checkbox :value="item.value" :checked="item.checked"/>{{item.name}}
+						  </label>
+						 </radio-group>
+						 </view>
+					</uni-forms-item>
+				</uni-forms>
+			<view class="buttons">
+				<view @click="closed">取消</view>
+			<view id="next" @click="changeBox">下一步</view>
+			</view>
+		</view>
+		
+ 
+    <view id="instruction" :class="currentBoxId == 'instruction' ? 'show' : 'hidden'">
+        <productAddStep2 />
+		<view class="buttons">
+			<view id="previous"  @click="changeBox">上一步</view>
+        <view @click="addCompleted">完成</view>
+		</view>
+    </view>
+ 
+
+
+
+	</view>
+</template>
+
+<script>
+	import serve from '@/api/packageIntegral/orderList.js'
+	import mulpicker from '@/packageIntegral/components/mulpicker.vue'
+	import productAddStep2 from '@/packageIntegral/productAddition/productAddStep2.vue'
+	export default {
+	components: {
+		mulpicker,
+		productAddStep2
+	},
+		data() {
+			return {
+				currentBoxId: 'instruction', //当前显示的view的id
+				isBoxShow: false,
+				productDate:{},
+				productList:[{
+		    "name": "北京市",
+			'id':'0',
+		    "city": [{
+					'name':"东城区",
+					'id':'1',
+				},{
+					'name':"西城区",
+					'id':'2',
+				},{
+					'name':"崇文区",
+					'id':'3',
+				},{
+					'name':"宣武区",
+					'id':'4',
+				},{
+					'name':"朝阳区",
+					'id':'5',
+				}
+		    ]
+		  }],
+		  radioItem:[{
+					  name: '新品',
+					  checked: true
+					 }, {
+					  name: '推荐',
+					  checked: false
+					 }]
+			}
+		},
+
+		onLoad(options) {
+			// this.get(options.orderId)
+		},
+		methods: {
+			checkbox (e) {
+				console.log(e)
+				 var index = e;//获取当前点击的下标
+				 var checkboxArr = this.radioItem;//选项集合
+				 if (checkboxArr[index].checked) return;//如果点击的当前已选中则返回
+				 checkboxArr.forEach(item => {
+				  item.checked = false
+				 })
+				 checkboxArr[index].checked = true;//改变当前选中的checked值
+				 // this.setData({
+				 //  checkboxArr: checkboxArr
+				 // });
+		
+			 },
+			 checkboxChange (e) {
+			 var checkValue = e.detail.value;
+			 // this.setData({
+			 //  checkValue: checkValue
+			 // });
+			 },
+			  changeBox(e){
+			    let currentFlag = e.currentTarget.id;
+			    switch(currentFlag){
+			      case 'next':
+			          this.currentBoxId = 'instruction'
+			        break;
+			      case 'previous':
+			          this.currentBoxId = 'chooseType'
+			        break;
+			        default:
+			            this.currentBoxId = 'viewInstruction'
+			          break;
+			    }
+			  },
+			  picker2(e){
+				  console.log(e.detail.value)
+				  this.productDate.value = e.detail.value
+			  },
+			  closed(){
+				  uni.navigateTo({
+				  	url: '/pages/index/index'
+				  })
+			  },
+			  addCompleted(){
+				  
+			  }
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+		.fadeBox{
+		    width: 100%;
+		    margin-bottom: 20rpx;
+		}
+		#chooseType{
+		padding: 30rpx;
+		
+		mulpicker{
+			height: 72rpx;
+			line-height: 72rpx;
+		}
+		/deep/ .uni-forms{
+			width: 100%;
+		}
+		/deep/ .uni-forms-item{
+			width: 100%;
+		}
+		
+		/deep/ .uni-forms-item__label{
+			color: #333 !important;
+			font-size: 30rpx;
+			font-weight: 700;
+		}
+		/deep/ .uni-forms-item__content{
+			width: 100%;
+			input{
+				height: 72rpx;
+				line-height: 72rpx;
+			}
+		}
+		
+		switch{
+			margin-top: 9rpx;
+		}
+		switch::before{
+			 content: '';
+		 }
+		 switch::after{
+			 content: '';
+		 }	
+		}
+		.checkbox-con{
+		 margin-top: 40rpx;
+		 text-align: center;
+		 position: relative;
+		}
+		.checkbox{
+		 width: 180rpx;
+		 height: 76rpx;
+		 line-height: 76rpx;
+		 font-size: 30rpx;
+		 color: #666666;
+		 border: 1rpx solid #B6B6B6;
+		 border-radius: 5rpx;
+		 display: inline-block;
+		 margin: 0 10rpx 20rpx 0;
+		 position: absolute;
+		 top: 50rpx;
+		 &:nth-of-type(1){
+			 left: -190rpx;
+		 }
+		 &:nth-of-type(2){
+			 left: 50rpx;
+		 }
+		}
+		
+		.checked{
+		 color: #FFFFFF;
+		 background: #FE0606;
+		 border: 1rpx solid #FE0606;
+		}
+		.checkbox checkbox{
+		 display: none
+		}
+		 
+		 
+		 
+		 
+		.buttons {
+			width: 100%;
+			display: flex;
+			justify-content: space-evenly;
+			margin-top: 180rpx;
+		
+			>view {
+				width: 250rpx;
+				height: 76rpx;
+				text-align: center;
+				line-height: 76rpx;
+				border-radius: 10rpx;
+				font-size: 28rpx;
+		
+				&:nth-of-type(1) {
+					background: #FFFFFF;
+					border: 1rpx solid #B6B6B6;
+					color: #333;
+				}
+		
+				&:nth-of-type(2) {
+					background: #FE0505;
+					color: #fff;
+				}
+			}
+		}
+		.show{
+		    display: flex;
+		    flex-wrap: wrap;
+		}
+		.hidden{
+		    display: none;
+		}
+</style>
diff --git a/packageIntegral/productAddition/productAddStep2.vue b/packageIntegral/productAddition/productAddStep2.vue
new file mode 100644
index 0000000..fa962aa
--- /dev/null
+++ b/packageIntegral/productAddition/productAddStep2.vue
@@ -0,0 +1,55 @@
+<template>
+	<view class="container">
+		
+		<view class="body">
+			<view class="bodyContent">
+				<view class="bodyLabel">属性类型：</view>
+				<view class="bodyItem">
+					<uni-data-select
+					      v-model="value"
+					      :localdata="range"
+					      @change="change"
+					    ></uni-data-select>
+				</view>
+			</view>
+		</view>
+		
+		</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				value: 1,
+		        range: [
+		          { value: 0, text: "篮球" },
+		          { value: 1, text: "足球" },
+		          { value: 2, text: "游泳" },
+		        ],
+			}
+		},
+		methods:{
+			change(e) {
+			        console.log("e:", e);
+			      },
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container{
+		.body{
+			padding: 30rpx;
+		}
+	}
+	.bodyContent{
+		position: relative;
+		// padding-left:150rpx;
+		.bodyLabel{
+			display: inline-block;
+			width: 150rpx;
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/packageIntegral/productList/index.vue b/packageIntegral/productList/index.vue
index c598dcb..54e62db 100644
--- a/packageIntegral/productList/index.vue
+++ b/packageIntegral/productList/index.vue
@@ -27,7 +27,7 @@
 					<view>￥{{item.marketPrice}} X{{item.orderNum}}</view>
 					<view>库存：{{item.orderNum}}</view>
 				</view>
-				<view class="examine" :style="{background:statusEnum[1].color}" >{{statusEnum[1].value}}</view>
+				<view class="examine" @click="examineDetail" :style="{background:statusEnum[1].color}" >{{statusEnum[1].value}}</view>
 				<view class="footer">
 					<view class="button" @click="orderDelete">删除</view>
 					<view class="button">编辑</view>
@@ -40,7 +40,31 @@
 			<image src="https://publicxingyou.oss-cn-hangzhou.aliyuncs.com/mp-oil/yunsite-empty.png"></image>
 			<view>还没有订单哦~</view>
 		</view>
-		
+
+		<uni-popup ref="detail">
+			<view class="determine-detail">
+				<view class="title">审核详情</view>
+				<uni-icons @click="$refs.detail.close()" color="#666666" type="closeempty" size="28"></uni-icons>
+				<view class="item" v-for="(item,index) in examineDetailList" :key="index">
+					<view>
+						<view class="header">审核时间</view>
+						<view>{{item.createTime}}</view>
+					</view>
+					<view>
+						<view class="header">审核结果</view>
+						<view>{{item.status}}</view>
+					</view>
+					<view>
+						<view class="header">反馈详情</view>
+						<view>{{item.dateil}}</view>
+					</view>
+				</view>
+				<view class="buttons">
+					<view @click="$refs.detail.close()">关闭</view>
+				</view>
+			</view>
+		</uni-popup>
+
 		<uni-popup ref="delete">
 			<view class="determine-frame">
 				<view class="title">是否删除该商品？</view>
@@ -50,7 +74,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		
+
 		<uni-popup ref="popup">
 			<view class="determine-frame">
 				<view class="title">是否上架/下架该商品？</view>
@@ -60,7 +84,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		
+
 	</view>
 </template>
 
@@ -73,7 +97,7 @@
 		},
 		data() {
 			return {
-	
+
 				currentIndex: 0,
 				code: '',
 				controlWindows: {
@@ -129,7 +153,24 @@
 						color: '#FCB438',
 						value: "已审核"
 					},
-				}
+				},
+				examineDetailList:[
+					{
+						createTime:'2023.11.22',
+						status:'1',
+						dateil:'未审核'
+					},
+					{
+						createTime:'2023.11.23',
+						status:'2',
+						dateil:'已审核'
+					},
+					{
+						createTime:'2023.11.24',
+						status:'已驳回',
+						dateil:'图片不清晰，请重新上传图片'
+					}
+				]
 			}
 		},
 
@@ -181,6 +222,9 @@
 				this.paramter.currentPage += 1
 				this.getByPageCloudMini()
 			},
+			examineDetail(){
+				this.$refs.detail.open('center')
+			},
 			orderDelete(){
 				this.$refs.delete.open('center')
 			},
@@ -352,7 +396,7 @@
 						border: 1px solid #999;
 						border-radius: 10rpx;
 					}
-				
+
 					>.button{
 						&:nth-of-type(1){
 							right: 360rpx;
@@ -363,32 +407,86 @@
 						&:nth-of-type(3){
 							right: 40rpx;
 						}
-						
+
 					}
 				}
 			}
 		}
-		
+
+		.determine-detail {
+			padding: 30rpx 0;
+			width: 681rpx;
+			background: #FFFFFF;
+			border-radius: 15rpx;
+			position: relative;
+
+			>.title {
+				text-align: center;
+				font-size: 38rpx;
+				color: #000;
+				margin-bottom: 20rpx;
+			}
+			>uni-icons{
+				position: absolute;
+				top: 30rpx;
+				right: 30rpx;
+			}
+			>.item{
+				display: flex;
+				justify-content: space-evenly;
+				overflow-y: hidden;
+				font-size: 22rpx;
+				color: #666;
+				padding: 10rpx;
+				view{
+					width: 200rpx;
+					line-height: 46rpx;
+				}
+				.header{
+					font-size: 32rpx;
+					color: #000;
+				}
+			}
+
+			>.buttons {
+
+				display: flex;
+				justify-content: space-evenly;
+				margin-top: 50rpx;
+
+				>view {
+					width: 550rpx;
+					height: 76rpx;
+					text-align: center;
+					line-height: 76rpx;
+					border-radius: 10rpx;
+					font-size: 28rpx;
+					background: #FE0505;
+					color: #fff;
+				}
+			}
+		}
+
 		.determine-frame {
 			padding-top: 85rpx;
 			width: 681rpx;
 			height: 340rpx;
 			background: #FFFFFF;
 			border-radius: 15rpx;
-		
+
 			>.title {
 				text-align: center;
 				font-size: 38rpx;
 				color: #000;
-		
+
 			}
-		
+
 			>.buttons {
-		
+
 				display: flex;
 				justify-content: space-evenly;
 				margin-top: 80rpx;
-		
+
 				>view {
 					width: 250rpx;
 					height: 76rpx;
@@ -396,13 +494,13 @@
 					line-height: 76rpx;
 					border-radius: 10rpx;
 					font-size: 28rpx;
-		
+
 					&:nth-of-type(1) {
 						background: #FFFFFF;
 						border: 1rpx solid #B6B6B6;
 						color: #333;
 					}
-		
+
 					&:nth-of-type(2) {
 						background: #FE0505;
 						color: #fff;
diff --git a/packageIntegral/takeGoods/index.vue b/packageIntegral/takeGoods/index.vue
index f4d7e50..6fc91f1 100644
--- a/packageIntegral/takeGoods/index.vue
+++ b/packageIntegral/takeGoods/index.vue
@@ -5,21 +5,21 @@
 			<block slot="content">订单提货</block>
 		</cu-custom>
 
-		<view class="code">提货码: 1899</view>
+		<view class="code">提货码: {{code}}</view>
 
 		<scroll-view v-if="dataList.length" class="list" :scroll-y="true" @scrolltolower="lower">
 			<view class="item" v-for="item,index in dataList" :key="index">
-				<view class="header">用户手机：18879008955<text>待提货</text></view>
+				<view class="header">用户手机：{{item.customerPhone}}<text>{{item.statusMerge}}</text></view>
 				<view class="introduce">
-					<image></image>
-					<view>康师傅方便面 经典红烧牛肉面*5+番茄鸡蛋牛肉*1</view>
-					<view>规格：默认</view>
-					<view>￥120.61 X1</view>
-					<view>共1件商品已支付积分：20000</view>
+					<image :src="item.oderDetailImg"></image>
+					<view>{{item.productName}}</view>
+					<view>规格：{{handler(item.attributeJson)}}</view>
+					<view>￥{{item.marketPrice}} X{{item.orderNum}}</view>
+					<view>共{{item.orderNum}}件商品已支付积分：{{item.payIntegral}}</view>
 				</view>
 				<view class="footer">
-					提货码：1899
-					<view class="button" @click="determine">确定提货</view>
+					提货码：{{item.takeCode}}
+					<view class="button" v-if="item.statusMerge=='待核销'" @click="determine">确定提货</view>
 				</view>
 			</view>
 		</scroll-view>
@@ -48,7 +48,7 @@
 				<view class="title">是否立即提货</view>
 				<view class="buttons">
 					<view @click="$refs.popup.close()">取消</view>
-					<view>确认</view>
+					<view @click="submitFirm">确认</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-	import serve from '@/api/packageBill/push.js'
+	import serve from '@/api/packageIntegral/orderList.js'
 
 	export default {
 		options: {
@@ -66,9 +66,17 @@
 			return {
 				code: '',
 				controlWindows: {
-					code: false
+					code: true
 				},
-				dataList: [1]
+				paramter: {
+					currentPage: 1,
+					pagesize: 20,
+					params: {
+						takeCode: '',
+						customerPhone:''
+					},
+				},
+				dataList: []
 			}
 		},
 
@@ -78,9 +86,58 @@
 			determine() {
 				this.$refs.popup.open('center')
 			},
-		
+		handler(json) {
+			json = json.replace(/'/g, '"')
+			let res = JSON.parse(json)
+			let values = Object.values(res)
+			let text =values.reduce((prev,item,index) => {
+				let _text = `${index == 0 ? '' :','}${item}`
+				return prev += _text
+			},'')
+			return text
+		},
 			confirm() {
 				this.controlWindows.code = false
+				this.paramter.params.takeCode = this.code
+				this.paramter.params.customerPhone = this.code
+				this.getByPageCloudMini()
+			},
+			getByPageCloudMini() {
+				serve.getByPageCloudMini(this.paramter).then(res => {
+					if (res.code === 20000) {
+						if (!res.data.list.length) {
+							uni.showToast({
+								title: '没有更多订单啦~',
+								icon: 'none'
+							})
+							return
+						}
+						if (this.paramter.currentPage == 1) {
+							this.dataList = []
+						}
+						this.dataList = this.dataList.concat(res.data.list)
+						// console.log(this.dataList)
+					}
+				})
+			},
+			submitFirm(){
+				
+				let data = {}
+				data.id = this.dataList[0].orderId
+				data.takeCode = this.dataList[0].takeCode
+				serve.takeOrder(data).then(res => {
+					if (res.code === 20000) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+						this.$refs.popup.close();
+						uni.navigateTo({
+							url: '/packageIntegral/orderDetails/index'
+						})
+					}
+				})
+				
 			}
 		}
 	}
diff --git a/pages.json b/pages.json
index 311b280..cf9ca96 100644
--- a/pages.json
+++ b/pages.json
@@ -100,6 +100,9 @@
 			},{
 				"path": "productList/index",
 				"style": {}
+			},{
+				"path": "productAddition/index",
+				"style": {}
 			}]
 		},
 		{
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 6d29304..fd18300 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -439,6 +439,12 @@
 						obj.color = 'blue',
 						obj.badge = 0
 					obj.name = list.roleName
+				}else if (list.roleName == '新增商品') {
+					obj.cuIcon = 'punch',
+						obj.path = '/packageIntegral/productAddition/index',
+						obj.color = 'blue',
+						obj.badge = 0
+					obj.name = list.roleName
 				}
 				return obj
 			},

From f96dccb8c8ba1226bfb41c7be5a8744fc70a4f23 Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Fri, 2 Feb 2024 14:50:21 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packageIntegral/orderDetails/index.vue | 6 +++---
 packageIntegral/takeGoods/index.vue    | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packageIntegral/orderDetails/index.vue b/packageIntegral/orderDetails/index.vue
index 339fbd1..eeec860 100644
--- a/packageIntegral/orderDetails/index.vue
+++ b/packageIntegral/orderDetails/index.vue
@@ -8,17 +8,17 @@
 		<view class="status-frame">
 			<view v-if="info.orderStatus">{{statusEnum[info.orderStatus].value}}</view>
 			<view>提货码: <text>{{info.takeCode}}</text></view>
-			<view>提货时间：2024-1-9</view>
+			<view v-if="info.orderStatus==2">提货时间：{{info.takeTime}}</view>
 		</view>
 
 
 		<view class="info-frame">
-			<view class="header">用户手机: 18879008955<text>用户名: 张小明</text></view>
+			<view class="header">用户手机: {{info.customerPhone}}<text>用户名: {{info.customerName}}</text></view>
 			<view class="introduce" v-for="item,index in info.mallOrderInfoDetails" :key="index">
 				<image :src="item.oderDetailImg"></image>
 				<view>{{item.productName}}</view>
 				<view>规格：{{handler(item.attributeJson)}}</view>
-				<view>￥120.61 X1</view>
+				<view>￥{{item.marketPrice}} X{{item.orderNum}}</view>
 			</view>
 			<view class="detial">
 				<view>订单编号: <text>{{info.orderCode}}</text></view>
diff --git a/packageIntegral/takeGoods/index.vue b/packageIntegral/takeGoods/index.vue
index 6fc91f1..1fd931f 100644
--- a/packageIntegral/takeGoods/index.vue
+++ b/packageIntegral/takeGoods/index.vue
@@ -31,7 +31,7 @@
 
 		<view class="take-frame" v-if="controlWindows.code">
 			<view>请输入提货码</view>
-			<view>提货码或手机后四位</view>
+			<view>提货码</view>
 			<view class="code">
 				<xt-verify-code v-model="code" cursorColor="#333" boxNormalColor="#EAEAEA" boxActiveColor="#EAEAEA"
 					@confirm="confirm" :size="4" :isFocus="false"></xt-verify-code>
@@ -73,7 +73,7 @@
 					pagesize: 20,
 					params: {
 						takeCode: '',
-						customerPhone:''
+						// customerPhone:''
 					},
 				},
 				dataList: []
@@ -99,7 +99,7 @@
 			confirm() {
 				this.controlWindows.code = false
 				this.paramter.params.takeCode = this.code
-				this.paramter.params.customerPhone = this.code
+				// this.paramter.params.customerPhone = this.code
 				this.getByPageCloudMini()
 			},
 			getByPageCloudMini() {
@@ -132,8 +132,9 @@
 							icon: 'none'
 						});
 						this.$refs.popup.close();
+						this;getByPageCloudMini()
 						uni.navigateTo({
-							url: '/packageIntegral/orderDetails/index'
+							url: `../orderDetails/index?orderId=${this.dataList[0].orderId}`
 						})
 					}
 				})

From abe3126e89a202deee220b81de3a59ba0a9f1bdb Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Mon, 19 Feb 2024 16:56:07 +0800
Subject: [PATCH 5/6] OCR

---
 api/oli-user.js                |   7 +++
 pages/stationDetail/ZYSite.vue | 103 ++++++++++++++++++++++++++++++++-
 2 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/api/oli-user.js b/api/oli-user.js
index 944f54d..d23b972 100644
--- a/api/oli-user.js
+++ b/api/oli-user.js
@@ -94,4 +94,11 @@ export default{
 		   method: 'GET' 
 		})
 	},
+	// 查询企业配置
+	getCompanyConfigByCompanyId(id) {
+		return request({
+			url: `/${service_name}/sysCompanyConfig/getCompanyConfigByCompanyId/${id}`,
+			method: 'GET' 
+		})
+	},
 }
\ No newline at end of file
diff --git a/pages/stationDetail/ZYSite.vue b/pages/stationDetail/ZYSite.vue
index 090785f..6916f38 100644
--- a/pages/stationDetail/ZYSite.vue
+++ b/pages/stationDetail/ZYSite.vue
@@ -116,6 +116,19 @@
 				
 				<text class="cuIcon-write text-orange"></text>
 			</view>
+			
+				<view class="cu-form-group margin margin-top-0 radius">
+					<view class="title  text-black ">
+						车牌识别
+					</view>
+					<view @tap="srcPhoto" class="text-center" style="width: 60%;margin: 0 2%;">
+						<input v-model="plateNumberOcr"  type="digit" class="block"
+							placeholder="请点击拍照识别车牌" value="" style="border-bottom: 1px solid #efefef;" />
+					</view>
+					<view  @tap="srcPhoto">
+						<uni-icons type="camera-filled" size="30"></uni-icons>
+					</view>
+				</view>
 			<!-- 油品卡片 -->
 			<view class="padding-top-xs margin margin-top-xs margin-bottom-0 padding-bottom radius">
 				
@@ -309,6 +322,7 @@
 	import g7Api from '@/api/g7.js'
 	import utils from '@/utils/encode'
 	import PlateNumberPicker from '@/components/plate-number-picker/plate-number-picker.vue'
+	import user from '@/api/oli-user.js'
 	export default {
 		components: {
 			PlateNumberPicker
@@ -375,6 +389,8 @@
 				type: '',
 				curIndex: null,
 				InputNumber: 0,
+				plateNumberOcr:'',
+				plateNumberOcrShow:false
 			}
 		},
 		onLoad(option) {
@@ -416,6 +432,7 @@
 				this.timer = null;
 			}
 		},
+
 		watch: {
 			oilTypeList: {
 				handler(newVal, oldVal) {
@@ -466,6 +483,60 @@
 
 		},
 		methods: {
+			getCompanyConfig(companyId){
+				if(companyId){
+					user.getCompanyConfigByCompanyId(companyId).then(res=>{
+						console.log(res,'res')
+						if(res.data.plateNumberOcr==1){
+							this.plateNumberOcrShow = true
+						}else{
+							this.plateNumberOcrShow = false
+						}
+						
+					})
+				}
+			},
+			srcPhoto(){
+				let _that = this
+				uni.chooseImage({
+					count: 1, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['camera'], // 只能拍照
+					success: function(res) {
+						uni.showLoading({
+							title: '识别中',
+							mask: true
+						});
+								
+						const JSESSIONID = utils.uuid()
+						uni.uploadFile({
+							url: 'http://uat.xingoil.com/adminapi/oil-oss/obejct/carNoIdentify',
+							filePath: res.tempFilePaths[0],
+							name: 'file',
+							header: {
+								"Content-Type": "multipart/form-data",
+								"Authorization": uni.getStorageSync('Authorization'),
+								'dataSources': 'MP',
+								"imei": uni.getStorageSync('unionid'),
+								"openId": uni.getStorageSync('openid'),
+								'JSESSIONID': JSESSIONID,
+								'token': utils.md5Salt(JSESSIONID)
+							},
+							success(e) {
+								uni.hideLoading()
+								console.log(e)
+								let obj = JSON.parse(e.data)
+								console.log(obj,obj.data,obj.data.carNo)
+								 _that.plateNumberOcr = obj.data.carNo
+							},fail(res){
+								uni.hideLoading()
+							}
+						})
+			
+						
+					}
+				})
+			},
 			hz(e){
 				// carNumber.length>0
 				// console.log(new RegExp("[\u4E00-\u9FA5]+").test(e),'*-*-*-*-*-*')
@@ -1066,7 +1137,33 @@
 						xoilAmountGun: this.insertResult.vol, //类型：String  必有字段  备注：加油升数
 					}
 				} else {
-					var data6 = {
+					if(this.plateNumberOcrShow == true){
+						var data6 = {
+							siteId: this.siteData.siteId,
+							priceId: this.insertResult.priceId,
+							customerOrderId: this.siteData.customerOrderId,
+							volume: this.insertResult.vol,
+							plateNumberImage: this.PlateNumberImages,
+							engineImage: this.refuellerImages,
+							createSource: "WECHAT_MINIAPPS", //类型：String  必有字段  备注：创建来源
+							orderSource: "WECHAT_MINIAPPS",
+							vehicleLicenseNum: this.plateNumberOcr,
+							customerId: this.siteData.customerId, //类型：String  必有字段  备注：司机id
+							companyId: this.siteData.companyId, //类型：String  必有字段  备注：企业id
+							oilsBar: this.insertResult.bar,
+							oilsCode: this.insertResult.oilProductCode,
+							orderMethod: "SITE_SCAN", //类型：String  必有字段  备注：订单产生方式
+							suppleMark: 0,
+							orderType: "REAL_ORDER", //类型：String  必有字段  备注：订单类型 ( REAL_ORDER：真实订单 VIRTUAL_ORDER：虚拟订单)
+							payChannel: "BALANCE_PAYMENT", //类型：String  必有字段  备注：支付渠道
+							oilCardType: this.siteData.oilCardNature, //类型：String  必有字段  备注：油卡性质 1：个人 2：企业 3：外请
+							accountCardCode: this.siteData.accountCardCode, //类型：String  必有字段  备注：油卡卡号
+							siteUserName: "1", //类型：String  必有字段  备注：加油员名称
+							version: this.siteData.siteType=='2'?null:"1", //类型：Number  必有字段  备注：版本号
+							xoilAmountGun: this.insertResult.vol, //类型：String  必有字段  备注：加油升数
+						}
+					}else{
+						var data6 = {
 						siteId: this.siteData.siteId,
 						priceId: this.insertResult.priceId,
 						customerOrderId: this.siteData.customerOrderId,
@@ -1090,6 +1187,8 @@
 						version: this.siteData.siteType=='2'?null:"1", //类型：Number  必有字段  备注：版本号
 						xoilAmountGun: this.insertResult.vol, //类型：String  必有字段  备注：加油升数
 					}
+					}
+					
 				}
 
 				if (!data6.oilsCode) {
@@ -1372,7 +1471,7 @@
 						} else if (res.data.plateNumbers) {
 							this.carNumber = res.data.plateNumbers[0]
 						}
-
+						this.getCompanyConfig(res.data.companyId)
 					} else {
 						uni.showToast({
 							title: res.msg ? res.msg : '请确认是否油站二维码',

From 914ccb83de915150bd01ff4e168e01b7e89126ca Mon Sep 17 00:00:00 2001
From: zhangyouji <zhangyouji@sdxkhlw.cn>
Date: Wed, 21 Feb 2024 15:06:02 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/stationDetail/ZYSite.vue | 79 +++++++++++++++++++++++++++++++---
 1 file changed, 74 insertions(+), 5 deletions(-)

diff --git a/pages/stationDetail/ZYSite.vue b/pages/stationDetail/ZYSite.vue
index 6916f38..40a8b9f 100644
--- a/pages/stationDetail/ZYSite.vue
+++ b/pages/stationDetail/ZYSite.vue
@@ -117,11 +117,11 @@
 				<text class="cuIcon-write text-orange"></text>
 			</view>
 			
-				<view class="cu-form-group margin margin-top-0 radius">
+				<view class="cu-form-group margin margin-top-0 radius" v-if="plateNumberOcrShow==true">
 					<view class="title  text-black ">
 						车牌识别
 					</view>
-					<view @tap="srcPhoto" class="text-center" style="width: 60%;margin: 0 2%;">
+					<view  @tap="srcPhoto" class="text-center" style="width: 60%;margin: 0 2%;">
 						<input v-model="plateNumberOcr"  type="digit" class="block"
 							placeholder="请点击拍照识别车牌" value="" style="border-bottom: 1px solid #efefef;" />
 					</view>
@@ -312,6 +312,39 @@
 		<PlateNumberPicker @newPlate="showPlateModal(false,true)" @onDeleteInput="onDeleteInput"
 			:showInputList="showInputList" :showPlateList="showPlateList" @selectNo="selectNo"
 			@clearAll="clearPlateNumber" @selectName="selectText" @hideModal="showModel=''" :modalName="showModel" />
+		
+		<view class="cu-modal bottom-modal " :class="showPlicePhoto">
+	
+			<view class="cu-dialog bg-white">
+				<view class="cu-bar bg-white justify-end">
+					<view class="content"></view>
+					<view class="action" @tap="showPlicePhoto=''">
+						<text class="cuIcon-close text-red"></text>
+					</view>
+				</view>
+				
+			<view style="height: 1000rpx;">
+				<view style="margin: 100rpx 0;">
+					<uni-icons type="clear" size="80" color="#f56c6c"></uni-icons>
+					<view>
+						<text style="color: #d9001b;font-size: 30rpx;font-weight: bold;">识别失败!</text>
+					</view>
+					
+				</view>
+				<view style="margin: 60rpx 0;">
+					<button @tap="srcPhoto" style="width: 60%;background-color: #409EFF;color: #ffffff;">重新拍照</button>
+				</view>
+				<view style="margin: 60rpx 0;">
+					<button style="width: 60%;background-color: #F59A23;color: #ffffff;" @click="manualInput">手动输入车牌号</button>
+				</view>
+			</view>
+			</view>
+		</view>
+		<uni-popup ref="inputDialog" type="dialog">
+			<uni-popup-dialog mode="input" title="请输入车牌号" value="" :before-close="true"
+				placeholder="请输入" @close="inputClose" @confirm="inputConfirm"></uni-popup-dialog>
+		</uni-popup>
+
 	</view>
 </template>
 
@@ -390,7 +423,9 @@
 				curIndex: null,
 				InputNumber: 0,
 				plateNumberOcr:'',
-				plateNumberOcrShow:false
+				plateNumberOcrShow:false,
+				showPlicePhoto:'',
+				plateNumberImages:''
 			}
 		},
 		onLoad(option) {
@@ -483,6 +518,25 @@
 
 		},
 		methods: {
+			manualInput(){
+							this.showPlicePhoto=''
+							this.$refs.inputDialog.open()
+						},
+						inputClose(){
+							this.$refs.inputDialog.close()
+						},
+						inputConfirm(val){
+							if(val){
+								this.plateNumberOcr = val
+								this.$refs.inputDialog.close()
+							}else{
+								uni.showToast({
+									title: '请输入车牌号',
+									icon: 'none'
+								})
+							}
+							
+						},
 			getCompanyConfig(companyId){
 				if(companyId){
 					user.getCompanyConfigByCompanyId(companyId).then(res=>{
@@ -497,6 +551,7 @@
 				}
 			},
 			srcPhoto(){
+				this.showPlicePhoto=''
 				let _that = this
 				uni.chooseImage({
 					count: 1, //默认9
@@ -526,10 +581,16 @@
 								uni.hideLoading()
 								console.log(e)
 								let obj = JSON.parse(e.data)
-								console.log(obj,obj.data,obj.data.carNo)
-								 _that.plateNumberOcr = obj.data.carNo
+								if(obj.data&&obj.data.carNo){
+									 _that.plateNumberOcr = obj.data.carNo
+									 _that.plateNumberImages = obj.data.imgUrl
+								}else{
+									_that.plateNumberOcr = ''
+									_that.showPlicePhoto = 'show'
+								}
 							},fail(res){
 								uni.hideLoading()
+								_that.showPlicePhoto = 'show'
 							}
 						})
 			
@@ -1138,6 +1199,13 @@
 					}
 				} else {
 					if(this.plateNumberOcrShow == true){
+						if(!this.plateNumberOcr){
+							uni.showToast({
+								icon: 'none',
+								title: '请上传车牌照片'
+							})
+							return
+						}
 						var data6 = {
 							siteId: this.siteData.siteId,
 							priceId: this.insertResult.priceId,
@@ -1148,6 +1216,7 @@
 							createSource: "WECHAT_MINIAPPS", //类型：String  必有字段  备注：创建来源
 							orderSource: "WECHAT_MINIAPPS",
 							vehicleLicenseNum: this.plateNumberOcr,
+							plateNumberImages: this.plateNumberImages, // 车牌照片地址
 							customerId: this.siteData.customerId, //类型：String  必有字段  备注：司机id
 							companyId: this.siteData.companyId, //类型：String  必有字段  备注：企业id
 							oilsBar: this.insertResult.bar,