diff --git a/components/change-table.vue b/components/change-table.vue
new file mode 100644
index 0000000..3d17af7
--- /dev/null
+++ b/components/change-table.vue
@@ -0,0 +1,239 @@
+<template>
+	<view>
+		<up-popup :show="show" mode="center">
+
+			<view class="bg-fff u-p-30 box">
+				<scroll-view direction="vertical" scroll-y style="max-height: 80vh;">
+					<view class="u-flex gap-20">
+						<view>转桌到</view>
+						<view>
+							<chooseTable v-model="form.mewTable"></chooseTable>
+						</view>
+					</view>
+					<view class="u-flex gap-20 u-m-t-32 u-col-baseline">
+						<view>转入类型</view>
+						<up-radio-group v-model="form.type" placement="column">
+							<up-radio label="转桌(可将部分商品转入)" :name="1" :key="1"></up-radio>
+							<up-radio label="并桌(并台会将全部购物车商品转入)" :name="2" :key="2"></up-radio>
+						</up-radio-group>
+					</view>
+					<template v-if="form.type==1">
+						<view class=" u-m-t-32 ">
+							<view class="u-m-b-24">购物车商品</view>
+							<u-table2 :data="nowCartData" :columns="columnsCheck1" row-key="id"
+								@selection-change="handleSelectionChange($event,'now')" />
+
+						</view>
+						<view class=" u-m-t-50 ">
+							<view class="u-m-b-24">历史订单商品</view>
+							<view v-for="(order,orderIndex) in goodsList" class="u-m-t-32" :key="index">
+								<view>第{{ orderIndex }}次下单</view>
+								<u-table2 :data="order" :columns="columnsCheck" row-key="id"
+									@selection-change="handleSelectionChange($event,'old')" />
+							</view>
+
+
+						</view>
+					</template>
+
+				</scroll-view>
+
+				<view class="u-flex gap-20   u-p-t-30">
+					<view class="u-flex-1">
+						<my-button type="default" @click="close">取消</my-button>
+					</view>
+					<view class="u-flex-1">
+						<my-button @click="confirm">确认</my-button>
+					</view>
+
+				</view>
+			</view>
+
+		</up-popup>
+
+	</view>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref
+	} from 'vue';
+	import chooseTable from './choose-table.vue'
+	import {
+		mergeOrder
+	} from '@/http/api/order/order.js'
+	const show = defineModel(false)
+	const allChecked = ref(false)
+
+	const props = defineProps({
+		goodsList: {},
+		order: {
+			id: ''
+		},
+		nowCartData: []
+	})
+
+	function close() {
+		show.value = false
+	}
+	const form = reactive({
+		mewTable: {
+			id: ''
+		},
+		type: 1,
+		now: [],
+		old: []
+	})
+
+	const columnsCheck = ref([
+		// 复选框列
+		{
+			type: 'selection',
+			width: '50px'
+		},
+		// 普通列
+		{
+			title: '商品',
+			key: 'productName'
+		},
+		{
+			title: '数量',
+			key: 'num'
+		}
+	]);
+
+	const columnsCheck1 = ref([
+		// 复选框列
+		{
+			type: 'selection',
+			width: '50px'
+		},
+		// 普通列
+		{
+			title: '商品',
+			key: 'name'
+		},
+		{
+			title: '数量',
+			key: 'number'
+		}
+	]);
+
+
+	const handleSelectionChange = (selection, key) => {
+		if (key === 'old') {
+			form.old = selection
+		}
+		if (key === 'now') {
+			form.now = selection
+		}
+	};
+
+	const emits = defineEmits('update', 'confirm')
+
+	function confirm() {
+		if (!form.mewTable.id) {
+			return uni.showToast({
+				title: '请选择目标台桌',
+				icon: 'none'
+			})
+		}
+		if (form.type == 1) {
+			if (form.old.length <= 0 && form.now.length <= 0) {
+				return uni.showToast({
+					title: '请选择转桌商品',
+					icon: 'none'
+				})
+			}
+		}
+		if (form.type == 2) {
+			if (props.nowCartData.length <= 0) {
+				mergeOrder({
+					allMerge: 1,
+					sourceOrderId:props.order? props.order.id:'',
+					targetTableCode: form.mewTable.tableCode,
+					detailIds: Object.entries(props.goodsList).reduce((prve, cur) => {
+						prve.push(...cur.map(v => v.id))
+						return prve
+					}, [])
+				}).then(res => {
+					uni.showToast({
+						title: '转桌成功',
+						icon: 'none'
+					})
+					close()
+					emits('update', 1)
+
+				})
+			} else {
+				close()
+				emits('confirm', {
+					targetTableCode: form.mewTable.tableCode,
+					old: {
+						allMerge:1,
+						sourceOrderId:props.order? props.order.id:'',
+						targetTableCode: form.mewTable.tableCode,
+						detailIds: Object.entries(props.goodsList).reduce((prve, cur) => {
+							prve.push(...cur.map(v => v.id))
+							return prve
+						}, [])
+					},
+					now: {
+						allMerge:1,
+						cart_id: props.nowCartData.map(v=>v.id)
+					}
+				})
+			}
+
+			return
+		}
+		console.log(form);
+		let allOldLen = 0;
+		for (let key in props.goodsList) {
+			allOldLen += props.goodsList[key].length
+		}
+
+		const allMerge = form.old.length === allOldLen ? 1 : 0
+		if (props.nowCartData.length <= 0) {
+			mergeOrder({
+				allMerge,
+				sourceOrderId:props.order? props.order.id:'',
+				targetTableCode: form.mewTable.tableCode,
+				detailIds: form.old.map(v => v.id)
+			}).then(res => {
+				uni.showToast({
+					title: '转桌成功',
+					icon: 'none'
+				})
+				close()
+				emits('update', allMerge)
+
+			})
+		} else {
+			close()
+			emits('confirm', {
+				targetTableCode: form.mewTable.tableCode,
+				old: {
+					allMerge,
+					sourceOrderId:props.order? props.order.id:'',
+					targetTableCode: form.mewTable.tableCode,
+					detailIds: form.old.map(v => v.id)
+				},
+				now: {
+					allMerge: props.nowCartData.length == form.now.length,
+					cart_id: form.now.map(v => v.id)
+				}
+			})
+		}
+
+	}
+</script>
+
+<style scoped>
+	.box {
+		width: 690rpx;
+		border-radius: 18rpx;
+
+	}
+</style>
\ No newline at end of file
diff --git a/components/choose-table.vue b/components/choose-table.vue
new file mode 100644
index 0000000..b4b03bc
--- /dev/null
+++ b/components/choose-table.vue
@@ -0,0 +1,150 @@
+<template>
+	<view>
+		<view class="u-flex input-box u-row-between" @click="openPopup">
+			<template v-if="!modelValue||!modelValue.id">
+				<text class="color-999">请选择转桌到</text>
+				<up-icon name="arrow-down" color="#999"></up-icon>
+			</template>
+			<template v-else>
+				<text class="color-333">{{modelValue.name}}</text>
+				<up-icon name="arrow-down" color="#999"></up-icon>
+			</template>
+		</view>
+
+
+		<up-popup :show="show" mode="bottom">
+			<view class="box bg-fff u-p-30">
+				<up-search v-model="query.name" @search="search" @clear="search" @custom="search"></up-search>
+				<scroll-view direction="vertical" scroll-y style="max-height: 50vh;">
+					<view class="u-m-t-30 list">
+						<view class="item" v-for="(item,index) in list" :key="index" :class="{active:selIndex==index}"
+							@click="selIndex=index">
+							<text> {{item.name}}</text>
+
+						</view>
+					</view>
+					<up-loadmore status="nomore"></up-loadmore>
+				</scroll-view>
+
+
+			</view>
+			<view class="u-flex gap-20 u-p-l-30 u-p-r-30 u-p-b-30">
+				<view class="u-flex-1">
+					<my-button type="default" @click="close">取消</my-button>
+				</view>
+				<view class="u-flex-1">
+					<my-button @click="confirm">确认</my-button>
+				</view>
+
+			</view>
+		</up-popup>
+
+	</view>
+
+</template>
+
+<script setup>
+	import {
+		reactive,
+		ref,
+		watch,
+		onMounted
+	} from 'vue';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app'
+
+	import {
+		getShopTable
+	} from '@/http/api/table.js'
+
+	const modelValue = defineModel({
+		default:{id:''}
+	})
+	const list = ref([])
+	const show = ref(false)
+	const selIndex = ref(-1)
+
+	function close() {
+		show.value = false
+		selIndex.value = -1;
+	}
+
+	function confirm() {
+		if (selIndex.value < 0) {
+			return uni.showToast({
+				title: '请选择桌台',
+				icon: 'none'
+			})
+		}
+		modelValue.value = list.value[selIndex.value]
+		close()
+	}
+	const query = reactive({
+		page: 1,
+		size: 999,
+		// status: 'idle',
+		name: ''
+	})
+	/**
+	 * 获取桌台列表
+	 */
+	async function getTable() {
+		let res = await getShopTable(query)
+		list.value = res.records
+
+	}
+
+	function search() {
+		selIndex.value = -1;
+		getTable()
+	}
+
+	function openPopup() {
+		const index = list.value.findIndex(v => v.id === modelValue.value.id)
+		if (index != -1) {
+			selIndex.value = index
+		}
+		show.value = true
+	}
+	onMounted(() => {
+		getTable()
+	})
+</script>
+
+<style lang="scss" scoped>
+	.input-box {
+		padding: 20rpx 20rpx;
+		border-radius: 8rpx;
+		border: 1px solid #dedede;
+		min-width: 300rpx;
+	}
+
+	.box {
+		border-radius: 18rpx;
+	}
+
+	.list {
+		display: grid;
+		grid-template-columns: 1fr 1fr 1fr 1fr;
+		grid-gap: 20rpx;
+
+		.item {
+			margin-bottom: 24rpx;
+			padding: 20rpx 40rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 6rpx;
+			border: 1px solid #dedede;
+			transition: all .3s ease-in-out;
+
+			&.active {
+				border-color: $my-main-color;
+				background-color: $my-main-color;
+				color: #fff;
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/data/icon.js b/data/icon.js
new file mode 100644
index 0000000..b3a75b8
--- /dev/null
+++ b/data/icon.js
@@ -0,0 +1,2 @@
+// static/coupon/qrcode.svg
+export const qrcode = 'https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/6/7070aa441e4e4126b0bba32502a3521e.svg'
\ No newline at end of file
diff --git a/http/api/order/order.js b/http/api/order/order.js
new file mode 100644
index 0000000..a13b110
--- /dev/null
+++ b/http/api/order/order.js
@@ -0,0 +1,16 @@
+import http from "@/http/http.js";
+const request = http.request;
+const urlType = "order";
+
+
+
+export function mergeOrder(data) {
+	return request({
+		url: urlType + '/admin/order/mergeOrder',
+		method: "POST",
+		data: {
+			...data,
+		},
+	});
+}
+
diff --git a/pageCoupon/index.vue b/pageCoupon/index.vue
index 355d040..5d54435 100644
--- a/pageCoupon/index.vue
+++ b/pageCoupon/index.vue
@@ -31,7 +31,7 @@
 							<view> 领券后{{ item.validDays }}天过期 </view>
 						</view>
 						<view class="JQclass">
-							<image :src="'/static/coupon/qrcode.svg'" mode="scaleToFill" />
+							<image :src="qrcode" mode="scaleToFill" />
 						</view>
 					</view>
 					<view class="couponContentListcontent2">
@@ -69,6 +69,7 @@
 </template>
 
 <script setup>
+	import {qrcode} from '@/data/icon.js'
 	import { reactive, ref } from 'vue';
 	import { onShow } from '@dcloudio/uni-app';
 	import go from '@/commons/utils/go.js'
diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue
index 409a1fd..a4187ab 100644
--- a/pagesCreateOrder/confirm-order/confirm-order.vue
+++ b/pagesCreateOrder/confirm-order/confirm-order.vue
@@ -1,1552 +1,1515 @@
 <template>
-  <view class="page-gray color-333 u-font-28">
-    <template v-if="true">
-      <view
-        class="block u-p-t-32 u-p-b-32"
-        v-if="pageData.table && pageData.table.id"
-      >
-        <view>桌位号</view>
-        <view class="font-bold u-font-32 u-m-t-16">
-          {{ pageData.table.name || "" }}
-        </view>
-      </view>
-      <view class="block">
-        <view class="u-p-b-24 u-m-b-24 border-bottom">
-          <view>选择用户</view>
-          <view class="u-m-t-24 u-flex u-row-between" @tap="chooseUser">
-            <view v-if="!pageData.user || !pageData.user.id">选择用户</view>
-            <view class="u-flex" v-if="pageData.user && pageData.user.id">
-              <up-avatar
-                :src="pageData.user.headImg"
-                shape="square"
-                :size="30"
-              ></up-avatar>
+	<view class="page-gray color-333 u-font-28">
+		<template v-if="true">
+			<view class="block u-p-t-32 u-p-b-32" v-if="pageData.table && pageData.table.id">
+				<view>桌位号</view>
+				<view class="font-bold u-font-32 u-m-t-16">
+					{{ pageData.table.name || "" }}
+				</view>
+			</view>
+			<view class="block">
+				<view class="u-p-b-24 u-m-b-24 border-bottom">
+					<view>选择用户</view>
+					<view class="u-m-t-24 u-flex u-row-between" @tap="chooseUser">
+						<view v-if="!pageData.user || !pageData.user.id">选择用户</view>
+						<view class="u-flex" v-if="pageData.user && pageData.user.id">
+							<up-avatar :src="pageData.user.headImg" shape="square" :size="30"></up-avatar>
 
-              <view class="u-m-l-20">
-                <view class="">{{ pageData.user.nickName }}</view>
-              </view>
-              <view class="u-font-24 u-m-l-30 u-text-center">
-                <text>余额：</text>
-                <text class="color-main">{{ pageData.user.amount }}</text>
-              </view>
-              <view class="u-font-24 u-m-l-30 u-text-center">
-                <text>积分：</text>
-                <text class="color-main">{{
+							<view class="u-m-l-20">
+								<view class="">{{ pageData.user.nickName }}</view>
+							</view>
+							<view class="u-font-24 u-m-l-30 u-text-center">
+								<text>余额：</text>
+								<text class="color-main">{{ pageData.user.amount }}</text>
+							</view>
+							<view class="u-font-24 u-m-l-30 u-text-center">
+								<text>积分：</text>
+								<text class="color-main">{{
                   pageData.user.pointBalance||0
                 }}</text>
-              </view>
-            </view>
-            <uni-icons type="right" color="#999" size="20" bold></uni-icons>
-          </view>
-        </view>
-        <view class="  ">
-          <view>就餐类型</view>
-          <view class="u-m-t-24 u-flex">
-            <view class="u-flex color-666">
-              <up-radio-group
-                :disabled="option.type == 'add'"
-                v-model="pageData.eatTypes.active"
-                placement="row"
-              >
-                <up-radio
-                  :customStyle="{ marginRight: '30px' }"
-                  v-for="(item, index) in pageData.eatTypes.list"
-                  :key="index"
-                  :label="item.name"
-                  :name="item.value"
-                ></up-radio>
-              </up-radio-group>
-            </view>
-          </view>
-        </view>
-      </view>
+							</view>
+						</view>
+						<uni-icons type="right" color="#999" size="20" bold></uni-icons>
+					</view>
+				</view>
+				<view class="  ">
+					<view>就餐类型</view>
+					<view class="u-m-t-24 u-flex">
+						<view class="u-flex color-666">
+							<up-radio-group :disabled="option.type == 'add'" v-model="pageData.eatTypes.active"
+								placement="row">
+								<up-radio :customStyle="{ marginRight: '30px' }"
+									v-for="(item, index) in pageData.eatTypes.list" :key="index" :label="item.name"
+									:name="item.value"></up-radio>
+							</up-radio-group>
+						</view>
+					</view>
+				</view>
+			</view>
 
-      <template v-if="pageData.user && pageData.user.id">
-        <view class="block">
-          <view class="">
-            <view class="u-flex border-bottom u-p-b-24">
-              <up-avatar
-                :src="pageData.user.headImg"
-                shape="square"
-                :size="60"
-              ></up-avatar>
-              <!-- <image class="headeimg" src="@/static/uni.png" mode=""></image> -->
-              <view class="u-m-l-32">
-                <view class="">{{ pageData.user.nickName }}</view>
-                <view class="color-main u-font-24">{{
+			<template v-if="pageData.user && pageData.user.id">
+				<view class="block">
+					<view class="">
+						<view class="u-flex border-bottom u-p-b-24">
+							<up-avatar :src="pageData.user.headImg" shape="square" :size="60"></up-avatar>
+							<!-- <image class="headeimg" src="@/static/uni.png" mode=""></image> -->
+							<view class="u-m-l-32">
+								<view class="">{{ pageData.user.nickName }}</view>
+								<view class="color-main u-font-24">{{
                   pageData.user.isVip ? "会员" : ""
                 }}</view>
-              </view>
-            </view>
-            <view class="u-flex u-m-t-24 u-row-between u-font-24 color-999">
-              <view class="u-flex">
-                <view>余额</view>
-                <view class="color-333 u-m-l-10">{{
+							</view>
+						</view>
+						<view class="u-flex u-m-t-24 u-row-between u-font-24 color-999">
+							<view class="u-flex">
+								<view>余额</view>
+								<view class="color-333 u-m-l-10">{{
                   pageData.user.amount
                 }}</view>
-              </view>
-              <view class="u-flex">
-                <view>积分</view>
-                <view class="color-333 u-m-l-10">{{
+							</view>
+							<view class="u-flex">
+								<view>积分</view>
+								<view class="color-333 u-m-l-10">{{
                                   pageData.user.pointBalance||0
                 }}</view>
-              </view>
-              <view class="u-flex">
-                <view class="u-text-center">订单数量</view>
-                <view class="color-333 u-m-l-10">{{
+							</view>
+							<view class="u-flex">
+								<view class="u-text-center">订单数量</view>
+								<view class="color-333 u-m-l-10">{{
                   pageData.user.orderNumber || 0
                 }}</view>
-              </view>
-            </view>
-          </view>
-        </view>
-      </template>
-      <template
-        v-if="
+							</view>
+						</view>
+					</view>
+				</view>
+			</template>
+			<template v-if="
           !pageData.shopInfo.isTableFee && pageData.table && pageData.table.id
-        "
-      >
-        <!-- 不免餐位费 -->
-        <view class="block">
-          <view class="   ">
-            <view>用餐人数（人）</view>
-            <picker
-              @change="userNumberChange"
-              :value="userNumbers.defaultCateIndex"
-              :range="userNumbers.list"
-            >
-              <view class="u-m-t-24 u-flex u-row-between">
-                <view class="color-333">{{
+        ">
+				<!-- 不免餐位费 -->
+				<view class="block">
+					<view class="   ">
+						<view>用餐人数（人）</view>
+						<picker @change="userNumberChange" :value="userNumbers.defaultCateIndex"
+							:range="userNumbers.list">
+							<view class="u-m-t-24 u-flex u-row-between">
+								<view class="color-333">{{
                   userNumbers.defaultCateIndex * 1 + 1 + "人"
                 }}</view>
-                <uni-icons type="right" color="#999" size="16"></uni-icons>
-              </view>
-            </picker>
-          </view>
-        </view>
-      </template>
-      <!-- 	<template v-if="goods.list[0].tableId&&goods.list[0].orderId">
+								<uni-icons type="right" color="#999" size="16"></uni-icons>
+							</view>
+						</picker>
+					</view>
+				</view>
+			</template>
+			<!-- 	<template v-if="goods.list[0].tableId&&goods.list[0].orderId">
 				<view class="block" @tap="rotatingTables"
 					style="display: flex;align-items: center;justify-content: space-between;">
 					<view>转桌/并桌</view>
 					<uni-icons type="right" color="#999" size="16"></uni-icons>
 				</view>
 			</template> -->
-    </template>
+		</template>
 
-    <view class="block">
-      <view class="u-p-b-24">
-        <view class="font-bold">订单备注</view>
-        <view class="u-m-t-32 u-flex">
-          <uni-easyinput
-            type="textarea"
-            v-model="pageData.form.note"
-            placeholder="请输入备注"
-          ></uni-easyinput>
-        </view>
-      </view>
-    </view>
+		<view class="block">
+			<view class="u-p-b-24">
+				<view class="font-bold">订单备注</view>
+				<view class="u-m-t-32 u-flex">
+					<uni-easyinput type="textarea" v-model="pageData.form.note" placeholder="请输入备注"></uni-easyinput>
+				</view>
+			</view>
+		</view>
 
-    <view class="block u-m-b-0">
-      <view class="u-flex">
-        <view>共</view>
-        <view class="fen font-bold">{{ allGoodsList.length }}</view>
-        <view>份菜品</view>
-      </view>
+		<view class="block u-m-b-0">
+			<view class="u-flex">
+				<view>共</view>
+				<view class="fen font-bold">{{ allGoodsList.length }}</view>
+				<view>份菜品</view>
+			</view>
 
-      <view class="goods u-m-t-32">
-        <view
-          class="item u-m-b-48"
-          @click="changeGoodsSel(index)"
-          v-for="(item, index) in goods.list"
-          :key="index"
-        >
-          <view class="u-flex u-row-between">
-            <view class="u-flex">
-              <view v-if="item.coverImg" class="u-relative">
-                <view class="limit-discount" v-if="item.is_time_discount"
-                  >限时折扣</view
-                >
-                <image class="img" :src="item.coverImg" mode=""></image>
-              </view>
-			  
-              <view
-                style="
+			<view class="goods u-m-t-32">
+				<view class="item u-m-b-48" @click="changeGoodsSel(index)" v-for="(item, index) in goods.list"
+					:key="index">
+					<view class="u-flex u-row-between">
+						<view class="u-flex">
+							<view v-if="item.coverImg" class="u-relative">
+								<view class="limit-discount" v-if="item.is_time_discount">限时折扣</view>
+								<image class="img" :src="item.coverImg" mode=""></image>
+							</view>
+
+							<view style="
                   background-color: #3f9eff;
                   width: 84rpx;
                   height: 84rpx;
                   line-height: 84rpx;
                   text-align: center;
                   color: #fff;
-                "
-                v-else
-              >
-                {{ item.name }}
-              </view>
-              <view class="u-m-l-32">
-                <view class="u-flex">
-                  <view
-                    class="u-flex u-m-r-20"
-                    v-if="item.is_wait_call"
-                    style="flex-shrink: 0"
-                  >
-                    <uni-tag
-                      text="等叫"
-                      custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;"
-                    >
-                    </uni-tag>
-                  </view>
-                  <view
-                    class="u-m-r-20 u-flex"
-                    v-if="item.is_gift"
-                    style="flex-shrink: 0"
-                  >
-                    <uni-tag
-                      text="赠送"
-                      custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;"
-                    >
-                    </uni-tag>
-                  </view>
-                  <view
-                    class="u-m-r-20 u-flex"
-                    v-if="item.pack_number > 0"
-                    style="flex-shrink: 0"
-                  >
-                    <uni-tag
-                      custom-style="background-color: #E6F0FF; border-color: #E6F0FF; color: #318AFE;"
-                      size="small"
-                      text="打包"
-                      inverted
-                      type="success"
-                    />
-                  </view>
-                  <view
-                    class="u-m-r-20 u-flex"
-                    v-if="item.is_print"
-                    style="flex-shrink: 0"
-                  >
-                    <uni-tag
-                      custom-style="background-color: #E6F0FF; border-color: #E6F0FF; color: #318AFE;"
-                      size="small"
-                      text="打印"
-                      inverted
-                      type="success"
-                    />
-                  </view>
-                  <view>
-                    {{ item.name }}
-                  </view>
-                </view>
-                <view class="u-font-24 color-999 u-m-t-10">{{
+                " v-else>
+								{{ item.name }}
+							</view>
+							<view class="u-m-l-32">
+								<view class="u-flex">
+									<view class="u-flex u-m-r-20" v-if="item.is_wait_call" style="flex-shrink: 0">
+										<uni-tag text="等叫"
+											custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;">
+										</uni-tag>
+									</view>
+									<view class="u-m-r-20 u-flex" v-if="item.is_gift" style="flex-shrink: 0">
+										<uni-tag text="赠送"
+											custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;">
+										</uni-tag>
+									</view>
+									<view class="u-m-r-20 u-flex" v-if="item.pack_number > 0" style="flex-shrink: 0">
+										<uni-tag
+											custom-style="background-color: #E6F0FF; border-color: #E6F0FF; color: #318AFE;"
+											size="small" text="打包" inverted type="success" />
+									</view>
+									<view class="u-m-r-20 u-flex" v-if="item.is_print" style="flex-shrink: 0">
+										<uni-tag
+											custom-style="background-color: #E6F0FF; border-color: #E6F0FF; color: #318AFE;"
+											size="small" text="打印" inverted type="success" />
+									</view>
+									<view>
+										{{ item.name }}
+									</view>
+								</view>
+								<view class="u-font-24 color-999 u-m-t-10">{{
                   item.specInfo || " "
                 }}</view>
-              </view>
-            </view>
-            <view class="">
-              <view class="u-relative">
-                <template v-if="item.is_gift">
-                  <text class="line-th color-999"
-                    >￥{{
+							</view>
+						</view>
+						<view class="">
+							<view class="u-relative">
+								<template v-if="item.is_gift">
+									<text class="line-th color-999">￥{{
                       $utils.toFixed(item.lowPrice * item.number, item)
-                    }}</text
-                  >
-                  <view class="u-absolute" style="right: 0; bottom: 100%">
-                    <text class="font-bold">￥0</text>
-                  </view>
-                </template>
-                <template v-else>
-                  <template
-                    v-if="
+                    }}</text>
+									<view class="u-absolute" style="right: 0; bottom: 100%">
+										<text class="font-bold">￥0</text>
+									</view>
+								</template>
+								<template v-else>
+									<template v-if="
                       item.discount_sale_amount &&
                       item.discount_sale_amount * 1 > 0
-                    "
-                  >
-                    <text class="line-th color-999"
-                      >￥{{
+                    ">
+										<text class="line-th color-999">￥{{
                         $utils.toFixed(item.lowPrice * item.number, item)
-                      }}</text
-                    >
-                    <view class="u-absolute" style="right: 0; bottom: 100%">
-                      <text class="font-bold"
-                        >￥{{
+                      }}</text>
+										<view class="u-absolute" style="right: 0; bottom: 100%">
+											<text class="font-bold">￥{{
                           $utils.toFixed(
                             item.discount_sale_amount * item.number,
                             item
                           )
-                        }}</text
-                      >
-                    </view>
-                  </template>
-                  <template v-else-if="item.is_time_discount">
-                    <text class="line-th color-999"
-                      >￥{{
+                        }}</text>
+										</view>
+									</template>
+									<template v-else-if="item.is_time_discount">
+										<text class="line-th color-999">￥{{
                         $utils.toFixed(item.lowPrice * item.number, item)
-                      }}</text
-                    >
-                    <view
-                      class="u-absolute xianshi"
-                      style="right: 0; bottom: 100%"
-                    >
-                      <text class="font-bold"
-                        >￥{{ returnLimitTotalMoney(item) }}</text
-                      >
-                    </view>
-                  </template>
-                  <template
-                    v-else-if="
+                      }}</text>
+										<view class="u-absolute xianshi" style="right: 0; bottom: 100%">
+											<text class="font-bold">￥{{ returnLimitTotalMoney(item) }}</text>
+										</view>
+									</template>
+									<template v-else-if="
                       isVip &&
                       item.lowMemberPrice &&
                       item.lowMemberPrice * 1 !=0
-                    "
-                  >
-                    <text class="line-th color-999"
-                      >￥{{
+                    ">
+										<text class="line-th color-999">￥{{
                         $utils.toFixed(item.lowPrice * item.number, item)
-                      }}</text
-                    >
-                    <view class="u-absolute" style="right: 0; bottom: 100%">
-                      <text class="font-bold"
-                        >￥{{
+                      }}</text>
+										<view class="u-absolute" style="right: 0; bottom: 100%">
+											<text class="font-bold">￥{{
                           $utils.toFixed(
                             item.lowMemberPrice * item.number,
                             item
                           )
-                        }}</text
-                      >
-                    </view>
-                  </template>
-                  <template v-else>
-                    <view class="font-bold">
-                      <text>￥</text>
-                      <text class="">{{
+                        }}</text>
+										</view>
+									</template>
+									<template v-else>
+										<view class="font-bold">
+											<text>￥</text>
+											<text class="">{{
                         $utils.toFixed(item.lowPrice * item.number, item)
                       }}</text>
-                    </view>
-                  </template>
-                </template>
-              </view>
-              <view class="color-999 u-text-right u-font-24 u-m-t-12"
-                >×{{ item.number }}</view
-              >
-            </view>
-          </view>
-          <template v-if="item.remark">
-            <view class="u-p-20 bg-gray u-m-t-16">
-              {{ item.remark }}
-            </view>
-          </template>
-          <scroll-view
-            class="u-m-t-32"
-            scroll-x="true"
-            v-if="index == goods.sel"
-          >
-            <view class="u-flex no-wrap">
-              <view class="u-flex u-m-r-20" v-if="!item.is_gift">
-                <button
-                  class="tag"
-                  hover-class="hover-class"
-                  @tap="showModel('discount', index)"
-                >
-                  单品打折
-                </button>
-              </view>
-              <view class="u-flex u-m-r-20">
-                <!-- <button class="tag" hover-class="hover-class" @tap="showModel('giveFood')">赠菜</button> -->
-                <button
-                  class="tag"
-                  hover-class="hover-class"
-                  @tap="toggleItem(item, 'is_gift')"
-                >
-                  {{ item.is_gift ? "取消赠送" : "赠送" }}
-                </button>
-              </view>
-              <view class="u-flex u-m-r-20">
-                <button
-                  class="tag"
-                  hover-class="hover-class"
-                  @tap="showModel('packNumber', index, item)"
-                >
-                  {{ item.pack_number > 0 ? "取消打包" : "打包" }}
-                </button>
-              </view>
-              <view class="u-flex u-m-r-20">
-                <button
-                  class="tag"
-                  hover-class="hover-class"
-                  @tap="toggleItem(item, 'is_wait_call')"
-                >
-                  {{ item.is_wait_call ? "取消等叫" : "等叫" }}
-                </button>
-              </view>
-              <view class="u-flex u-m-r-20">
-                <button
-                  class="tag"
-                  hover-class="hover-class"
-                  @tap="toggleItem(item, 'is_print')"
-                >
-                  {{ item.is_print ? "免厨打" : "打印" }}
-                </button>
-              </view>
-              <view class="u-flex u-m-r-20">
-                <button
-                  class="tag"
-                  hover-class="hover-class"
-                  @tap="showModel('remark', index)"
-                >
-                  单品备注
-                </button>
-              </view>
-            </view>
-          </scroll-view>
-        </view>
-      </view>
-      <!-- 历史订单 -->
-      <orderList :orderInfo="pageData.orderInfo"></orderList>
-      <view class="border-bottom">
-        <template v-if="$seatFee && $seatFee.totalAmount">
-          <view class="u-flex u-row-between u-m-t-18 u-p-b-34">
-            <view>
-              <text>桌位费</text>
-            </view>
-            <view>￥{{ $seatFee.totalAmount.toFixed(2) || "0.00" }}</view>
-          </view>
-        </template>
-        <template v-if="orderCostSummary.packFee > 0">
-          <view class="u-flex u-row-between u-m-t-18 u-p-b-34">
-            <view>
-              <text>打包费</text>
-            </view>
-            <view>￥{{ orderCostSummary.packFee }}</view>
-          </view>
-        </template>
-      </view>
+										</view>
+									</template>
+								</template>
+							</view>
+							<view class="color-999 u-text-right u-font-24 u-m-t-12">×{{ item.number }}</view>
+						</view>
+					</view>
+					<template v-if="item.remark">
+						<view class="u-p-20 bg-gray u-m-t-16">
+							{{ item.remark }}
+						</view>
+					</template>
+					<scroll-view class="u-m-t-32" scroll-x="true" v-if="index == goods.sel">
+						<view class="u-flex no-wrap">
+							<view class="u-flex u-m-r-20" v-if="!item.is_gift">
+								<button class="tag" hover-class="hover-class" @tap="showModel('discount', index)">
+									单品打折
+								</button>
+							</view>
+							<view class="u-flex u-m-r-20">
+								<!-- <button class="tag" hover-class="hover-class" @tap="showModel('giveFood')">赠菜</button> -->
+								<button class="tag" hover-class="hover-class" @tap="toggleItem(item, 'is_gift')">
+									{{ item.is_gift ? "取消赠送" : "赠送" }}
+								</button>
+							</view>
+							<view class="u-flex u-m-r-20">
+								<button class="tag" hover-class="hover-class"
+									@tap="showModel('packNumber', index, item)">
+									{{ item.pack_number > 0 ? "取消打包" : "打包" }}
+								</button>
+							</view>
+							<view class="u-flex u-m-r-20">
+								<button class="tag" hover-class="hover-class" @tap="toggleItem(item, 'is_wait_call')">
+									{{ item.is_wait_call ? "取消等叫" : "等叫" }}
+								</button>
+							</view>
+							<view class="u-flex u-m-r-20">
+								<button class="tag" hover-class="hover-class" @tap="toggleItem(item, 'is_print')">
+									{{ item.is_print ? "免厨打" : "打印" }}
+								</button>
+							</view>
+							<view class="u-flex u-m-r-20">
+								<button class="tag" hover-class="hover-class" @tap="showModel('remark', index)">
+									单品备注
+								</button>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+			<!-- 历史订单 -->
+			<orderList :orderInfo="pageData.orderInfo"></orderList>
+			<view class="border-bottom">
+				<template v-if="$seatFee && $seatFee.totalAmount">
+					<view class="u-flex u-row-between u-m-t-18 u-p-b-34">
+						<view>
+							<text>桌位费</text>
+						</view>
+						<view>￥{{ $seatFee.totalAmount.toFixed(2) || "0.00" }}</view>
+					</view>
+				</template>
+				<template v-if="orderCostSummary.packFee > 0">
+					<view class="u-flex u-row-between u-m-t-18 u-p-b-34">
+						<view>
+							<text>打包费</text>
+						</view>
+						<view>￥{{ orderCostSummary.packFee }}</view>
+					</view>
+				</template>
+			</view>
 
-      <view class="u-flex u-row-between u-m-t-38">
-        <view class="u-flex">
-          <view
-            class="u-flex price"
-            v-if="orderCostSummary.totalDiscountAmount"
-          >
-            <view class="">优惠金额</view>
-            <view class="font-bold u-font-32 u-m-r-16"
-              >￥{{ orderCostSummary.totalDiscountAmount }}</view
-            >
-            <up-icon
-              name="question-circle"
-              color="#666"
-              @click="showDiscountInfo = true"
-            ></up-icon>
-          </view>
-        </view>
+			<view class="u-flex u-row-between u-m-t-38">
+				<view class="u-flex">
+					<view class="u-flex price" v-if="orderCostSummary.totalDiscountAmount">
+						<view class="">优惠金额</view>
+						<view class="font-bold u-font-32 u-m-r-16">￥{{ orderCostSummary.totalDiscountAmount }}</view>
+						<up-icon name="question-circle" color="#666" @click="showDiscountInfo = true"></up-icon>
+					</view>
+				</view>
 
-        <view class="u-flex price u-m-l-32">
-          <view class="">实收金额</view>
-          <view class="font-bold u-font-32"
-            >￥{{ orderCostSummary.finalPayAmount }}</view
-          >
-        </view>
-      </view>
-    </view>
+				<view class="u-flex price u-m-l-32">
+					<view class="">实收金额</view>
+					<view class="font-bold u-font-32">￥{{ orderCostSummary.finalPayAmount }}</view>
+				</view>
+			</view>
+		</view>
 
-    <view :style="{ height: bottomHeight + 'px' }"></view>
-    <view class="safe-bottom fixed">
-      <view class="btn">
-        <my-button shape="circle" @click="createAnOrder">
-          <view class="font-bold u-font-32">
-            <text v-if="pageData.shopInfo.registerType == 'before'">
-              下单
-            </text>
-            <text v-if="pageData.shopInfo.registerType == 'after'">
-              {{ goods.list.length > 0 ? "下单" : "结算" }}
-            </text>
-          </view>
-        </my-button>
-      </view>
-    </view>
-    <model-discount
-      title="菜品减免"
-      :ref="setModel"
-      name="discount"
-      :price="modelData.data.salePrice"
-      @confirm="discountconfirm"
-    ></model-discount>
-    <give-food title="赠菜" :ref="setModel" name="giveFood"></give-food>
-    <one-remark
-      @confirm="goodsOneRemarkConfirm"
-      title="单品备注"
-      :ref="setModel"
-      name="remark"
-    ></one-remark>
-    <pack-number
-      @confirm="goodsOnePackNumberConfirm"
-      title="打包"
-      :ref="setModel"
-      name="packNumber"
-    ></pack-number>
+		<view :style="{ height: bottomHeight + 'px' }"></view>
+		<view class="safe-bottom fixed u-flex gap-20">
+			<view class="btn u-flex-1">
+				<my-button shape="circle" @click="changeTableShow=true" type="default">
+					<view class="font-bold u-font-32">
+						<text>
+							转桌
+						</text>
 
-    <up-popup :show="showDiscountInfo" mode="center" round="16rpx" @close="showDiscountInfo = false"  closeOnClickOverlay >
-      <view class="u-p-30 u-flex u-flex-col gap-20" style="min-width: 300rpx;">
-        <view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.goodsDiscountAmount">
-          <text>商品优惠</text>
-          <text class="color-red">-￥{{ orderCostSummary.goodsDiscountAmount }}</text>
-        </view>
-        <view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.newUserDiscount">
-          <text>新客立减</text>
-          <text class="color-red">-￥{{ orderCostSummary.newUserDiscount }}</text>
-        </view>
-        <view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.fullReduction.actualAmount">
-          <text>满减活动</text>
-          <text class="color-red">-￥{{ orderCostSummary.fullReduction.actualAmount }}</text>
-        </view>
-        <view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.vipDiscountAmount">
-          <text>会员折扣</text>
-          <text class="color-red">-￥{{ orderCostSummary.vipDiscountAmount }}</text>
-        </view>
-      </view>
-    </up-popup>
+					</view>
+				</my-button>
+			</view>
+			<view class="btn u-flex-1">
+				<my-button shape="circle" @click="createAnOrder">
+					<view class="font-bold u-font-32">
+						<text v-if="pageData.shopInfo.registerType == 'before'">
+							下单
+						</text>
+						<text v-if="pageData.shopInfo.registerType == 'after'">
+							{{ goods.list.length > 0 ? "下单" : "结算" }}
+						</text>
+					</view>
+				</my-button>
+			</view>
+		</view>
+		<model-discount title="菜品减免" :ref="setModel" name="discount" :price="modelData.data.salePrice"
+			@confirm="discountconfirm"></model-discount>
+		<give-food title="赠菜" :ref="setModel" name="giveFood"></give-food>
+		<one-remark @confirm="goodsOneRemarkConfirm" title="单品备注" :ref="setModel" name="remark"></one-remark>
+		<pack-number @confirm="goodsOnePackNumberConfirm" title="打包" :ref="setModel" name="packNumber"></pack-number>
 
-    <!-- <edit-discount title="优惠金额" :ref="setModel" name="editMoney" :price="allPrice"></edit-discount> -->
-  </view>
+		<up-popup :show="showDiscountInfo" mode="center" round="16rpx" @close="showDiscountInfo = false"
+			closeOnClickOverlay>
+			<view class="u-p-30 u-flex u-flex-col gap-20" style="min-width: 300rpx;">
+				<view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.goodsDiscountAmount">
+					<text>商品优惠</text>
+					<text class="color-red">-￥{{ orderCostSummary.goodsDiscountAmount }}</text>
+				</view>
+				<view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.newUserDiscount">
+					<text>新客立减</text>
+					<text class="color-red">-￥{{ orderCostSummary.newUserDiscount }}</text>
+				</view>
+				<view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.fullReduction.actualAmount">
+					<text>满减活动</text>
+					<text class="color-red">-￥{{ orderCostSummary.fullReduction.actualAmount }}</text>
+				</view>
+				<view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.vipDiscountAmount">
+					<text>会员折扣</text>
+					<text class="color-red">-￥{{ orderCostSummary.vipDiscountAmount }}</text>
+				</view>
+			</view>
+		</up-popup>
+
+
+		<changeTable v-model="changeTableShow" :nowCartData="goods.list"
+			:goodsList="pageData.orderInfo?pageData.orderInfo.detailMap:[]" :order="pageData.orderInfo"
+			@update="changeTableUpdate" @confirm="changeTableConfirm"></changeTable>
+
+		<!-- <edit-discount title="优惠金额" :ref="setModel" name="editMoney" :price="allPrice"></edit-discount> -->
+	</view>
 </template>
 
 <script setup>
-import { onLoad, onReady, onShow, onHide } from "@dcloudio/uni-app";
-import {
-  ref,
-  inject,
-  onUnmounted,
-  nextTick,
-  reactive,
-  computed,
-  watch,
-  provide,
-} from "vue";
+	import {
+		onLoad,
+		onReady,
+		onShow,
+		onHide
+	} from "@dcloudio/uni-app";
+	import {
+		ref,
+		inject,
+		onUnmounted,
+		nextTick,
+		reactive,
+		computed,
+		watch,
+		provide,
+	} from "vue";
 
-import modelDiscount from "./components/discount";
-import giveFood from "./components/give-food";
-import packNumber from "./components/pack-number";
-import oneRemark from "./components/remark";
-import orderList from "./components/list";
+	import changeTable from '@/components/change-table.vue'
+	const changeTableShow = ref(false)
 
-// import editDiscount from '@/pagesCreateOrder/components/edit-discount.vue'
+	function transformTable() {
+		changeTableShow.value = true
+	}
 
-import { getSafeBottomHeight } from "@/commons/utils/safe-bottom.js";
-import go from "@/commons/utils/go.js";
-import { hasPermission } from "@/commons/utils/hasPermission.js";
-import { getNowCart } from "@/pagesCreateOrder/util.js";
+	function changeTableUpdate(allMerge) {
+		if (allMerge) {
+			uni.navigateBack()
+		} else {
+			init();
+		}
+	}
+	import {
+		mergeOrder
+	} from '@/http/api/order/order.js'
 
-import { getShopInfo } from "@/http/api/shop.js";
-import { getShopTableDetail } from "@/http/api/table.js";
-import { getProductList } from "@/http/api/product.js";
-import { createOrder, getHistoryOrder } from "@/http/api/order.js";
-import { shopUserDetail } from "@/http/yskApi/shop-user.js";
-import { discountActivity } from "@/http/yskApi/market/discountActivity.js";
-import BigNumber from "bignumber.js";
-import * as limitTimeDiscountApi from "@/http/yskApi/limitTimeDiscount.js";
+	function changeTableConfirm(json) {
+		websocketUtil.send(
+			JSON.stringify({
+				type: "shopping",
+				operate_type: "rottable",
+				table_code: pageData.table.tableCode,
+				new_table_code: json.targetTableCode,
+				shop_id: uni.getStorageSync("shopInfo").id,
+				cart_id: json.now.cart_id
+			})
+		);
+		if (!json.old.sourceOrderId) {
+			uni.showToast({
+				title: '转桌成功',
+				icon: 'none'
+			})
+			if (json.now.allMerge) {
+				setTimeout(() => {
+					uni.navigateBack()
+				}, 1500)
+			} else {
+				init();
+			}
+			return
+		}
+		mergeOrder(json.old).then(res => {
+			uni.showToast({
+				title: '转桌成功',
+				icon: 'none'
+			})
+			if (json.old.allMerge && json.now.allMerge) {
+				setTimeout(() => {
+					uni.navigateBack()
+				}, 1500)
+			} else {
+				init();
+			}
+		})
+	}
 
-import yskUtils from "ysk-utils";
+	import modelDiscount from "./components/discount";
+	import giveFood from "./components/give-food";
+	import packNumber from "./components/pack-number";
+	import oneRemark from "./components/remark";
+	import orderList from "./components/list";
 
-//优惠详情弹窗
-const showDiscountInfo = ref(false);
-// import yskUtils from "@/lib/index";
-const limitUtils = yskUtils.limitUtils;
-provide("yskUtils", yskUtils);
+	// import editDiscount from '@/pagesCreateOrder/components/edit-discount.vue'
 
-const shopInfo = uni.getStorageSync("shopInfo");
-provide("shopInfo", shopInfo);
-function returnLimitTotalMoney(data) {
-  // const price = yskUtils.limitUtils.returnPrice({
-  const price = limitUtils.returnPrice({
-    goods: data,
-    shopInfo: shopInfo,
-    limitTimeDiscountRes: pageData.limitTimeDiscount,
-    shopUserInfo: pageData.user,
-    idKey: "product_id",
-  });
-  return BigNumber(price).times(data.number).toNumber();
-}
+	import {
+		getSafeBottomHeight
+	} from "@/commons/utils/safe-bottom.js";
+	import go from "@/commons/utils/go.js";
+	import {
+		hasPermission
+	} from "@/commons/utils/hasPermission.js";
+	import {
+		getNowCart
+	} from "@/pagesCreateOrder/util.js";
 
-const models = new Map();
-const modelData = reactive({
-  data: {},
-  selIndex: -1,
-});
-const option = reactive({
-  id: "",
-  tableId: "",
-});
-/**
- * 用餐人数
- */
-const userNumbers = reactive({
-  list: new Array(100).fill(1).map((v, index) => {
-    // return index === 0 ? '无' : index + '人'
-    return index + 1 + "人";
-  }),
-  defaultCateIndex: 0,
-});
-const f = reactive({});
+	import {
+		getShopInfo
+	} from "@/http/api/shop.js";
+	import {
+		getShopTableDetail
+	} from "@/http/api/table.js";
+	import {
+		getProductList
+	} from "@/http/api/product.js";
+	import {
+		createOrder,
+		getHistoryOrder
+	} from "@/http/api/order.js";
+	import {
+		shopUserDetail
+	} from "@/http/yskApi/shop-user.js";
+	import {
+		discountActivity
+	} from "@/http/yskApi/market/discountActivity.js";
+	import BigNumber from "bignumber.js";
+	import * as limitTimeDiscountApi from "@/http/yskApi/limitTimeDiscount.js";
 
-let $goods = [];
-const goods = reactive({
-  list: [],
-  sel: 0,
-});
-const pageData = reactive({
-  shopInfo: {},
-  table: {},
-  user: {},
-  eatTypes: {
-    list: [
-      {
-        name: "堂食",
-        value: "dine-in",
-      },
-      {
-        name: "外带",
-        value: "take-out",
-      },
-      // ,
-      // {
-      // 	name: "外卖",
-      // 	value: "take-away",
-      // }
-    ],
-    active: "dine-in",
-    isShow: false,
-  },
-  form: {
-    note: "",
-  },
-  orderInfo: {},
-});
-provide("pageData", pageData);
+	import yskUtils from "ysk-utils";
 
-async function getDiscountActivity() {
-  let res = await discountActivity({
-    shopId: uni.getStorageSync("shopInfo").id || "",
-  });
-  if (res) {
-    fullReductionActivities.value = res ? [res] : [];
-  }
-}
-//后台返回的限时折扣
-const limitTimeDiscountRes = ref(null);
+	//优惠详情弹窗
+	const showDiscountInfo = ref(false);
+	// import yskUtils from "@/lib/index";
+	const limitUtils = yskUtils.limitUtils;
+	provide("yskUtils", yskUtils);
 
-async function getLimit() {
-  const res = await limitTimeDiscountApi.limitTimeDiscount();
-  limitTimeDiscountRes.value = res;
-  if (pageData.table.tableCode) {
-    pageData.limitTimeDiscount = limitTimeDiscountRes.value;
+	const shopInfo = uni.getStorageSync("shopInfo");
+	provide("shopInfo", shopInfo);
 
-    websocketUtil.send(
-      JSON.stringify({
-        type: "shopping",
-        operate_type: "time_discount_save",
-        table_code: pageData.table.tableCode,
-        shop_id: uni.getStorageSync("shopInfo").id,
-        operate_type: "time_discount_save",
-        data: limitTimeDiscountRes.value,
-      })
-    );
-    console.log("limitTimeDiscount", pageData.limitTimeDiscount);
-  }
-}
-const websocketUtil = inject("websocketUtil"); // 注入 WebSocket 工具类实例
-onLoad(async (opt) => {
-  Object.assign(option, opt);
-  console.log("opt====", opt);
-  if (opt.tableId || opt.tableCode) {
-    pageData.table.id = opt.tableId;
-    pageData.table.tableCode = opt.tableCode;
-  }
-  //获取限时折扣
-  await getLimit();
-  //获取满减活动
-  await getDiscountActivity();
-  pageData.shopInfo = uni.getStorageSync("shopInfo");
-  getTbShopInfo();
-});
-let bottomHeight = ref(100);
-onReady(() => {
-  getSafeBottomHeight("safe-bottom").then((res) => {
-    bottomHeight.value = res + 50;
-  });
-});
+	function returnLimitTotalMoney(data) {
+		// const price = yskUtils.limitUtils.returnPrice({
+		const price = limitUtils.returnPrice({
+			goods: data,
+			shopInfo: shopInfo,
+			limitTimeDiscountRes: pageData.limitTimeDiscount,
+			shopUserInfo: pageData.user,
+			idKey: "product_id",
+		});
+		return BigNumber(price).times(data.number).toNumber();
+	}
 
-watch(
-  () => userNumbers.defaultCateIndex,
-  (newval) => {
-    updateChoseCount();
-  }
-);
+	const models = new Map();
+	const modelData = reactive({
+		data: {},
+		selIndex: -1,
+	});
+	const option = reactive({
+		id: "",
+		tableId: "",
+	});
+	/**
+	 * 用餐人数
+	 */
+	const userNumbers = reactive({
+		list: new Array(100).fill(1).map((v, index) => {
+			// return index === 0 ? '无' : index + '人'
+			return index + 1 + "人";
+		}),
+		defaultCateIndex: 0,
+	});
+	const f = reactive({});
 
-watch(
-  () => pageData.eatTypes.active,
-  (newval) => {
-    pageData.eatTypes.isShow = true;
-    changeUseType();
-  }
-);
-onShow(() => {
-  init();
-  watchChooseuser();
-  watchChooseTable();
-});
-onHide(() => {
-  console.log("onHide");
-  websocketUtil.offMessage();
-});
-onUnmounted(() => {
-  console.log("onUnmounted");
-  websocketUtil.offMessage();
-});
+	let $goods = [];
+	const goods = reactive({
+		list: [],
+		sel: 0,
+	});
+	const pageData = reactive({
+		shopInfo: {},
+		table: {},
+		user: {},
+		eatTypes: {
+			list: [{
+					name: "堂食",
+					value: "dine-in",
+				},
+				{
+					name: "外带",
+					value: "take-out",
+				},
+				// ,
+				// {
+				// 	name: "外卖",
+				// 	value: "take-away",
+				// }
+			],
+			active: "dine-in",
+			isShow: false,
+		},
+		form: {
+			note: "",
+		},
+		orderInfo: {},
+	});
+	provide("pageData", pageData);
 
-/**
- * 获取订单详情
- * @param {Object} tableCode
- */
-async function getHistoryOrderDetail(tableCode) {
-  let res = await getHistoryOrder({ tableCode: tableCode });
-  pageData.orderInfo = res;
-}
+	async function getDiscountActivity() {
+		let res = await discountActivity({
+			shopId: uni.getStorageSync("shopInfo").id || "",
+		});
+		if (res) {
+			fullReductionActivities.value = res ? [res] : [];
+		}
+	}
+	//后台返回的限时折扣
+	const limitTimeDiscountRes = ref(null);
 
-//餐位费
-const $seatFee = reactive({
-  totalNumber: 0,
-  totalAmount: 0,
-});
+	async function getLimit() {
+		const res = await limitTimeDiscountApi.limitTimeDiscount();
+		limitTimeDiscountRes.value = res;
+		if (pageData.table.tableCode) {
+			pageData.limitTimeDiscount = limitTimeDiscountRes.value;
 
-/**
- * 判断是否是会员
- */
-const isVip = computed(() => {
-  return (
-    pageData.shopInfo.isMemberPrice &&
-    pageData.user &&
-    pageData.user.id &&
-    pageData.user.isVip
-  );
-});
+			websocketUtil.send(
+				JSON.stringify({
+					type: "shopping",
+					operate_type: "time_discount_save",
+					table_code: pageData.table.tableCode,
+					shop_id: uni.getStorageSync("shopInfo").id,
+					operate_type: "time_discount_save",
+					data: limitTimeDiscountRes.value,
+				})
+			);
+			console.log("limitTimeDiscount", pageData.limitTimeDiscount);
+		}
+	}
+	const websocketUtil = inject("websocketUtil"); // 注入 WebSocket 工具类实例
+	onLoad(async (opt) => {
+		Object.assign(option, opt);
+		console.log("opt====", opt);
+		if (opt.tableId || opt.tableCode) {
+			pageData.table.id = opt.tableId;
+			pageData.table.tableCode = opt.tableCode;
+		}
+		//获取限时折扣
+		await getLimit();
+		//获取满减活动
+		await getDiscountActivity();
+		pageData.shopInfo = uni.getStorageSync("shopInfo");
+		getTbShopInfo();
+	});
+	let bottomHeight = ref(100);
+	onReady(() => {
+		getSafeBottomHeight("safe-bottom").then((res) => {
+			bottomHeight.value = res + 50;
+		});
+	});
 
-/**
- * init
- */
-async function init() {
-  nextTick(() => {
-    onMessage();
-  });
-  // 获取商品列表
-  $goods = await getProductList({}, "product", false);
-  // console.log("商品列表===",$goods)
-  getTableInfo(pageData.table);
-}
+	watch(
+		() => userNumbers.defaultCateIndex,
+		(newval) => {
+			updateChoseCount();
+		}
+	);
 
-/**
- * socket消息监听
- */
-function onMessage() {
-  websocketUtil.offMessage();
-  websocketUtil.onMessage((res) => {
-    let msg = JSON.parse(res);
-    console.log("msg===", msg);
-    let cartItem;
-    if (msg.msg_id) {
-      websocketUtil.send(
-        JSON.stringify({
-          type: "receipt",
-          msg_id: msg.msg_id,
-        })
-      );
-    }
-    if (msg.status == 0) {
-      infoBox.showToast(msg.msg || "操作失败");
-      return false;
-    }
+	watch(
+		() => pageData.eatTypes.active,
+		(newval) => {
+			pageData.eatTypes.isShow = true;
+			changeUseType();
+		}
+	);
+	onShow(() => {
+		init();
+		watchChooseuser();
+		watchChooseTable();
+	});
+	onHide(() => {
+		console.log("onHide");
+		websocketUtil.offMessage();
+	});
+	onUnmounted(() => {
+		console.log("onUnmounted");
+		websocketUtil.offMessage();
+	});
 
-    switch (msg.operate_type) {
-      case "onboc_init":
-        goods.list = [];
-        console.log("msg.data", msg.data);
-        msg.data.map((item) => {
-          console.log("item===", item);
-          cartItem = getNowCart(item, $goods, pageData.user);
-          console.log(cartItem);
-          if (cartItem.isGrounding || cartItem.is_temporary == 1) {
-            cartControls(cartItem, "add");
-          } else {
-            delCart(cartItem.id);
-          }
-        });
-        if (pageData.eatTypes.isShow) {
-          if (pageData.eatTypes.active == "take-out") {
-            cartItem.pack_number = cartItem.number;
-          } else {
-            cartItem.pack_number = 0;
-          }
-          let par = {
-            type: "onboc",
-            account: uni.getStorageSync("iToken").loginId,
-            shop_id: uni.getStorageSync("shopInfo").id,
-            operate_type: "batch",
-            table_code: pageData.table.tableCode,
-            is_pack: pageData.eatTypes.active == "take-out" ? 1 : 0,
-          };
-          updateCart(par);
-        }
-        // 是否更新就餐人数
-        if (!$seatFee.totalNumber) {
-          updateChoseCount();
-        }
+	/**
+	 * 获取订单详情
+	 * @param {Object} tableCode
+	 */
+	async function getHistoryOrderDetail(tableCode) {
+		let res = await getHistoryOrder({
+			tableCode: tableCode
+		});
+		pageData.orderInfo = res;
+	}
 
-        pageData.eatTypes.isShow = false;
-        pageData.limitTimeDiscount = msg.time_dis_info;
+	//餐位费
+	const $seatFee = reactive({
+		totalNumber: 0,
+		totalAmount: 0,
+	});
 
-        break;
-      case "onboc_add":
-      case "add":
-        cartItem = getNowCart(msg.data, $goods, pageData.user);
-        cartControls(cartItem, "add");
-        break;
-      case "onboc_edit":
-      case "edit":
-        getCart();
-        break;
-      case "onboc_del":
-      case "del":
-        cartItem = getNowCart(msg.data, $goods, pageData.user);
-        cartControls(cartItem, "del");
-        break;
-      case "onboc_cleanup":
-      case "cleanup":
-        goods.list = [];
-        $seatFee.totalNumber = 0;
-        $seatFee.totalAmount = 0;
-        userNumbers.defaultCateIndex = 0;
-        init();
-        break;
-      case "product_update":
-        init();
-        break;
-    }
-  });
-}
+	/**
+	 * 判断是否是会员
+	 */
+	const isVip = computed(() => {
+		return (
+			pageData.shopInfo.isMemberPrice &&
+			pageData.user &&
+			pageData.user.id &&
+			pageData.user.isVip
+		);
+	});
 
-/**
- * 删除购物车菜品
- */
-function delCart(cartItem) {
-  let params = {
-    type: "onboc",
-    account: uni.getStorageSync("iToken").loginId,
-    shop_id: uni.getStorageSync("shopInfo").id,
-    is_gift: 0,
-    id: cartItem.id,
-    operate_type: "del",
-    table_code: cartItem.table_code,
-  };
-  websocketUtil.send(JSON.stringify(params));
-}
+	/**
+	 * init
+	 */
+	async function init() {
+		nextTick(() => {
+			onMessage();
+		});
+		// 获取商品列表
+		$goods = await getProductList({}, "product", false);
+		// console.log("商品列表===",$goods)
+		getTableInfo(pageData.table);
+	}
 
-/**
- * socket通知购物车商品数量修改处理
- */
-function cartControls(cartItem, type) {
-  if (!pageData.table.tableCode) {
-    pageData.table.tableCode = cartItem.table_code;
-  }
-  let cartIndex = 0;
-  goods.list.map((item, index) => {
-    if (item.id == cartItem.id) {
-      cartIndex = index;
-    }
-  });
+	/**
+	 * socket消息监听
+	 */
+	function onMessage() {
+		websocketUtil.offMessage();
+		websocketUtil.onMessage((res) => {
+			let msg = JSON.parse(res);
+			console.log("msg===", msg);
+			let cartItem;
+			if (msg.msg_id) {
+				websocketUtil.send(
+					JSON.stringify({
+						type: "receipt",
+						msg_id: msg.msg_id,
+					})
+				);
+			}
+			if (msg.status == 0 && msg.operate_type != "time_discount_save") {
+				uni.showToast({
+					title: msg.msg || "操作失败",
+					icon: 'none'
+				})
+				return false;
+			}
 
-  if (type == "del") {
-    goods.list.splice(cartIndex, 1);
-    return;
-  }
-  if (type == "add") {
-    goods.list.push(cartItem);
-  }
-  if (type == "edit") {
-    goods.list[cartIndex].number = cartItem.number;
-    goods.list[cartIndex].pack_number = cartItem.pack_number;
-    goods.list[cartIndex].packNumber = cartItem.pack_number;
-  }
-}
+			switch (msg.operate_type) {
+				case "onboc_init":
+					goods.list = [];
+					console.log("msg.data", msg.data);
+					msg.data.map((item) => {
+						console.log("item===", item);
+						cartItem = getNowCart(item, $goods, pageData.user);
+						console.log(cartItem);
+						if (cartItem.isGrounding || cartItem.is_temporary == 1) {
+							cartControls(cartItem, "add");
+						} else {
+							delCart(cartItem.id);
+						}
+					});
+					if (pageData.eatTypes.isShow) {
+						if (pageData.eatTypes.active == "take-out") {
+							cartItem.pack_number = cartItem.number;
+						} else {
+							cartItem.pack_number = 0;
+						}
+						let par = {
+							type: "onboc",
+							account: uni.getStorageSync("iToken").loginId,
+							shop_id: uni.getStorageSync("shopInfo").id,
+							operate_type: "batch",
+							table_code: pageData.table.tableCode,
+							is_pack: pageData.eatTypes.active == "take-out" ? 1 : 0,
+						};
+						updateCart(par);
+					}
+					// 是否更新就餐人数
+					if (!$seatFee.totalNumber) {
+						updateChoseCount();
+					}
 
-/**
- * 获取购物车数据
- */
-function getCart() {
-  // 初始化购物车
-  websocketUtil.send(
-    JSON.stringify({
-      type: "onboc",
-      account: uni.getStorageSync("iToken").loginId,
-      shop_id: uni.getStorageSync("shopInfo").id,
-      operate_type: "init",
-      table_code: pageData.table.tableCode,
-    })
-  );
-}
+					pageData.eatTypes.isShow = false;
+					pageData.limitTimeDiscount = msg.time_dis_info;
 
-/**
- * 获取店铺信息
- */
-async function getTbShopInfo() {
-  const res = await getShopInfo({ id: uni.getStorageSync("shopInfo").id });
-  pageData.shopInfo = res;
-  uni.setStorageSync("shopInfo", res);
-}
+					break;
+				case "onboc_add":
+				case "add":
+					cartItem = getNowCart(msg.data, $goods, pageData.user);
+					cartControls(cartItem, "add");
+					break;
+				case "onboc_edit":
+				case "edit":
+					getCart();
+					break;
+				case "onboc_del":
+				case "del":
+					cartItem = getNowCart(msg.data, $goods, pageData.user);
+					cartControls(cartItem, "del");
+					break;
+				case "onboc_cleanup":
+				case "cleanup":
+					goods.list = [];
+					$seatFee.totalNumber = 0;
+					$seatFee.totalAmount = 0;
+					userNumbers.defaultCateIndex = 0;
+					init();
+					break;
+				case "product_update":
+					init();
+					break;
+			}
+		});
+	}
 
-/**
- * 获取桌台信息
- */
-async function getTableInfo(opt) {
-  let res = {};
-  if (opt.id) {
-    res = await getShopTableDetail({ id: opt.id, tableCode: opt.tableCode });
-  }
-  Object.assign(pageData.table, res);
-  if (!pageData.shopInfo.isTableFee && pageData.table && pageData.table.id) {
-    userNumbers.list = new Array(res.maxCapacity ? res.maxCapacity * 1 : 100)
-      .fill(1)
-      .map((v, index) => {
-        return index + 1 + "人";
-      });
-  }
-  // 获取购物车数据
-  getCart();
-  // 获取购物车数据
-  if(shopInfo.registerType==='before'){
-    return 
-  }
-  getHistoryOrderDetail(opt.tableCode);
-}
+	/**
+	 * 删除购物车菜品
+	 */
+	function delCart(cartItem) {
+		let params = {
+			type: "onboc",
+			account: uni.getStorageSync("iToken").loginId,
+			shop_id: uni.getStorageSync("shopInfo").id,
+			is_gift: 0,
+			id: cartItem.id,
+			operate_type: "del",
+			table_code: cartItem.table_code,
+		};
+		websocketUtil.send(JSON.stringify(params));
+	}
 
-/**
- * 更新选择用户
- */
-function watchChooseuser() {
-  uni.$off("choose-user");
-  uni.$on("choose-user", async (data) => {
-    if (pageData.user.id == data.id) {
-      return;
-    }
-	pageData.user = data;
-    // if (data.id) {
-    //   const res = await shopUserDetail({
-    //     userId: data.userId,
-    //   });
-    //   pageData.user = res;
-    // } else {
-    //   pageData.user = data;
-    // }
-    // 更新购物车和历史订单数据
-    uodateCartAndHistory();
-  });
-}
+	/**
+	 * socket通知购物车商品数量修改处理
+	 */
+	function cartControls(cartItem, type) {
+		if (!pageData.table.tableCode) {
+			pageData.table.tableCode = cartItem.table_code;
+		}
+		let cartIndex = 0;
+		goods.list.map((item, index) => {
+			if (item.id == cartItem.id) {
+				cartIndex = index;
+			}
+		});
 
-/**
- * 更新购物车和历史订单数据
- */
-function uodateCartAndHistory() {
-  let newData = {
-    history: [],
-    cart: [],
-  };
-  console.log("uodateCartAndHistory", pageData.user);
-  for (let cart of goods.list) {
-    const canUseLimitTimeDiscount = yskUtils.limitUtils.canUseLimitTimeDiscount(
-      cart,
-      pageData.limitTimeDiscount,
-      pageData.shopInfo,
-      pageData.user,
-      "product_id"
-    )
-      ? 1
-      : 0;
-    console.log("uodateCartAndHistory", pageData.user);
-    if (canUseLimitTimeDiscount != cart.is_time_discount) {
-      newData.cart.push({
-        id: cart.id,
-        is_time_discount: canUseLimitTimeDiscount,
-      });
-    }
-  }
-  if (newData.history.length <= 0 && newData.cart.length <= 0) {
-    return;
-  }
+		if (type == "del") {
+			goods.list.splice(cartIndex, 1);
+			return;
+		}
+		if (type == "add") {
+			goods.list.push(cartItem);
+		}
+		if (type == "edit") {
+			goods.list[cartIndex].number = cartItem.number;
+			goods.list[cartIndex].pack_number = cartItem.pack_number;
+			goods.list[cartIndex].packNumber = cartItem.pack_number;
+		}
+	}
 
-  websocketUtil.send(
-    JSON.stringify({
-      type: "onboc",
-      account: uni.getStorageSync("shopInfo").id,
-      shop_id: uni.getStorageSync("shopInfo").id,
-      operate_type: "bulk_edit",
-      table_code: pageData.table.tableCode,
-      data: newData,
-    })
-  );
-}
+	/**
+	 * 获取购物车数据
+	 */
+	function getCart() {
+		// 初始化购物车
+		websocketUtil.send(
+			JSON.stringify({
+				type: "onboc",
+				account: uni.getStorageSync("iToken").loginId,
+				shop_id: uni.getStorageSync("shopInfo").id,
+				operate_type: "init",
+				table_code: pageData.table.tableCode,
+			})
+		);
+	}
 
-/**
- * 就餐类型切换监听
- */
-async function changeUseType() {
-  if (!goods.list.length) {
-    return;
-  }
-  websocketUtil.send(
-    JSON.stringify({
-      type: "onboc",
-      is_pack: pageData.eatTypes.active == "take-out" ? 1 : 0,
-      account: uni.getStorageSync("shopInfo").id,
-      shop_id: uni.getStorageSync("shopInfo").id,
-      operate_type: "batch",
-      table_code: pageData.table.tableCode,
-    })
-  );
-  getCart();
-}
+	/**
+	 * 获取店铺信息
+	 */
+	async function getTbShopInfo() {
+		const res = await getShopInfo({
+			id: uni.getStorageSync("shopInfo").id
+		});
+		pageData.shopInfo = res;
+		uni.setStorageSync("shopInfo", res);
+	}
 
-/**
- * 购物车数据修改
- * @param {Object} par
- */
-function updateCart(par) {
-  websocketUtil.send(
-    JSON.stringify({
-      type: "onboc",
-      account: uni.getStorageSync("iToken").loginId,
-      shop_id: uni.getStorageSync("shopInfo").id,
-      operate_type: "edit",
-      table_code: pageData.table.tableCode,
-      ...par,
-    })
-  );
-  getCart();
-}
+	/**
+	 * 获取桌台信息
+	 */
+	async function getTableInfo(opt) {
+		let res = {};
+		if (opt.id) {
+			res = await getShopTableDetail({
+				id: opt.id,
+				tableCode: opt.tableCode
+			});
+		}
+		Object.assign(pageData.table, res);
+		if (!pageData.shopInfo.isTableFee && pageData.table && pageData.table.id) {
+			userNumbers.list = new Array(res.maxCapacity ? res.maxCapacity * 1 : 100)
+				.fill(1)
+				.map((v, index) => {
+					return index + 1 + "人";
+				});
+		}
+		// 获取购物车数据
+		getCart();
+		// 获取购物车数据
+		if (shopInfo.registerType === 'before') {
+			return
+		}
+		getHistoryOrderDetail(opt.tableCode);
+	}
 
-/**
- * 菜品赠送/等叫/打印修改
- * @param {Object} item
- */
-function toggleItem(item, key) {
-  let par = {
-    id: item.id,
-    product_id: item.product_id,
-    sku_id: item.sku_id,
-  };
-  par[key] = item[key] == 0 ? 1 : 0;
-  updateCart(par);
-}
+	/**
+	 * 更新选择用户
+	 */
+	function watchChooseuser() {
+		uni.$off("choose-user");
+		uni.$on("choose-user", async (data) => {
+			if (pageData.user.id == data.id) {
+				return;
+			}
+			pageData.user = data;
+			// if (data.id) {
+			//   const res = await shopUserDetail({
+			//     userId: data.userId,
+			//   });
+			//   pageData.user = res;
+			// } else {
+			//   pageData.user = data;
+			// }
+			// 更新购物车和历史订单数据
+			uodateCartAndHistory();
+		});
+	}
 
-/**
- * 单品打折
- * @param {Object} form
- */
-async function discountconfirm(form) {
-  if (form.discountMoney != ".") {
-    let str = "";
-    if (form.notes) {
-      form.notes.forEach((ele) => {
-        if (ele.checked) {
-          str = str + ele.name + ",";
-        }
-      });
-    }
-    let lowMemberPrice = modelData.data.lowMemberPrice
-      ? modelData.data.lowMemberPrice
-      : modelData.data.lowPrice;
-    let discount_sale_amount = modelData.data.is_gift ? 0 : form.discountMoney;
-    let par = {
-      id: modelData.data.id,
-      product_id: modelData.data.product_id,
-      sku_id: modelData.data.sku_id,
-      discount_sale_amount: discount_sale_amount,
-      discount_sale_note: str + form.note,
-    };
-    updateCart(par);
-  }
-}
+	/**
+	 * 更新购物车和历史订单数据
+	 */
+	function uodateCartAndHistory() {
+		let newData = {
+			history: [],
+			cart: [],
+		};
+		console.log("uodateCartAndHistory", pageData.user);
+		for (let cart of goods.list) {
+			const canUseLimitTimeDiscount = yskUtils.limitUtils.canUseLimitTimeDiscount(
+					cart,
+					pageData.limitTimeDiscount,
+					pageData.shopInfo,
+					pageData.user,
+					"product_id"
+				) ?
+				1 :
+				0;
+			console.log("uodateCartAndHistory", pageData.user);
+			if (canUseLimitTimeDiscount != cart.is_time_discount) {
+				newData.cart.push({
+					id: cart.id,
+					is_time_discount: canUseLimitTimeDiscount,
+				});
+			}
+		}
+		if (newData.history.length <= 0 && newData.cart.length <= 0) {
+			return;
+		}
 
-/**
- * 打包
- */
-function goodsOnePackNumberConfirm(e) {
-  let par = {
-    id: modelData.data.id,
-    product_id: modelData.data.product_id,
-    sku_id: modelData.data.sku_id,
-    pack_number: e,
-  };
-  updateCart(par);
-}
+		websocketUtil.send(
+			JSON.stringify({
+				type: "onboc",
+				account: uni.getStorageSync("shopInfo").id,
+				shop_id: uni.getStorageSync("shopInfo").id,
+				operate_type: "bulk_edit",
+				table_code: pageData.table.tableCode,
+				data: newData,
+			})
+		);
+	}
 
-/**
- * 单品备注确认
- * @param {Object} e
- */
-async function goodsOneRemarkConfirm(e) {
-  let par = {
-    id: modelData.data.id,
-    product_id: modelData.data.product_id,
-    sku_id: modelData.data.sku_id,
-    remark: e.remark,
-  };
-  updateCart(par);
-}
+	/**
+	 * 就餐类型切换监听
+	 */
+	async function changeUseType() {
+		if (!goods.list.length) {
+			return;
+		}
+		websocketUtil.send(
+			JSON.stringify({
+				type: "onboc",
+				is_pack: pageData.eatTypes.active == "take-out" ? 1 : 0,
+				account: uni.getStorageSync("shopInfo").id,
+				shop_id: uni.getStorageSync("shopInfo").id,
+				operate_type: "batch",
+				table_code: pageData.table.tableCode,
+			})
+		);
+		getCart();
+	}
 
-/**
- * 设置弹窗信息
- * @param {Object} el
- */
-function setModel(el) {
-  if (el && el.$attrs["name"]) {
-    models.set(el.$attrs["name"], el);
-  }
-}
+	/**
+	 * 购物车数据修改
+	 * @param {Object} par
+	 */
+	function updateCart(par) {
+		websocketUtil.send(
+			JSON.stringify({
+				type: "onboc",
+				account: uni.getStorageSync("iToken").loginId,
+				shop_id: uni.getStorageSync("shopInfo").id,
+				operate_type: "edit",
+				table_code: pageData.table.tableCode,
+				...par,
+			})
+		);
+		getCart();
+	}
 
-/**
- * 打开弹窗
- * @param {Object} key
- * @param {Object} index
- */
-function showModel(key, index, item) {
-  modelData.data = goods.list[index];
-  modelData.selIndex = index;
-  const model = models.get(key);
-  console.log("弹窗数据===", modelData.data);
-  if (key == "packNumber") {
-    if (modelData.data.type == "weight" && item.pack_number <= 0) {
-      let par = {
-        id: modelData.data.id,
-        product_id: modelData.data.product_id,
-        sku_id: modelData.data.sku_id,
-        pack_number: 1,
-      };
-      updateCart(par);
-      return false;
-    }
-    if (item.pack_number > 0) {
-      let par = {
-        id: modelData.data.id,
-        product_id: modelData.data.product_id,
-        sku_id: modelData.data.sku_id,
-        pack_number: 0,
-      };
-      updateCart(par);
-      return false;
-    }
-    model &&
-      model.open({
-        number: item.number,
-      });
-  } else {
-    model &&
-      model.open({
-        packNumber: modelData.data.remark || "",
-      });
-  }
-}
+	/**
+	 * 菜品赠送/等叫/打印修改
+	 * @param {Object} item
+	 */
+	function toggleItem(item, key) {
+		let par = {
+			id: item.id,
+			product_id: item.product_id,
+			sku_id: item.sku_id,
+		};
+		par[key] = item[key] == 0 ? 1 : 0;
+		updateCart(par);
+	}
 
-/**
- * 更新就餐人数
- */
-async function updateChoseCount() {
-  const maxCapacity =
-    pageData.table && pageData.table.id ? pageData.table.maxCapacity || 0 : 100;
-  if (
-    pageData.table &&
-    pageData.table.id &&
-    userNumbers.defaultCateIndex * 1 + 1 > maxCapacity
-  ) {
-    uni.$utils.showToast("当前台桌最大人数为: " + maxCapacity);
-    userNumbers.defaultCateIndex = maxCapacity - 1;
-    return;
-  }
-  console.log(pageData.shopInfo);
-  console.log(!pageData.shopInfo.isTableFee);
-  if (
-    !pageData.shopInfo.isTableFee &&
-    pageData.table &&
-    pageData.table.id &&
-    goods.list.length > 0
-  ) {
-    //不免餐位费
-    console.log("不免餐位费");
-    let seatFee = {
-      totalNumber: userNumbers.defaultCateIndex * 1 + 1,
-      totalAmount:
-        (userNumbers.defaultCateIndex * 1 + 1) * pageData.shopInfo.tableFee,
-    };
-    Object.assign($seatFee, seatFee);
-    userNumbers.defaultCateIndex = $seatFee.totalNumber - 1;
-  }
-}
+	/**
+	 * 单品打折
+	 * @param {Object} form
+	 */
+	async function discountconfirm(form) {
+		if (form.discountMoney != ".") {
+			let str = "";
+			if (form.notes) {
+				form.notes.forEach((ele) => {
+					if (ele.checked) {
+						str = str + ele.name + ",";
+					}
+				});
+			}
+			let lowMemberPrice = modelData.data.lowMemberPrice ?
+				modelData.data.lowMemberPrice :
+				modelData.data.lowPrice;
+			let discount_sale_amount = modelData.data.is_gift ? 0 : form.discountMoney;
+			let par = {
+				id: modelData.data.id,
+				product_id: modelData.data.product_id,
+				sku_id: modelData.data.sku_id,
+				discount_sale_amount: discount_sale_amount,
+				discount_sale_note: str + form.note,
+			};
+			updateCart(par);
+		}
+	}
 
-/**
- * 选择就餐人数
- * @param {Object} e
- */
-function userNumberChange(e) {
-  userNumbers.defaultCateIndex = e.detail.value;
-}
+	/**
+	 * 打包
+	 */
+	function goodsOnePackNumberConfirm(e) {
+		let par = {
+			id: modelData.data.id,
+			product_id: modelData.data.product_id,
+			sku_id: modelData.data.sku_id,
+			pack_number: e,
+		};
+		updateCart(par);
+	}
 
-function chooseUser() {
-  go.to("PAGES_CHOOSE_USER");
-}
+	/**
+	 * 单品备注确认
+	 * @param {Object} e
+	 */
+	async function goodsOneRemarkConfirm(e) {
+		let par = {
+			id: modelData.data.id,
+			product_id: modelData.data.product_id,
+			sku_id: modelData.data.sku_id,
+			remark: e.remark,
+		};
+		updateCart(par);
+	}
 
-function chooseTable() {
-  go.to("PAGES_CHOOSE_TABLE", {
-    ...pageData.table,
-  });
-}
+	/**
+	 * 设置弹窗信息
+	 * @param {Object} el
+	 */
+	function setModel(el) {
+		if (el && el.$attrs["name"]) {
+			models.set(el.$attrs["name"], el);
+		}
+	}
 
-function watchChooseTable() {
-  uni.$off("choose-table");
-  uni.$on("choose-table", (data) => {
-    pageData.table = data;
-    console.log("台桌信息", pageData.table);
-  });
-}
+	/**
+	 * 打开弹窗
+	 * @param {Object} key
+	 * @param {Object} index
+	 */
+	function showModel(key, index, item) {
+		modelData.data = goods.list[index];
+		modelData.selIndex = index;
+		const model = models.get(key);
+		console.log("弹窗数据===", modelData.data);
+		if (key == "packNumber") {
+			if (modelData.data.type == "weight" && item.pack_number <= 0) {
+				let par = {
+					id: modelData.data.id,
+					product_id: modelData.data.product_id,
+					sku_id: modelData.data.sku_id,
+					pack_number: 1,
+				};
+				updateCart(par);
+				return false;
+			}
+			if (item.pack_number > 0) {
+				let par = {
+					id: modelData.data.id,
+					product_id: modelData.data.product_id,
+					sku_id: modelData.data.sku_id,
+					pack_number: 0,
+				};
+				updateCart(par);
+				return false;
+			}
+			model &&
+				model.open({
+					number: item.number,
+				});
+		} else {
+			model &&
+				model.open({
+					packNumber: modelData.data.remark || "",
+				});
+		}
+	}
 
-function changeGoodsSel(index) {
-  goods.sel = index;
-}
+	/**
+	 * 更新就餐人数
+	 */
+	async function updateChoseCount() {
+		const maxCapacity =
+			pageData.table && pageData.table.id ? pageData.table.maxCapacity || 0 : 100;
+		if (
+			pageData.table &&
+			pageData.table.id &&
+			userNumbers.defaultCateIndex * 1 + 1 > maxCapacity
+		) {
+			uni.$utils.showToast("当前台桌最大人数为: " + maxCapacity);
+			userNumbers.defaultCateIndex = maxCapacity - 1;
+			return;
+		}
+		console.log(pageData.shopInfo);
+		console.log(!pageData.shopInfo.isTableFee);
+		if (
+			!pageData.shopInfo.isTableFee &&
+			pageData.table &&
+			pageData.table.id &&
+			goods.list.length > 0
+		) {
+			//不免餐位费
+			console.log("不免餐位费");
+			let seatFee = {
+				totalNumber: userNumbers.defaultCateIndex * 1 + 1,
+				totalAmount: (userNumbers.defaultCateIndex * 1 + 1) * pageData.shopInfo.tableFee,
+			};
+			Object.assign($seatFee, seatFee);
+			userNumbers.defaultCateIndex = $seatFee.totalNumber - 1;
+		}
+	}
 
-/**
- * 创建订单
- */
-async function createAnOrder() {
-  if (
-    pageData.shopInfo.registerType == "before" ||
-    pageData.eatTypes.active == "take-out"
-  ) {
-    const canJiesuan = await hasPermission("允许收款");
-    if (!canJiesuan) {
-      return;
-    }
-  }
+	/**
+	 * 选择就餐人数
+	 * @param {Object} e
+	 */
+	function userNumberChange(e) {
+		userNumbers.defaultCateIndex = e.detail.value;
+	}
 
-  let vipPrice = isVip.value ? 1 : 0;
-  let placeNum = pageData.orderInfo ? pageData.orderInfo.placeNum + 1 : 1;
-  let par = {
-    shopId: pageData.shopInfo.id, //店铺Id
-    userId: pageData.user.userId, //用户Id
-    tableCode: pageData.table.tableCode, //台桌编码
-    dineMode: pageData.eatTypes.active, //用餐模式 堂食 dine-in 外带 take-out 外卖 take-away
-    remark: pageData.form.note, //备注
-    seatNum:
-      pageData.eatTypes.active == "dine-in" ? seatFeeConfig.personCount : 0, //用餐人数
-    packFee: orderCostSummary.value.packFee, //打包费
-    originAmount: orderCostSummary.value.goodsRealAmount, //订单原金额（不包含打包费+餐位费）
-    placeNum: placeNum, //当前订单下单次数
-    waitCall: 0, //是否等叫 0 否 1 等叫
-    vipPrice: vipPrice, //是否使用会员价
-    limitRate: pageData.limitTimeDiscount,
-  };
-  if (!pageData.shopInfo.isTableFee && pageData.table && pageData.table.id) {
-    par.seatNum = userNumbers.defaultCateIndex * 1 + 1;
-  }
-  if (pageData.orderInfo && pageData.shopInfo.registerType != "before") {
-    par.orderId = pageData.orderInfo.id;
-  }
-  let res = null;
-  if (goods.list.length) {
-    res = await createOrder(par);
-    console.log(res, "创建订单");
-    if (!res) {
-      uni.showToast({
-        title: res.msg || "创建订单失败！",
-        icon: "none",
-      });
-      return;
-    }
-    uni.$emit("update:createOrderIndex");
-    websocketUtil.send(
-      JSON.stringify({
-        type: "onboc",
-        account: uni.getStorageSync("iToken").loginId,
-        shop_id: uni.getStorageSync("shopInfo").id,
-        operate_type: "cleanup",
-        table_code: pageData.table.tableCode,
-      })
-    );
-    uni.removeStorageSync("table_code");
-  }
+	function chooseUser() {
+		go.to("PAGES_CHOOSE_USER");
+	}
 
-  if (
-    pageData.shopInfo.registerType == "before" ||
-    pageData.eatTypes.active == "take-out"
-  ) {
-    //先付
-    return go.to(
-      "PAGES_ORDER_PAY",
-      {
-        orderId: res.id,
-        isNowPay: true,
-        dinnerType: pageData.eatTypes.active,
-      },
-      "redirect"
-    );
-  } else {
-    if (!res.id && pageData.orderInfo.id) {
-      return go.to(
-        "PAGES_ORDER_PAY",
-        {
-          orderId: pageData.orderInfo.id,
-          isNowPay: true,
-          dinnerType: pageData.eatTypes.active,
-        },
-        "redirect"
-      );
-    }
-    //后付
-    if (option.isCreateOrderToDetail != "0") {
-      go.to(
-        "PAGES_ORDER_DETAIL",
-        {
-          id: res.id || pageData.orderInfo.id,
-          dinnerType: pageData.eatTypes.active,
-        },
-        "redirect"
-      );
-    } else {
-      uni.navigateBack({
-        delta: 2,
-      });
-    }
-  }
-  uni.showToast({
-    title: "提交成功",
-    icon: "none",
-  });
-}
+	function chooseTable() {
+		go.to("PAGES_CHOOSE_TABLE", {
+			...pageData.table,
+		});
+	}
 
-//选择的优惠券
-const selCoupon = ref([]);
-//活动列表
-const activityList = ref([]);
-// 商家减免，初始配置：默认无减免（固定金额 0 元）
-const merchantReductionConfig = reactive({
-  type: "fixed_amount",
-  fixedAmount: 0,
-});
-//积分规则
-const pointDeductionRule = reactive({
-  pointsPerYuan: 0,
-  maxDeductionAmount: Infinity,
-});
-//餐费费
-const seatFeeConfig = reactive({
-  pricePerPerson: pageData.shopInfo.tableFee || 0,
-  personCount: 0, //就餐人数
-  isEnabled: !pageData.shopInfo.isTableFee,
-});
-//使用积分数量
-const userPoints = ref(0);
-//是否使用会员价
-const useVipPrice = computed(() => {
-  if (pageData.shopInfo.isMemberPrice == 1 && pageData.user.isVip == 1) {
-    return true;
-  }
-  return false;
-});
-//新客立减
-const newUserDiscount = ref(0);
-//满减活动
-const fullReductionActivities = ref([]);
-// 商家霸王餐配置
-const freeDineConfig = ref(null);
+	function watchChooseTable() {
+		uni.$off("choose-table");
+		uni.$on("choose-table", (data) => {
+			pageData.table = data;
+			console.log("台桌信息", pageData.table);
+		});
+	}
 
-const orderExtraConfig = computed(() => {
-  return {
-    // 引用扩展后的商家减免配置
-    merchantReduction: merchantReductionConfig,
-    additionalFee: 0,
-    pointDeductionRule: pointDeductionRule,
-    seatFeeConfig: seatFeeConfig,
-    currentStoreId: "",
-    userPoints: userPoints.value,
-    isMember: useVipPrice.value,
-    memberDiscountRate: 1,
-    newUserDiscount: newUserDiscount.value,
-    fullReductionActivities: fullReductionActivities.value,
-    currentDinnerType: pageData.eatTypes.active,
-    isFreeDine: false, //霸王餐
-    freeDineConfig: freeDineConfig.value,
-    limitTimeDiscount: pageData.limitTimeDiscount,
-    shopUserInfo: pageData.user,
-  };
-});
+	function changeGoodsSel(index) {
+		goods.sel = index;
+	}
 
-const allGoodsList = computed(() => {
-  if (!pageData.orderInfo || !pageData.orderInfo.detailMap) {
-    return goods.list;
-  }
-  console.log(Object.values(pageData.orderInfo.detailMap));
-  const historyGoodsList = Object.values(pageData.orderInfo.detailMap).reduce(
-    (prve, cur) => {
-      cur.map((v) => {
-        v.number = v.num;
-        v.salePrice = v.price;
-        v.discount_sale_amount = v.discount_sale_amount
-          ? v.discount_sale_amount * 1
-          : 0;
-      });
-      prve.push(...cur);
-      return prve;
-    },
-    []
-  );
-  return [...goods.list, ...historyGoodsList];
-});
+	/**
+	 * 创建订单
+	 */
+	async function createAnOrder() {
+		if (
+			pageData.shopInfo.registerType == "before" ||
+			pageData.eatTypes.active == "take-out"
+		) {
+			const canJiesuan = await hasPermission("允许收款");
+			if (!canJiesuan) {
+				return;
+			}
+		}
 
-// 订单费用汇总
-const orderCostSummary = computed(() => {
-  console.log(goods.list, "购物车数据");
-  const costSummary = yskUtils.OrderPriceCalculator.calculateOrderCostSummary(
-    allGoodsList.value,
-    pageData.eatTypes.active,
-    selCoupon.value,
-    activityList.value,
-    orderExtraConfig.value,
-    {},
-    new Date()
-  );
-  console.log(" 订单费用汇总", costSummary);
-  return costSummary;
-});
-watch(
-  () => $seatFee.totalNumber,
-  (newVal, oldVal) => {
-    seatFeeConfig.personCount = newVal;
-  },
-  {
-    immediate: true,
-  }
-);
+		let vipPrice = isVip.value ? 1 : 0;
+		let placeNum = pageData.orderInfo ? pageData.orderInfo.placeNum + 1 : 1;
+		let par = {
+			shopId: pageData.shopInfo.id, //店铺Id
+			userId: pageData.user.userId, //用户Id
+			tableCode: pageData.table.tableCode, //台桌编码
+			dineMode: pageData.eatTypes.active, //用餐模式 堂食 dine-in 外带 take-out 外卖 take-away
+			remark: pageData.form.note, //备注
+			seatNum: pageData.eatTypes.active == "dine-in" ? seatFeeConfig.personCount : 0, //用餐人数
+			packFee: orderCostSummary.value.packFee, //打包费
+			originAmount: orderCostSummary.value.goodsRealAmount, //订单原金额（不包含打包费+餐位费）
+			placeNum: placeNum, //当前订单下单次数
+			waitCall: 0, //是否等叫 0 否 1 等叫
+			vipPrice: vipPrice, //是否使用会员价
+			limitRate: pageData.limitTimeDiscount,
+		};
+		if (!pageData.shopInfo.isTableFee && pageData.table && pageData.table.id) {
+			par.seatNum = userNumbers.defaultCateIndex * 1 + 1;
+		}
+		if (pageData.orderInfo && pageData.shopInfo.registerType != "before") {
+			par.orderId = pageData.orderInfo.id;
+		}
+		let res = null;
+		if (goods.list.length) {
+			res = await createOrder(par);
+			console.log(res, "创建订单");
+			if (!res) {
+				uni.showToast({
+					title: res.msg || "创建订单失败！",
+					icon: "none",
+				});
+				return;
+			}
+			uni.$emit("update:createOrderIndex");
+			websocketUtil.send(
+				JSON.stringify({
+					type: "onboc",
+					account: uni.getStorageSync("iToken").loginId,
+					shop_id: uni.getStorageSync("shopInfo").id,
+					operate_type: "cleanup",
+					table_code: pageData.table.tableCode,
+				})
+			);
+			uni.removeStorageSync("table_code");
+		}
+
+		if (
+			pageData.shopInfo.registerType == "before" ||
+			pageData.eatTypes.active == "take-out"
+		) {
+			//先付
+			return go.to(
+				"PAGES_ORDER_PAY", {
+					orderId: res.id,
+					isNowPay: true,
+					dinnerType: pageData.eatTypes.active,
+				},
+				"redirect"
+			);
+		} else {
+			if (!res.id && pageData.orderInfo.id) {
+				return go.to(
+					"PAGES_ORDER_PAY", {
+						orderId: pageData.orderInfo.id,
+						isNowPay: true,
+						dinnerType: pageData.eatTypes.active,
+					},
+					"redirect"
+				);
+			}
+			//后付
+			if (option.isCreateOrderToDetail != "0") {
+				go.to(
+					"PAGES_ORDER_DETAIL", {
+						id: res.id || pageData.orderInfo.id,
+						dinnerType: pageData.eatTypes.active,
+					},
+					"redirect"
+				);
+			} else {
+				uni.navigateBack({
+					delta: 2,
+				});
+			}
+		}
+		uni.showToast({
+			title: "提交成功",
+			icon: "none",
+		});
+	}
+
+	//选择的优惠券
+	const selCoupon = ref([]);
+	//活动列表
+	const activityList = ref([]);
+	// 商家减免，初始配置：默认无减免（固定金额 0 元）
+	const merchantReductionConfig = reactive({
+		type: "fixed_amount",
+		fixedAmount: 0,
+	});
+	//积分规则
+	const pointDeductionRule = reactive({
+		pointsPerYuan: 0,
+		maxDeductionAmount: Infinity,
+	});
+	//餐费费
+	const seatFeeConfig = reactive({
+		pricePerPerson: pageData.shopInfo.tableFee || 0,
+		personCount: 0, //就餐人数
+		isEnabled: !pageData.shopInfo.isTableFee,
+	});
+	//使用积分数量
+	const userPoints = ref(0);
+	//是否使用会员价
+	const useVipPrice = computed(() => {
+		if (pageData.shopInfo.isMemberPrice == 1 && pageData.user.isVip == 1) {
+			return true;
+		}
+		return false;
+	});
+	//新客立减
+	const newUserDiscount = ref(0);
+	//满减活动
+	const fullReductionActivities = ref([]);
+	// 商家霸王餐配置
+	const freeDineConfig = ref(null);
+
+	const orderExtraConfig = computed(() => {
+		return {
+			// 引用扩展后的商家减免配置
+			merchantReduction: merchantReductionConfig,
+			additionalFee: 0,
+			pointDeductionRule: pointDeductionRule,
+			seatFeeConfig: seatFeeConfig,
+			currentStoreId: "",
+			userPoints: userPoints.value,
+			isMember: useVipPrice.value,
+			memberDiscountRate: 1,
+			newUserDiscount: newUserDiscount.value,
+			fullReductionActivities: fullReductionActivities.value,
+			currentDinnerType: pageData.eatTypes.active,
+			isFreeDine: false, //霸王餐
+			freeDineConfig: freeDineConfig.value,
+			limitTimeDiscount: pageData.limitTimeDiscount,
+			shopUserInfo: pageData.user,
+		};
+	});
+
+	const allGoodsList = computed(() => {
+		if (!pageData.orderInfo || !pageData.orderInfo.detailMap) {
+			return goods.list;
+		}
+		console.log(Object.values(pageData.orderInfo.detailMap));
+		const historyGoodsList = Object.values(pageData.orderInfo.detailMap).reduce(
+			(prve, cur) => {
+				cur.map((v) => {
+					v.number = v.num;
+					v.salePrice = v.price;
+					v.discount_sale_amount = v.discount_sale_amount ?
+						v.discount_sale_amount * 1 :
+						0;
+				});
+				prve.push(...cur);
+				return prve;
+			},
+			[]
+		);
+		return [...goods.list, ...historyGoodsList];
+	});
+
+	// 订单费用汇总
+	const orderCostSummary = computed(() => {
+		console.log(goods.list, "购物车数据");
+		const costSummary = yskUtils.OrderPriceCalculator.calculateOrderCostSummary(
+			allGoodsList.value,
+			pageData.eatTypes.active,
+			selCoupon.value,
+			activityList.value,
+			orderExtraConfig.value, {},
+			new Date()
+		);
+		console.log(" 订单费用汇总", costSummary);
+		return costSummary;
+	});
+	watch(
+		() => $seatFee.totalNumber,
+		(newVal, oldVal) => {
+			seatFeeConfig.personCount = newVal;
+		}, {
+			immediate: true,
+		}
+	);
 </script>
 
 <style lang="scss" scoped>
-.fen {
-  color: #ff9f2e;
-}
+	.fen {
+		color: #ff9f2e;
+	}
 
-.page-gray {
-  padding: 32rpx 28rpx 0 28rpx;
-}
+	.page-gray {
+		padding: 32rpx 28rpx 0 28rpx;
+	}
 
-.headeimg {
-  width: 84rpx;
-  height: 84rpx;
-  border-radius: 12rpx 12rpx 12rpx 12rpx;
-}
+	.headeimg {
+		width: 84rpx;
+		height: 84rpx;
+		border-radius: 12rpx 12rpx 12rpx 12rpx;
+	}
 
-.block {
-  background-color: #fff;
-  padding: 32rpx 24rpx;
-  border-radius: 18rpx;
-  margin-bottom: 32rpx;
-}
+	.block {
+		background-color: #fff;
+		padding: 32rpx 24rpx;
+		border-radius: 18rpx;
+		margin-bottom: 32rpx;
+	}
 
-.textarea {
-  border-radius: 12rpx 12rpx 12rpx 12rpx;
-  padding: 32rpx 0 32rpx 24rpx;
-  border: 1px solid #999999;
-  overflow: hidden;
-}
+	.textarea {
+		border-radius: 12rpx 12rpx 12rpx 12rpx;
+		padding: 32rpx 0 32rpx 24rpx;
+		border: 1px solid #999999;
+		overflow: hidden;
+	}
 
-.goods {
-  // padding-bottom: 30rpx;
-  border-bottom: 1px dashed #e5e5e5;
+	.goods {
+		// padding-bottom: 30rpx;
+		border-bottom: 1px dashed #e5e5e5;
 
-  .item {
-    .img {
-      width: 120rpx;
-      height: 120rpx;
-      border-radius: 8rpx 8rpx 8rpx 8rpx;
-      overflow: hidden;
-    }
-  }
-}
+		.item {
+			.img {
+				width: 120rpx;
+				height: 120rpx;
+				border-radius: 8rpx 8rpx 8rpx 8rpx;
+				overflow: hidden;
+			}
+		}
+	}
 
-.headeimg {
-  width: 60rpx;
-  height: 60rpx;
-  display: flex;
-  background-color: #eee;
-  border-radius: 12rpx;
-  overflow: hidden;
+	.headeimg {
+		width: 60rpx;
+		height: 60rpx;
+		display: flex;
+		background-color: #eee;
+		border-radius: 12rpx;
+		overflow: hidden;
 
-  .img {
-    width: 60rpx;
-    height: 60rpx;
-  }
-}
+		.img {
+			width: 60rpx;
+			height: 60rpx;
+		}
+	}
 
-.price {
-  color: #eb4f4f;
-}
+	.price {
+		color: #eb4f4f;
+	}
 
-.opacity0 {
-  opacity: 0;
-}
+	.opacity0 {
+		opacity: 0;
+	}
 
-.fixed {
-  position: fixed;
-}
+	.fixed {
+		position: fixed;
+	}
 
-.safe-bottom {
-  padding: 34rpx 28rpx;
-  background-color: #fff;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  z-index: 10;
+	.safe-bottom {
+		padding: 34rpx 28rpx;
+		background-color: #fff;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 10;
 
-  .btn {
-    padding: 0 88rpx 56rpx 88rpx;
-  }
-}
+		.btn {
+			// padding: 0 88rpx 56rpx 88rpx;
+		}
+	}
 
-.tag {
-  background-color: #fff;
-  border: 1px solid #e5e5e5;
-  line-height: inherit;
-  font-size: 24rpx;
-  color: #666666;
-  padding: 6rpx 16rpx;
-  border-radius: 100rpx;
-}
+	.tag {
+		background-color: #fff;
+		border: 1px solid #e5e5e5;
+		line-height: inherit;
+		font-size: 24rpx;
+		color: #666666;
+		padding: 6rpx 16rpx;
+		border-radius: 100rpx;
+	}
 
-.hover-class {
-  background-color: #e5e5e5;
-}
+	.hover-class {
+		background-color: #e5e5e5;
+	}
 
-.limit-discount {
-  background-color: #cc5617;
-  padding: 2rpx 10rpx;
-  white-space: nowrap;
-  text-align: center;
-  position: absolute;
-  top: 0;
-  left: 0;
-  font-weight: 400;
-  font-size: 24rpx;
-  color: #ffffff;
-  border-radius: 8rpx 0rpx 20rpx 0rpx;
-  z-index: 9;
-  color: #fff;
-}
-.u-row-between {
-  justify-content: space-between;
-}
-.w-full{
-  width: 100%;
-}
-</style>
+	.limit-discount {
+		background-color: #cc5617;
+		padding: 2rpx 10rpx;
+		white-space: nowrap;
+		text-align: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #ffffff;
+		border-radius: 8rpx 0rpx 20rpx 0rpx;
+		z-index: 9;
+		color: #fff;
+	}
+
+	.u-row-between {
+		justify-content: space-between;
+	}
+
+	.w-full {
+		width: 100%;
+	}
+</style>
\ No newline at end of file
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 0875bce..c3570e8 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -23,10 +23,15 @@
 				</template>
 				<template v-else>
 					<template v-if="orderDetail.info.status=='unpaid'">
+						
 						<view class="u-flex-1">
 							<my-button @tap="diancan" color="#fff" bgColor="rgb(57,53,52)" borderRadius="100rpx 0 0 100rpx" fontWeight="700" 
 								shape="circle" plain type="primary">加菜</my-button>
 						</view>
+						<view class="u-flex-1" style="border-right: 1px solid #fff;">
+							<my-button @tap="transformTable" borderRadius="0 0 0 0" shape="circle" fontWeight="700" 
+								type="primary">转桌</my-button>
+						</view>
 						<view class="u-flex-1">
 							<my-button @tap="toPay" borderRadius="0 100rpx 100rpx 0" shape="circle" fontWeight="700" 
 								type="primary">结账</my-button>
@@ -37,6 +42,10 @@
 		</view>
 
 		<tuicai-vue @confirm="tuicaiConfirm" v-model:show="tuicai.show" :data="tuicai.selGoods"></tuicai-vue>
+		
+		<changeTable v-model="changeTableShow" :nowCartData="[]" :goodsList="orderDetail.info?orderDetail.info.detailMap:[]" :order="orderDetail.info"
+		@update="changeTableUpdate"
+		></changeTable>
 	</view>
 </template>
 
@@ -60,6 +69,12 @@
 	import { shopUserDetail } from '@/http/api/shopUser.js'
 	import { getShopInfo } from '@/http/api/shop.js'
 	
+	import changeTable from '@/components/change-table.vue'
+	const changeTableShow=ref(false)
+	function transformTable(){
+		changeTableShow.value=true
+	}
+	
 	const tuicai = reactive({
 		show: false,
 		isSeatFee: false,
@@ -128,6 +143,8 @@
 				item.unitPrice = uni.$utils.isGoodsPrice(item,user.value)
 			})
 		})
+		console.log('orderDetail.goodsList',orderDetail.goodsList);
+		console.log('orderDetail.info',orderDetail.info);
 		orderDetail.info = res
 	}
 
@@ -316,7 +333,13 @@
 		})
 	}
 
-	
+	function changeTableUpdate(allMerge){
+		if(allMerge===1){
+			uni.navigateBack()
+		}else{
+			getOrderDetail()
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pagesOrder/index/compoents/order-item.vue b/pagesOrder/index/compoents/order-item.vue
index 0c68a44..66bf3fa 100644
--- a/pagesOrder/index/compoents/order-item.vue
+++ b/pagesOrder/index/compoents/order-item.vue
@@ -147,7 +147,7 @@
 				$goodsMap[goods.productId] = goods.num * 1
 				goosZhonglei.value += 1
 			}
-			originAmount.value += goods.unitPrice
+			originAmount.value += goods.payAmount
 		}
 	}
 	goodsMapInit()
diff --git a/static/coupon/qrcode.svg b/static/coupon/qrcode.svg
deleted file mode 100644
index b6ea4c2..0000000
--- a/static/coupon/qrcode.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24.1" height="24.1" viewBox="0 0 24.1 24.1"><defs><style>.a{fill:#333;}</style></defs><path class="a" d="M179.826,184.148v-2.183h-2.231v2.185Zm3.33,0a1,1,0,0,0,.993-.993v-1.192h-2.139v2.183m-13.222-21.914v6.555h-6.555v-6.555h6.555m1.192-2.185h-8.938a1,1,0,0,0-.993.993v8.938a1,1,0,0,0,.993.993h8.938a1,1,0,0,0,.993-.993v-8.938a1,1,0,0,0-.993-.993Zm-4.469,5.462-1.092,0a1.092,1.092,0,1,0,1.092-1.092A1.092,1.092,0,0,0,164.419,165.512Zm17.545-3.277v6.555H175.41v-6.555h6.555m1.192-2.185h-8.938a1,1,0,0,0-.993.993v8.938a1,1,0,0,0,.993.993h8.938a1,1,0,0,0,.993-.993v-8.938a1,1,0,0,0-.993-.993Zm-4.469,5.462-1.092,0a1.092,1.092,0,1,0,1.092-1.092A1.092,1.092,0,0,0,177.595,165.512Zm-8.806,9.9v6.555h-6.555V175.41h6.555m1.192-2.185h-8.938a1,1,0,0,0-.993.993v8.938a1,1,0,0,0,.993.993h8.938a1,1,0,0,0,.993-.993v-8.938a1,1,0,0,0-.993-.993Zm-4.469,5.462-1.092,0a1.092,1.092,0,1,0,1.092-1.092A1.092,1.092,0,0,0,164.419,178.688Zm18.737-5.462h-1.218v4.37h-2.185v-4.37h-5.535a1,1,0,0,0-.993.993v8.938a1,1,0,0,0,.993.993h1.192V177.6h2.185v2.185h6.555v-5.562A1,1,0,0,0,183.156,173.225Z" transform="translate(-160.049 -160.05)"/></svg>
\ No newline at end of file
diff --git a/static/devIconImg/icon-code.svg b/static/devIconImg/icon-code.svg
deleted file mode 100644
index 01e19cf..0000000
--- a/static/devIconImg/icon-code.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" class="design-iconfont">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M16 24C13.582 24 12.0552 23.9956 10.9102 23.8846C9.82673 23.7795 9.51384 23.6092 9.4039 23.5402C9.02229 23.3004 8.69961 22.9777 8.45983 22.5961C8.39075 22.4862 8.22051 22.1733 8.11544 21.0898C8.00439 19.9448 8 18.418 8 16C8 13.582 8.00439 12.0552 8.11544 10.9102C8.22051 9.82673 8.39075 9.51384 8.45983 9.4039C8.69961 9.02229 9.02229 8.69961 9.4039 8.45983C9.51384 8.39075 9.82673 8.22051 10.9102 8.11544C12.0552 8.00439 13.582 8 16 8C18.418 8 19.9448 8.00439 21.0898 8.11544C22.1733 8.22051 22.4862 8.39075 22.5961 8.45983C22.9777 8.69961 23.3004 9.02229 23.5402 9.4039C23.6092 9.51384 23.7795 9.82673 23.8846 10.9102C23.9956 12.0552 24 13.582 24 16C24 18.418 23.9956 19.9448 23.8846 21.0898C23.7795 22.1733 23.6092 22.4862 23.5402 22.5961C23.3004 22.9777 22.9777 23.3004 22.5961 23.5402C22.4862 23.6092 22.1733 23.7795 21.0898 23.8846C19.9448 23.9956 18.418 24 16 24ZM4 16C4 11.3222 4 8.98333 5.07293 7.27577C5.63242 6.38535 6.38535 5.63242 7.27577 5.07293C8.98333 4 11.3222 4 16 4C20.6778 4 23.0167 4 24.7242 5.07293C25.6147 5.63242 26.3676 6.38535 26.9271 7.27577C28 8.98333 28 11.3222 28 16C28 20.6778 28 23.0167 26.9271 24.7242C26.3676 25.6147 25.6147 26.3676 24.7242 26.9271C23.0167 28 20.6778 28 16 28C11.3222 28 8.98333 28 7.27577 26.9271C6.38535 26.3676 5.63242 25.6147 5.07293 24.7242C4 23.0167 4 20.6778 4 16ZM16 52C13.582 52 12.0552 51.9956 10.9102 51.8846C9.82673 51.7795 9.51384 51.6092 9.4039 51.5402C9.02229 51.3004 8.69961 50.9777 8.45983 50.5961C8.39075 50.4862 8.22051 50.1733 8.11544 49.0898C8.00439 47.9448 8 46.418 8 44C8 41.582 8.00439 40.0552 8.11544 38.9102C8.22051 37.8267 8.39075 37.5138 8.45983 37.4039C8.69961 37.0223 9.02229 36.6996 9.4039 36.4598C9.51384 36.3908 9.82673 36.2205 10.9102 36.1154C12.0552 36.0044 13.582 36 16 36C18.418 36 19.9448 36.0044 21.0898 36.1154C22.1733 36.2205 22.4862 36.3908 22.5961 36.4598C22.9777 36.6996 23.3004 37.0223 23.5402 37.4039C23.6092 37.5138 23.7795 37.8267 23.8846 38.9102C23.9956 40.0552 24 41.582 24 44C24 46.418 23.9956 47.9448 23.8846 49.0898C23.7795 50.1733 23.6092 50.4862 23.5402 50.5961C23.3004 50.9777 22.9777 51.3004 22.5961 51.5402C22.4862 51.6092 22.1733 51.7795 21.0898 51.8846C19.9448 51.9956 18.418 52 16 52ZM4 44C4 39.3222 4 36.9833 5.07293 35.2758C5.63242 34.3853 6.38535 33.6324 7.27577 33.0729C8.98333 32 11.3222 32 16 32C20.6778 32 23.0167 32 24.7242 33.0729C25.6147 33.6324 26.3676 34.3853 26.9271 35.2758C28 36.9833 28 39.3222 28 44C28 48.6778 28 51.0167 26.9271 52.7242C26.3676 53.6147 25.6147 54.3676 24.7242 54.9271C23.0167 56 20.6778 56 16 56C11.3222 56 8.98333 56 7.27577 54.9271C6.38535 54.3676 5.63242 53.6147 5.07293 52.7242C4 51.0167 4 48.6778 4 44ZM37.5 36C36.6716 36 36 36.6716 36 37.5C36 38.3284 36.6716 39 37.5 39H44.5C47.5376 39 50 41.4624 50 44.5C50 47.5376 47.5376 50 44.5 50H40.5C39.3954 50 38.5 49.1046 38.5 48C38.5 46.8954 39.3954 46 40.5 46H44.5C45.3284 46 46 45.3284 46 44.5C46 43.6716 45.3284 43 44.5 43H37.5C34.4624 43 32 40.5376 32 37.5C32 34.4624 34.4624 32 37.5 32H41C42.1046 32 43 32.8954 43 34C43 35.1046 42.1046 36 41 36H37.5ZM56 41C56 39.8954 55.1046 39 54 39C52.8954 39 52 39.8954 52 41V41.4C52 44.0694 51.9973 45.9107 51.8445 47.3204C51.6959 48.6927 51.4245 49.4167 51.0451 49.9389C50.7367 50.3634 50.3634 50.7367 49.9389 51.0451C49.4167 51.4245 48.6927 51.6959 47.3204 51.8445C45.9107 51.9973 44.0694 52 41.4 52H41C39.8954 52 39 52.8954 39 54C39 55.1046 39.8954 56 41 56H41.5137C44.0419 56 46.1008 56.0001 47.7513 55.8213C49.4638 55.6357 50.9723 55.2386 52.2901 54.2812C53.0541 53.726 53.726 53.0541 54.2812 52.2901C55.2386 50.9723 55.6357 49.4638 55.8213 47.7513C56.0001 46.1008 56 44.0419 56 41.5137V41ZM38.9102 23.8846C40.0552 23.9956 41.582 24 44 24C46.418 24 47.9448 23.9956 49.0898 23.8846C50.1733 23.7795 50.4862 23.6092 50.5961 23.5402C50.9777 23.3004 51.3004 22.9777 51.5402 22.5961C51.6092 22.4862 51.7795 22.1733 51.8846 21.0898C51.9956 19.9448 52 18.418 52 16C52 13.582 51.9956 12.0552 51.8846 10.9102C51.7795 9.82673 51.6092 9.51384 51.5402 9.4039C51.3004 9.02229 50.9777 8.69961 50.5961 8.45983C50.4862 8.39075 50.1733 8.22051 49.0898 8.11544C47.9448 8.00439 46.418 8 44 8C41.582 8 40.0552 8.00439 38.9102 8.11544C37.8267 8.22051 37.5138 8.39075 37.4039 8.45983C37.0223 8.69961 36.6996 9.02229 36.4598 9.4039C36.3908 9.51384 36.2205 9.82673 36.1154 10.9102C36.0044 12.0552 36 13.582 36 16C36 18.418 36.0044 19.9448 36.1154 21.0898C36.2205 22.1733 36.3908 22.4862 36.4598 22.5961C36.6996 22.9777 37.0223 23.3004 37.4039 23.5402C37.5138 23.6092 37.8267 23.7795 38.9102 23.8846ZM33.0729 7.27577C32 8.98333 32 11.3222 32 16C32 20.6778 32 23.0167 33.0729 24.7242C33.6324 25.6147 34.3853 26.3676 35.2758 26.9271C36.9833 28 39.3222 28 44 28C48.6778 28 51.0167 28 52.7242 26.9271C53.6147 26.3676 54.3676 25.6147 54.9271 24.7242C56 23.0167 56 20.6778 56 16C56 11.3222 56 8.98333 54.9271 7.27577C54.3676 6.38535 53.6147 5.63242 52.7242 5.07293C51.0167 4 48.6778 4 44 4C39.3222 4 36.9833 4 35.2758 5.07293C34.3853 5.63242 33.6324 6.38535 33.0729 7.27577ZM13.191 13.4122C13 13.6751 13 14.0501 13 14.8V17.2C13 17.9499 13 18.3249 13.191 18.5878C13.2527 18.6727 13.3273 18.7473 13.4122 18.809C13.6751 19 14.0501 19 14.8 19H17.2C17.9499 19 18.3249 19 18.5878 18.809C18.6727 18.7473 18.7473 18.6727 18.809 18.5878C19 18.3249 19 17.9499 19 17.2V14.8C19 14.0501 19 13.6751 18.809 13.4122C18.7473 13.3273 18.6727 13.2527 18.5878 13.191C18.3249 13 17.9499 13 17.2 13H14.8C14.0501 13 13.6751 13 13.4122 13.191C13.3273 13.2527 13.2527 13.3273 13.191 13.4122ZM13 42.8C13 42.0501 13 41.6751 13.191 41.4122C13.2527 41.3273 13.3273 41.2527 13.4122 41.191C13.6751 41 14.0501 41 14.8 41H17.2C17.9499 41 18.3249 41 18.5878 41.191C18.6727 41.2527 18.7473 41.3273 18.809 41.4122C19 41.6751 19 42.0501 19 42.8V45.2C19 45.9499 19 46.3249 18.809 46.5878C18.7473 46.6727 18.6727 46.7473 18.5878 46.809C18.3249 47 17.9499 47 17.2 47H14.8C14.0501 47 13.6751 47 13.4122 46.809C13.3273 46.7473 13.2527 46.6727 13.191 46.5878C13 46.3249 13 45.9499 13 45.2V42.8ZM41.191 13.4122C41 13.6751 41 14.0501 41 14.8V17.2C41 17.9499 41 18.3249 41.191 18.5878C41.2527 18.6727 41.3273 18.7473 41.4122 18.809C41.6751 19 42.0501 19 42.8 19H45.2C45.9499 19 46.3249 19 46.5878 18.809C46.6727 18.7473 46.7473 18.6727 46.809 18.5878C47 18.3249 47 17.9499 47 17.2V14.8C47 14.0501 47 13.6751 46.809 13.4122C46.7473 13.3273 46.6727 13.2527 46.5878 13.191C46.3249 13 45.9499 13 45.2 13H42.8C42.0501 13 41.6751 13 41.4122 13.191C41.3273 13.2527 41.2527 13.3273 41.191 13.4122ZM34 46C35.1046 46 36 46.8954 36 48V54C36 55.1046 35.1046 56 34 56C32.8954 56 32 55.1046 32 54V48C32 46.8954 32.8954 46 34 46ZM48 32C46.8954 32 46 32.8954 46 34C46 35.1046 46.8954 36 48 36H54C55.1046 36 56 35.1046 56 34C56 32.8954 55.1046 32 54 32H48Z" fill="url(#6k36kdqf2__paint0_linear_7_727)"/>
-  <defs>
-    <linearGradient id="6k36kdqf2__paint0_linear_7_727" x1="56" y1="29.9589" x2="4" y2="29.9589" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#238FFC"/>
-      <stop offset="1" stop-color="#1A66FF"/>
-    </linearGradient>
-  </defs>
-</svg>
diff --git a/static/devIconImg/icon-face-1.svg b/static/devIconImg/icon-face-1.svg
deleted file mode 100644
index 4e7082a..0000000
--- a/static/devIconImg/icon-face-1.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.8917 2H42.1083C43.8909 1.99995 45.3881 1.9999 46.5982 2.131C47.8701 2.26881 49.0596 2.57044 50.1145 3.33689C50.7088 3.76864 51.2314 4.29124 51.6631 4.88551C52.4296 5.94043 52.7312 7.12995 52.869 8.40184C53.0001 9.61184 53.0001 11.109 53 12.8915V12.8916V12.8916V12.8917V12.8917V40.1083V40.1083V40.1084V40.1084V40.1085C53.0001 41.891 53.0001 43.3882 52.869 44.5982C52.7312 45.8701 52.4296 47.0596 51.6631 48.1145C51.2314 48.7088 50.7088 49.2314 50.1145 49.6631C49.0596 50.4296 47.8701 50.7312 46.5982 50.869C45.3882 51.0001 43.891 51.0001 42.1085 51H42.1084H42.1084H42.1083H42.1083H32V54H51C52.1046 54 53 54.8954 53 56C53 57.1046 52.1046 58 51 58H32H28H9C7.89543 58 7 57.1046 7 56C7 54.8954 7.89543 54 9 54H28V51H17.8917H17.8917H17.8916H17.8916H17.8915C16.109 51.0001 14.6118 51.0001 13.4018 50.869C12.1299 50.7312 10.9404 50.4296 9.88551 49.6631C9.29124 49.2314 8.76864 48.7088 8.33689 48.1145C7.57044 47.0596 7.26881 45.8701 7.131 44.5982C6.9999 43.3881 6.99995 41.8909 7 40.1083V12.8917C6.99995 11.1091 6.9999 9.61188 7.131 8.40184C7.26881 7.12995 7.57044 5.94043 8.33689 4.88551C8.76864 4.29124 9.29124 3.76864 9.88551 3.33689C10.9404 2.57044 12.1299 2.26881 13.4018 2.131C14.6119 1.9999 16.1091 1.99995 17.8917 2ZM13.8327 6.10773C12.9011 6.20866 12.4961 6.38449 12.2366 6.57295C11.982 6.75799 11.758 6.98196 11.573 7.23665C11.3845 7.49605 11.2087 7.90113 11.1077 8.83269C11.0027 9.80168 11 11.0806 11 13V40C11 41.9194 11.0027 43.1983 11.1077 44.1673C11.2087 45.0989 11.3845 45.504 11.573 45.7634C11.758 46.018 11.982 46.242 12.2366 46.4271C12.4961 46.6155 12.9011 46.7913 13.8327 46.8923C14.8017 46.9973 16.0806 47 18 47H42C43.9194 47 45.1983 46.9973 46.1673 46.8923C47.0989 46.7913 47.504 46.6155 47.7634 46.4271C48.018 46.242 48.242 46.018 48.4271 45.7634C48.6155 45.504 48.7913 45.0989 48.8923 44.1673C48.9973 43.1983 49 41.9194 49 40V13C49 11.0806 48.9973 9.80168 48.8923 8.83269C48.7913 7.90113 48.6155 7.49605 48.4271 7.23665C48.242 6.98196 48.018 6.75799 47.7634 6.57295C47.504 6.38449 47.0989 6.20866 46.1673 6.10773C45.1983 6.00275 43.9194 6 42 6H18C16.0806 6 14.8017 6.00275 13.8327 6.10773ZM30 15C23.3726 15 18 20.3726 18 27C18 33.6274 23.3726 39 30 39C36.6274 39 42 33.6274 42 27C42 20.3726 36.6274 15 30 15ZM14 27C14 18.1634 21.1634 11 30 11C38.8366 11 46 18.1634 46 27C46 35.8366 38.8366 43 30 43C21.1634 43 14 35.8366 14 27ZM38.9429 28.0217C39.0682 26.9242 38.2803 25.9329 37.1828 25.8075C36.0854 25.6822 35.0941 26.4702 34.9687 27.5676C34.8516 28.5925 34.4204 29.5561 33.7341 30.3263C33.0479 31.0965 32.1402 31.6355 31.1355 31.8696C30.1308 32.1037 29.0784 32.0212 28.1224 31.6336C27.1664 31.246 26.3537 30.5722 25.7957 29.7046C25.1982 28.7756 23.9607 28.5068 23.0317 29.1043C22.1027 29.7018 21.8339 30.9393 22.4314 31.8683C23.4358 33.43 24.8986 34.6429 26.6194 35.3405C28.3402 36.0382 30.2347 36.1866 32.0431 35.7653C33.8515 35.344 35.4853 34.3736 36.7206 32.9873C37.9558 31.601 38.7321 29.8665 38.9429 28.0217Z" fill="url(#paint0_linear_516_209)"/>
-<defs>
-<linearGradient id="paint0_linear_516_209" x1="53" y1="29.9558" x2="7" y2="29.9558" gradientUnits="userSpaceOnUse">
-<stop stop-color="#238FFC"/>
-<stop offset="1" stop-color="#1A66FF"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/static/devIconImg/icon-horn.svg b/static/devIconImg/icon-horn.svg
deleted file mode 100644
index 1ea06af..0000000
--- a/static/devIconImg/icon-horn.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" class="design-iconfont">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M19.0024 9.5012V43.4988C19.0024 45.1965 18.9995 46.2358 18.9376 47.0142C18.9088 47.3769 18.8725 47.5969 18.8419 47.7308C18.8273 47.7946 18.8151 47.8339 18.8077 47.8551C18.8007 47.8752 18.7966 47.8836 18.796 47.8848L18.796 47.8849C18.6013 48.2795 18.2819 48.5989 17.8873 48.7936L17.8824 48.7958C17.8779 48.7978 17.8699 48.801 17.8575 48.8053C17.8363 48.8127 17.797 48.8249 17.7332 48.8395C17.5993 48.8701 17.3793 48.9064 17.0166 48.9352C16.2382 48.9971 15.1989 49 13.5012 49C11.8035 49 10.7642 48.9971 9.98575 48.9352C9.62309 48.9064 9.40313 48.8701 9.26916 48.8395C9.20541 48.8249 9.16612 48.8127 9.14488 48.8053C9.12476 48.7983 9.1164 48.7942 9.11519 48.7936L9.11514 48.7936C8.7205 48.5989 8.40109 48.2795 8.20639 47.8849L8.20637 47.8848C8.20578 47.8836 8.20166 47.8752 8.19469 47.8551C8.18734 47.8339 8.17511 47.7946 8.16052 47.7308C8.12988 47.5969 8.09365 47.3769 8.06482 47.0142C8.00294 46.2358 8 45.1965 8 43.4988V9.5012C8 7.8035 8.00294 6.76416 8.06482 5.98575C8.09365 5.62309 8.12988 5.40313 8.16052 5.26916C8.17511 5.20541 8.18734 5.16612 8.19469 5.14488C8.20175 5.12448 8.20589 5.11616 8.20639 5.11514C8.40109 4.7205 8.7205 4.40109 9.11514 4.20639L9.11517 4.20638C9.11633 4.20581 9.12468 4.20168 9.14488 4.19469C9.16612 4.18734 9.20541 4.17511 9.26916 4.16052C9.40313 4.12988 9.62309 4.09365 9.98575 4.06482C10.7642 4.00294 11.8035 4 13.5012 4C15.1989 4 16.2382 4.00294 17.0166 4.06482C17.3793 4.09365 17.5993 4.12988 17.7332 4.16052C17.797 4.17511 17.8363 4.18734 17.8575 4.19469C17.8777 4.20168 17.8861 4.2058 17.8872 4.20638L17.8873 4.20639C18.2819 4.40109 18.6013 4.7205 18.796 5.11514C18.7965 5.11616 18.8006 5.12448 18.8077 5.14488C18.8151 5.16612 18.8273 5.20541 18.8419 5.26916C18.8725 5.40313 18.9088 5.62309 18.9376 5.98575C18.9995 6.76416 19.0024 7.8035 19.0024 9.5012ZM4 9.5012C4 6.23407 4 4.6005 4.61918 3.34542C5.20326 2.1615 6.1615 1.20326 7.34542 0.619181C8.6005 0 10.2341 0 13.5012 0C16.7683 0 18.4019 0 19.657 0.619181C20.8409 1.20326 21.7991 2.1615 22.3832 3.34542C23.0024 4.6005 23.0024 6.23407 23.0024 9.5012V43.4988C23.0024 46.7659 23.0024 48.3995 22.3832 49.6546C21.7991 50.8385 20.8409 51.7967 19.657 52.3808C18.6889 52.8584 17.4956 52.9676 15.5011 52.9926V56H22.0024C23.1071 56 24.0027 56.8954 24.0027 58C24.0027 59.1046 23.1071 60 22.0024 60H13.5011H5.00025C3.89554 60 3 59.1046 3 58C3 56.8954 3.89554 56 5.00025 56H11.5011V52.9926C9.50674 52.9676 8.31349 52.8584 7.34542 52.3808C6.1615 51.7967 5.20326 50.8385 4.61918 49.6546C4 48.3995 4 46.7659 4 43.4988V9.5012ZM32.2205 20.7829C31.4394 20.0019 30.173 20.0019 29.3919 20.7829C28.6108 21.5639 28.6108 22.8302 29.3919 23.6112C29.9026 24.1218 30.3078 24.7281 30.5842 25.3954C30.8606 26.0626 31.0029 26.7778 31.0029 27.5C31.0029 28.2222 30.8606 28.9374 30.5842 29.6046C30.3078 30.2719 29.9026 30.8782 29.3919 31.3888C28.6108 32.1698 28.6108 33.4361 29.3919 34.2171C30.173 34.9981 31.4394 34.9981 32.2205 34.2171C33.1027 33.335 33.8025 32.2878 34.28 31.1353C34.7574 29.9827 35.0032 28.7475 35.0032 27.5C35.0032 26.2525 34.7574 25.0173 34.28 23.8647C33.8025 22.7122 33.1027 21.665 32.2205 20.7829ZM16.001 9.5C16.001 10.8807 14.8817 12 13.501 12C12.1203 12 11.001 10.8807 11.001 9.5C11.001 8.11929 12.1203 7 13.501 7C14.8817 7 16.001 8.11929 16.001 9.5ZM13.501 20C14.8817 20 16.001 18.8807 16.001 17.5C16.001 16.1193 14.8817 15 13.501 15C12.1203 15 11.001 16.1193 11.001 17.5C11.001 18.8807 12.1203 20 13.501 20ZM16.001 25.5C16.001 26.8807 14.8817 28 13.501 28C12.1203 28 11.001 26.8807 11.001 25.5C11.001 24.1193 12.1203 23 13.501 23C14.8817 23 16.001 24.1193 16.001 25.5ZM13.501 36C14.8817 36 16.001 34.8807 16.001 33.5C16.001 32.1193 14.8817 31 13.501 31C12.1203 31 11.001 32.1193 11.001 33.5C11.001 34.8807 12.1203 36 13.501 36ZM37.4451 13.6962C38.2252 12.914 39.4917 12.9122 40.2739 13.6922C42.1458 15.5586 43.6186 17.7861 44.603 20.2393C45.5873 22.6924 46.0625 25.3201 45.9998 27.9625C45.9371 30.605 45.3378 33.2072 44.2382 35.6109C43.1386 38.0146 41.5618 40.1697 39.6035 41.9453C38.7851 42.6873 37.5202 42.6255 36.7781 41.8072C36.036 40.989 36.0978 39.7242 36.9162 38.9822C38.4728 37.5708 39.7262 35.8578 40.6002 33.9471C41.4742 32.0365 41.9506 29.9681 42.0004 27.8677C42.0503 25.7672 41.6725 23.6786 40.8901 21.7286C40.1077 19.7787 38.937 18.0082 37.4491 16.5246C36.6668 15.7446 36.6651 14.4783 37.4451 13.6962ZM47.5747 5.86219C46.7762 5.09891 45.51 5.12741 44.7467 5.92584C43.9833 6.72427 44.0118 7.99027 44.8103 8.75355C47.4154 11.2436 49.4851 14.2387 50.8931 17.5557C52.3011 20.8728 53.0177 24.4421 52.9991 28.0455C52.9805 31.6489 52.2272 35.2106 50.785 38.513C49.3429 41.8153 47.2424 44.7889 44.6118 47.2519C43.8054 48.0069 43.7639 49.2726 44.519 50.0788C45.2741 50.8851 46.5399 50.9266 47.3462 50.1716C50.3739 47.3368 52.7915 43.9144 54.4513 40.1136C56.1111 36.3128 56.9782 32.2134 56.9996 28.0661C57.021 23.9188 56.1962 19.8107 54.5757 15.993C52.9552 12.1752 50.573 8.72807 47.5747 5.86219Z" fill="url(#g20x3qzgy__paint0_linear_7_780)"/>
-  <defs>
-    <linearGradient id="g20x3qzgy__paint0_linear_7_780" x1="57" y1="29.9526" x2="3" y2="29.9526" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#238FFC"/>
-      <stop offset="1" stop-color="#1A66FF"/>
-    </linearGradient>
-  </defs>
-</svg>
diff --git a/static/devIconImg/icon-pos.svg b/static/devIconImg/icon-pos.svg
deleted file mode 100644
index 65a901e..0000000
--- a/static/devIconImg/icon-pos.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" class="design-iconfont">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M18.5 4H41.5C44.1645 4 45.8473 4.0053 47.1023 4.13891C48.2849 4.2648 48.6139 4.4667 48.736 4.55332C49.0112 4.74856 49.2514 4.98882 49.4467 5.26399C49.5333 5.38606 49.7352 5.71509 49.8611 6.89766C49.9947 8.15273 50 9.83554 50 12.5C50 15.1645 49.9947 16.8473 49.8611 18.1023C49.7352 19.2849 49.5333 19.6139 49.4467 19.736C49.2514 20.0112 49.0112 20.2514 48.736 20.4467C48.6139 20.5333 48.2849 20.7352 47.1023 20.8611C45.8473 20.9947 44.1645 21 41.5 21H18.5C15.8355 21 14.1527 20.9947 12.8977 20.8611C11.7151 20.7352 11.3861 20.5333 11.264 20.4467C10.9888 20.2514 10.7486 20.0112 10.5533 19.736C10.4667 19.6139 10.2648 19.2849 10.1389 18.1023C10.0053 16.8473 10 15.1645 10 12.5C10 9.83554 10.0053 8.15273 10.1389 6.89766C10.2648 5.71509 10.4667 5.38606 10.5533 5.26399C10.7486 4.98882 10.9888 4.74856 11.264 4.55332C11.3861 4.4667 11.7151 4.2648 12.8977 4.13891C14.1527 4.0053 15.8355 4 18.5 4ZM6 12.5C6 7.34593 6 4.7689 7.29107 2.9493C7.74664 2.30724 8.30724 1.74664 8.9493 1.29107C10.7689 0 13.3459 0 18.5 0H41.5C46.6541 0 49.2311 0 51.0507 1.29107C51.6928 1.74664 52.2534 2.30724 52.7089 2.9493C54 4.7689 54 7.34593 54 12.5C54 17.6541 54 20.2311 52.7089 22.0507C52.2534 22.6928 51.6928 23.2534 51.0507 23.7089C50.0389 24.4268 48.793 24.7455 47 24.887V25V47.4C47 52.6496 47 55.2744 45.6631 57.1145C45.2314 57.7088 44.7088 58.2314 44.1145 58.6631C42.2744 60 39.6496 60 34.4 60H25.6C20.3504 60 17.7256 60 15.8855 58.6631C15.2912 58.2314 14.7686 57.7088 14.3369 57.1145C13 55.2744 13 52.6496 13 47.4V25V24.887C11.207 24.7455 9.96107 24.4268 8.9493 23.7089C8.30724 23.2534 7.74664 22.6928 7.29107 22.0507C6 20.2311 6 17.6541 6 12.5ZM17 24.9986V25V27V47.4C17 50.1139 17.0055 51.828 17.1438 53.105C17.2741 54.3071 17.4825 54.6388 17.5729 54.7634C17.758 55.018 17.982 55.242 18.2366 55.4271C18.3612 55.5175 18.6929 55.7259 19.895 55.8562C21.172 55.9945 22.8861 56 25.6 56H34.4C37.1139 56 38.828 55.9945 40.105 55.8562C41.3071 55.7259 41.6388 55.5175 41.7634 55.4271C42.018 55.242 42.242 55.018 42.4271 54.7634C42.5175 54.6388 42.7259 54.3071 42.8562 53.105C42.9945 51.828 43 50.1139 43 47.4V27V25V24.9986C42.5256 25 42.0262 25 41.5 25H18.5C17.9738 25 17.4744 25 17 24.9986ZM13.191 7.41221C13 7.67508 13 8.05005 13 8.8V12.2C13 12.9499 13 13.3249 13.191 13.5878C13.2527 13.6727 13.3273 13.7473 13.4122 13.809C13.6751 14 14.0501 14 14.8 14H45.2C45.9499 14 46.3249 14 46.5878 13.809C46.6727 13.7473 46.7473 13.6727 46.809 13.5878C47 13.3249 47 12.9499 47 12.2V8.8C47 8.05005 47 7.67508 46.809 7.41221C46.7473 7.32732 46.6727 7.25266 46.5878 7.19098C46.3249 7 45.9499 7 45.2 7H14.8C14.0501 7 13.6751 7 13.4122 7.19098C13.3273 7.25266 13.2527 7.32732 13.191 7.41221ZM26 51.8C26 51.0501 26 50.6751 26.191 50.4122C26.2527 50.3273 26.3273 50.2527 26.4122 50.191C26.6751 50 27.0501 50 27.8 50H32.2C32.9499 50 33.3249 50 33.5878 50.191C33.6727 50.2527 33.7473 50.3273 33.809 50.4122C34 50.6751 34 51.0501 34 51.8V52.2C34 52.9499 34 53.3249 33.809 53.5878C33.7473 53.6727 33.6727 53.7473 33.5878 53.809C33.3249 54 32.9499 54 32.2 54H27.8C27.0501 54 26.6751 54 26.4122 53.809C26.3273 53.7473 26.2527 53.6727 26.191 53.5878C26 53.3249 26 52.9499 26 52.2V51.8Z" fill="url(#pqjpdjg7m__paint0_linear_7_827)"/>
-  <defs>
-    <linearGradient id="pqjpdjg7m__paint0_linear_7_827" x1="54" y1="29.9526" x2="6" y2="29.9526" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#238FFC"/>
-      <stop offset="1" stop-color="#1A66FF"/>
-    </linearGradient>
-  </defs>
-</svg>
diff --git a/static/devIconImg/icon-print.svg b/static/devIconImg/icon-print.svg
deleted file mode 100644
index bf85464..0000000
--- a/static/devIconImg/icon-print.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" class="design-iconfont">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M23.6 8H36.4C39.1139 8 40.828 8.00549 42.105 8.14384C43.3071 8.27408 43.6388 8.48249 43.7634 8.57295C44.018 8.75799 44.242 8.98196 44.4271 9.23664C44.5175 9.36116 44.7259 9.69294 44.8562 10.895C44.9945 12.172 45 13.8861 45 16.6V17.4C45 17.9767 44.9998 18.5082 44.998 19H15.002C15.0002 18.5082 15 17.9767 15 17.4V16.6C15 13.8861 15.0055 12.172 15.1438 10.895C15.2741 9.69294 15.4825 9.36116 15.5729 9.23664C15.758 8.98196 15.982 8.75799 16.2366 8.57295C16.3612 8.48249 16.6929 8.27408 17.895 8.14384C19.172 8.00549 20.8861 8 23.6 8ZM49 17.4C49 17.9633 49 18.4965 48.9983 19.0016C53.2028 19.0153 55.4715 19.1432 57.1145 20.3369C57.7088 20.7686 58.2314 21.2912 58.6631 21.8855C60 23.7256 60 26.3504 60 31.6V32.4C60 37.6496 60 40.2744 58.6631 42.1145C58.2314 42.7088 57.7088 43.2314 57.1145 43.6631C55.4715 44.8568 53.2028 44.9847 48.9984 44.9984C48.9847 49.2028 48.8568 51.4715 47.6631 53.1145C47.2314 53.7088 46.7088 54.2314 46.1145 54.6631C44.2744 56 41.6496 56 36.4 56H23.6C18.3504 56 15.7256 56 13.8855 54.6631C13.2912 54.2314 12.7686 53.7088 12.3369 53.1145C11.1432 51.4715 11.0153 49.2028 11.0016 44.9984C6.79724 44.9847 4.52853 44.8568 2.8855 43.6631C2.29124 43.2314 1.76864 42.7088 1.33688 42.1145C0 40.2744 0 37.6496 0 32.4V31.6C0 26.3504 0 23.7256 1.33688 21.8855C1.76864 21.2912 2.29124 20.7686 2.8855 20.3369C4.52853 19.1432 6.79725 19.0153 11.0017 19.0016C11 18.4965 11 17.9634 11 17.4V16.6C11 11.3504 11 8.72556 12.3369 6.8855C12.7686 6.29124 13.2912 5.76864 13.8855 5.33688C15.7256 4 18.3504 4 23.6 4H36.4C41.6496 4 44.2744 4 46.1145 5.33688C46.7088 5.76864 47.2314 6.29124 47.6631 6.8855C49 8.72556 49 11.3504 49 16.6V17.4ZM47.4 23H12.6C9.88609 23 8.17196 23.0055 6.89502 23.1438C5.69294 23.2741 5.36116 23.4825 5.23664 23.5729C4.98196 23.758 4.75799 23.982 4.57295 24.2366C4.48249 24.3612 4.27408 24.6929 4.14384 25.895C4.00549 27.172 4 28.8861 4 31.6V32.4C4 35.1139 4.00549 36.828 4.14384 38.105C4.27408 39.3071 4.48249 39.6388 4.57295 39.7634C4.75799 40.018 4.98196 40.242 5.23664 40.4271C5.36116 40.5175 5.69294 40.7259 6.89502 40.8562C7.90092 40.9651 9.17813 40.9917 11.0017 40.998C11.0154 36.7959 11.1435 34.5281 12.3369 32.8855C12.7686 32.2912 13.2912 31.7686 13.8855 31.3369C15.7256 30 18.3504 30 23.6 30H36.4C41.6496 30 44.2744 30 46.1145 31.3369C46.7088 31.7686 47.2314 32.2912 47.6631 32.8855C48.8565 34.5281 48.9846 36.7959 48.9983 40.998C50.8219 40.9917 52.0991 40.9651 53.105 40.8562C54.3071 40.7259 54.6388 40.5175 54.7634 40.4271C55.018 40.242 55.242 40.018 55.4271 39.7634C55.5175 39.6388 55.7259 39.3071 55.8562 38.105C55.9945 36.828 56 35.1139 56 32.4V31.6C56 28.8861 55.9945 27.172 55.8562 25.895C55.7259 24.6929 55.5175 24.3612 55.4271 24.2366C55.242 23.982 55.018 23.758 54.7634 23.5729C54.6388 23.4825 54.3071 23.2741 53.105 23.1438C51.828 23.0055 50.1139 23 47.4 23ZM23.6 34H36.4C39.1139 34 40.828 34.0055 42.105 34.1438C43.3071 34.2741 43.6388 34.4825 43.7634 34.5729C44.018 34.758 44.242 34.982 44.4271 35.2366C44.5175 35.3612 44.7259 35.6929 44.8562 36.895C44.9945 38.172 45 39.8861 45 42.6V43.4C45 46.1139 44.9945 47.828 44.8562 49.105C44.7259 50.3071 44.5175 50.6388 44.4271 50.7634C44.242 51.018 44.018 51.242 43.7634 51.4271C43.6388 51.5175 43.3071 51.7259 42.105 51.8562C40.828 51.9945 39.1139 52 36.4 52H23.6C20.8861 52 19.172 51.9945 17.895 51.8562C16.6929 51.7259 16.3612 51.5175 16.2366 51.4271C15.982 51.242 15.758 51.018 15.5729 50.7634C15.4825 50.6388 15.2741 50.3071 15.1438 49.105C15.0055 47.828 15 46.1139 15 43.4V42.6C15 39.8861 15.0055 38.172 15.1438 36.895C15.2741 35.6929 15.4825 35.3612 15.5729 35.2366C15.758 34.982 15.982 34.758 16.2366 34.5729C16.3612 34.4825 16.6929 34.2741 17.895 34.1438C19.172 34.0055 20.8861 34 23.6 34ZM9.5 31C10.8807 31 12 29.8807 12 28.5C12 27.1193 10.8807 26 9.5 26C8.11929 26 7 27.1193 7 28.5C7 29.8807 8.11929 31 9.5 31Z" fill="url(#fozfhulz2__paint0_linear_7_688)"/>
-  <defs>
-    <linearGradient id="fozfhulz2__paint0_linear_7_688" x1="60" y1="29.9589" x2="1.3e-7" y2="29.9589" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#238FFC"/>
-      <stop offset="1" stop-color="#1A66FF"/>
-    </linearGradient>
-  </defs>
-</svg>
diff --git a/static/devIconImg/icon-scanPos.svg b/static/devIconImg/icon-scanPos.svg
deleted file mode 100644
index 6576a71..0000000
--- a/static/devIconImg/icon-scanPos.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" class="design-iconfont">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M21.7873 4H38.2127C40.5825 4 42.0614 4.00475 43.1728 4.11677C44.2077 4.22108 44.5178 4.38796 44.6467 4.46987C44.8869 4.62253 45.1043 4.80844 45.2921 5.02205C45.3929 5.13667 45.6054 5.41696 45.8662 6.42115C46.1462 7.49952 46.3758 8.9565 46.7361 11.2923L48.8382 24.9183C48.9662 25.7486 48.9809 25.8785 48.986 25.9913C48.9884 26.0452 48.9894 26.0992 48.9889 26.1531C48.9878 26.266 48.9778 26.3964 48.8794 27.2308L46.3815 48.4048C46.0954 50.8297 45.9115 52.3464 45.6598 53.4706C45.425 54.5199 45.2128 54.812 45.1139 54.9294C44.9261 55.1524 44.7067 55.347 44.4627 55.507C44.3342 55.5912 44.0185 55.7672 42.9461 55.8772C41.7972 55.9951 40.2652 56 37.8169 56H22.1831C19.7348 56 18.2028 55.9951 17.0539 55.8772C15.9815 55.7672 15.6658 55.5912 15.5373 55.507C15.2933 55.347 15.0739 55.1524 14.8861 54.9294C14.7872 54.812 14.575 54.5199 14.3402 53.4706C14.0885 52.3464 13.9046 50.8297 13.6185 48.4048L11.1206 27.2308C11.0222 26.3964 11.0122 26.266 11.0111 26.1531C11.0106 26.0992 11.0116 26.0452 11.014 25.9913C11.0191 25.8785 11.0338 25.7486 11.1618 24.9183L13.2639 11.2923C13.6243 8.9565 13.8538 7.49952 14.1338 6.42115C14.3946 5.41696 14.6071 5.13667 14.7079 5.02205C14.8957 4.80844 15.1131 4.62253 15.3533 4.46987C15.4822 4.38796 15.7923 4.22108 16.8272 4.11677C17.9386 4.00475 19.4175 4 21.7873 4ZM9.29956 10.6841C9.99533 6.17396 10.3432 3.91891 11.6922 2.38479C12.1305 1.88637 12.6375 1.45256 13.1981 1.09636C14.9237 0 17.2115 0 21.7873 0H38.2127C42.7885 0 45.0763 0 46.8019 1.09636C47.3625 1.45256 47.8695 1.88637 48.3078 2.38479C49.6568 3.91891 50.0047 6.17397 50.7004 10.6841L52.8025 24.31C52.9182 25.0598 52.976 25.4348 52.993 25.8124C52.9986 25.9382 53.0009 26.0641 52.9997 26.19C52.9962 26.568 52.9518 26.9447 52.8629 27.6981L50.365 48.8722C49.8124 53.5561 49.5361 55.8981 48.1854 57.5019C47.7471 58.0223 47.2352 58.4763 46.6657 58.8496C44.9106 60 42.5461 60 37.8169 60H22.1831C17.4539 60 15.0894 60 13.3343 58.8496C12.7648 58.4763 12.2529 58.0223 11.8146 57.5019C10.4639 55.8981 10.1876 53.5561 9.63503 48.8722L7.13711 27.6981C7.04823 26.9447 7.00379 26.568 7.0003 26.19C6.99914 26.0641 7.00138 25.9382 7.00703 25.8124C7.02398 25.4348 7.08182 25.0598 7.19749 24.31L9.29956 10.6841ZM21.9578 11.5H38.0422C38.5684 11.5 38.9781 11.5002 39.3304 11.5069C39.3656 11.8566 39.3989 12.2637 39.4414 12.7869L40.0675 20.4869C40.1172 21.0984 40.156 21.5781 40.1809 21.9912C39.766 21.9998 39.2834 22 38.6682 22H21.3318C20.7166 22 20.234 21.9998 19.8191 21.9912C19.844 21.5781 19.8828 21.0984 19.9326 20.4869L20.5586 12.7869C20.6011 12.2637 20.6344 11.8566 20.6696 11.5069C21.0219 11.5002 21.4316 11.5 21.9578 11.5ZM16.5607 12.4636C16.7301 10.3807 16.8147 9.3392 17.3934 8.62095C17.5809 8.38824 17.8022 8.18473 18.05 8.01717C18.8146 7.5 19.8623 7.5 21.9578 7.5H38.0422C40.1377 7.5 41.1854 7.5 41.9501 8.01717C42.1978 8.18473 42.4191 8.38824 42.6066 8.62095C43.1853 9.3392 43.2699 10.3807 43.4393 12.4636L44.0653 20.1636C44.2615 22.5765 44.3596 23.7829 43.7945 24.6435C43.6126 24.9205 43.386 25.1655 43.1238 25.3687C42.3094 26 41.0956 26 38.6682 26H21.3318C18.9044 26 17.6906 26 16.8762 25.3687C16.614 25.1655 16.3874 24.9205 16.2055 24.6435C15.6404 23.7829 15.7385 22.5765 15.9347 20.1636L16.5607 12.4636V12.4636ZM15.9615 34C15.9615 32.8954 16.8594 32 17.967 32H21.978C23.0856 32 23.9835 32.8954 23.9835 34C23.9835 35.1046 23.0856 36 21.978 36H17.967C16.8594 36 15.9615 35.1046 15.9615 34ZM18.9698 39C17.8622 39 16.9643 39.8954 16.9643 41C16.9643 42.1046 17.8622 43 18.9698 43H21.978C23.0856 43 23.9835 42.1046 23.9835 41C23.9835 39.8954 23.0856 39 21.978 39H18.9698ZM18.4684 49C18.4684 47.8954 19.3663 47 20.4739 47H21.4766C22.5842 47 23.4821 47.8954 23.4821 49C23.4821 50.1046 22.5842 51 21.4766 51H20.4739C19.3663 51 18.4684 50.1046 18.4684 49ZM29.4986 47C28.391 47 27.4931 47.8954 27.4931 49C27.4931 50.1046 28.391 51 29.4986 51H30.5014C31.609 51 32.5069 50.1046 32.5069 49C32.5069 47.8954 31.609 47 30.5014 47H29.4986ZM25.989 34C25.989 32.8954 26.8869 32 27.9945 32H32.0055C33.1131 32 34.011 32.8954 34.011 34C34.011 35.1046 33.1131 36 32.0055 36H27.9945C26.8869 36 25.989 35.1046 25.989 34ZM28.4959 39C27.3883 39 26.4904 39.8954 26.4904 41C26.4904 42.1046 27.3883 43 28.4959 43H31.5041C32.6117 43 33.5096 42.1046 33.5096 41C33.5096 39.8954 32.6117 39 31.5041 39H28.4959ZM36.0165 34C36.0165 32.8954 36.9144 32 38.022 32H42.033C43.1406 32 44.0385 32.8954 44.0385 34C44.0385 35.1046 43.1406 36 42.033 36H38.022C36.9144 36 36.0165 35.1046 36.0165 34ZM36.2679 40.0293C36.0165 40.4821 36.0165 41.0849 36.0165 42.2905V48.0703C36.0165 48.9362 36.0165 49.3692 36.1483 49.7141C36.3514 50.2454 36.7711 50.6651 37.3024 50.8682C37.6473 51 38.0802 51 38.9462 51C39.7194 51 40.1059 51 40.4263 50.8881C40.9195 50.7158 41.3257 50.3573 41.558 49.8893C41.7089 49.5854 41.757 49.2018 41.8531 48.4347L42.572 42.6998C42.7398 41.3613 42.8236 40.692 42.5937 40.1802C42.4281 39.8117 42.1547 39.502 41.8097 39.2918C41.3305 39 40.656 39 39.307 39C38.1014 39 37.4986 39 37.0457 39.2514C36.7188 39.4329 36.4493 39.7024 36.2679 40.0293Z" fill="url(#wovu678lo__paint0_linear_7_812)"/>
-  <defs>
-    <linearGradient id="wovu678lo__paint0_linear_7_812" x1="53" y1="29.9526" x2="7" y2="29.9526" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#238FFC"/>
-      <stop offset="1" stop-color="#1A66FF"/>
-    </linearGradient>
-  </defs>
-</svg>
diff --git a/static/devIconImg/icon-term.svg b/static/devIconImg/icon-term.svg
deleted file mode 100644
index 376411f..0000000
--- a/static/devIconImg/icon-term.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" class="design-iconfont">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M19.6 4H40.4C43.1139 4 44.828 4.00549 46.105 4.14384C47.3071 4.27408 47.6388 4.48249 47.7634 4.57295C48.018 4.75799 48.242 4.98196 48.4271 5.23664C48.5175 5.36116 48.7259 5.69294 48.8562 6.89502C48.9945 8.17196 49 9.88609 49 12.6V34H53V12.6C53 7.35037 53 4.72556 51.6631 2.8855C51.2314 2.29124 50.7088 1.76864 50.1145 1.33688C48.2744 0 45.6496 0 40.4 0H19.6C14.3504 0 11.7256 0 9.8855 1.33688C9.29124 1.76864 8.76864 2.29124 8.33688 2.8855C7 4.72556 7 7.35037 7 12.6V34H11V12.6C11 9.88609 11.0055 8.17196 11.1438 6.89502C11.2741 5.69294 11.4825 5.36116 11.5729 5.23664C11.758 4.98196 11.982 4.75799 12.2366 4.57295C12.3612 4.48249 12.6929 4.27408 13.895 4.14384C15.172 4.00549 16.8861 4 19.6 4ZM11 44H7V47.4C7 52.6496 7 55.2744 8.33688 57.1145C8.76864 57.7088 9.29124 58.2314 9.8855 58.6631C11.7256 60 14.3504 60 19.6 60H40.4C45.6496 60 48.2744 60 50.1145 58.6631C50.7088 58.2314 51.2314 57.7088 51.6631 57.1145C53 55.2744 53 52.6496 53 47.4V44H49V47.4C49 50.1139 48.9945 51.828 48.8562 53.105C48.7259 54.3071 48.5175 54.6388 48.4271 54.7634C48.242 55.018 48.018 55.242 47.7634 55.4271C47.6388 55.5175 47.3071 55.7259 46.105 55.8562C44.828 55.9945 43.1139 56 40.4 56H19.6C16.8861 56 15.172 55.9945 13.895 55.8562C12.6929 55.7259 12.3612 55.5175 12.2366 55.4271C11.982 55.242 11.758 55.018 11.5729 54.7634C11.4825 54.6388 11.2741 54.3071 11.1438 53.105C11.0055 51.828 11 50.1139 11 47.4V44ZM21 19C19.8954 19 19 19.8954 19 21V34H23V21C23 19.8954 22.1046 19 21 19ZM19 44V47C19 48.1046 19.8954 49 21 49C22.1046 49 23 48.1046 23 47V44H19ZM31 44V47C31 48.1046 30.1046 49 29 49C27.8954 49 27 48.1046 27 47V44H31ZM27 34V21C27 19.8954 27.8954 19 29 19C30.1046 19 31 19.8954 31 21V34H27ZM34 44V45.5C34 46.9045 34 47.6067 34.3371 48.1111C34.483 48.3295 34.6705 48.517 34.8889 48.6629C35.3933 49 36.0955 49 37.5 49C38.9045 49 39.6067 49 40.1111 48.6629C40.3295 48.517 40.517 48.3295 40.6629 48.1111C41 47.6067 41 46.9045 41 45.5V44H34ZM34 34V22.5C34 21.0955 34 20.3933 34.3371 19.8889C34.483 19.6705 34.6705 19.483 34.8889 19.3371C35.3933 19 36.0955 19 37.5 19C38.9045 19 39.6067 19 40.1111 19.3371C40.3295 19.483 40.517 19.6705 40.6629 19.8889C41 20.3933 41 21.0955 41 22.5V34H34ZM2 37C0.895431 37 0 37.8954 0 39C0 40.1046 0.895432 41 2 41H58C59.1046 41 60 40.1046 60 39C60 37.8954 59.1046 37 58 37H2Z" fill="url(#47umcq4q1__paint0_linear_8_17)"/>
-  <defs>
-    <linearGradient id="47umcq4q1__paint0_linear_8_17" x1="60" y1="29.9526" x2="1.3e-7" y2="29.9526" gradientUnits="userSpaceOnUse">
-      <stop stop-color="#238FFC"/>
-      <stop offset="1" stop-color="#1A66FF"/>
-    </linearGradient>
-  </defs>
-</svg>
diff --git a/static/pay/scancode.svg b/static/pay/scancode.svg
deleted file mode 100644
index 089d99b..0000000
--- a/static/pay/scancode.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 60" class="design-iconfont">
-  <defs>
-    <clipPath id="4vn0u2nsia">
-      <path data-name="矩形 3396" transform="translate(78 1064)" stroke="#707070" fill="#666f80" d="M0 0H60V60H0z"/>
-    </clipPath>
-  </defs>
-  <g data-name="蒙版组 14" transform="translate(-78 -1064)" clip-path="url(#4vn0u2nsia)">
-    <g data-name="组 1186" fill="#666f80">
-      <path data-name="矩形 3392" d="M2,0H46.333a2,2,0,0,1,2,2V23.333a0,0,0,0,1,0,0H0a0,0,0,0,1,0,0V2A2,2,0,0,1,2,0Z" transform="translate(83.833 1069)"/>
-      <path data-name="矩形 3393" d="M2,0H46.333a2,2,0,0,1,2,2V23.333a0,0,0,0,1,0,0H0a0,0,0,0,1,0,0V2A2,2,0,0,1,2,0Z" transform="rotate(180 66.083 559.5)" opacity=".7"/>
-      <path data-name="矩形 3394" d="M1,0H2.5a0,0,0,0,1,0,0V3.333a0,0,0,0,1,0,0H1a1,1,0,0,1-1-1V1A1,1,0,0,1,1,0Z" transform="translate(81.333 1092.333)"/>
-      <path data-name="矩形 3395" d="M0,0H1.5a1,1,0,0,1,1,1V2.333a1,1,0,0,1-1,1H0a0,0,0,0,1,0,0V0A0,0,0,0,1,0,0Z" transform="translate(132.166 1092.333)"/>
-    </g>
-  </g>
-</svg>
diff --git a/static/pay/type-wx.svg b/static/pay/type-wx.svg
deleted file mode 100644
index 8558912..0000000
--- a/static/pay/type-wx.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" class="design-iconfont">
-  <defs>
-    <clipPath id="4x4sc48saa">
-      <rect data-name="矩形 3977" width="50" height="50" rx="10" transform="translate(180 998)" fill="#fff"/>
-    </clipPath>
-  </defs>
-  <g data-name="蒙版组 198" transform="translate(-180 -998)" clip-path="url(#4x4sc48saa)">
-    <path d="M43.75,0H6.25A6.268,6.268,0,0,0,0,6.25v37.5A6.268,6.268,0,0,0,6.25,50h37.5A6.268,6.268,0,0,0,50,43.75V6.25A6.268,6.268,0,0,0,43.75,0ZM25,38.438a18.189,18.189,0,0,1-5.937-.938c-1.25.625-3.125,2.187-3.75,2.5-1.25.625-.938-.625-.938-.625L15,35.625A13.105,13.105,0,0,1,9.062,24.688c0-7.813,7.188-14.063,15.938-14.063a17.368,17.368,0,0,1,13.125,5.938L22.5,23.75a2.483,2.483,0,0,1-2.5-.312l-2.5-1.875S15.625,20,16.562,22.5l2.5,5.625s.313,1.562,2.188.625c1.563-.625,13.125-7.812,18.125-10.625a14.219,14.219,0,0,1,1.562,6.25c0,7.5-7.187,14.063-15.937,14.063Z" transform="translate(180 998)" fill="#06c05f"/>
-  </g>
-</svg>
diff --git a/static/pay/type-ysf.svg b/static/pay/type-ysf.svg
deleted file mode 100644
index 21abb77..0000000
--- a/static/pay/type-ysf.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" class="design-iconfont">
-  <path data-name="路径 10777" d="M0,0,11.111,0H38.889Q50,0,50,11.111V38.889Q50,50,38.889,50H11.111Q0,50,0,38.889V11.111Q0,0,11.111,0Z" fill="#fd2821"/>
-  <path data-name="路径 10778" d="M115.226,385a.74.74,0,0,1,.837.837v10.914a.837.837,0,1,1-1.675,0V385.839A.74.74,0,0,1,115.226,385Zm3.554,5,2.614,2.614a.933.933,0,1,1-1.32,1.32l-2.614-2.614a.835.835,0,0,1,0-1.32A.807.807,0,0,1,118.78,390Zm-18.249-1.4v8.046a.939.939,0,1,1-1.878,0v-8.046a.824.824,0,0,1,.939-.939A.833.833,0,0,1,100.531,388.606Zm-15.38-3.2h10a.939.939,0,0,1,0,1.879h-10a.824.824,0,0,1-.939-.939A.834.834,0,0,1,85.15,385.408Z" transform="translate(-80.099 -366.203)" fill="#fff"/>
-  <path data-name="路径 10779" d="M99.185,377.8a.927.927,0,0,0-1.32.025l-3.68,3.756v-2.234a.7.7,0,0,0-.076-.33.948.948,0,0,0-.913-.736H84.439l-.431-.431a.933.933,0,1,0-1.294,1.345l.711.685a.861.861,0,0,0,.685.254h8.249v3.35l-.736.761-2.589-2.589a.452.452,0,0,0-.178-.127.928.928,0,0,0-1.32.025l-3.3,3.274a.933.933,0,0,0,1.32,1.32l2.614-2.614,2.665,2.665a.865.865,0,0,0,.355.228.927.927,0,0,0,1.117-.178l.025-.025v2.233c0,.076-.051.152-.1.152l-.964.025a.939.939,0,0,0,0,1.879l1.853-.025h.152a.953.953,0,0,0,.939-.939V384.27l5-5.127a.958.958,0,0,0-.025-1.345Zm9.873,2.031h-.787v-1.32a.939.939,0,1,0-1.878,0v1.32H101.14a.939.939,0,0,0,0,1.878h5.254v6.954a.116.116,0,0,1-.1.127h-1.244a.939.939,0,0,0,0,1.879h2.284a1.141,1.141,0,0,0,.964-1.091v-7.868h.787a.954.954,0,0,0,.939-.939.994.994,0,0,0-.965-.939Zm-37.817,4.949a.739.739,0,0,0,.051-.228H79.21a.939.939,0,1,0,.051-1.878H67.485a.939.939,0,1,0-.051,1.878h1.853l-1.726,4.492a.963.963,0,0,0,.355,1.117.944.944,0,0,0,.711.33H78.6a.5.5,0,0,0,.2-.025.865.865,0,0,0,.355-.051.967.967,0,0,0,.584-1.193l-1.015-2.893a.939.939,0,1,0-1.776.609l.533,1.523a.171.171,0,0,1-.1.152H69.947a.127.127,0,0,1-.127-.152v-.051l1.421-3.629Z" transform="translate(-63.271 -359.101)" fill="#fff"/>
-  <path data-name="路径 10780" d="M491.818,417.077l7.436-7.64.077.076-7.437,7.64-.076-.076Zm-4.771-4.188.076-.076,4.721,4.746-.077.077-4.721-4.746Z" transform="translate(-463.265 -389.445)" fill="#ff2217"/>
-</svg>
diff --git a/static/pay/type-zfb.svg b/static/pay/type-zfb.svg
deleted file mode 100644
index 0eb8372..0000000
--- a/static/pay/type-zfb.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" class="design-iconfont">
-  <g fill="#0d72ff">
-    <path data-name="路径 10775" d="M87.9,103.816a18.921,18.921,0,0,1-12.7,1.8c-4.655-1.1-7.959-4.075-7.391-9.571s6.444-7.392,11.276-7.392,14,3.132,14,3.132.77-1.726,1.519-3.7a17.85,17.85,0,0,0,.96-3.559H76.046V82.57h9.486V78.826l-11.826.085V76.444H85.533V70.828h6.211v5.615h12.678v2.468L91.744,79v3.488l10.468.085a24.572,24.572,0,0,1-1.516,5.516,27.025,27.025,0,0,1-2.57,5.375L114,98.67V74a10,10,0,0,0-10-10H74A10,10,0,0,0,64,74v30a10,10,0,0,0,10,10h30a10,10,0,0,0,9.633-7.348L95.318,97.97S91.647,102.03,87.9,103.816Z" transform="translate(-64 -64)"/>
-    <path data-name="路径 10776" d="M175.257,559.5c-5.829.371-7.253,2.936-7.253,5.3s1.439,5.64,8.29,5.64,12.662-6.907,12.662-6.907S181.084,559.124,175.257,559.5Z" transform="translate(-162.2 -531.824)"/>
-  </g>
-</svg>
diff --git a/static/startImg/mch-name.svg b/static/startImg/mch-name.svg
deleted file mode 100644
index 86a98c9..0000000
--- a/static/startImg/mch-name.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 195 60"><defs><style>.cls-1{fill:url(#未命名的渐变_2);}.cls-2{fill:url(#未命名的渐变_2-2);}.cls-3{fill:url(#未命名的渐变_2-3);}.cls-4{fill:url(#未命名的渐变_2-4);}</style><linearGradient id="未命名的渐变_2" x1="0.64" y1="28.6" x2="37.23" y2="28.6" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#238ffc"/><stop offset="1" stop-color="#1a66ff"/></linearGradient><linearGradient id="未命名的渐变_2-2" x1="41.89" y1="28.6" x2="77.05" y2="28.6" xlink:href="#未命名的渐变_2"/><linearGradient id="未命名的渐变_2-3" x1="81.86" y1="28.83" x2="118.14" y2="28.83" xlink:href="#未命名的渐变_2"/><linearGradient id="未命名的渐变_2-4" x1="123.38" y1="28.67" x2="157.74" y2="28.67" xlink:href="#未命名的渐变_2"/></defs><path class="cls-1" d="M.64,46.58h.48v.31H.64ZM15.2,10.3h6.67c.31,1.48.46,2.28.46,2.38h14.9V16H29.79l-.33,1.28c-.1.31-.37,1.3-.79,3H33a3.25,3.25,0,0,1,3.17,2.22,3.8,3.8,0,0,1,.15,1.12V39.76q0,4.76-2.07,7.13H28.05a10.71,10.71,0,0,0,1.89-6.33V25A1.39,1.39,0,0,0,29,23.77a.69.69,0,0,0-.49-.16H8.25V46.89H2.07V20.27H9.5c-.63-2.64-1-4.06-1.1-4.27H1V12.68H15.69Zm3.17,15.05-3,6.34H9l3.17-6.34Zm-7.74,7h5.85v7.92h5.24V37.39A1.65,1.65,0,0,0,21.23,36,1.82,1.82,0,0,0,20,35.65H17.58V32.33H24.4a3.25,3.25,0,0,1,3.32,3.16v8.08H10.63ZM15.05,16l1.28,4.27h5.54L23.12,16Zm4.75,9.35H26c.11,0,.42.58.95,1.74l2.22,4.6H22.82L22,30Z"/><path class="cls-2" d="M55.84,10.3h6.64c0,.11.43,1.16,1.28,3.17h9.81a2.91,2.91,0,0,1,2.53,1.1A2.52,2.52,0,0,1,76.89,16v7.92c0,1.69.06,4.38.16,8.08H50.91v4.29a22.27,22.27,0,0,1-1.25,8.07c-.33.84-.7,1.68-1.13,2.53H41.89q2.37-4,2.38-10.6V13.47h6.64V28.83H70.25V18.22a1.45,1.45,0,0,0-1.43-1.43H52V13.47h4.91C56.2,11.46,55.84,10.41,55.84,10.3Z"/><path class="cls-3" d="M96.6,15.21h6.8v16h14.74v3.33H103.4V46.89H96.6V34.53H81.86V31.2H96.6ZM83.45,10.76h33.11v3.35H83.45Zm1.1,6.83h6.82l3,10.14H87.71c-.1,0-.2-.27-.3-.79S86.35,23.39,84.55,17.59Zm24.24,0h6.65l-3.17,10.14h-6.65Z"/><path class="cls-4" d="M135.41,10.46q-4.75,9.2-5.06,10l-.15.15c0,.53.31.89.94,1.1h17.28l1.4,3.32H126.24c-1.48,0-2.39-.53-2.71-1.58a1.41,1.41,0,0,1-.15-.62,8.64,8.64,0,0,1,1.27-3.65q.16-.48,4.12-8.71ZM124.48,27.24h6.66V43.72H149V32.15a1.46,1.46,0,0,0-1.1-1.58H132.4V27.24h20.13a3,3,0,0,1,2.84,1.92,2.63,2.63,0,0,1,.33,1.25V46.89H124.48Zm26.93-15.68,1,2.07q5.06,10.94,5.36,11.39H151.1q-.32-.46-6.34-13.29v-.17Z"/></svg>
\ No newline at end of file
diff --git a/static/startImg/start-bg.svg b/static/startImg/start-bg.svg
deleted file mode 100644
index 069737d..0000000
--- a/static/startImg/start-bg.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<svg width="750" height="1624" viewBox="0 0 750 1624" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_530_174)">
-<rect width="750" height="1624" fill="white"/>
-<rect width="750" height="398" fill="url(#paint0_linear_530_174)"/>
-<g clip-path="url(#clip1_530_174)">
-<path d="M446.619 -69C388.364 -39.9258 273.972 31.5229 282.446 84.7239C293.038 151.225 415.806 129.54 537.612 116.529C659.417 103.518 661.343 148.334 577.09 261.097C492.837 373.86 613.68 393.617 787 317.478" stroke="url(#paint1_linear_530_174)" stroke-opacity="0.1" stroke-width="50"/>
-</g>
-<rect opacity="0.1" width="750" height="1624" fill="url(#paint2_linear_530_174)"/>
-</g>
-<defs>
-<linearGradient id="paint0_linear_530_174" x1="375" y1="398" x2="375" y2="6.81275e-06" gradientUnits="userSpaceOnUse">
-<stop stop-color="#2A95F8" stop-opacity="0"/>
-<stop offset="1" stop-color="#215CF5" stop-opacity="0.07"/>
-</linearGradient>
-<linearGradient id="paint1_linear_530_174" x1="787" y1="363" x2="281.535" y2="-68.4548" gradientUnits="userSpaceOnUse">
-<stop stop-color="#76DEFF" stop-opacity="0.5"/>
-<stop offset="1" stop-color="#003AAD"/>
-</linearGradient>
-<linearGradient id="paint2_linear_530_174" x1="375" y1="1624" x2="375" y2="3.81125e-06" gradientUnits="userSpaceOnUse">
-<stop stop-color="white"/>
-<stop offset="1" stop-color="#339DFF"/>
-</linearGradient>
-<clipPath id="clip0_530_174">
-<rect width="750" height="1624" fill="white"/>
-</clipPath>
-<clipPath id="clip1_530_174">
-<rect width="750" height="398" fill="white"/>
-</clipPath>
-</defs>
-</svg>