From 0990e082010677d85a4bf1cc013170c1acbeab95 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 13 Jan 2026 14:52:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A7=AF=E5=88=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=88=86=E9=94=80=E5=91=98?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=B6=85=E7=BA=A7?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/my-components/my-user-select.vue   |  222 ++
 http/api/market/index.js                      |   11 +-
 http/api/market/points.js                     |   17 +
 http/yskApi/http.js                           |    2 +-
 .../components/fenxiao-user-select.vue        |  219 ++
 pageMarket/distribution/index.vue             |  874 +++--
 pageMarket/superVip/index.vue                 |   10 +-
 pagesCreateOrder/choose-user/choose-user.vue  |    4 +-
 .../confirm-order/confirm-order.vue           |   21 +-
 .../components/edit-accountPoints.vue         |  146 +-
 pagesOrder/pay-order/pay-order.vue            | 2904 ++++++++---------
 11 files changed, 2416 insertions(+), 2014 deletions(-)
 create mode 100644 components/my-components/my-user-select.vue
 create mode 100644 http/api/market/points.js
 create mode 100644 pageMarket/distribution/components/fenxiao-user-select.vue

diff --git a/components/my-components/my-user-select.vue b/components/my-components/my-user-select.vue
new file mode 100644
index 0000000..27b5eda
--- /dev/null
+++ b/components/my-components/my-user-select.vue
@@ -0,0 +1,222 @@
+<template>
+	<view>
+
+		<view class="box" @click.stop="openPopup">
+			<text class="u-font-28 color-999 u-p-r-16" v-if="!modelValue||list.length==0">请选择用户</text>
+			<text class="u-font-28 color-333 u-p-r-16 u-line-1" v-else :style="{
+				maxWidth: maxWidth+'rpx'
+			}">{{returnLabel()}}</text>
+			<view class="icon ">
+				<up-icon name="arrow-down" size="14" color="#999"></up-icon>
+			</view>
+		</view>
+		<up-popup :show="show" placement="bottom" round="18rpx" closeOnClickOverlay @close="close">
+			<view class="u-p-30">
+				<view class="font-bold color-333 u-font-32">选择用户</view>
+				<view class="u-m-t-24">
+					<up-search v-model="query.key" @clear="search" @custom="search" @search="search"></up-search>
+				</view>
+				<scroll-view scroll-with-animation :scroll-into-view="selId" class="scroll-view u-m-t-30"
+					scroll-y="true" style="max-height :60vh;" @scrolltolower="scrolltolower">
+					<view class="u-m-b-10 u-flex item" v-for="item in list" :key="item.id" @click="itemClick(item)"
+						:id="'item_'+item.id" :class="{active:selItem&&selItem.id==item.id}">
+						<view class="checkbox">
+							<up-icon name="checkbox-mark" color="#fff"></up-icon>
+						</view>
+						<view class="u-flex-1">{{item.nickName}}/{{item.phone}}</view>
+					</view>
+					<template v-if="search.key!==''">
+						<up-empty v-if="list.length==0" text="未搜到相关用户"></up-empty>
+						<up-loadmore v-else :status="isEnd?'nomore':'loading'"></up-loadmore>
+					</template>
+					<template v-else>
+						<up-empty v-if="list.length==0" text="暂无用户"></up-empty>
+						<up-loadmore v-else :status="isEnd?'nomore':'loading'"></up-loadmore>
+					</template>
+				</scroll-view>
+				<view class="u-flex gap-20 u-m-t-30">
+					<view class="u-flex-1">
+						<my-button type="default" @click="close">取消</my-button>
+					</view>
+					<view class="u-flex-1">
+						<my-button type="primary" @click="submit">确定</my-button>
+					</view>
+				</view>
+			</view>
+		</up-popup>
+	</view>
+</template>
+<script setup>
+	import {
+		computed,
+		onMounted,
+		reactive,
+		ref,
+		watch
+	} from 'vue';
+	import {
+		getShopUser
+	} from '@/http/api/market/index.js';
+
+	const customStyle = ref({
+		marginRight: '20px'
+	});
+
+	const show = ref(false);
+	let modelValue = defineModel('modelValue', {
+		default: '',
+	});
+
+	const props = defineProps({
+		maxWidth: {
+			default: 240
+		}
+	})
+
+	const selId = ref('')
+
+	function returnLabel() {
+		const findItem = list.value.find(v => v.id == modelValue.value)
+		if (findItem) {
+			return findItem.nickName + (findItem.phone ? ('/' + findItem.phone) : '')
+		}
+		return ''
+	}
+
+	const selItem = ref(null)
+
+	function itemClick(item) {
+		selItem.value = item
+	}
+
+	function returnShopName(id) {
+		const item = list.value.find((v) => v.id == id);
+		return item?.shopName || '';
+	}
+
+	function close() {
+		show.value = false;
+	}
+
+
+	const emits = defineEmits(['change'])
+
+	function submit() {
+		if (!selItem.value) {
+			return uni.showToast({
+				title: '请选择用户'
+			})
+		}
+		if (modelValue.value != selItem.value.id) {
+			modelValue.value=selItem.value.id
+			emits('change')
+		}else{
+			modelValue.value=selItem.value.id
+		}
+		show.value = false;
+	}
+
+
+	const list = ref([]);
+
+	function openPopup() {
+		selId.value = 'item_' + modelValue.value
+		init()
+		show.value = true;
+
+	}
+	const isEnd = ref(false)
+	const query = reactive({
+		page: 1,
+		size: 10,
+		key: ''
+	})
+
+	function search() {
+		isEnd.value = false
+		query.page = 1
+		selItem.value = null
+		init()
+	}
+	async function init() {
+		const res = await getShopUser(query);
+		if (res) {
+			isEnd.value = query.page >= res.totalPage * 1
+			if (query.page == 1) {
+				list.value = res.records
+			} else {
+				list.value.push(...res.records)
+			}
+		}
+	}
+
+	function scrolltolower() {
+		if (!isEnd.value) {
+			query.page++
+			init()
+		}
+	}
+</script>
+<style lang="scss">
+	.box {
+		border-radius: 8upx;
+		display: flex;
+		flex-direction: row;
+		align-items: top;
+		flex-wrap: wrap;
+		padding: 10rpx 24rpx;
+		border: 2rpx solid #e5e5e5;
+		position: relative;
+
+		.icon {
+			position: absolute;
+			top: 50%;
+			right: 24rpx;
+			transform: translateY(-50%);
+		}
+	}
+
+	.shop-item {
+		padding: 4rpx 8rpx 4rpx 16rpx;
+		border-radius: 4rpx;
+		border: 2rpx solid #f0f0f0;
+		background-color: #f5f5f5;
+		margin-bottom: 16rpx;
+		margin-left: 16rpx;
+	}
+
+	.scroll-view {
+		.item {
+			border: 1px solid #eee;
+			padding: 20rpx;
+			border-radius: 12rpx;
+
+			&.active {
+				border-color: $my-main-color;
+			}
+
+		}
+	}
+
+	.checkbox {
+		margin-right: 10rpx;
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 50%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 6rpx;
+		border: 1px solid #999;
+
+	}
+
+	.item {
+		&.active {
+			.checkbox {
+				background-color: $my-main-color;
+				border-color: $my-main-color;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/http/api/market/index.js b/http/api/market/index.js
index 014ff57..f98301e 100644
--- a/http/api/market/index.js
+++ b/http/api/market/index.js
@@ -188,4 +188,13 @@ export function shopUserFlow(data) {
 		method: 'get',
 		data
 	});
-}
\ No newline at end of file
+}
+
+
+export function getShopUser(data) {
+	return request({
+		url: `account/admin/shopUser`,
+		method: 'get',
+		data
+	});
+}
diff --git a/http/api/market/points.js b/http/api/market/points.js
new file mode 100644
index 0000000..42a940d
--- /dev/null
+++ b/http/api/market/points.js
@@ -0,0 +1,17 @@
+import http from '@/http/http.js'
+const request = http.request
+const MARKET_URL = 'market'
+const ORDER_URL = 'order'
+
+/**
+ * 积分:配置:新增/更新
+ * @param {Object} data
+ */
+export function pointsConfig(data) {
+	return request({
+	    url: MARKET_URL+`/admin/points/config`,
+		method: "GET",
+		data
+	})
+}
+
diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index fe371ef..5d3eeb0 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -14,7 +14,7 @@ import storageManage from '@/commons/utils/storageManage.js'
 import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
 import { reject } from 'lodash';
-let baseUrl = appConfig.returnBaseUrl({apiType:'php'});
+let baseUrl = appConfig.returnBaseUrl({apiType:'java'});
 const loadingShowTime = 200
 
 function getHeader(){
diff --git a/pageMarket/distribution/components/fenxiao-user-select.vue b/pageMarket/distribution/components/fenxiao-user-select.vue
new file mode 100644
index 0000000..9edf009
--- /dev/null
+++ b/pageMarket/distribution/components/fenxiao-user-select.vue
@@ -0,0 +1,219 @@
+<template>
+	<view>
+
+		<view class="box" @click.stop="openPopup">
+			<text class="u-font-28 color-999 u-p-r-16" v-if="!modelValue||list.length==0">请选择用户</text>
+			<text class="u-font-28 color-333 u-p-r-16 u-line-1" v-else :style="{
+				maxWidth: maxWidth+'rpx'
+			}">{{returnLabel()}}</text>
+			<view class="icon ">
+				<up-icon name="arrow-down" size="14" color="#999"></up-icon>
+			</view>
+		</view>
+		<up-popup :show="show" placement="bottom" round="18rpx" closeOnClickOverlay @close="close">
+			<view class="u-p-30">
+				<view class="font-bold color-333 u-font-32">选择用户</view>
+				<view class="u-m-t-24">
+					<up-search v-model="query.key" @clear="search" @custom="search" @search="search"></up-search>
+				</view>
+				<scroll-view scroll-with-animation :scroll-into-view="selId" class="scroll-view u-m-t-30"
+					scroll-y="true" style="max-height :60vh;" @scrolltolower="scrolltolower">
+					<view class="u-m-b-10 u-flex item" v-for="item in list" :key="item.id" @click="itemClick(item)"
+						:id="'item_'+item.id" :class="{active:selItem&&selItem.id==item.id}">
+						<view class="checkbox">
+							<up-icon name="checkbox-mark" color="#fff"></up-icon>
+						</view>
+						<view class="u-flex-1">{{item.nickName}}/{{item.phone}}</view>
+					</view>
+					<template v-if="search.key!==''">
+						<up-empty v-if="list.length==0" text="未搜到相关用户"></up-empty>
+						<up-loadmore v-else :status="isEnd?'nomore':'loading'"></up-loadmore>
+					</template>
+					<template v-else>
+						<up-empty v-if="list.length==0" text="暂无用户"></up-empty>
+						<up-loadmore v-else :status="isEnd?'nomore':'loading'"></up-loadmore>
+					</template>
+				</scroll-view>
+				<view class="u-flex gap-20 u-m-t-30">
+					<view class="u-flex-1">
+						<my-button type="default" @click="close">取消</my-button>
+					</view>
+					<view class="u-flex-1">
+						<my-button type="primary" @click="submit">确定</my-button>
+					</view>
+				</view>
+			</view>
+		</up-popup>
+	</view>
+</template>
+<script setup>
+	import {
+		computed,
+		onMounted,
+		reactive,
+		ref,
+		watch
+	} from 'vue';
+	import {
+		getShopUser
+	} from '@/http/api/market/index.js';
+
+	const customStyle = ref({
+		marginRight: '20px'
+	});
+
+	const show = ref(false);
+	let modelValue = defineModel('modelValue', {
+		default: '',
+	});
+	
+	const props=defineProps({
+		maxWidth:{
+			default:240
+		}
+	})
+
+	const selId = ref('')
+
+	function returnLabel() {
+		const findItem = list.value.find(v => v.id == modelValue.value)
+		if(findItem){
+			return findItem.nickName+(findItem.phone?('/'+findItem.phone):'')
+		}
+		return ''
+	}
+	
+	const selItem=ref(null)
+	function itemClick(item) {
+		selItem.value=item
+	}
+
+	function returnShopName(id) {
+		const item = list.value.find((v) => v.id == id);
+		return item?.shopName || '';
+	}
+
+	function close() {
+		show.value = false;
+	}
+	
+	
+	const emits=defineEmits(['change'])
+	
+	function submit() {
+		if(!selItem.value){
+			return uni.showToast({
+				title:'请选择用户'
+			})
+		}
+	
+		modelValue.value = selItem.value.id
+		if(modelValue.value!=selItem.value.id){
+			emits('change')
+		}
+		show.value = false;
+	}
+
+
+	const list = ref([]);
+
+	function openPopup() {
+		selId.value = 'item_' + modelValue.value
+		init()
+		show.value = true;
+
+	}
+	const isEnd = ref(false)
+	const query = reactive({
+		page: 1,
+		size: 10,
+		key: ''
+	})
+
+	function search() {
+		isEnd.value = false
+		query.page = 1
+		selItem.value=null
+		init()
+	}
+	async function init() {
+		const res = await getShopUser(query);
+		if (res) {
+			isEnd.value = query.page >= res.totalPage * 1
+			if (query.page == 1) {
+				list.value = res.records
+			} else {
+				list.value.push(...res.records)
+			}
+		}
+	}
+
+	function scrolltolower() {
+		if (!isEnd.value) {
+			query.page++
+			init()
+		}
+	}
+</script>
+<style lang="scss">
+	.box {
+		border-radius: 8upx;
+		display: flex;
+		flex-direction: row;
+		align-items: top;
+		flex-wrap: wrap;
+		padding: 10rpx 24rpx;
+		border: 2rpx solid #e5e5e5;
+		position: relative;
+		.icon {
+			position: absolute;
+			top: 50%;
+			right: 24rpx;
+			transform: translateY(-50%);
+		}
+	}
+
+	.shop-item {
+		padding: 4rpx 8rpx 4rpx 16rpx;
+		border-radius: 4rpx;
+		border: 2rpx solid #f0f0f0;
+		background-color: #f5f5f5;
+		margin-bottom: 16rpx;
+		margin-left: 16rpx;
+	}
+
+	.scroll-view {
+		.item {
+			border: 1px solid #eee;
+			padding: 20rpx;
+			border-radius: 12rpx;
+
+			&.active {
+				border-color: $my-main-color;
+			}
+
+		}
+	}
+
+	.checkbox {
+		margin-right: 10rpx;
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 50%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 6rpx;
+		border: 1px solid #999;
+
+	}
+
+	.item {
+		&.active {
+			.checkbox {
+				background-color: $my-main-color;
+				border-color: $my-main-color;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pageMarket/distribution/index.vue b/pageMarket/distribution/index.vue
index 862e804..dd62192 100644
--- a/pageMarket/distribution/index.vue
+++ b/pageMarket/distribution/index.vue
@@ -1,34 +1,25 @@
 <template>
-  <view class="min-page u-font-28">
-    <up-sticky>
-      <view class="bg-fff top">
-        <view class="bg-fff container u-flex u-m-b-48">
-          <image
-            style="width: 60rpx; height: 60rpx"
-            src="/pageMarket/static/images/distribution.png"
-          ></image>
-          <view class="u-flex-1 u-flex u-p-l-24">
-            <view class="u-font-28 u-flex-1 u-p-r-4">
-              <view class="color-333 font-bold">分销</view>
-              <view class="color-666 u-m-t-4 u-font-24"
-                >用户成为业务员，可促进消费
-              </view>
-            </view>
-            <up-switch
-              v-model="distributionStore.config.isEnable"
-              size="18"
-              :active-value="1"
-              :inactive-value="0"
-            ></up-switch>
-          </view>
-        </view>
-        <my-tabs v-model="active" :list="tabs" textKey="label"></my-tabs>
-        <view
-          v-if="active == 1 || active == 2"
-          class="u-flex u-row-between u-m-t-32"
-          style="gap: 58rpx"
-        >
-          <view class="u-flex-1 filter-box" style="border-radius: 100rpx">
+	<view class="min-page u-font-28">
+		<up-sticky>
+			<view class="bg-fff top">
+				<view class="bg-fff container u-flex u-m-b-48">
+					<image style="width: 60rpx; height: 60rpx" src="/pageMarket/static/images/distribution.png"></image>
+					<view class="u-flex-1 u-flex u-p-l-24">
+						<view class="u-font-28 u-flex-1 u-p-r-4">
+							<view class="color-333 font-bold">分销</view>
+							<view class="color-666 u-m-t-4 u-font-24">用户成为业务员，可促进消费
+							</view>
+						</view>
+						<up-switch v-model="distributionStore.config.isEnable" size="18" :active-value="1"
+							:inactive-value="0"></up-switch>
+					</view>
+				</view>
+				<my-tabs v-model="active" :list="tabs" textKey="label"></my-tabs>
+				<view v-if="active == 1 || active == 2" class="u-flex u-row-between u-m-t-32" style="gap: 58rpx">
+					<view class="u-flex-1">
+						<fenXiaoUserSelect v-model="userId" @change="getList()" />
+					</view>
+					<!-- <view class="u-flex-1 filter-box" style="border-radius: 100rpx">
             <up-icon name="search" size="18"></up-icon>
             <input
               class="u-m-l-10 u-font-28"
@@ -39,476 +30,439 @@
               @blur="keyWordBlur"
             />
             <up-icon v-if="keyWord" name="close" size="14" @click="clearKeyWord"></up-icon>
-          </view>
-          <view
-            class="u-flex-1 u-font-28 filter-box u-flex u-row-between"
-            @click="showTimeArea = true"
-          >
-            <template
-              v-if="userComponentQuery.startTime && userComponentQuery.endTime"
-            >
-              <text class="u-font-20">
-                {{ userComponentQuery.startTime }} -
-                {{ userComponentQuery.endTime }}
-              </text>
-              <view @click.stop="clearTime">
-                <up-icon name="close" size="14"></up-icon>
-              </view>
-            </template>
-            <template v-else>
-              <text class="color-999">请选择日期范围</text>
-              <up-icon name="arrow-right" size="12"></up-icon>
-            </template>
-          </view>
-        </view>
-        <view
-          v-if="active == 3"
-          class="u-flex u-row-between u-m-t-32"
-          style="gap: 30rpx"
-        >
-          <view
-            class="u-font-28 filter-box u-flex u-row-between"
-            @click="showActions = true"
-          >
-            <template v-if="selActions && selActions.value">
-              <text class="u-font-28 u-m-r-10">{{ selActions.name }} </text>
-            </template>
-            <template v-else>
-              <text class="color-999 u-m-r-10">全部</text>
-            </template>
-            <up-icon name="arrow-down" size="12"></up-icon>
-          </view>
-          <view class="u-flex-1 filter-box" style="border-radius: 100rpx">
-            <up-icon name="search" size="18"></up-icon>
-            <input
-              class="u-m-l-10 u-font-28"
-              type="text"
-              placeholder-class="color-999 u-font-28"
-              placeholder="分销员昵称/手机号"
-              v-model="keyWord"
-              @blur="keyWordBlur"
-            />
-          </view>
-          <view
-            class="u-flex-1 u-font-28 filter-box u-flex u-row-between"
-            @click="showTimeArea = true"
-          >
-            <template
-              v-if="userComponentQuery.startTime && userComponentQuery.endTime"
-            >
-              <text class="u-font-20">
-                {{ userComponentQuery.startTime }} -
-                {{ userComponentQuery.endTime }}
-              </text>
-              <view @click.stop="clearTime">
-                <up-icon name="close" size="14"></up-icon>
-              </view>
-            </template>
-            <template v-else>
-              <text class="color-999">请选择日期</text>
-              <up-icon name="arrow-right" size="12"></up-icon>
-            </template>
-          </view>
-        </view>
-        <view v-if="active == 2" class="u-flex u-p-l-32 u-p-r-32 u-m-t-32">
-          <view class="u-flex-1 u-text-center">
-            <view class="u-font-32 color-main font-bold">{{
+          </view> -->
+					<view class="u-flex-1 u-font-28 filter-box u-flex u-row-between" @click="showTimeArea = true">
+						<template v-if="userComponentQuery.startTime && userComponentQuery.endTime">
+							<text class="u-font-20">
+								{{ userComponentQuery.startTime }} -
+								{{ userComponentQuery.endTime }}
+							</text>
+							<view @click.stop="clearTime">
+								<up-icon name="close" size="14"></up-icon>
+							</view>
+						</template>
+						<template v-else>
+							<text class="color-999">请选择日期范围</text>
+							<up-icon name="arrow-right" size="12"></up-icon>
+						</template>
+					</view>
+				</view>
+				<view v-if="active == 3" class="u-flex u-row-between u-m-t-32" style="gap: 30rpx">
+					<view class="u-font-28 filter-box u-flex u-row-between" @click="showActions = true">
+						<template v-if="selActions && selActions.value">
+							<text class="u-font-28 u-m-r-10">{{ selActions.name }} </text>
+						</template>
+						<template v-else>
+							<text class="color-999 u-m-r-10">全部</text>
+						</template>
+						<up-icon name="arrow-down" size="12"></up-icon>
+					</view>
+					<view class="u-flex-1">
+						<fenXiaoUserSelect v-model="userId" :maxWidth="200" @change="getList()" />
+					</view>
+					<!-- <view class="u-flex-1 filter-box" style="border-radius: 100rpx">
+						<up-icon name="search" size="18"></up-icon>
+						<input class="u-m-l-10 u-font-28" type="text" placeholder-class="color-999 u-font-28"
+							placeholder="分销员昵称/手机号" v-model="keyWord" @blur="keyWordBlur" />
+					</view> -->
+					<view class="u-flex-1 u-font-28 filter-box u-flex u-row-between" @click="showTimeArea = true">
+						<template v-if="userComponentQuery.startTime && userComponentQuery.endTime">
+							<text class="u-font-20">
+								{{ userComponentQuery.startTime }} -
+								{{ userComponentQuery.endTime }}
+							</text>
+							<view @click.stop="clearTime">
+								<up-icon name="close" size="14"></up-icon>
+							</view>
+						</template>
+						<template v-else>
+							<text class="color-999">请选择日期</text>
+							<up-icon name="arrow-right" size="12"></up-icon>
+						</template>
+					</view>
+				</view>
+				<view v-if="active == 2" class="u-flex u-p-l-32 u-p-r-32 u-m-t-32">
+					<view class="u-flex-1 u-text-center">
+						<view class="u-font-32 color-main font-bold">{{
               listRes.totalCount
             }}</view>
-            <view class="u-font-24 color-666 u-m-t-16">支付开通人数</view>
-          </view>
-          <view class="u-flex-1 u-text-center">
-            <view class="u-font-32 color-main font-bold">{{
+						<view class="u-font-24 color-666 u-m-t-16">支付开通人数</view>
+					</view>
+					<view class="u-flex-1 u-text-center">
+						<view class="u-font-32 color-main font-bold">{{
               listRes.totalAmount
             }}</view>
-            <view class="u-font-24 color-666 u-m-t-16">已支付金额（元）</view>
-          </view>
-        </view>
-        <view v-if="active == 3" class="u-flex u-m-t-32">
-          <view class="u-flex-1 u-text-center">
-            <view class="u-font-32 color-main font-bold">{{
+						<view class="u-font-24 color-666 u-m-t-16">已支付金额（元）</view>
+					</view>
+				</view>
+				<view v-if="active == 3" class="u-flex u-m-t-32">
+					<view class="u-flex-1 u-text-center">
+						<view class="u-font-32 color-main font-bold">{{
               listRes.successAmount
             }}</view>
-            <view class="u-font-24 color-666 u-m-t-16">已入账金额（元）</view>
-          </view>
-          <view class="u-flex-1 u-text-center">
-            <view class="u-font-32 color-main font-bold">{{
+						<view class="u-font-24 color-666 u-m-t-16">已入账金额（元）</view>
+					</view>
+					<view class="u-flex-1 u-text-center">
+						<view class="u-font-32 color-main font-bold">{{
               listRes.pendingAmount || 0
             }}</view>
-            <view class="u-font-24 color-666 u-m-t-16">待入账金额（元）</view>
-          </view>
-          <view class="u-flex-1 u-text-center">
-            <view class="u-font-32 color-main font-bold">{{
+						<view class="u-font-24 color-666 u-m-t-16">待入账金额（元）</view>
+					</view>
+					<view class="u-flex-1 u-text-center">
+						<view class="u-font-32 color-main font-bold">{{
               listRes.balanceAmount
             }}</view>
-            <view class="u-font-24 color-666 u-m-t-16">
-              <text>运营余额（元）</text>
-              <text class="color-main" @click="go.to('PAGES_PAY')"
-                >充值{{ ">" }}</text
-              >
-            </view>
-          </view>
-        </view>
-      </view>
-    </up-sticky>
-    <configVue v-if="active == 0"></configVue>
-    <fenxiaoUserListVue
-      v-if="active == 1"
-      :list="list"
-      :isEnd="isEnd"
-      @refresh="refresh"
-    ></fenxiaoUserListVue>
+						<view class="u-font-24 color-666 u-m-t-16">
+							<text>运营余额（元）</text>
+							<text class="color-main" @click="go.to('PAGES_PAY')">充值{{ ">" }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</up-sticky>
+		<configVue v-if="active == 0"></configVue>
+		<fenxiaoUserListVue v-if="active == 1" :list="list" :isEnd="isEnd" @refresh="refresh"></fenxiaoUserListVue>
 
-    <openListVue
-      v-if="active == 2"
-      :list="list"
-      :isEnd="isEnd"
-      @refresh="refresh"
-    ></openListVue>
-    <fenxiaoMingxiVue
-      v-if="active == 3"
-      :list="list"
-      :isEnd="isEnd"
-      @refresh="refresh"
-    ></fenxiaoMingxiVue>
-    <!-- 选择门店 -->
-    <shopSelActionSheetVue
-      @choose="chooseShop"
-      v-model="showShopSelActionSheet"
-      title="选择门店"
-    >
-    </shopSelActionSheetVue>
+		<openListVue v-if="active == 2" :list="list" :isEnd="isEnd" @refresh="refresh"></openListVue>
+		<fenxiaoMingxiVue v-if="active == 3" :list="list" :isEnd="isEnd" @refresh="refresh"></fenxiaoMingxiVue>
+		<!-- 选择门店 -->
+		<shopSelActionSheetVue @choose="chooseShop" v-model="showShopSelActionSheet" title="选择门店">
+		</shopSelActionSheetVue>
 
-    <dateAreaSel
-      :show="showTimeArea"
-      :minYear="2022"
-      @close="showTimeArea = false"
-      @confirm="confirmTimeArea"
-    ></dateAreaSel>
+		<dateAreaSel :show="showTimeArea" :minYear="2022" @close="showTimeArea = false" @confirm="confirmTimeArea">
+		</dateAreaSel>
 
-    <!-- 分销明细状态 -->
-    <up-action-sheet
-      :show="showActions"
-      :actions="actions"
-      @select="handleSelect"
-      @close="showActions = false"
-      cancel-text="取消"
-    ></up-action-sheet>
-  </view>
+		<!-- 分销明细状态 -->
+		<up-action-sheet :show="showActions" :actions="actions" @select="handleSelect" @close="showActions = false"
+			cancel-text="取消"></up-action-sheet>
+	</view>
 </template>
 <script setup>
-import {
-  onLoad,
-  onReady,
-  onShow,
-  onPageScroll,
-  onReachBottom,
-  onBackPress,
-} from "@dcloudio/uni-app";
-import go from "@/commons/utils/go.js";
-import { ref, onMounted, watch, provide } from "vue";
-import * as consumeCashbackApi from "@/http/api/market/consumeCashback.js";
-import * as distributionApi from "@/http/api/market/distribution.js";
-import configVue from "./components/config.vue";
-import shopSelActionSheetVue from "@/pageMarket/components/shop-sel-action-sheet.vue";
-import dateAreaSel from "@/components/date-range-picker/date-range-picker.vue";
-import fenxiaoUserListVue from "./components/fenxiao-user-list.vue";
-import openListVue from "./components/open-list.vue";
-import fenxiaoMingxiVue from "./components/fenxiao-mingxi.vue";
+	import {
+		onLoad,
+		onReady,
+		onShow,
+		onPageScroll,
+		onReachBottom,
+		onBackPress,
+	} from "@dcloudio/uni-app";
+	import go from "@/commons/utils/go.js";
+	import {
+		ref,
+		onMounted,
+		watch,
+		provide
+	} from "vue";
+	import * as consumeCashbackApi from "@/http/api/market/consumeCashback.js";
+	import * as distributionApi from "@/http/api/market/distribution.js";
+	import fenXiaoUserSelect from './components/fenxiao-user-select.vue'
+	import configVue from "./components/config.vue";
+	import shopSelActionSheetVue from "@/pageMarket/components/shop-sel-action-sheet.vue";
+	import dateAreaSel from "@/components/date-range-picker/date-range-picker.vue";
+	import fenxiaoUserListVue from "./components/fenxiao-user-list.vue";
+	import openListVue from "./components/open-list.vue";
+	import fenxiaoMingxiVue from "./components/fenxiao-mingxi.vue";
 
-import { useDistributionStore } from "@/store/market.js";
-import { reactive } from "vue";
+	import {
+		useDistributionStore
+	} from "@/store/market.js";
+	import {
+		reactive
+	} from "vue";
 
-const actions = [
-  {
-    name: "全部",
-    value: "",
-  },
-  {
-    name: "已入账",
-    value: "success",
-  },
-  {
-    name: "待入账",
-    value: "pending",
-  },
-  {
-    name: "已退款",
-    value: "refund",
-  },
-];
-function clearKeyWord() {
-  keyWord.value = "";
-  userComponentQuery.user = "";
-}
-function clearTime() {
-  userComponentQuery.startTime = "";
-  userComponentQuery.endTime = "";
-}
-const selActions = ref("");
-const showActions = ref(false);
-function handleSelect(e) {
-  selActions.value = e;
-}
+	const actions = [{
+			name: "全部",
+			value: "",
+		},
+		{
+			name: "已入账",
+			value: "success",
+		},
+		{
+			name: "待入账",
+			value: "pending",
+		},
+		{
+			name: "已退款",
+			value: "refund",
+		},
+	];
 
-const distributionStore = useDistributionStore();
-distributionStore.getConfig();
-provide("distributionStore", distributionStore);
-provide("distributionApi", distributionApi);
-const showTimeArea = ref(false);
-function confirmTimeArea(e) {
-  console.log(e);
-  userComponentQuery.startTime = e[0];
-  userComponentQuery.endTime = e[1];
-}
-const tabs = [
-  {
-    label: "基础设置",
-    value: "basic",
-  },
-  {
-    label: "分销员",
-    value: "user",
-  },
-  {
-    label: "开通记录",
-    value: "recoders",
-  },
-  {
-    label: "分销明细",
-    value: "details",
-  },
-];
 
-const keyWord = ref("");
-function keyWordBlur() {
-  userComponentQuery.user = keyWord.value;
-}
-const userComponentQuery = reactive({
-  user: "",
-  startTime: "",
-  endTime: "",
-});
+	const userId = ref('')
 
-const form = ref({
-  isEnable: 0,
-});
+	function clearKeyWord() {
+		keyWord.value = "";
+		userComponentQuery.user = "";
+	}
 
-const list = ref([]);
-const pageNum = ref(1);
-const isEnd = ref(false);
-const selShop = ref({
-  shopId: "",
-  shopName: "",
-});
-const searchText = ref("");
+	function clearTime() {
+		userComponentQuery.startTime = "";
+		userComponentQuery.endTime = "";
+	}
+	const selActions = ref("");
+	const showActions = ref(false);
 
-function search() {
-  pageNum.value = 1;
-  getList();
-}
+	function handleSelect(e) {
+		selActions.value = e;
+	}
 
-function chooseShop(e) {
-  selShop.value = e;
-}
+	const distributionStore = useDistributionStore();
+	distributionStore.getConfig();
+	provide("distributionStore", distributionStore);
+	provide("distributionApi", distributionApi);
+	const showTimeArea = ref(false);
 
-watch(
-  () => selShop.value.shopId,
-  (newval) => {
-    pageNum.value = 1;
-    getList();
-  }
-);
+	function confirmTimeArea(e) {
+		console.log(e);
+		userComponentQuery.startTime = e[0];
+		userComponentQuery.endTime = e[1];
+	}
+	const tabs = [{
+			label: "基础设置",
+			value: "basic",
+		},
+		{
+			label: "分销员",
+			value: "user",
+		},
+		{
+			label: "开通记录",
+			value: "recoders",
+		},
+		{
+			label: "分销明细",
+			value: "details",
+		},
+	];
 
-watch(
-  () => userComponentQuery,
-  (newval) => {
-    isEnd.value = false;
-    pageNum.value = 1;
+	const keyWord = ref("");
 
-    getList();
-  },
-  {
-    deep: true,
-  }
-);
+	function keyWordBlur() {
+		userComponentQuery.user = keyWord.value;
+	}
+	const userComponentQuery = reactive({
+		user: "",
+		startTime: "",
+		endTime: "",
+	});
 
-function refresh() {
-  isEnd.value = false;
-  pageNum.value = 1;
-  getList();
-}
+	const form = ref({
+		isEnable: 0,
+	});
 
-const listRes = ref({});
-async function getList() {
-  let res = null;
-  if (active.value == 1) {
-    //分销员列表
-    res = await distributionApi.distributionUser({
-      page: pageNum.value,
-      size: 10,
-      user: userComponentQuery.user,
-      startTime: userComponentQuery.startTime
-        ? userComponentQuery.startTime + " 00:00:00"
-        : "",
-      endTime: userComponentQuery.endTime
-        ? userComponentQuery.endTime + " 23:59:59"
-        : "",
-    });
-  }
-  if (active.value == 2) {
-    //开通记录
-    res = await distributionApi.openFlow({
-      page: pageNum.value,
-      size: 10,
-      key: userComponentQuery.user,
-      startTime: userComponentQuery.startTime
-        ? userComponentQuery.startTime + " 00:00:00"
-        : "",
-      endTime: userComponentQuery.endTime
-        ? userComponentQuery.endTime + " 23:59:59"
-        : "",
-    });
-  }
-  if (active.value == 3) {
-    //分销明细
-    res = await distributionApi.distributionFlow({
-      page: pageNum.value,
-      size: 10,
-      key: userComponentQuery.user,
-      status: selActions.value?.value || "",
-      startTime: userComponentQuery.startTime
-        ? userComponentQuery.startTime + " 00:00:00"
-        : "",
-      endTime: userComponentQuery.endTime
-        ? userComponentQuery.endTime + " 23:59:59"
-        : "",
-    });
-  }
-  if (res) {
-    listRes.value = res;
-    if (pageNum.value == 1) {
-      list.value = res.records || [];
-    } else {
-      list.value = [...list.value, ...(res.records || [])];
-    }
-    isEnd.value = pageNum.value >= res.totalPage * 1 ? true : false;
-    console.log(isEnd.value);
-  }
-}
+	const list = ref([]);
+	const pageNum = ref(1);
+	const isEnd = ref(false);
+	const selShop = ref({
+		shopId: "",
+		shopName: "",
+	});
+	const searchText = ref("");
 
-// 显示选择门店弹窗
-const showShopSelActionSheet = ref(false);
+	function search() {
+		pageNum.value = 1;
+		getList();
+	}
 
-function showShopSelActionSheetFun() {
-  showShopSelActionSheet.value = true;
-}
-const active = ref(0);
-watch(
-  () => active.value,
-  (newval) => {
-    userComponentQuery.startTime = "";
-    userComponentQuery.endTime = "";
-    keyWord.value = "";
-    console.log(newval);
-    pageNum.value = 1;
-    getList();
-  }
-);
-watch(
-  () => active.value,
-  (newval) => {
+	function chooseShop(e) {
+		selShop.value = e;
+	}
 
-    refresh();
-  }
-);
-watch(
-  () => selActions.value,
-  () => {
-    refresh();
-  }
-);
-onReachBottom(() => {
-  if (!isEnd.value) {
-    pageNum.value++;
-    getList();
-  }
-});
-watch(
-  () => distributionStore.config.isEnable,
-  () => {
-    distributionStore.editConfig();
-  }
-);
-onShow(() => {
-  pageNum.value = 1;
-  getList();
-});
+	watch(
+		() => selShop.value.shopId,
+		(newval) => {
+			pageNum.value = 1;
+			getList();
+		}
+	);
+
+	watch(
+		() => userComponentQuery,
+		(newval) => {
+			isEnd.value = false;
+			pageNum.value = 1;
+
+			getList();
+		}, {
+			deep: true,
+		}
+	);
+
+	function refresh() {
+		isEnd.value = false;
+		pageNum.value = 1;
+		getList();
+	}
+
+	const listRes = ref({});
+	async function getList() {
+		let res = null;
+		if (active.value == 1) {
+			//分销员列表
+			res = await distributionApi.distributionUser({
+				page: pageNum.value,
+				size: 10,
+				user: userComponentQuery.user,
+				id:userId.value,
+				startTime: userComponentQuery.startTime ?
+					userComponentQuery.startTime + " 00:00:00" : "",
+				endTime: userComponentQuery.endTime ?
+					userComponentQuery.endTime + " 23:59:59" : "",
+			});
+		}
+		if (active.value == 2) {
+			//开通记录
+			res = await distributionApi.openFlow({
+				page: pageNum.value,
+				size: 10,
+				id:userId.value,
+				key: userComponentQuery.user,
+				startTime: userComponentQuery.startTime ?
+					userComponentQuery.startTime + " 00:00:00" : "",
+				endTime: userComponentQuery.endTime ?
+					userComponentQuery.endTime + " 23:59:59" : "",
+			});
+		}
+		if (active.value == 3) {
+			//分销明细
+			res = await distributionApi.distributionFlow({
+				page: pageNum.value,
+				size: 10,
+				id:userId.value,
+				key: userComponentQuery.user,
+				status: selActions.value?.value || "",
+				startTime: userComponentQuery.startTime ?
+					userComponentQuery.startTime + " 00:00:00" : "",
+				endTime: userComponentQuery.endTime ?
+					userComponentQuery.endTime + " 23:59:59" : "",
+			});
+		}
+		if (res) {
+			listRes.value = res;
+			if (pageNum.value == 1) {
+				list.value = res.records || [];
+			} else {
+				list.value = [...list.value, ...(res.records || [])];
+			}
+			isEnd.value = pageNum.value >= res.totalPage * 1 ? true : false;
+			console.log(isEnd.value);
+		}
+	}
+
+	// 显示选择门店弹窗
+	const showShopSelActionSheet = ref(false);
+
+	function showShopSelActionSheetFun() {
+		showShopSelActionSheet.value = true;
+	}
+	const active = ref(0);
+	watch(
+		() => active.value,
+		(newval) => {
+			userComponentQuery.startTime = "";
+			userComponentQuery.endTime = "";
+			keyWord.value = "";
+			userId.value="";
+			console.log(newval);
+			pageNum.value = 1;
+			getList();
+		}
+	);
+	watch(
+		() => active.value,
+		(newval) => {
+
+			refresh();
+		}
+	);
+	watch(
+		() => selActions.value,
+		() => {
+			refresh();
+		}
+	);
+	onReachBottom(() => {
+		if (!isEnd.value) {
+			pageNum.value++;
+			getList();
+		}
+	});
+	watch(
+		() => distributionStore.config.isEnable,
+		() => {
+			distributionStore.editConfig();
+		}
+	);
+	onShow(() => {
+		pageNum.value = 1;
+		getList();
+	});
 </script>
 <style lang="scss" scoped>
-.min-page {
-  background: #f7f7f7;
-}
+	.min-page {
+		background: #f7f7f7;
+	}
 
-.box {
-}
+	.box {}
 
-.top {
-  padding: 32rpx 24rpx;
-}
+	.top {
+		padding: 32rpx 24rpx;
+	}
 
-.list {
-  padding: 0 30rpx;
+	.list {
+		padding: 0 30rpx;
 
-  .item {
-    padding: 32rpx 24rpx;
-    border-radius: 14rpx;
-    background-color: #fff;
-    overflow: hidden;
-  }
-}
+		.item {
+			padding: 32rpx 24rpx;
+			border-radius: 14rpx;
+			background-color: #fff;
+			overflow: hidden;
+		}
+	}
 
-.tag {
-  border-radius: 12rpx;
-  padding: 8rpx 22rpx;
-  font-size: 28rpx;
+	.tag {
+		border-radius: 12rpx;
+		padding: 8rpx 22rpx;
+		font-size: 28rpx;
 
-  &.success {
-    background-color: #edfff0;
-    color: #5bbc6d;
-  }
+		&.success {
+			background-color: #edfff0;
+			color: #5bbc6d;
+		}
 
-  &.end {
-    background-color: #f7f7f7;
-    color: #999;
-  }
-}
+		&.end {
+			background-color: #f7f7f7;
+			color: #999;
+		}
+	}
 
-.my-btn {
-  font-size: 28rpx;
-  line-height: 36rpx;
-  padding: 8rpx 32rpx;
-  border-radius: 12rpx;
-  margin: 0;
-}
+	.my-btn {
+		font-size: 28rpx;
+		line-height: 36rpx;
+		padding: 8rpx 32rpx;
+		border-radius: 12rpx;
+		margin: 0;
+	}
 
-.edit-btn {
-  background: #e6f0ff;
-  color: $my-main-color;
-}
+	.edit-btn {
+		background: #e6f0ff;
+		color: $my-main-color;
+	}
 
-.delete-btn {
-  background: #ffe7e6;
-  color: #ff1c1c;
-}
-.filter-box {
-  display: flex;
-  padding: 8rpx 24rpx;
-  align-items: center;
-  border-radius: 8rpx;
-  border: 2rpx solid #d9d9d9;
-  background: #f7f7f7;
-  min-height: 62rpx;
-  box-sizing: border-box;
-}
-</style>
+	.delete-btn {
+		background: #ffe7e6;
+		color: #ff1c1c;
+	}
+
+	.filter-box {
+		display: flex;
+		padding: 8rpx 24rpx;
+		align-items: center;
+		border-radius: 8rpx;
+		border: 2rpx solid #d9d9d9;
+		background: #f7f7f7;
+		min-height: 62rpx;
+		box-sizing: border-box;
+	}
+</style>
\ No newline at end of file
diff --git a/pageMarket/superVip/index.vue b/pageMarket/superVip/index.vue
index f08c874..c39e2db 100644
--- a/pageMarket/superVip/index.vue
+++ b/pageMarket/superVip/index.vue
@@ -14,10 +14,13 @@
 				</view>
 				<my-tabs v-model="active" :list="tabs" textKey="label"></my-tabs>
 				<view v-if="active == 2" class="u-flex u-row-between u-m-t-32" style="gap: 58rpx">
-					<view class="u-flex-1 filter-box" style="border-radius: 100rpx">
+					<!-- <view class="u-flex-1 filter-box" style="border-radius: 100rpx">
 						<up-icon name="search" size="18"></up-icon>
 						<input class="u-m-l-10 u-font-28" type="text" placeholder-class="color-999 u-font-28" placeholder="搜索关键词" v-model="keyWord" @blur="keyWordBlur" />
 						<up-icon v-if="keyWord" name="close" size="14" @click="clearKeyWord"></up-icon>
+					</view> -->
+					<view class="u-flex-1">
+						<my-user-select v-model="userId" @change="search()" ></my-user-select>
 					</view>
 					<view class="u-flex-1 u-font-28 filter-box u-flex u-row-between" @click="showTimeArea = true">
 						<template v-if="userComponentQuery.startTime && userComponentQuery.endTime">
@@ -215,6 +218,7 @@ function refresh() {
 }
 
 const listRes = ref({});
+const userId=ref('')
 async function getList() {
 	let res = null;
 	if (active.value == 1) {
@@ -232,7 +236,8 @@ async function getList() {
 		res = await memberApi.orderList({
 			page: pageNum.value,
 			size: 10,
-			key: userComponentQuery.user,
+			// key: userComponentQuery.user,
+			key: userId.value,
 			startTime: userComponentQuery.startTime ? userComponentQuery.startTime + ' 00:00:00' : '',
 			endTime: userComponentQuery.endTime ? userComponentQuery.endTime + ' 23:59:59' : ''
 		});
@@ -264,6 +269,7 @@ watch(
 		userComponentQuery.startTime = '';
 		userComponentQuery.endTime = '';
 		keyWord.value = '';
+		userId.value=''
 		refresh();
 	}
 );
diff --git a/pagesCreateOrder/choose-user/choose-user.vue b/pagesCreateOrder/choose-user/choose-user.vue
index 15d871e..334d0c7 100644
--- a/pagesCreateOrder/choose-user/choose-user.vue
+++ b/pagesCreateOrder/choose-user/choose-user.vue
@@ -37,7 +37,7 @@
 									</view>
 									<view class="u-m-l-30 u-flex">
 										<text class="">积分：</text>
-										<text class="color-main">{{item.accountPoints}}</text>
+										<text class="color-main">{{item.pointBalance||0}}</text>
 									</view>
 								</view>
 							</view>
@@ -113,7 +113,7 @@
 				headImg: '',
 				telephone: '',
 				amount: '0.00',
-				accountPoints: '0.00'
+				pointBalance: '0.00'
 			})
 		} else {
 			list[index].checked = true
diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue
index 3871e97..409a1fd 100644
--- a/pagesCreateOrder/confirm-order/confirm-order.vue
+++ b/pagesCreateOrder/confirm-order/confirm-order.vue
@@ -32,7 +32,7 @@
               <view class="u-font-24 u-m-l-30 u-text-center">
                 <text>积分：</text>
                 <text class="color-main">{{
-                  pageData.user.accountPoints
+                  pageData.user.pointBalance||0
                 }}</text>
               </view>
             </view>
@@ -88,7 +88,7 @@
               <view class="u-flex">
                 <view>积分</view>
                 <view class="color-333 u-m-l-10">{{
-                  pageData.user.accountPoints
+                                  pageData.user.pointBalance||0
                 }}</view>
               </view>
               <view class="u-flex">
@@ -935,14 +935,15 @@ function watchChooseuser() {
     if (pageData.user.id == data.id) {
       return;
     }
-    if (data.id) {
-      const res = await shopUserDetail({
-        userId: data.userId,
-      });
-      pageData.user = res;
-    } else {
-      pageData.user = data;
-    }
+	pageData.user = data;
+    // if (data.id) {
+    //   const res = await shopUserDetail({
+    //     userId: data.userId,
+    //   });
+    //   pageData.user = res;
+    // } else {
+    //   pageData.user = data;
+    // }
     // 更新购物车和历史订单数据
     uodateCartAndHistory();
   });
diff --git a/pagesOrder/pay-order/components/edit-accountPoints.vue b/pagesOrder/pay-order/components/edit-accountPoints.vue
index b7b2adf..6312b6f 100644
--- a/pagesOrder/pay-order/components/edit-accountPoints.vue
+++ b/pagesOrder/pay-order/components/edit-accountPoints.vue
@@ -2,20 +2,18 @@
 	<my-model ref="model" :title="title" iconColor="#000" @close="resetForm">
 		<template #desc>
 			<view class="u-text-left u-p-30 color-666 u-font-28">
-				<view class="u-m-t-32 u-flex ">
-					<view class="" v-if="accountPoints.calcRes.usable">
+				<view class="u-m-t-32 u-flex">
+					<view class="" v-if="pointDeductionRule.enableRewards">
 						<text class="color-red">*</text>
 						<text class=""
-							v-if="accountPoints.calcRes.equivalentPoints">100积分等于{{to2(accountPoints.calcRes.equivalentPoints*100)}}元,</text>
+							v-if="pointDeductionRule.equivalentPoints">{{ pointDeductionRule.equivalentPoints }}积分等于1元,</text>
 						<text>
-							最大抵扣积分{{accountPoints.calcRes.maxUsablePoints}}
-						</text>
-						<text>,
-							最小抵扣积分0
+							最大抵扣积分{{ maxCanUsePoints }}
 						</text>
+						<text>, 最小抵扣积分0 </text>
 					</view>
 				</view>
-				<view class="u-m-t-40 u-flex ">
+				<view class="u-m-t-40 u-flex">
 					<view>积分</view>
 					<view class="u-m-l-32 border u-p-l-10 u-p-r-10 u-flex-1">
 						<uni-easyinput type="number" @input="pointsInput" @change="pointsChange" paddingNone
@@ -38,93 +36,103 @@
 </template>
 
 <script setup>
-	import { reactive, nextTick, ref, watch } from 'vue';
-	import myModel from '@/components/my-components/my-model.vue'
-	import myButton from '@/components/my-components/my-button.vue'
-	import myTabs from '@/components/my-components/my-tabs.vue'
-	import infoBox from '@/commons/utils/infoBox.js'
+	import {
+		reactive,
+		nextTick,
+		ref,
+		watch
+	} from "vue";
+	import myModel from "@/components/my-components/my-model.vue";
+	import myButton from "@/components/my-components/my-button.vue";
+	import myTabs from "@/components/my-components/my-tabs.vue";
+	import infoBox from "@/commons/utils/infoBox.js";
 	const props = defineProps({
 		title: {
 			type: String,
-			default: '积分抵扣'
+			default: "积分抵扣",
 		},
-		accountPoints:{
-			type:Object,
-			default:()=>{
+		maxCanUsePoints: {
+			type: Number,
+			default: 0
+		},
+		pointDeductionRule: {
+			type: Object,
+			default: () => {
 				return {
-					calcRes:{
-						usable: false,
-						unusableReason: '',
-						minDeductionPoints: 0,
-						maxUsablePoints: 0
-					}
-				}
-			}
+					enableRewards: false,
+					unusableReason: "",
+					minDeductionPoints: 0,
+					maxUsablePoints: 0,
+				};
+			},
 		},
 		price: {
 			type: [Number, String],
-			default: 0
-		}
-	})
-	
+			default: 0,
+		},
+	});
+
 	function to2(n) {
 		if (!n) {
-			return ''
-		}
-		return n.toFixed(2)
-	}
-	
-	function pointsInput(e){
-		setTimeout(()=>{
-			form.points=Math.floor(e)
-		},100)
-	}
-	
-	
-	function pointsChange(newval) {
-		form.points=Math.floor(newval)
-		if (newval < 0) {
-			form.points = 0
-			return infoBox.showToast('积分抵扣不能小于0')
-		}
-		if (newval > props.accountPoints.calcRes.maxUsablePoints) {
-			form.points = props.price
-			return infoBox.showToast('积分抵扣不能大于'+props.accountPoints.calcRes.maxUsablePoints)
+			return "";
 		}
+		return n.toFixed(2);
 	}
 
+	function pointsInput(e) {
+		setTimeout(() => {
+			form.points = Math.floor(e);
+		}, 100);
+	}
+
+	function pointsChange(newval) {
+		form.points = Math.floor(newval);
+		if (newval < 0) {
+			form.points = 0;
+			return infoBox.showToast("积分抵扣不能小于0");
+		}
+		if (newval > props.maxCanUsePoints) {
+			form.points = props.price;
+			return infoBox.showToast(
+				"积分抵扣不能大于" + props.maxCanUsePoints
+			);
+		}
+	}
 
 	const form = reactive({
 		points: props.price,
-	})
-	watch(() => props.price, (newval) => {
-		form.points = newval
-	})
+	});
+	watch(
+		() => props.price,
+		(newval) => {
+			form.points = newval;
+		}
+	);
 
 	function resetForm() {
-		form.points=0
+		form.points = 0;
 	}
 
-	const model = ref(null)
+	const model = ref(null);
 
 	function open() {
-		model.value.open()
-		form.points = props.price
+		model.value.open();
+		form.points = props.price;
 	}
 
 	function close() {
-		model.value.close()
+		model.value.close();
 	}
-	const emits = defineEmits(['confirm'])
+	const emits = defineEmits(["confirm"]);
 
 	function confirm() {
-		emits('confirm',Math.floor(form.points) )
-		close()
+		emits("confirm", Math.floor(form.points));
+		close();
 	}
 	defineExpose({
 		open,
-		close
-	})
+		close,
+	});
 </script>
 
 <style lang="scss" scoped>
@@ -140,7 +148,7 @@
 
 	.tag {
 		background-color: #fff;
-		border: 1px solid #E5E5E5;
+		border: 1px solid #e5e5e5;
 		line-height: inherit;
 		font-size: 24rpx;
 		color: #666666;
@@ -148,13 +156,13 @@
 		border-radius: 8rpx;
 
 		&.active {
-			border-color: #E6F0FF;
+			border-color: #e6f0ff;
 			color: $my-main-color;
 		}
 	}
 
 	.hover-class {
-		background-color: #E5E5E5;
+		background-color: #e5e5e5;
 	}
 
 	.discount {
@@ -166,7 +174,7 @@
 	}
 
 	.bg1 {
-		background: #F7F7FA;
+		background: #f7f7fa;
 	}
 
 	.tab {
@@ -174,7 +182,7 @@
 	}
 
 	.border {
-		border: 1px solid #E5E5E5;
+		border: 1px solid #e5e5e5;
 		border-radius: 4rpx;
 	}
 
diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
index 92bfba9..eabe3d4 100644
--- a/pagesOrder/pay-order/pay-order.vue
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -1,1510 +1,1476 @@
 <template>
 	<view class="bg-gray min-page u-p-30 u-font-28">
-	  <view class="u-p-t-60 u-p-b-60 u-text-center">
-		<view class="u-font-32">
-		  <text class="price-fuhao">￥</text>
-		  <text class="font-bold price">{{
+		<view class="u-p-t-60 u-p-b-60 u-text-center">
+			<view class="u-font-32">
+				<text class="price-fuhao">￥</text>
+				<text class="font-bold price">{{
 			orderCostSummary.finalPayAmount
 		  }}</text>
-		</view>
-		<view
-		  class="u-m-t-10 color-999 old-price"
-		  v-if="orderCostSummary.merchantReduction.actualAmount"
-		>
-		  <text class="">￥</text>
-		  <text class=" ">{{ returnMerchantReductionBeforeMoney }}</text>
-		</view>
-		<view class="u-m-t-10 u-flex u-row-center color-main">
-		  <view @click="discountShow">修改</view>
-		</view>
-		<view class="u-m-t-10 u-flex u-row-center color-main u-m-t-24">
-		  <view @click="chooseUser()">选择用户</view>
-		</view>
-	  </view>
-	  <view class="content bg-fff border-r-12">
-		<view class="u-p-l-26 u-p-r-26 card top u-m-t-30">
-		  <view
-			class="border-bottom-dashed u-p-b-30 u-p-t-30"
-			v-if="orderCostSummary.newUserDiscount"
-		  >
-			<view class="u-flex u-p-l-24 u-p-r-24 u-row-between">
-			  <view>新客立减</view>
-			  <view class="color-red">
-				-￥{{ orderCostSummary.newUserDiscount }}
-			  </view>
 			</view>
-		  </view>
-		  <view
-			class="border-bottom-dashed u-p-b-30 u-p-t-30"
-			v-if="orderCostSummary.vipDiscountAmount"
-		  >
-			<view class="u-flex u-p-l-24 u-p-r-24 u-row-between">
-			  <view>会员折扣</view>
-			  <view class="color-red">
-				-￥{{ orderCostSummary.vipDiscountAmount }}
-			  </view>
+			<view class="u-m-t-10 color-999 old-price" v-if="orderCostSummary.merchantReduction.actualAmount">
+				<text class="">￥</text>
+				<text class=" ">{{ returnMerchantReductionBeforeMoney }}</text>
 			</view>
-		  </view>
-		  <view
-			class="border-bottom-dashed u-p-b-30 u-p-t-30"
-			v-if="orderCostSummary.merchantReduction.actualAmount"
-		  >
-			<view class="u-flex u-p-l-24 u-p-r-24 u-row-between">
-			  <view>商家减免</view>
-			  <view class="color-red">
-				-￥{{ orderCostSummary.merchantReduction.actualAmount }}
-			  </view>
+			<view class="u-m-t-10 u-flex u-row-center color-main">
+				<view @click="discountShow">修改</view>
 			</view>
-		  </view>
-		  <view
-			class="border-bottom-dashed u-p-b-30 u-p-t-30"
-			v-if="
+			<view class="u-m-t-10 u-flex u-row-center color-main u-m-t-24">
+				<view @click="chooseUser()">选择用户</view>
+			</view>
+		</view>
+		<view class="content bg-fff border-r-12">
+			<view class="u-p-l-26 u-p-r-26 card top u-m-t-30">
+				<view class="border-bottom-dashed u-p-b-30 u-p-t-30" v-if="orderCostSummary.newUserDiscount">
+					<view class="u-flex u-p-l-24 u-p-r-24 u-row-between">
+						<view>新客立减</view>
+						<view class="color-red">
+							-￥{{ orderCostSummary.newUserDiscount }}
+						</view>
+					</view>
+				</view>
+				<view class="border-bottom-dashed u-p-b-30 u-p-t-30" v-if="orderCostSummary.vipDiscountAmount">
+					<view class="u-flex u-p-l-24 u-p-r-24 u-row-between">
+						<view>会员折扣</view>
+						<view class="color-red">
+							-￥{{ orderCostSummary.vipDiscountAmount }}
+						</view>
+					</view>
+				</view>
+				<view class="border-bottom-dashed u-p-b-30 u-p-t-30"
+					v-if="orderCostSummary.merchantReduction.actualAmount">
+					<view class="u-flex u-p-l-24 u-p-r-24 u-row-between">
+						<view>商家减免</view>
+						<view class="color-red">
+							-￥{{ orderCostSummary.merchantReduction.actualAmount }}
+						</view>
+					</view>
+				</view>
+				<view class="border-bottom-dashed u-p-b-30 u-p-t-30" v-if="
 			  orderCostSummary.fullReduction.actualAmount &&
 			  orderCostSummary.fullReduction.usedThreshold
-			"
-		  >
-			<view class="u-flex u-p-l-24 u-p-r-24 u-row-between">
-			  <view>满减活动</view>
-			  <view class="color-red">
-				-￥{{ orderCostSummary.fullReduction.actualAmount }}
-			  </view>
-			</view>
-		  </view>
-  
-		  <view class="border-bottom-dashed u-p-b-30 u-p-t-30">
-			<view class="u-flex u-p-l-24 u-p-r-24 u-row-between" @click="toQuan">
-			  <view>优惠券</view>
-			  <view class="color-999 u-flex u-col-center">
-				<text
-				  class="color-red"
-				  v-if="orderCostSummary.fullReduction.usedThreshold"
-				  >满减活动不可与优惠券同享</text
-				>
-				<text v-else-if="orderCostSummary.couponDeductionAmount <= 0"
-				  >选择优惠券</text
-				>
-				<text class="color-red" v-else>
-				  -￥{{ orderCostSummary.couponDeductionAmount }}
-				</text>
-  
-				<view
-				  class="u-flex u-col-center"
-				  v-if="!orderCostSummary.fullReduction.usedThreshold"
-				>
-				  <uni-icons type="right" color="#999"></uni-icons>
-				</view>
-			  </view>
-			</view>
-		  </view>
-  
-		  <view
-			class="border-bottom u-p-b-30"
-			v-if="discount.value || accountPoints.sel"
-		  >
-			<view
-			  class="u-flex u-p-l-24 u-p-r-24 u-row-between u-p-t-30"
-			  v-if="discount.value"
-			>
-			  <view>服务员改价</view>
-			  <view class="u-flex u-col-center">
-				<text style="color: rgb(255, 95, 46)"
-				  >-￥{{ to2(discount.value) }}</text
-				>
-			  </view>
-			</view>
-			<view
-			  class="u-flex u-p-l-24 u-p-r-24 u-row-between u-p-t-30"
-			  v-if="orderCostSummary.pointDeductionAmount && accountPoints.sel"
-			>
-			  <view>积分抵扣</view>
-			  <view class="u-flex u-col-center">
-				<text style="color: rgb(255, 95, 46)"
-				  >-￥{{ orderCostSummary.pointDeductionAmount }}</text
-				>
-			  </view>
-			</view>
-		  </view>
-		</view>
-		<view class="bg-fff border-r-12">
-		  <view class="u-p-t-30 u-p-l-50 u-p-r-50 card bottom">
-			<my-tabs :list="pays.list" v-model="pays.selIndex"></my-tabs>
-			<template v-if="pays.selIndex == 0">
-			  <view class="list">
-				<view
-				  class="item"
-				  @click="changePayType(index, item)"
-				  :class="{ disabled: item.disabled }"
-				  v-for="(item, index) in pays.payTypes.list"
-				  :key="index"
-				>
-				  <view
-					class="u-flex u-row-between u-p-t-30 u-p-b-30 border-bottom"
-				  >
-					<view class="u-flex">
-					  <image class="icon" :src="item.icon" mode=""></image>
-					  <text class="u-m-l-10 no-wrap">{{ item.payName }}</text>
+			">
+					<view class="u-flex u-p-l-24 u-p-r-24 u-row-between">
+						<view>满减活动</view>
+						<view class="color-red">
+							-￥{{ orderCostSummary.fullReduction.actualAmount }}
+						</view>
 					</view>
-					<view class="u-flex color-999 u-font-24">
-					  <view
-						class="u-m-r-20"
-						v-if="item.payType == 'arrears' && pageData.buyer.id"
-						@click.stop="chooseBuyer"
-					  >
-						<view>
-						  <text>挂账人：</text>
-						  <text class="u-m-r-4">{{ pageData.buyer.debtor }}</text>
+				</view>
+
+				<view class="border-bottom-dashed u-p-b-30 u-p-t-30">
+					<view class="u-flex u-p-l-24 u-p-r-24 u-row-between" @click="toQuan">
+						<view>优惠券</view>
+						<view class="color-999 u-flex u-col-center">
+							<text class="color-red"
+								v-if="orderCostSummary.fullReduction.usedThreshold">满减活动不可与优惠券同享</text>
+							<text v-else-if="orderCostSummary.couponDeductionAmount <= 0">选择优惠券</text>
+							<text class="color-red" v-else>
+								-￥{{ orderCostSummary.couponDeductionAmount }}
+							</text>
+
+							<view class="u-flex u-col-center" v-if="!orderCostSummary.fullReduction.usedThreshold">
+								<uni-icons type="right" color="#999"></uni-icons>
+							</view>
 						</view>
-						<view>
-						  <text>挂账额度：</text>
-						  <text
-							>￥{{ pageData.buyer.remainingAmount || "0" }}</text
-						  >
+					</view>
+				</view>
+
+				<view class="border-bottom u-p-b-30" v-if="discount.value || accountPoints.sel">
+					<view class="u-flex u-p-l-24 u-p-r-24 u-row-between u-p-t-30" v-if="discount.value">
+						<view>服务员改价</view>
+						<view class="u-flex u-col-center">
+							<text style="color: rgb(255, 95, 46)">-￥{{ to2(discount.value) }}</text>
 						</view>
-					  </view>
-					  <view
-						class="u-m-r-20"
-						v-if="
+					</view>
+					<view class="u-flex u-p-l-24 u-p-r-24 u-row-between u-p-t-30"
+						v-if="orderCostSummary.pointDeductionAmount && accountPoints.sel">
+						<view>积分抵扣</view>
+						<view class="u-flex u-col-center">
+							<text style="color: rgb(255, 95, 46)">-￥{{ orderCostSummary.pointDeductionAmount }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="bg-fff border-r-12">
+				<view class="u-p-t-30 u-p-l-50 u-p-r-50 card bottom">
+					<my-tabs :list="pays.list" v-model="pays.selIndex"></my-tabs>
+					<template v-if="pays.selIndex == 0">
+						<view class="list">
+							<view class="item" @click="changePayType(index, item)" :class="{ disabled: item.disabled }"
+								v-for="(item, index) in pays.payTypes.list" :key="index">
+								<view class="u-flex u-row-between u-p-t-30 u-p-b-30 border-bottom">
+									<view class="u-flex">
+										<image class="icon" :src="item.icon" mode=""></image>
+										<text class="u-m-l-10 no-wrap">{{ item.payName }}</text>
+									</view>
+									<view class="u-flex color-999 u-font-24">
+										<view class="u-m-r-20" v-if="item.payType == 'arrears' && pageData.buyer.id"
+											@click.stop="chooseBuyer">
+											<view>
+												<text>挂账人：</text>
+												<text class="u-m-r-4">{{ pageData.buyer.debtor }}</text>
+											</view>
+											<view>
+												<text>挂账额度：</text>
+												<text>￥{{ pageData.buyer.remainingAmount || "0" }}</text>
+											</view>
+										</view>
+										<view class="u-m-r-20" v-if="
 						  item.payType == 'member-account' && pageData.user.id
-						"
-						@click.stop="chooseUser"
-					  >
-						<view>
-						  <text>会员：</text>
-						  <text class="u-m-r-4">{{
+						" @click.stop="chooseUser">
+											<view>
+												<text>会员：</text>
+												<text class="u-m-r-4">{{
 							pageData.user.phone || pageData.user.nickName
 						  }}</text>
-						</view>
-						<view>
-						  <text>余额：</text>
-						  <text>￥{{ pageData.user.amount || "0" }}</text>
-						</view>
-						<!-- <view>
+											</view>
+											<view>
+												<text>余额：</text>
+												<text>￥{{ pageData.user.amount || "0" }}</text>
+											</view>
+											<!-- <view>
 												  <text>积分：</text>
 												  <text>{{user.accountPoints||'0'}}</text>
 											  </view> -->
-					  </view>
-					  <view :class="{ op3: item.disabled }">
-						<my-radio
-						  @click="changePayType(index, item)"
-						  :modelValue="index == pays.payTypes.selIndex"
-						>
-						</my-radio>
-					  </view>
+										</view>
+										<view :class="{ op3: item.disabled }">
+											<my-radio @click="changePayType(index, item)"
+												:modelValue="index == pays.payTypes.selIndex">
+											</my-radio>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="border-bottom-dashed"></view>
+						<view class="u-flex u-row-between u-p-t-24" v-if="pageData.user.id"
+							@click="changeAccountPoints">
+							<view class="u-flex">
+								<view class="">积分抵扣</view>
+								<view class="color-999 u-m-l-10">
+									<text>(</text>
+									<text>{{ pageData.user.pointBalance || "0" }}</text>
+									<text>)</text>
+								</view>
+								<!-- <view><text class="color-red font-bold">{{accountPoints.price}}</text>元</view> -->
+							</view>
+							<view class="u-flex">
+								<view class="u-flex">
+									<view><text>{{ userPoints }}</text></view>
+									<view v-if="pointDeductionRule.enableRewards&&accountPoints.sel"
+										@click.stop="refPointsOpen">
+										<up-icon name="edit-pen" size="16" color="#999"></up-icon>
+									</view>
+								</view>
+								<view class="u-m-l-32 u-relative" v-if="pointDeductionRule.enableRewards">
+									<view class="u-absolute position-all"></view>
+									<my-radio :modelValue="accountPoints.sel"> </my-radio>
+								</view>
+							</view>
+						</view>
+						<view class="color-999 u-font-24 u-m-t-16">
+							<view class="" v-if="!pointDeductionRule.enableRewards">
+								<text class="color-red">*</text>
+								<text>积分不可用</text>
+							</view>
+							<view class="" v-if="pointDeductionRule.enableRewards">
+								<text class="color-red">*</text>
+								<text class=""
+									v-if="pointDeductionRule.enableRewards">「可用积分{{ pageData.user.id?pageData.user.pointBalance:0}}，最大可抵扣{{
+						                      maxPointDiscount
+						                    }}元」</text>
+
+							</view>
+						</view>
+						<view class="u-m-t-60 u-p-b-30">
+							<my-button @click="payOrderClick">确认付款</my-button>
+						</view>
+					</template>
+					<template v-if="pays.selIndex == 1">
+						<view class="u-font-32 u-m-t-40 u-text-center">请让顾客使用微信/支付宝扫码</view>
+						<view class="u-flex u-row-center u-m-t-40">
+							<up-qrcode cid="code" :size="140" :val="payCodeUrl"></up-qrcode>
+						</view>
+					</template>
+				</view>
+
+				<!-- 二维码支付扫码 -->
+				<template v-if="pays.selIndex == 1">
+					<view class="card border-bottom top u-m-t-32"> </view>
+					<view class="bg-fff card bottom border-r-12 u-p-32">
+						<view class="font-bold u-font-32 u-text-center">
+							￥{{ payPrice }}</view>
+						<view class="u-flex u-row-center u-m-t-24">
+							<template v-if="order.status == 'unpaid'">
+								<up-loading-icon size="14" text="等待支付"></up-loading-icon>
+							</template>
+							<template v-if="order.status == 'done'">
+								<view class="u-flex pay-success">
+									<up-icon color="#5CBB6F" name="checkmark-circle-fill"></up-icon>
+									<view class="u-m-l-6">支付成功</view>
+								</view>
+							</template>
+						</view>
 					</view>
-				  </view>
-				</view>
-			  </view>
-			  <view class="border-bottom-dashed"></view>
-			  <view
-				class="u-flex u-row-between u-p-t-24"
-				v-if="pageData.user.id"
-				@click="changeAccountPoints"
-			  >
-				<view class="u-flex">
-				  <view class="">积分抵扣</view>
-				  <view class="color-999 u-m-l-10">
-					<text>(</text>
-					<text>{{ pageData.user.accountPoints || "0" }}</text>
-					<text>)</text>
-				  </view>
-				  <!-- <view><text class="color-red font-bold">{{accountPoints.price}}</text>元</view> -->
-				</view>
-				<view class="u-flex">
-				  <view class="u-flex">
-					<view
-					  ><text>{{ accountPoints.num }}</text></view
-					>
-					<view
-					  v-if="accountPoints.calcRes.usable"
-					  @click.stop="refPointsOpen"
-					>
-					  <up-icon name="edit-pen" size="16" color="#999"></up-icon>
-					</view>
-				  </view>
-  
-				  <view
-					class="u-m-l-32 u-relative"
-					v-if="accountPoints.calcRes.usable"
-				  >
-					<view class="u-absolute position-all"></view>
-					<my-radio :modelValue="accountPoints.sel"> </my-radio>
-				  </view>
-				</view>
-			  </view>
-			  <view class="color-999 u-font-24 u-m-t-16">
-				<view class="" v-if="accountPoints.calcRes.unusableReason">
-				  <text class="color-red">*</text>
-				  <text>{{ accountPoints.calcRes.unusableReason }}</text>
-				</view>
-				<view class="" v-if="accountPoints.calcRes.usable">
-				  <text class="color-red">*</text>
-				  <text class="" v-if="accountPoints.calcRes.equivalentPoints"
-					>{{
-					  accountPoints.calcRes.equivalentPoints
-					}}积分等于1元,</text
-				  >
-				  <text>
-					最大抵扣积分{{ accountPoints.calcRes.maxUsablePoints }}
-				  </text>
-				  <text>, 最小抵扣积分0 </text>
-				</view>
-			  </view>
-			  <view class="u-m-t-60 u-p-b-30">
-				<my-button @click="payOrderClick">确认付款</my-button>
-			  </view>
-			</template>
-			<template v-if="pays.selIndex == 1">
-			  <view class="u-font-32 u-m-t-40 u-text-center"
-				>请让顾客使用微信/支付宝扫码</view
-			  >
-			  <view class="u-flex u-row-center u-m-t-40">
-				<up-qrcode cid="code" :size="140" :val="payCodeUrl"></up-qrcode>
-			  </view>
-			</template>
-		  </view>
-  
-		  <!-- 二维码支付扫码 -->
-		  <template v-if="pays.selIndex == 1">
-			<view class="card border-bottom top u-m-t-32"> </view>
-			<view class="bg-fff card bottom border-r-12 u-p-32">
-			  <view class="font-bold u-font-32 u-text-center">
-				￥{{ payPrice }}</view
-			  >
-			  <view class="u-flex u-row-center u-m-t-24">
-				<template v-if="order.status == 'unpaid'">
-				  <up-loading-icon size="14" text="等待支付"></up-loading-icon>
 				</template>
-				<template v-if="order.status == 'done'">
-				  <view class="u-flex pay-success">
-					<up-icon
-					  color="#5CBB6F"
-					  name="checkmark-circle-fill"
-					></up-icon>
-					<view class="u-m-l-6">支付成功</view>
-				  </view>
-				</template>
-			  </view>
 			</view>
-		  </template>
 		</view>
-	  </view>
-  
-	  <edit-discount
-		@confirm="editDiscountConfirm"
-		title="优惠金额"
-		:ref="setModel"
-		name="editMoney"
-		:price="returnMerchantReductionBeforeMoney"
-		:discount="discount.discount"
-	  ></edit-discount>
-  
-	  <up-modal
-		:title="modal.title"
-		:content="modal.content"
-		:show="modal.show"
-		:confirmText="modal.confirmText"
-		:cancelText="modal.cancelText"
-		showCancelButton
-		closeOnClickOverlay
-		@confirm="confirmModelConfirm"
-		@cancel="confirmModelCancel"
-		@close="confirmModelCancel"
-		width="300px"
-	  />
-  
-	  <edit-accountPoints
-		@confirm="pointsConfirm"
-		:price="accountPoints.num"
-		:accountPoints="accountPoints"
-		ref="refPoints"
-	  ></edit-accountPoints>
+
+		<edit-discount @confirm="editDiscountConfirm" title="优惠金额" :ref="setModel" name="editMoney"
+			:price="returnMerchantReductionBeforeMoney" :discount="discount.discount"></edit-discount>
+
+		<up-modal :title="modal.title" :content="modal.content" :show="modal.show" :confirmText="modal.confirmText"
+			:cancelText="modal.cancelText" showCancelButton closeOnClickOverlay @confirm="confirmModelConfirm"
+			@cancel="confirmModelCancel" @close="confirmModelCancel" width="300px" />
+
+		<edit-accountPoints @confirm="pointsConfirm" :price="userPoints" :pointDeductionRule="pointDeductionRule"
+			:maxCanUsePoints="maxCanUsePoints" ref="refPoints"></edit-accountPoints>
 	</view>
-  </template>
-  
-  <script setup>
-  import {
-	reactive,
-	onMounted,
-	nextTick,
-	watch,
-	ref,
-	onBeforeUnmount,
-	computed,
-	inject,
-  } from "vue";
-  import { onLoad, onBackPress, onShow } from "@dcloudio/uni-app";
-  import BigNumber from "bignumber.js";
-  import go from "@/commons/utils/go.js";
-  import infoBox from "@/commons/utils/infoBox.js";
-  import { hasPermission } from "@/commons/utils/hasPermission.js";
-  import editDiscount from "@/components/my-components/edit-discount.vue";
-  import editAccountPoints from "./components/edit-accountPoints.vue";
-  import {
-	returnGoodsPayPriceMap,
-	returnProCoupStartIndex,
-	returnProductCoupAllPrice,
-	returnProductCanUseNum,
-  } from "../quan_util.js";
-  import { mathFloorPrice } from "@/commons/utils/goodsUtil.js";
-  import { getDiscountByUserId } from "@/http/yskApi/market/consumeDiscount.js";
-  
-  // import { getCouponList } from '@/http/api/coupon.js'
-  import { getHistoryOrder } from "@/http/api/order.js";
-  import { getPayTypeList } from "@/http/api/payType.js";
-  import { shopUserDetail } from "@/http/api/shopUser.js";
-  import { discountActivity } from "@/http/yskApi/market/discountActivity.js";
-  
-  import {
-	scanPay,
-	microPay,
-	cashPay,
-	vipPay,
-	creditPay,
-	getOrderPayUrl,
-	queryOrderStatus,
-  } from "@/http/api/pay.js";
-  import {
-	calcUsablePoints,
-	calcDeductionAmount,
-	payedDeductPoints,
-	consumeAwardPoints,
-  } from "@/http/api/points.js";
-  
-  import yskUtils from "ysk-utils";
-//   import yskUtils from "@/lib/index";
-  
-  const websocketUtil = inject("websocketUtil"); // 注入 WebSocket 工具类实例
-  const modal = reactive({
-	title: "提示",
-	cancelText: "取消",
-	confirmText: "确认",
-	content: "",
-	key: "cash",
-	show: false,
-	data: "",
-  });
-  
-  const pageData = reactive({
-	goodsList: [], //菜品列表
-	user: {
-	  //会员信息
-	  userId: null,
-	  amount: 0,
-	},
-	shopInfo: uni.getStorageSync("shopInfo"),
-	buyer: {},
-	payUrlShow: false,
-  });
-  const order = reactive({
-	orderAmount: 0,
-  });
-  
-  const pays = reactive({
-	list: ["扫码收款", "二维码收款"],
-	selIndex: 0,
-	payTypes: {
-	  list: [],
-	  selIndex: 0,
-	},
-	quan: [],
-	seatNum: 0,
-  });
-  //打折相关数据
-  const discount = reactive({
-	discount: 100,
-	currentPrice: 0,
-	value: 0,
-  });
-  
-  const accountPoints = reactive({
-	sel: false,
-	num: 0,
-	calcRes: {
-	  usable: false,
-	  unusableReason: "",
-	  minDeductionPoints: 0,
-	  maxUsablePoints: 0,
-	},
-	price: 0,
-  });
-  let timer = null;
-  
-  const refPoints = ref(null);
-  let payCodeUrl = ref(""); //收款二维码地址
-  onShow(() => {
-	watchChooseuser();
-	watchChoosebuyer();
-	watchChooseQuan();
-  });
-  const options = reactive({});
-  async function getDiscountActivity() {
-	let res = await discountActivity({
-	  shopId: uni.getStorageSync("shopInfo").id||'',
+</template>
+
+<script setup>
+	import {
+		reactive,
+		onMounted,
+		nextTick,
+		watch,
+		ref,
+		onBeforeUnmount,
+		computed,
+		inject,
+	} from "vue";
+	import {
+		onLoad,
+		onBackPress,
+		onShow
+	} from "@dcloudio/uni-app";
+	import BigNumber from "bignumber.js";
+	import go from "@/commons/utils/go.js";
+	import infoBox from "@/commons/utils/infoBox.js";
+	import {
+		hasPermission
+	} from "@/commons/utils/hasPermission.js";
+	import editDiscount from "@/components/my-components/edit-discount.vue";
+	import editAccountPoints from "./components/edit-accountPoints.vue";
+	import {
+		returnGoodsPayPriceMap,
+		returnProCoupStartIndex,
+		returnProductCoupAllPrice,
+		returnProductCanUseNum,
+	} from "../quan_util.js";
+	import {
+		mathFloorPrice
+	} from "@/commons/utils/goodsUtil.js";
+	import {
+		getDiscountByUserId
+	} from "@/http/yskApi/market/consumeDiscount.js";
+	import {
+		pointsConfig
+	} from "@/http/api/market/points.js";
+	// import { getCouponList } from '@/http/api/coupon.js'
+	import {
+		getHistoryOrder
+	} from "@/http/api/order.js";
+	import {
+		getPayTypeList
+	} from "@/http/api/payType.js";
+	import {
+		shopUserDetail
+	} from "@/http/api/shopUser.js";
+	import {
+		discountActivity
+	} from "@/http/yskApi/market/discountActivity.js";
+
+	import {
+		scanPay,
+		microPay,
+		cashPay,
+		vipPay,
+		creditPay,
+		getOrderPayUrl,
+		queryOrderStatus,
+	} from "@/http/api/pay.js";
+	import {
+		calcUsablePoints,
+		calcDeductionAmount,
+		payedDeductPoints,
+		consumeAwardPoints,
+	} from "@/http/api/points.js";
+
+	import yskUtils from "ysk-utils";
+	//   import yskUtils from "@/lib/index";
+
+	const websocketUtil = inject("websocketUtil"); // 注入 WebSocket 工具类实例
+	const modal = reactive({
+		title: "提示",
+		cancelText: "取消",
+		confirmText: "确认",
+		content: "",
+		key: "cash",
+		show: false,
+		data: "",
 	});
-	if (res) {
-	  fullReductionActivities.value = res ? [res] : [];
-	}
-  }
-  onLoad(async (opt) => {
-	Object.assign(order, opt);
-	Object.assign(options, opt);
-	await getPayType();
-	await getDiscountActivity();
-	console.log("pays.payTypes.list");
-	init();
-  });
-  onBeforeUnmount(() => {
-	clearInterval(timer);
-	timer = null;
-  });
-  onBackPress(() => {
-	uni.$emit("orderDetail:update");
-	console.log("onBackPress");
-  });
-  
-  function toDiancai() {
-	setTimeout(() => {
-	  go.to("PAGES_CREATE_ORDER", {}, "redirect");
-	}, 1500);
-  }
-  
-  /**
-   * 初始化
-   */
-  async function init() {
-	nextTick(() => {
-	  onMessage();
+
+	const pageData = reactive({
+		goodsList: [], //菜品列表
+		user: {
+			//会员信息
+			userId: null,
+			amount: 0,
+		},
+		shopInfo: uni.getStorageSync("shopInfo"),
+		buyer: {},
+		payUrlShow: false,
 	});
-	// 获取订单详情
-	const orderRes = await getHistoryOrder({ orderId: order.orderId });
-	if (orderRes.status == "cancelled") {
-	  uni.showToast({
-		title: "订单已取消",
-		icon: "none",
-	  });
-	  toDiancai();
-	  return;
-	}
-	if (orderRes.status == "done") {
-	  uni.showToast({
-		title: "订单已完成",
-		icon: "none",
-	  });
-	  toDiancai();
-	  return;
-	}
-	Object.assign(order, orderRes);
-	pageData.goodsList = objToArrary(orderRes.detailMap);
-  
-	// console.log("order===",order)
-	// console.log("pageData.user===",pageData.user)
-	// 获取用户信息
-  
-	if (order.userId || pageData.user.userId) {
-	  shopUserDetail({
-		userId: order.userId || pageData.user.userId,
-	  }).then((res) => {
+	const order = reactive({
+		orderAmount: 0,
+	});
+
+	const pays = reactive({
+		list: ["扫码收款", "二维码收款"],
+		selIndex: 0,
+		payTypes: {
+			list: [],
+			selIndex: 0,
+		},
+		quan: [],
+		seatNum: 0,
+	});
+	//打折相关数据
+	const discount = reactive({
+		discount: 100,
+		currentPrice: 0,
+		value: 0,
+	});
+
+	const accountPoints = reactive({
+		sel: false,
+		num: 0,
+		calcRes: {
+			usable: false,
+			unusableReason: "",
+			minDeductionPoints: 0,
+			maxUsablePoints: 0,
+		},
+		price: 0,
+	});
+	let timer = null;
+
+	const refPoints = ref(null);
+	let payCodeUrl = ref(""); //收款二维码地址
+	onShow(() => {
+		watchChooseuser();
+		watchChoosebuyer();
+		watchChooseQuan();
+	});
+	const options = reactive({});
+	async function getDiscountActivity() {
+		let res = await discountActivity({
+			shopId: uni.getStorageSync("shopInfo").id || '',
+		});
 		if (res) {
-		  pageData.user = res;
-		  getCalcUsablePoints();
-		  if (orderRes.pointsNum) {
-			accountPoints.sel = true;
-		  }
+			fullReductionActivities.value = res ? [res] : [];
 		}
-	  });
 	}
-	pageData.seatNum = order.seatNum;
-	seatFeeConfig.personCount = order.seatNum;
-  }
-  
-  /**
-   * 判断是否是会员
-   */
-  const isVip = computed(() => {
-	return (
-	  uni.getStorageSync("shopInfo").isMemberPrice &&
-	  pageData.user &&
-	  pageData.user.id &&
-	  pageData.user.isVip
-	);
-  });
-  
-  const coupAllPrice = computed(() => {
-	const n = pays.quan.reduce((prve, cur) => {
-	  return prve + cur.discountAmount * 1;
-	}, 0);
-	return n;
-  });
-  
-  /**
-   * 桌位费
-   */
-  const tableFee = computed(() => {
-	// console.log("桌位费===", order.seatNum > 0 ? order.seatNum*pageData.shopInfo.tableFee : 0)
-	return order.seatNum > 0 ? order.seatNum * pageData.shopInfo.tableFee : 0;
-  });
-  
-  // 计算商家减免前金额（使用bignumber.js确保精度）
-  const returnMerchantReductionBeforeMoney = computed(() => {
-	const total = BigNumber(orderCostSummary.value.finalPayAmount).plus(
-	  orderCostSummary.value.merchantReduction.actualAmount
-	);
-	// 确保结果不小于0，返回数字类型
-	return total.lte(0) ? 0 : total.toNumber();
-  });
-  
-  //选择的优惠券
-  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(() => {
-	console.log("pageData.shopInfo", pageData.shopInfo);
-	if (pageData.shopInfo.isMemberPrice == 1 && pageData.user.isVip == 1) {
-	  return true;
+	async function getPointsConfig() {
+		let res = await pointsConfig();
+		if (res) {
+			const {
+				equivalentPoints,
+				maxDeductionAmount,
+				enableRewards,
+				minPaymentAmount,
+				maxDeductionRatio
+			} = res
+
+			pointDeductionRule.pointsPerYuan = equivalentPoints || 0;
+			pointDeductionRule.maxDeductionAmount = maxDeductionAmount || 0;
+			pointDeductionRule.maxDeductionRatio = maxDeductionRatio || 0;
+			pointDeductionRule.enableRewards = enableRewards || 0;
+			pointDeductionRule.minPaymentAmount = minPaymentAmount || 0;
+			console.log('pointDeductionRule', pointDeductionRule);
+		}
 	}
-	return false;
-  });
-  //新客立减
-  const newUserDiscount = ref(0);
-  //满减活动
-  const fullReductionActivities = ref([]);
-  // 商家霸王餐配置
-  const freeDineConfig = ref(null);
-  //店铺用户
-  const shopUserInfo = ref({});
-  //限时折扣
-  const limitTimeDiscount = ref(null);
-  // const orderExtraConfig = reactive({
-  //   // 引用扩展后的商家减免配置
-  //   merchantReduction: merchantReductionConfig,
-  //   additionalFee: 0,
-  //   pointDeductionRule: pointDeductionRule,
-  //   seatFeeConfig: seatFeeConfig,
-  //   currentStoreId: "",
-  //   userPoints: userPoints.value,
-  //   isMember: useVipPrice.value,
-  //   memberDiscountRate: 1,
-  //   newUserDiscount: newUserDiscount.value,
-  //   fullReductionActivities: fullReductionActivities.value,
-  //   currentDinnerType: options.dinnerType,
-  //   isFreeDine: false, //霸王餐
-  //   freeDineConfig: freeDineConfig.value,
-  //   limitTimeDiscount: order.limitRate,
-  //   shopUserInfo: shopUserInfo.value,
-  // });
-  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: options.dinnerType,
-	  isFreeDine: false, //霸王餐
-	  freeDineConfig: freeDineConfig.value,
-	  limitTimeDiscount: order.limitRate,
-	  shopUserInfo: pageData.user,
-	};
-  });
-  // 订单费用汇总
-  const orderCostSummary = computed(() => {
-	const costSummary = yskUtils.OrderPriceCalculator.calculateOrderCostSummary(
-	  pageData.goodsList,
-	  options.dinnerType,
-	  selCoupon.value,
-	  activityList.value,
-	  orderExtraConfig.value,
-	  {},
-	  new Date()
-	);
-	console.log(" 订单费用汇总", costSummary);
-	return costSummary;
-  });
-  
-  //积分可抵扣最大金额
-  const pointsCanDicountMaxMoney = computed(() => {
-	const maxMoney =
-	  orderCostSummary.value.finalPayAmount +
-	  orderCostSummary.value.pointDeductionAmount;
-	console.log("pointsCanDicountMaxMoney.value", maxMoney);
-	return maxMoney;
-  });
-  
-  /**
-   * 支付金额
-   */
-  const payPrice = computed(() => {
-	return orderCostSummary.value.finalPayAmount;
-  });
-  
-  watch(
-	() => accountPoints.sel,
-	(newval) => {
-	  if (newval) {
-		userPoints.value = accountPoints.num;
-	  } else {
-		userPoints.value = 0;
-	  }
-	}
-  );
-  watch(
-	() => accountPoints.num,
-	(newval) => {
-	  if (accountPoints.sel) {
-		userPoints.value = newval;
-	  }
-	}
-  );
-  watch(
-	() => pointsCanDicountMaxMoney.value,
-	(newval) => {
-	  if (pageData.user.id) {
-		getCalcUsablePoints();
-	  }
-	}
-  );
-  watch(
-	() => pageData.user.id,
-	(newval) => {
-	  if (newval) {
-		getCalcUsablePoints();
-	  }
-	}
-  );
-  watch(
-	() => orderCostSummary.value.finalPayAmount,
-	(newval) => {
-	  if (pageData.payUrlShow) {
+	onLoad(async (opt) => {
+		Object.assign(order, opt);
+		Object.assign(options, opt);
+		await getPayType();
+		await getDiscountActivity();
+		await getPointsConfig()
+		console.log("pays.payTypes.list");
+		init();
+	});
+	onBeforeUnmount(() => {
+		clearInterval(timer);
+		timer = null;
+	});
+	onBackPress(() => {
+		uni.$emit("orderDetail:update");
+		console.log("onBackPress");
+	});
+
+	function toDiancai() {
 		setTimeout(() => {
-		  getPayUrl();
-		});
-	  }
-	  if (newval <= 0) {
-		const arr = ["cash", "member-account"];
-		pays.payTypes.list.map((v) => {
-		  if (arr.includes(v.payType)) {
-			v.disabled = false;
-		  } else {
-			v.disabled = true;
-		  }
-		});
-		const index = pays.payTypes.list.findIndex((v) => !v.disabled);
-		pays.payTypes.selIndex = index;
-	  } else {
-		pays.payTypes.list.map((v) => {
-		  v.disabled = false;
-		});
-	  }
-	},
-	{
-	  immediate: true,
-	}
-  );
-  
-  watch(
-	() => pays.selIndex,
-	(newval) => {
-	  clearInterval(timer);
-	  if (newval) {
-		timer = setInterval(() => {
-		  getHistoryOrder({ orderId: order.orderId }).then((res) => {
-			order.status = res.status;
-			if (res.status == "done") {
-			  paySuccess();
-			}
-		  });
-		}, 2000);
-		if (newval == 1) {
-		  getPayUrl();
-		}
-	  }
-	}
-  );
-  
-  function getPayParam() {
-	let params = {
-	  shopId: uni.getStorageSync("shopInfo").id||'',
-	  orderId: order.id,
-	  originAmount: orderCostSummary.value.goodsRealAmount, //订单原金额（不包含打包费+餐位费）
-	  discountRatio: 1,
-	  discountAmount: orderCostSummary.value.merchantReduction.actualAmount, //手动优惠金额
-	  productCouponDiscountAmount: orderCostSummary.value.productCouponDeduction, //商品优惠券抵扣金额
-	  otherCouponDiscountAmount: orderCostSummary.value.fullCouponDeduction, //其他优惠券抵扣金额
-	  couponList: selCoupon.value.map((v) => v.id), //用户使用的卡券
-	  orderAmount: orderCostSummary.value.finalPayAmount, // 订单金额
-	  roundAmount: 0, //抹零金额 减免多少钱
-	  pointsDiscountAmount: orderCostSummary.value.pointDeductionAmount, //积分抵扣金额(tb_points_basic_setting表)
-	  pointsNum: orderCostSummary.value.pointUsed, //(扣除各类折扣 enable_deduction后使用)
-	  seatNum: options.dinnerType == "dine-in" ? seatFeeConfig.personCount : 0, //用餐人数
-	  newCustomerDiscountAmount: orderCostSummary.value.newUserDiscount, //新客立减
-	  newCustomerDiscountId:
-		orderCostSummary.value.newUserDiscount > 0
-		  ? newUserDiscountRes.value.id
-		  : "",
-  
-	  discountActAmount: orderCostSummary.value.fullReduction.actualAmount, //满减抵扣金额
-	  discountActId:
-		orderCostSummary.value.fullReduction.usedActivity &&
-		orderCostSummary.value.fullReduction.usedThreshold
-		  ? orderCostSummary.value.fullReduction.usedActivity.id
-		  : null,
-	  vipPrice: isVip.value ? 1 : 0, // 是否使用会员价
-	  limitRate:
-		order.limitRate && order.limitRate.id
-		  ? {
-			  id: order.limitRate.id,
-			  discountRate: order.limitRate.discountRate,
-			  discountPriority: order.limitRate.discountPriority,
-			  foodType: order.limitRate.foodType,
-			  foods: order.limitRate.foods,
-			}
-		  : null,
-	  vipDiscountAmount: orderCostSummary.value.vipDiscountAmount, //会员折扣减免金额
-	};
-	if (pays.quan.length > 0) {
-	  pays.quan.forEach((v) => {
-		params.couponList.push(v.id);
-	  });
-	}
-	params.couponList = params.couponList.join(",");
-	// params.couponList = JSON.stringify(params.couponList)
-	return params;
-  }
-  
-  /**
-   * 获取店铺订单支付URL
-   */
-  function getPayUrl() {
-	console.log("支付参数 ===", getPayParam());
-	let par = getPayParam();
-	let params = {
-	  shopId: uni.getStorageSync("shopInfo").id||'',
-	  ...par,
-	};
-	if (order.userId || pageData.user.userId) {
-	  params.userId = order.userId || pageData.user.userId;
-	}
-	getOrderPayUrl(params).then((res) => {
-	  console.log(res, "tishi");
-	  payCodeUrl.value = res;
-	  pageData.payUrlShow = true;
-	});
-  }
-  
-  /**
-   * 获取支付方式
-   */
-  async function getPayType() {
-	const payTypeList = await getPayTypeList();
-	pays.payTypes.list = [];
-	const arr = ["cash", "member-account"];
-	payTypeList.map((v) => {
-	  if (v.payType != "bank") {
-		let disabled = false;
-		if (orderCostSummary.value.finalPayAmount <= 0) {
-		  if (arr.includes(v.payType)) {
-			disabled = false;
-		  } else {
-			disabled = true;
-		  }
-		}
-		pays.payTypes.list.push({
-		  ...v,
-		  disabled,
-		});
-	  }
-	});
-  }
-  
-  /**
-   * 设置优惠券/商品券
-   * @param {Object} arr
-   */
-  function setQuan(arr) {
-	selCoupon.value = arr;
-	console.log("赋值优惠券", arr);
-  }
-  
-  /**
-   * 积分选择
-   */
-  function refPointsOpen() {
-	if (!accountPoints.calcRes.usable && accountPoints.sel) {
-	  return;
-	}
-	refPoints.value.open();
-  }
-  
-  /**
-   * 积分确认
-   * @param {Object} e
-   */
-  function pointsConfirm(e) {
-	accountPoints.num = e;
-  }
-  
-  /**
-   * 获取积分信息
-   * @param {Object} orderAmount
-   */
-  async function getCalcUsablePoints() {
-	if (!pageData.user.userId) {
-	  return;
-	}
-	const res = await calcUsablePoints({
-	  shopUserId: pageData.user.id,
-	  orderAmount: pointsCanDicountMaxMoney.value,
-	});
-	console.log("getCalcUsablePoints", res);
-	if(res){
-		pointDeductionRule.pointsPerYuan = res.equivalentPoints;
-	pointDeductionRule.maxDeductionAmount = res.maxDeductionAmount;
-	accountPoints.calcRes = res;
-	accountPoints.num = res.maxUsablePoints;
+			go.to("PAGES_CREATE_ORDER", {}, "redirect");
+		}, 1500);
 	}
 
-	return res;
-  }
-  
-  function changeAccountPoints() {
-	if (!accountPoints.calcRes.usable) {
-	  return;
-	}
-	accountPoints.sel = !accountPoints.sel;
-	if (!accountPoints.sel) {
-	  accountPoints.num = 0;
-	}
-  }
-  
-  /**
-   * 选择优惠券
-   */
-  function toQuan() {
-	if (orderCostSummary.value.fullReduction.usedThreshold) {
-	  return infoBox.showToast("满减活动不可与优惠券同享");
-	}
-	if (!order.userId && !pageData.user.id) {
-	  return infoBox.showToast("请先选择会员", 0.5).then(() => {
-		chooseUser();
-	  });
-	}
-	uni.setStorageSync("selCoupon", selCoupon.value);
-  
-	go.to("PAGES_ORDER_QUAN", {
-	  orderId: order.id,
-	  shopUserId: pageData.user.id,
-	  orderPrice: BigNumber(payPrice.value).plus(BigNumber(orderCostSummary.value.couponDeductionAmount)).decimalPlaces(2, BigNumber.ROUND_DOWN)
-	});
-  }
-  
-  /**
-   * 判断是否可以修改金额
-   */
-  async function discountShow() {
-	const bol = await hasPermission("yun_xu_da_zhe");
-	if (bol) {
-	  showModel("editMoney", true);
-	}
-  }
-  
-  /**
-   * 积分金额处理
-   * @param {Object} n
-   */
-  function to2(n) {
-	if (!n) {
-	  return "";
-	}
-	return Number(n).toFixed(2);
-  }
-  
-  /**
-   * 优惠券选择
-   */
-  function watchChooseQuan() {
-	uni.$off("selCoupon");
-	uni.$on("selCoupon", function (data) {
-	  setQuan(data);
-	});
-  }
-  
-  /**
-   * 删除优惠券
-   * @param {Object} i
-   */
-  function delQuan(i) {
-	pays.quan.splice(i, 1);
-	discount.discount = 100;
-	discount.value = 0;
-  }
-  
-  /**
-   * 选择用户
-   */
-  function chooseUser() {
-	go.to("PAGES_CHOOSE_USER");
-  }
-  
-  /**
-   * 更新选择用户
-   */
-  function watchChooseuser() {
-	uni.$off("choose-user");
-	uni.$on("choose-user", (data) => {
-	  pageData.user = data;
-	});
-  }
-  
-  watch(
-	() => pageData.user.id,
-	(newval) => {
-	  selCoupon.value = [];
-	  accountPoints.sel = false;
-	  merchantReductionConfig.fixedAmount = 0;
-	  // 更新购物车和历史订单数据
-	  uodateCartAndHistory();
-	  if (newval) {
-		getNewUserDiscount();
-		// getShopUserDetail();
-	  }
-	}
-  );
-  
-  /**
-   * 更新购物车和历史订单数据
-   */
-  function uodateCartAndHistory() {
-	let newData = {
-	  history: [],
-	  cart: [],
-	};
-	for (let cart of pageData.goodsList) {
-	  const canUseLimitTimeDiscount = yskUtils.limitUtils.canUseLimitTimeDiscount(
-		cart,
-		order.limitRate,
-		pageData.shopInfo,
-		pageData.user,
-		"productId"
-	  )
-		? 1
-		: 0;
-	  if (canUseLimitTimeDiscount != cart.isTimeDiscount) {
-		newData.history.push({
-		  id: cart.id,
-		  is_time_discount: canUseLimitTimeDiscount,
+	/**
+	 * 初始化
+	 */
+	async function init() {
+		nextTick(() => {
+			onMessage();
 		});
-	  }
-	}
-  
-	if (newData.history.length <= 0 && newData.cart.length <= 0) {
-	  return;
-	}
-  
-	websocketUtil.send(
-	  JSON.stringify({
-		type: "pad",
-		account: uni.getStorageSync("shopInfo").id,
-		shop_id: uni.getStorageSync("shopInfo").id,
-		operate_type: "bulk_edit",
-		table_code: order.takeCode,
-		data: newData,
-	  })
-	);
-  }
-  
-  function getShopUserDetail() {
-	shopUserDetail({
-	  // shopId: uni.getStorageSync("shopInfo").id,
-	  id: pageData.user.id,
-	}).then((res) => {
-	  if (res) {
-		pageData.user = res;
-	  }
-	});
-  }
-  
-  const newUserDiscountRes = ref(null);
-  //获取用户新客立减
-  function getNewUserDiscount() {
-	getDiscountByUserId({
-	  shopUserId: pageData.user.id,
-	}).then((res) => {
-	  if (res) {
-		newUserDiscount.value = res.amount || 0;
-		newUserDiscountRes.value = res;
-	  }
-	});
-  }
-  
-  /**
-   * 选择挂账人
-   */
-  function chooseBuyer() {
-	go.to("PAGES_CHOOSE_BUYER");
-  }
-  
-  /**
-   * 更新选择挂账人
-   */
-  function watchChoosebuyer() {
-	uni.$off("choose-buyer");
-	uni.$on("choose-buyer", (data) => {
-	  pageData.buyer = data;
-	});
-  }
-  
-  /**
-   * 修改价格确认
-   * @param {Object} form
-   */
-  function editDiscountConfirm(form) {
-	accountPoints.sel = false;
-	console.log(form);
-	const discount = BigNumber(returnMerchantReductionBeforeMoney.value)
-	  .minus(form.currentPrice)
-	  .toNumber();
-	merchantReductionConfig.fixedAmount = discount;
-  }
-  
-  /**
-   * 支付方式选择
-   * @param {Object} i
-   * @param {Object} item
-   */
-  function changePayType(i, item) {
-	if (item.disabled) {
-	  return infoBox.showToast(item.payName + "不可用");
-	}
-	pays.payTypes.selIndex = i;
-	if (item.payType == "member-account" && !pageData.user.id) {
-	  chooseUser();
-	}
-	if (item.payType == "arrears" && !pageData.buyer.id) {
-	  chooseBuyer();
-	}
-  }
-  
-  const models = new Map();
-  
-  function setModel(el) {
-	if (el && el.$attrs["name"]) {
-	  models.set(el.$attrs["name"], el);
-	}
-  }
-  
-  function showModel(key) {
-	const model = models.get(key);
-	model && model.open();
-  }
-  
-  let payStatus = "";
-  
-  /**
-   * 确认付款
-   */
-  const tipsMap = {
-	paying: "支付中",
-	success: "已支付成功",
-  };
-  function payOrderClick() {
-	const payType = pays.payTypes.list[pays.payTypes.selIndex].payType;
-	if (payType == "scanCode" || payType == "deposit") {
-	  return saomaPay(payType);
-	}
-	if (payType == "cash" && payPrice.value * 1 > 0) {
-	  return cashConfirmShow();
-	}
-	if (
-	  payType == "arrears" &&
-	  pageData.buyer.remainingAmount < payPrice.value * 1
-	) {
-	  return infoBox.showToast("挂账额度不足");
-	}
-	if (
-	  payType == "member-account" &&
-	  pageData.user.amount * 1 < payPrice.value * 1
-	) {
-	  return infoBox.showToast("余额不足");
-	}
-	if (payStatus) {
-	  return infoBox.showToast(tipsMap[payStatus]);
-	}
-	try {
-	  pay();
-	} catch (e) {
-	  //TODO handle the exception
-	  payStatus = "";
-	}
-  }
-  
-  /**
-   * 支付调佣
-   * @param {Object} par
-   */
-  async function pay(par) {
-	const payType = pays.payTypes.list[pays.payTypes.selIndex].payType;
-	let pars = getPayParam();
-	payStatus = "paying";
-	let params = {
-	  shopId: uni.getStorageSync("shopInfo").id||'',
-	  checkOrderPay: {
-		...pars,
-	  },
-	  ...par,
-	};
-	if (order.userId || pageData.user.userId) {
-	  params.checkOrderPay.userId = order.userId || pageData.user.userId;
-	}
-	if (payType == "arrears") {
-	  params.creditBuyerId = pageData.buyer.id;
-	}
-	let payRes = null;
-	try {
-	  if (payType == "scanCode") {
-		payRes = await microPay(params);
-	  }
-	  if (payType == "cash") {
-		payRes = await cashPay(params);
-	  }
-	  if (payType == "arrears") {
-		payRes = await creditPay(params);
-	  }
-	  if (payType == "member-account" || payType == "deposit") {
-		if (pageData.user.amount * 1 >= payPrice.value * 1) {
-		  params.payType = "userPay";
-		  params.shopUserId = pageData.user.id;
-		  payRes = await vipPay(params);
-		} else {
-		  infoBox.showToast("余额不足");
-		  return;
+		// 获取订单详情
+		const orderRes = await getHistoryOrder({
+			orderId: order.orderId
+		});
+		if (orderRes.status == "cancelled") {
+			uni.showToast({
+				title: "订单已取消",
+				icon: "none",
+			});
+			toDiancai();
+			return;
 		}
-	  }
-	} catch (error) {
-	  console.log(error);
-	  let res;
-	  let timer;
-	  if (error.code == 211 && error.msg == "等待用户付款") {
-		uni.showLoading({
-		  title: "支付中...",
-		});
-		timer = setInterval(async () => {
-		  res = await queryOrderStatus({ orderId: pars.orderId });
-		  if (res == "done") {
+		if (orderRes.status == "done") {
+			uni.showToast({
+				title: "订单已完成",
+				icon: "none",
+			});
+			toDiancai();
+			return;
+		}
+		Object.assign(order, orderRes);
+		pageData.goodsList = objToArrary(orderRes.detailMap);
+
+		// console.log("order===",order)
+		// console.log("pageData.user===",pageData.user)
+		// 获取用户信息
+
+		if (order.userId || pageData.user.userId) {
+			shopUserDetail({
+				userId: order.userId || pageData.user.userId,
+			}).then((res) => {
+				if (res) {
+					pageData.user = res;
+					getCalcUsablePoints();
+					if (orderRes.pointsNum) {
+						accountPoints.sel = true;
+					}
+				}
+			});
+		}
+		pageData.seatNum = order.seatNum;
+		seatFeeConfig.personCount = order.seatNum;
+	}
+
+	/**
+	 * 判断是否是会员
+	 */
+	const isVip = computed(() => {
+		return (
+			uni.getStorageSync("shopInfo").isMemberPrice &&
+			pageData.user &&
+			pageData.user.id &&
+			pageData.user.isVip
+		);
+	});
+
+	const coupAllPrice = computed(() => {
+		const n = pays.quan.reduce((prve, cur) => {
+			return prve + cur.discountAmount * 1;
+		}, 0);
+		return n;
+	});
+
+	/**
+	 * 桌位费
+	 */
+	const tableFee = computed(() => {
+		// console.log("桌位费===", order.seatNum > 0 ? order.seatNum*pageData.shopInfo.tableFee : 0)
+		return order.seatNum > 0 ? order.seatNum * pageData.shopInfo.tableFee : 0;
+	});
+
+	// 计算商家减免前金额（使用bignumber.js确保精度）
+	const returnMerchantReductionBeforeMoney = computed(() => {
+		const total = BigNumber(orderCostSummary.value.finalPayAmount).plus(
+			orderCostSummary.value.merchantReduction.actualAmount
+		);
+		// 确保结果不小于0，返回数字类型
+		return total.lte(0) ? 0 : total.toNumber();
+	});
+
+	//选择的优惠券
+	const selCoupon = ref([]);
+	//活动列表
+	const activityList = ref([]);
+	// 商家减免，初始配置：默认无减免（固定金额 0 元）
+	const merchantReductionConfig = reactive({
+		type: "fixed_amount",
+		fixedAmount: 0,
+	});
+	//积分规则
+	const pointDeductionRule = reactive({
+		enableRewards: 0, //是否开启
+		pointsPerYuan: 0,
+		maxDeductionAmount: Infinity,
+		maxDeductionRatio: 0, //积分抵扣比例
+		minPaymentAmount: 0, //门槛
+	});
+	//餐费费
+	const seatFeeConfig = reactive({
+		pricePerPerson: pageData.shopInfo.tableFee || 0,
+		personCount: 0, //就餐人数
+		isEnabled: !pageData.shopInfo.isTableFee,
+	});
+	//使用积分数量
+	const userPoints = ref(0);
+	//是否使用会员价
+	const useVipPrice = computed(() => {
+		console.log("pageData.shopInfo", pageData.shopInfo);
+		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 shopUserInfo = ref({});
+	//限时折扣
+	const limitTimeDiscount = ref(null);
+	// const orderExtraConfig = reactive({
+	//   // 引用扩展后的商家减免配置
+	//   merchantReduction: merchantReductionConfig,
+	//   additionalFee: 0,
+	//   pointDeductionRule: pointDeductionRule,
+	//   seatFeeConfig: seatFeeConfig,
+	//   currentStoreId: "",
+	//   userPoints: userPoints.value,
+	//   isMember: useVipPrice.value,
+	//   memberDiscountRate: 1,
+	//   newUserDiscount: newUserDiscount.value,
+	//   fullReductionActivities: fullReductionActivities.value,
+	//   currentDinnerType: options.dinnerType,
+	//   isFreeDine: false, //霸王餐
+	//   freeDineConfig: freeDineConfig.value,
+	//   limitTimeDiscount: order.limitRate,
+	//   shopUserInfo: shopUserInfo.value,
+	// });
+	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: options.dinnerType,
+			isFreeDine: false, //霸王餐
+			freeDineConfig: freeDineConfig.value,
+			limitTimeDiscount: order.limitRate,
+			shopUserInfo: pageData.user,
+		};
+	});
+	// 订单费用汇总
+	const orderCostSummary = computed(() => {
+		const costSummary = yskUtils.OrderPriceCalculator.calculateOrderCostSummary(
+			pageData.goodsList,
+			options.dinnerType,
+			selCoupon.value,
+			activityList.value,
+			orderExtraConfig.value, {},
+			new Date()
+		);
+		console.log(" 订单费用汇总", costSummary);
+		return costSummary;
+	});
+
+	//积分可抵扣最大金额
+	const pointsCanDicountMaxMoney = computed(() => {
+		const maxMoney =
+			orderCostSummary.value.finalPayAmount +
+			orderCostSummary.value.pointDeductionAmount;
+		console.log("pointsCanDicountMaxMoney.value", maxMoney);
+		return maxMoney;
+	});
+
+	/**
+	 * 支付金额
+	 */
+	const payPrice = computed(() => {
+		return orderCostSummary.value.finalPayAmount;
+	});
+
+	watch(
+		() => accountPoints.sel,
+		(newval) => {
+			if (newval) {
+				userPoints.value = maxCanUsePoints.value
+			} else {
+				userPoints.value = 0;
+			}
+		}
+	);
+
+	watch(
+		() => pointsCanDicountMaxMoney.value,
+		(newval) => {
+			if (pageData.user.id) {
+				getCalcUsablePoints();
+			}
+		}
+	);
+	watch(
+		() => pageData.user.id,
+		(newval) => {
+			if (newval) {
+				getCalcUsablePoints();
+			}
+		}
+	);
+	watch(
+		() => orderCostSummary.value.finalPayAmount,
+		(newval) => {
+			if (pageData.payUrlShow) {
+				setTimeout(() => {
+					getPayUrl();
+				});
+			}
+			if (newval <= 0) {
+				const arr = ["cash", "member-account"];
+				pays.payTypes.list.map((v) => {
+					if (arr.includes(v.payType)) {
+						v.disabled = false;
+					} else {
+						v.disabled = true;
+					}
+				});
+				const index = pays.payTypes.list.findIndex((v) => !v.disabled);
+				pays.payTypes.selIndex = index;
+			} else {
+				pays.payTypes.list.map((v) => {
+					v.disabled = false;
+				});
+			}
+		}, {
+			immediate: true,
+		}
+	);
+
+	watch(
+		() => pays.selIndex,
+		(newval) => {
 			clearInterval(timer);
-			uni.hideLoading();
-			paySuccess();
-		  }
-		  console.log(res);
-		}, 1000);
-	  }
-	  if (error.code == 701) {
-		uni.removeStorageSync("table_code");
-		uni.navigateBack();
-	  }
-	  payStatus = "";
-	  return false;
-	}
-	paySuccess();
-
-	
-  }
-  
-  /**
-   * 支付成功回调
-   */
-  function paySuccess() {
-	infoBox.showToast("支付成功");
-	payStatus = "success";
-	setTimeout(() => {
-	  // uni.$emit('orderDetail:update')
-	  uni.$emit("get:table");
-	  uni.$emit("update:orderDetail");
-	  uni.navigateBack({
-		delta: 1,
-	  });
-	  websocketUtil.send(
-		JSON.stringify({
-		  type: "onboc",
-		  account: uni.getStorageSync("iToken").loginId,
-		  shop_id: uni.getStorageSync("shopInfo").id||'',
-		  operate_type: "cleanup",
-		  table_code: order.tableCode,
-		})
-	  );
-	}, 1500);
-  }
-  
-  /**
-   * 弹窗关闭
-   */
-  function confirmModelCancel() {
-	if (modal.key == "fullCoupon") {
-	  // 取消改价
-	  discount.discount = 100;
-	  discount.value = 0;
-	}
-	modal.show = false;
-	modal.key = "";
-	modal.data = "";
-  }
-  
-  /**
-   * 弹窗确认
-   */
-  async function confirmModelConfirm() {
-	if (modal.key == "cash") {
-	  await pay();
-	  confirmModelCancel();
-	  return;
-	}
-	if (modal.key == "fullCoupon") {
-	  //删除满减券
-	  const index = pays.quan.findIndex((v) => v.type == 1);
-	  pays.quan.splice(index, 1);
-	  return;
-	}
-  }
-  function objToArrary(obj) {
-	if (Object.values(obj) && Array.isArray(Object.values(obj)[0])) {
-	  // 是数组
-	  let arr = [];
-	  Object.values(obj).forEach((item) => {
-		item.map((v) => {
-		  v.salePrice = v.salePrice ? v.salePrice : v.price;
-		  v.number = v.num;
-		  v.packFee = v.packAmount || 0;
-		  return v;
-		});
-		arr = [...arr, ...item];
-	  });
-	  return arr;
-	} else {
-	  // 不是数组
-	  return Object.keys(obj).map((key) => {
-		return obj[key];
-	  });
-	}
-  }
-  /**
-   * 扫码/储值卡支付
-   */
-  function saomaPay() {
-	const item = pays.payTypes.list[pays.payTypes.selIndex];
-	uni.scanCode({
-	  onlyFromCamera: true,
-	  success: function (res) {
-		console.log("条码类型：" + res.scanType);
-		console.log("条码内容：" + res.result);
-  
-		pay({
-		  authCode: res.result,
-		});
-	  },
-	});
-  }
-  
-  /**
-   * 现金支付唤起
-   */
-  function cashConfirmShow() {
-	modal.content = "是否确认已现金收款" + payPrice.value;
-	modal.key = "cash";
-	modal.show = true;
-  }
-  
-  /**
-   * 获取历史订单并更新商品列表
-   */
-  async function getHistoryAndUpdateGoodsList() {
-	// 获取订单详情
-	const orderRes = await getHistoryOrder({ orderId: order.orderId });
-	if (orderRes.status == "cancelled") {
-	  uni.showToast({
-		title: "订单已取消",
-		icon: "none",
-	  });
-	  toDiancai();
-	  return;
-	}
-	if (orderRes.status == "done") {
-	  uni.showToast({
-		title: "订单已完成",
-		icon: "none",
-	  });
-	  toDiancai();
-	  return;
-	}
-	Object.assign(order, orderRes);
-	pageData.goodsList = objToArrary(orderRes.detailMap);
-	pageData.seatNum = order.seatNum;
-  }
-  /**
-   * socket消息监听
-   */
-  function onMessage() {
-	websocketUtil.offMessage();
-	websocketUtil.onMessage((res) => {
-	  let msg = JSON.parse(res);
-	  console.log("onMessage", msg);
-	  switch (msg.operate_type) {
-		case "pad_init":
-		  getHistoryAndUpdateGoodsList();
-		  break;
-		case "pad_add":
-		case "add":
-		  break;
-		case "pad_edit":
-		case "edit":
-		  break;
-		case "bulk_edit":
-		  getHistoryAndUpdateGoodsList();
-		  break;
-		case "pad_del":
-		case "del":
-		  break;
-		case "pad_cleanup":
-		case "cleanup":
-		  break;
-		case "product_update":
-		  break;
-		case "pad_batch":
-		  break;
-	  }
-	});
-  }
-  </script>
-  
-  <style lang="scss" scoped>
-  $quan-color: #318afe;
-  
-  .op3 {
-	opacity: 0.3;
-  }
-  
-  .hui {
-	// background-color: $quan-color;
-	background-image: linear-gradient(
-	  to right bottom,
-	  rgb(254, 103, 4),
-	  rgb(241, 50, 42)
+			if (newval) {
+				timer = setInterval(() => {
+					getHistoryOrder({
+						orderId: order.orderId
+					}).then((res) => {
+						order.status = res.status;
+						if (res.status == "done") {
+							paySuccess();
+						}
+					});
+				}, 2000);
+				if (newval == 1) {
+					getPayUrl();
+				}
+			}
+		}
 	);
-	padding: 4rpx 10rpx;
-	border-radius: 10rpx;
-	font-size: 24rpx;
-	color: #fff;
-  }
-  
-  .box-shadow {
-	box-shadow: 0 0 5px #e5e5e5;
-  }
-  
-  .pay-success {
-	color: #5cbb6f;
-  }
-  
-  .icon {
-	width: 40rpx;
-	height: 40rpx;
-  }
-  
-  .border-bottom-dashed {
-	border-bottom: 1px dashed #bbb;
-  }
-  
-  .border-bottom {
-	border-color: rgb(240, 240, 240);
-  }
-  
-  .list {
-	.item {
-	  &.disabled {
-		color: #999;
-	  }
+
+	function getPayParam() {
+		let params = {
+			shopId: uni.getStorageSync("shopInfo").id || '',
+			orderId: order.id,
+			originAmount: orderCostSummary.value.goodsRealAmount, //订单原金额（不包含打包费+餐位费）
+			discountRatio: 1,
+			discountAmount: orderCostSummary.value.merchantReduction.actualAmount, //手动优惠金额
+			productCouponDiscountAmount: orderCostSummary.value.productCouponDeduction, //商品优惠券抵扣金额
+			otherCouponDiscountAmount: orderCostSummary.value.fullCouponDeduction, //其他优惠券抵扣金额
+			couponList: selCoupon.value.map((v) => v.id), //用户使用的卡券
+			orderAmount: orderCostSummary.value.finalPayAmount, // 订单金额
+			roundAmount: 0, //抹零金额 减免多少钱
+			pointsDiscountAmount: orderCostSummary.value.pointDeductionAmount, //积分抵扣金额(tb_points_basic_setting表)
+			pointsNum: orderCostSummary.value.pointUsed, //(扣除各类折扣 enable_deduction后使用)
+			seatNum: options.dinnerType == "dine-in" ? seatFeeConfig.personCount : 0, //用餐人数
+			newCustomerDiscountAmount: orderCostSummary.value.newUserDiscount, //新客立减
+			newCustomerDiscountId: orderCostSummary.value.newUserDiscount > 0 ?
+				newUserDiscountRes.value.id : "",
+
+			discountActAmount: orderCostSummary.value.fullReduction.actualAmount, //满减抵扣金额
+			discountActId: orderCostSummary.value.fullReduction.usedActivity &&
+				orderCostSummary.value.fullReduction.usedThreshold ?
+				orderCostSummary.value.fullReduction.usedActivity.id : null,
+			vipPrice: isVip.value ? 1 : 0, // 是否使用会员价
+			limitRate: order.limitRate && order.limitRate.id ? {
+				id: order.limitRate.id,
+				discountRate: order.limitRate.discountRate,
+				discountPriority: order.limitRate.discountPriority,
+				foodType: order.limitRate.foodType,
+				foods: order.limitRate.foods,
+			} : null,
+			vipDiscountAmount: orderCostSummary.value.vipDiscountAmount, //会员折扣减免金额
+		};
+		if (pays.quan.length > 0) {
+			pays.quan.forEach((v) => {
+				params.couponList.push(v.id);
+			});
+		}
+		params.couponList = params.couponList.join(",");
+		// params.couponList = JSON.stringify(params.couponList)
+		return params;
 	}
-  
-	.item:last-child {
-	  .border-bottom {
-		border-bottom: none;
-	  }
+
+	/**
+	 * 获取店铺订单支付URL
+	 */
+	function getPayUrl() {
+		console.log("支付参数 ===", getPayParam());
+		let par = getPayParam();
+		let params = {
+			shopId: uni.getStorageSync("shopInfo").id || '',
+			...par,
+		};
+		if (order.userId || pageData.user.userId) {
+			params.userId = order.userId || pageData.user.userId;
+		}
+		getOrderPayUrl(params).then((res) => {
+			console.log(res, "tishi");
+			payCodeUrl.value = res;
+			pageData.payUrlShow = true;
+		});
 	}
-  }
-  
-  .old-price {
-	text-decoration: line-through;
-  }
-  
-  .price-fuhao {
-	font-size: 24px;
-  }
-  
-  .price {
-	font-size: 32px;
-  }
-  
-  $dotSize: 20rpx;
-  $position: calc($dotSize / (-2));
-  
-  .card {
-	position: relative;
-  
-	&::after,
-	&:before {
-	  content: "";
-	  display: block;
-	  position: absolute;
-	  background-color: #f9f9f9;
-	  width: $dotSize;
-	  height: $dotSize;
-	  border-radius: 50%;
+
+	/**
+	 * 获取支付方式
+	 */
+	async function getPayType() {
+		const payTypeList = await getPayTypeList();
+		pays.payTypes.list = [];
+		const arr = ["cash", "member-account"];
+		payTypeList.map((v) => {
+			if (v.payType != "bank") {
+				let disabled = false;
+				if (orderCostSummary.value.finalPayAmount <= 0) {
+					if (arr.includes(v.payType)) {
+						disabled = false;
+					} else {
+						disabled = true;
+					}
+				}
+				pays.payTypes.list.push({
+					...v,
+					disabled,
+				});
+			}
+		});
 	}
-  
-	&.top {
-	  &::after {
-		right: $position;
-		bottom: $position;
-	  }
-  
-	  &:before {
-		left: $position;
-		bottom: $position;
-	  }
+
+	/**
+	 * 设置优惠券/商品券
+	 * @param {Object} arr
+	 */
+	function setQuan(arr) {
+		selCoupon.value = arr;
+		console.log("赋值优惠券", arr);
 	}
-  
-	&.bottom {
-	  &::after {
-		right: $position;
-		top: $position;
-	  }
-  
-	  &:before {
-		left: $position;
-		top: $position;
-	  }
+
+	/**
+	 * 积分选择
+	 */
+	function refPointsOpen() {
+		if (!pointDeductionRule.enableRewards && accountPoints.sel) {
+			return;
+		}
+		refPoints.value.open();
 	}
-  }
-  </style>
\ No newline at end of file
+
+
+	/**
+	 * 积分确认
+	 * @param {Object} e
+	 */
+	function pointsConfirm(e) {
+		userPoints.value = e
+	}
+
+	const maxPointDiscount = ref(0)
+	const maxCanUsePoints = ref(0)
+
+	/**
+	 * 获取积分信息
+	 * @param {Object} orderAmount
+	 */
+	async function getCalcUsablePoints() {
+		if (!pageData.user.userId) {
+			return;
+		}
+
+
+		let userAccountPoints = pageData.user ? pageData.user.pointBalance * 1 : 0;
+
+		//1积分等于多少钱
+		const onePointsMoney = pointDeductionRule.pointsPerYuan ? ((1 || 0) / pointDeductionRule.pointsPerYuan) : 0
+
+
+		const calcMaxDiscount = Math.floor(pointsCanDicountMaxMoney.value * (pointDeductionRule.maxDeductionRatio /
+			100))
+		const userMaxDiscount = BigNumber(userAccountPoints).times(onePointsMoney).decimalPlaces(2, BigNumber
+				.ROUND_DOWN)
+			.toNumber()
+
+		maxPointDiscount.value = Math.min(calcMaxDiscount, userMaxDiscount)
+		console.log('积分最大可抵扣金额', maxPointDiscount.value)
+		pointDeductionRule.maxDeductionAmount = maxPointDiscount.value || 0
+		if (pointDeductionRule.enableRewards) {
+			let num = (maxPointDiscount.value || 0) * pointDeductionRule.pointsPerYuan
+			if (num > userAccountPoints) {
+				num = userAccountPoints
+			}
+			maxCanUsePoints.value = num
+			if (accountPoints.sel) {
+				userPoints.value = num
+			}
+		}
+
+		if (!pointDeductionRule.enableRewards) {
+			userPoints.value = 0
+		}
+		console.log('maxCanUsePoints.value', maxCanUsePoints.value)
+	}
+
+	function changeAccountPoints() {
+		if (!pointDeductionRule.enableRewards) {
+			return;
+		}
+		accountPoints.sel = !accountPoints.sel;
+		if (!accountPoints.sel) {
+			accountPoints.num = 0;
+		}
+	}
+
+	/**
+	 * 选择优惠券
+	 */
+	function toQuan() {
+		if (orderCostSummary.value.fullReduction.usedThreshold) {
+			return infoBox.showToast("满减活动不可与优惠券同享");
+		}
+		if (!order.userId && !pageData.user.id) {
+			return infoBox.showToast("请先选择会员", 0.5).then(() => {
+				chooseUser();
+			});
+		}
+		uni.setStorageSync("selCoupon", selCoupon.value);
+
+		go.to("PAGES_ORDER_QUAN", {
+			orderId: order.id,
+			shopUserId: pageData.user.id,
+			orderPrice: BigNumber(payPrice.value).plus(BigNumber(orderCostSummary.value.couponDeductionAmount))
+				.decimalPlaces(2, BigNumber.ROUND_DOWN)
+		});
+	}
+
+	/**
+	 * 判断是否可以修改金额
+	 */
+	async function discountShow() {
+		const bol = await hasPermission("yun_xu_da_zhe");
+		if (bol) {
+			showModel("editMoney", true);
+		}
+	}
+
+	/**
+	 * 积分金额处理
+	 * @param {Object} n
+	 */
+	function to2(n) {
+		if (!n) {
+			return "";
+		}
+		return Number(n).toFixed(2);
+	}
+
+	/**
+	 * 优惠券选择
+	 */
+	function watchChooseQuan() {
+		uni.$off("selCoupon");
+		uni.$on("selCoupon", function(data) {
+			setQuan(data);
+		});
+	}
+
+	/**
+	 * 删除优惠券
+	 * @param {Object} i
+	 */
+	function delQuan(i) {
+		pays.quan.splice(i, 1);
+		discount.discount = 100;
+		discount.value = 0;
+	}
+
+	/**
+	 * 选择用户
+	 */
+	function chooseUser() {
+		go.to("PAGES_CHOOSE_USER");
+	}
+
+	/**
+	 * 更新选择用户
+	 */
+	function watchChooseuser() {
+		uni.$off("choose-user");
+		uni.$on("choose-user", (data) => {
+			pageData.user = data;
+		});
+	}
+
+	watch(
+		() => pageData.user.id,
+		(newval) => {
+			selCoupon.value = [];
+			accountPoints.sel = false;
+			merchantReductionConfig.fixedAmount = 0;
+			// 更新购物车和历史订单数据
+			uodateCartAndHistory();
+			if (newval) {
+				getNewUserDiscount();
+				// getShopUserDetail();
+			}
+		}
+	);
+
+	/**
+	 * 更新购物车和历史订单数据
+	 */
+	function uodateCartAndHistory() {
+		let newData = {
+			history: [],
+			cart: [],
+		};
+		for (let cart of pageData.goodsList) {
+			const canUseLimitTimeDiscount = yskUtils.limitUtils.canUseLimitTimeDiscount(
+					cart,
+					order.limitRate,
+					pageData.shopInfo,
+					pageData.user,
+					"productId"
+				) ?
+				1 :
+				0;
+			if (canUseLimitTimeDiscount != cart.isTimeDiscount) {
+				newData.history.push({
+					id: cart.id,
+					is_time_discount: canUseLimitTimeDiscount,
+				});
+			}
+		}
+
+		if (newData.history.length <= 0 && newData.cart.length <= 0) {
+			return;
+		}
+
+		websocketUtil.send(
+			JSON.stringify({
+				type: "pad",
+				account: uni.getStorageSync("shopInfo").id,
+				shop_id: uni.getStorageSync("shopInfo").id,
+				operate_type: "bulk_edit",
+				table_code: order.takeCode,
+				data: newData,
+			})
+		);
+	}
+
+	function getShopUserDetail() {
+		shopUserDetail({
+			// shopId: uni.getStorageSync("shopInfo").id,
+			id: pageData.user.id,
+		}).then((res) => {
+			if (res) {
+				pageData.user = res;
+			}
+		});
+	}
+
+	const newUserDiscountRes = ref(null);
+	//获取用户新客立减
+	function getNewUserDiscount() {
+		getDiscountByUserId({
+			shopUserId: pageData.user.id,
+		}).then((res) => {
+			if (res) {
+				newUserDiscount.value = res.amount || 0;
+				newUserDiscountRes.value = res;
+			}
+		});
+	}
+
+	/**
+	 * 选择挂账人
+	 */
+	function chooseBuyer() {
+		go.to("PAGES_CHOOSE_BUYER");
+	}
+
+	/**
+	 * 更新选择挂账人
+	 */
+	function watchChoosebuyer() {
+		uni.$off("choose-buyer");
+		uni.$on("choose-buyer", (data) => {
+			pageData.buyer = data;
+		});
+	}
+
+	/**
+	 * 修改价格确认
+	 * @param {Object} form
+	 */
+	function editDiscountConfirm(form) {
+		accountPoints.sel = false;
+		console.log(form);
+		const discount = BigNumber(returnMerchantReductionBeforeMoney.value)
+			.minus(form.currentPrice)
+			.toNumber();
+		merchantReductionConfig.fixedAmount = discount;
+	}
+
+	/**
+	 * 支付方式选择
+	 * @param {Object} i
+	 * @param {Object} item
+	 */
+	function changePayType(i, item) {
+		if (item.disabled) {
+			return infoBox.showToast(item.payName + "不可用");
+		}
+		pays.payTypes.selIndex = i;
+		if (item.payType == "member-account" && !pageData.user.id) {
+			chooseUser();
+		}
+		if (item.payType == "arrears" && !pageData.buyer.id) {
+			chooseBuyer();
+		}
+	}
+
+	const models = new Map();
+
+	function setModel(el) {
+		if (el && el.$attrs["name"]) {
+			models.set(el.$attrs["name"], el);
+		}
+	}
+
+	function showModel(key) {
+		const model = models.get(key);
+		model && model.open();
+	}
+
+	let payStatus = "";
+
+	/**
+	 * 确认付款
+	 */
+	const tipsMap = {
+		paying: "支付中",
+		success: "已支付成功",
+	};
+
+	function payOrderClick() {
+		const payType = pays.payTypes.list[pays.payTypes.selIndex].payType;
+		if (payType == "scanCode" || payType == "deposit") {
+			return saomaPay(payType);
+		}
+		if (payType == "cash" && payPrice.value * 1 > 0) {
+			return cashConfirmShow();
+		}
+		if (
+			payType == "arrears" &&
+			pageData.buyer.remainingAmount < payPrice.value * 1
+		) {
+			return infoBox.showToast("挂账额度不足");
+		}
+		if (
+			payType == "member-account" &&
+			pageData.user.amount * 1 < payPrice.value * 1
+		) {
+			return infoBox.showToast("余额不足");
+		}
+		if (payStatus) {
+			return infoBox.showToast(tipsMap[payStatus]);
+		}
+		try {
+			pay();
+		} catch (e) {
+			//TODO handle the exception
+			payStatus = "";
+		}
+	}
+
+	/**
+	 * 支付调佣
+	 * @param {Object} par
+	 */
+	async function pay(par) {
+		const payType = pays.payTypes.list[pays.payTypes.selIndex].payType;
+		let pars = getPayParam();
+		payStatus = "paying";
+		let params = {
+			shopId: uni.getStorageSync("shopInfo").id || '',
+			checkOrderPay: {
+				...pars,
+			},
+			...par,
+		};
+		if (order.userId || pageData.user.userId) {
+			params.checkOrderPay.userId = order.userId || pageData.user.userId;
+		}
+		if (payType == "arrears") {
+			params.creditBuyerId = pageData.buyer.id;
+		}
+		let payRes = null;
+		try {
+			if (payType == "scanCode") {
+				payRes = await microPay(params);
+			}
+			if (payType == "cash") {
+				payRes = await cashPay(params);
+			}
+			if (payType == "arrears") {
+				payRes = await creditPay(params);
+			}
+			if (payType == "member-account" || payType == "deposit") {
+				if (pageData.user.amount * 1 >= payPrice.value * 1) {
+					params.payType = "userPay";
+					params.shopUserId = pageData.user.id;
+					payRes = await vipPay(params);
+				} else {
+					infoBox.showToast("余额不足");
+					return;
+				}
+			}
+		} catch (error) {
+			console.log(error);
+			let res;
+			let timer;
+			if (error.code == 211 && error.msg == "等待用户付款") {
+				uni.showLoading({
+					title: "支付中...",
+				});
+				timer = setInterval(async () => {
+					res = await queryOrderStatus({
+						orderId: pars.orderId
+					});
+					if (res == "done") {
+						clearInterval(timer);
+						uni.hideLoading();
+						paySuccess();
+					}
+					console.log(res);
+				}, 1000);
+			}
+			if (error.code == 701) {
+				uni.removeStorageSync("table_code");
+				uni.navigateBack();
+			}
+			payStatus = "";
+			return false;
+		}
+		paySuccess();
+
+
+	}
+
+	/**
+	 * 支付成功回调
+	 */
+	function paySuccess() {
+		infoBox.showToast("支付成功");
+		payStatus = "success";
+		setTimeout(() => {
+			// uni.$emit('orderDetail:update')
+			uni.$emit("get:table");
+			uni.$emit("update:orderDetail");
+			uni.navigateBack({
+				delta: 1,
+			});
+			websocketUtil.send(
+				JSON.stringify({
+					type: "onboc",
+					account: uni.getStorageSync("iToken").loginId,
+					shop_id: uni.getStorageSync("shopInfo").id || '',
+					operate_type: "cleanup",
+					table_code: order.tableCode,
+				})
+			);
+		}, 1500);
+	}
+
+	/**
+	 * 弹窗关闭
+	 */
+	function confirmModelCancel() {
+		if (modal.key == "fullCoupon") {
+			// 取消改价
+			discount.discount = 100;
+			discount.value = 0;
+		}
+		modal.show = false;
+		modal.key = "";
+		modal.data = "";
+	}
+
+	/**
+	 * 弹窗确认
+	 */
+	async function confirmModelConfirm() {
+		if (modal.key == "cash") {
+			await pay();
+			confirmModelCancel();
+			return;
+		}
+		if (modal.key == "fullCoupon") {
+			//删除满减券
+			const index = pays.quan.findIndex((v) => v.type == 1);
+			pays.quan.splice(index, 1);
+			return;
+		}
+	}
+
+	function objToArrary(obj) {
+		if (Object.values(obj) && Array.isArray(Object.values(obj)[0])) {
+			// 是数组
+			let arr = [];
+			Object.values(obj).forEach((item) => {
+				item.map((v) => {
+					v.salePrice = v.salePrice ? v.salePrice : v.price;
+					v.number = v.num;
+					v.packFee = v.packAmount || 0;
+					return v;
+				});
+				arr = [...arr, ...item];
+			});
+			return arr;
+		} else {
+			// 不是数组
+			return Object.keys(obj).map((key) => {
+				return obj[key];
+			});
+		}
+	}
+	/**
+	 * 扫码/储值卡支付
+	 */
+	function saomaPay() {
+		const item = pays.payTypes.list[pays.payTypes.selIndex];
+		uni.scanCode({
+			onlyFromCamera: true,
+			success: function(res) {
+				console.log("条码类型：" + res.scanType);
+				console.log("条码内容：" + res.result);
+
+				pay({
+					authCode: res.result,
+				});
+			},
+		});
+	}
+
+	/**
+	 * 现金支付唤起
+	 */
+	function cashConfirmShow() {
+		modal.content = "是否确认已现金收款" + payPrice.value;
+		modal.key = "cash";
+		modal.show = true;
+	}
+
+	/**
+	 * 获取历史订单并更新商品列表
+	 */
+	async function getHistoryAndUpdateGoodsList() {
+		// 获取订单详情
+		const orderRes = await getHistoryOrder({
+			orderId: order.orderId
+		});
+		if (orderRes.status == "cancelled") {
+			uni.showToast({
+				title: "订单已取消",
+				icon: "none",
+			});
+			toDiancai();
+			return;
+		}
+		if (orderRes.status == "done") {
+			uni.showToast({
+				title: "订单已完成",
+				icon: "none",
+			});
+			toDiancai();
+			return;
+		}
+		Object.assign(order, orderRes);
+		pageData.goodsList = objToArrary(orderRes.detailMap);
+		pageData.seatNum = order.seatNum;
+	}
+	/**
+	 * socket消息监听
+	 */
+	function onMessage() {
+		websocketUtil.offMessage();
+		websocketUtil.onMessage((res) => {
+			let msg = JSON.parse(res);
+			console.log("onMessage", msg);
+			switch (msg.operate_type) {
+				case "pad_init":
+					getHistoryAndUpdateGoodsList();
+					break;
+				case "pad_add":
+				case "add":
+					break;
+				case "pad_edit":
+				case "edit":
+					break;
+				case "bulk_edit":
+					getHistoryAndUpdateGoodsList();
+					break;
+				case "pad_del":
+				case "del":
+					break;
+				case "pad_cleanup":
+				case "cleanup":
+					break;
+				case "product_update":
+					break;
+				case "pad_batch":
+					break;
+			}
+		});
+	}
+</script>
+
+<style lang="scss" scoped>
+	$quan-color: #318afe;
+
+	.op3 {
+		opacity: 0.3;
+	}
+
+	.hui {
+		// background-color: $quan-color;
+		background-image: linear-gradient(to right bottom,
+				rgb(254, 103, 4),
+				rgb(241, 50, 42));
+		padding: 4rpx 10rpx;
+		border-radius: 10rpx;
+		font-size: 24rpx;
+		color: #fff;
+	}
+
+	.box-shadow {
+		box-shadow: 0 0 5px #e5e5e5;
+	}
+
+	.pay-success {
+		color: #5cbb6f;
+	}
+
+	.icon {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.border-bottom-dashed {
+		border-bottom: 1px dashed #bbb;
+	}
+
+	.border-bottom {
+		border-color: rgb(240, 240, 240);
+	}
+
+	.list {
+		.item {
+			&.disabled {
+				color: #999;
+			}
+		}
+
+		.item:last-child {
+			.border-bottom {
+				border-bottom: none;
+			}
+		}
+	}
+
+	.old-price {
+		text-decoration: line-through;
+	}
+
+	.price-fuhao {
+		font-size: 24px;
+	}
+
+	.price {
+		font-size: 32px;
+	}
+
+	$dotSize: 20rpx;
+	$position: calc($dotSize / (-2));
+
+	.card {
+		position: relative;
+
+		&::after,
+		&:before {
+			content: "";
+			display: block;
+			position: absolute;
+			background-color: #f9f9f9;
+			width: $dotSize;
+			height: $dotSize;
+			border-radius: 50%;
+		}
+
+		&.top {
+			&::after {
+				right: $position;
+				bottom: $position;
+			}
+
+			&:before {
+				left: $position;
+				bottom: $position;
+			}
+		}
+
+		&.bottom {
+			&::after {
+				right: $position;
+				top: $position;
+			}
+
+			&:before {
+				left: $position;
+				top: $position;
+			}
+		}
+	}
+</style>
\ No newline at end of file