diff --git a/package-lock.json b/package-lock.json
index 53483a8..55b9fab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,10 +9,21 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
+        "decimal.js": "^10.6.0",
+        "js-md5": "^0.8.3",
         "moment": "^2.30.1",
         "ydui-district": "^1.1.0"
-      },
-      "devDependencies": {}
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg=="
+    },
+    "node_modules/js-md5": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.8.3.tgz",
+      "integrity": "sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ=="
     },
     "node_modules/moment": {
       "version": "2.30.1",
@@ -29,6 +40,16 @@
     }
   },
   "dependencies": {
+    "decimal.js": {
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg=="
+    },
+    "js-md5": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.8.3.tgz",
+      "integrity": "sha512-qR0HB5uP6wCuRMrWPTrkMaev7MJZwJuuw4fnwAzRgP4J4/F8RwtodOKpGp4XpqsLBFzzgqIO42efFAyz2Et6KQ=="
+    },
     "moment": {
       "version": "2.30.1",
       "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
diff --git a/package.json b/package.json
index 8d1b0c0..b464371 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,11 @@
   "description": "",
   "main": "main.js",
   "dependencies": {
+    "decimal.js": "^10.6.0",
+    "js-md5": "^0.8.3",
     "moment": "^2.30.1",
     "ydui-district": "^1.1.0"
   },
-  "devDependencies": {},
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/static/js/request.js b/static/js/request.js
index f885069..a8bfb5d 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import store from '@/store';
-
+import md5 from 'js-md5';
 // 定义 API URL
 const DEV_API_URL = 'http://1.13.193.49';
 // const DEV_API_URL = 'https://epic.js-dyyj.com';
@@ -81,6 +81,16 @@ Vue.prototype.Post = (params = {}, apiurl,customUrl) => {
         uni.showLoading({
             title: '加载中'
         });
+		let userID = ''
+		const userInfoFromStorage = uni.getStorageSync('userInfo');
+		if (userInfoFromStorage) {
+		    const userInfo = JSON.parse(userInfoFromStorage);
+		    if (userInfo.id) {
+		        userID =  userInfo.id.toString();
+		    }
+		}
+		let time = new Date().getTime()
+		let sign = userID+ time
         uni.request({
             method: params.method || 'GET',
             url:baseUrl  + apiurl,
@@ -89,9 +99,10 @@ Vue.prototype.Post = (params = {}, apiurl,customUrl) => {
                 'content-type': 'application/json',
                 'token': token || '',
 				'userId': getUserId() || '',
+				'sign':md5(md5(sign.toString())),
+				'timestamp':time
             },
             success: (res) => {
-                console.log('success', res.data);
                 uni.hideLoading()
                 if (res.data.code === 200 || res.data.code === 1) {
                     resolve(res.data);
diff --git a/subPackages/points/index.vue b/subPackages/points/index.vue
index 3136fa5..37daba0 100644
--- a/subPackages/points/index.vue
+++ b/subPackages/points/index.vue
@@ -1,748 +1,775 @@
 <template>
-	<view class="points-detail-page">
-		<!-- 积分总览 -->
-		<view class="points-overview">
-			<view class="total-points">
-				<text class="points-number">{{ totalPoints }}</text>
-				<text class="points-label">当前积分</text>
-			</view>
-			<!-- 时间奖励值 -->
-			<view class="time-reward" @click="showExchangeModal">
-				<view class="reward-icon">
-					<nmr-icon name="jifenduihuan" style="margin-right: 10rpx;margin-top: 3rpx;" size="40"
-						color="white"></nmr-icon>兑换奖励
-				</view>
-			</view>
-		</view>
-
-		<!-- 筛选选项 -->
-		<view class="filter-tabs">
-			<view class="tab-item" :class="[{ active: currentTab === 'all' }]" @click="switchTab('all')">
-				全部
-			</view>
-			<view class="tab-item" :class="[{ active: currentTab === 'in' }]" @click="switchTab('in')">
-				收入
-			</view>
-			<view class="tab-item" :class="[{ active: currentTab === 'out' }]" @click="switchTab('out')">
-				支出
-			</view>
-		</view>
-
-		<!-- 积分记录列表 -->
-		<scroll-view class="points-list" scroll-y="true" @scrolltolower="loadMore">
-			<template v-if="pointsList.length">
-				<view class="record-item" v-for="(item, index) in pointsList" :key="index">
-					<view class="record-left">
-						<view class="record-icon" :class="item.fromType === 'in' ? 'income' : 'expense'">
-							<nmr-icon name="jifen" size="60" color="#333"></nmr-icon>
-						</view>
-						<view class="record-info">
-							<view class="record-title">{{ item.dictName }}</view>
-							<view class="record-desc">{{ item.remark }}</view>
-							<view class="record-time">{{ item.createTime }}</view>
-						</view>
-					</view>
-					<view class="record-right">
-						<view class="record-points" :class="item.fromType === 'in' ? 'income' : 'expense'">
-							{{ item.points }}
-						</view>
-					</view>
-				</view>
-
-				<!-- 加载更多提示 -->
-				<view class="load-more" v-if="hasMore">
-					<text class="load-text">{{
-		     loading ? "加载中..." : "上拉加载更多"
-		   }}</text>
-				</view>
-
-				<!-- 没有更多数据 -->
-				<view class="no-more" v-if="!hasMore && pointsList.length > 0">
-					<text class="no-more-text">没有更多数据了</text>
-				</view>
-			</template>
-
-			<!-- 空状态 -->
-			<view class="empty-state" v-if="pointsList.length === 0 && !loading">
-				<image class="empty-icon"
-					src="https://epic.js-dyyj.com/uploads/20250808/c16267f9cc2b7a68bf23713b5847987e.png"
-					mode="aspectFit"></image>
-				<text class="empty-text">暂无积分记录</text>
-			</view>
-		</scroll-view>
-
-		<!-- 兑换弹窗 -->
-		<uni-popup ref="exchangePopup" type="center" :mask-click="false">
-			<view class="exchange-modal">
-				<view class="modal-header">
-					<text class="modal-title">时间奖励兑换</text>
-					<view class="close-btn" @click="closeExchangeModal">
-						<uni-icons type="closeempty" size="20" color="#999"></uni-icons>
-					</view>
-				</view>
-
-				<view class="modal-content">
-					<view class="current-reward">
-						<text class="reward-label">当前时间奖励值：</text>
-						<text class="reward-value">{{ userInfo&&userInfo.hourValue||0 }}</text>
-					</view>
-
-					<view class="exchange-form">
-						<view class="form-item">
-							<text class="form-label">兑换数量：</text>
-							<input class="form-input" v-model="exchangeAmount" type="number" placeholder="请输入兑换数量" />
-						</view>
-					</view>
-
-					<view class="exchange-rules">
-						<text class="rules-title">兑换规则：</text>
-						<view class="rules-list">
-							<text class="rule-item">• 1个时间奖励值 = {{pointInfo.points||0}}积分</text>
-
-						</view>
-					</view>
-				</view>
-
-				<view class="modal-footer">
-					<button class="cancel-btn" @click="closeExchangeModal">取消</button>
-					<button class="confirm-btn" @click="confirmExchange">确认兑换</button>
-				</view>
-			</view>
-		</uni-popup>
-	</view>
+  <view class="points-detail-page">
+    <!-- 积分总览 -->
+    <view class="points-overview">
+      <view class="total-points">
+        <text class="points-number">{{ totalPoints }}</text>
+        <text class="points-label">当前积分</text>
+      </view>
+      <!-- 时间奖励值 -->
+      <view class="time-reward" @click="showExchangeModal">
+        <view class="reward-icon">
+          <nmr-icon
+            name="jifenduihuan"
+            style="margin-right: 10rpx; margin-top: 3rpx"
+            size="40"
+            color="white"
+          ></nmr-icon
+          >兑换奖励
+        </view>
+      </view>
+    </view>
+
+    <!-- 筛选选项 -->
+    <view class="filter-tabs">
+      <view
+        class="tab-item"
+        :class="[{ active: currentTab === 'all' }]"
+        @click="switchTab('all')"
+      >
+        全部
+      </view>
+      <view
+        class="tab-item"
+        :class="[{ active: currentTab === 'in' }]"
+        @click="switchTab('in')"
+      >
+        收入
+      </view>
+      <view
+        class="tab-item"
+        :class="[{ active: currentTab === 'out' }]"
+        @click="switchTab('out')"
+      >
+        支出
+      </view>
+    </view>
+
+    <!-- 积分记录列表 -->
+    <scroll-view class="points-list" scroll-y="true" @scrolltolower="loadMore">
+      <template v-if="pointsList.length">
+        <view
+          class="record-item"
+          v-for="(item, index) in pointsList"
+          :key="index"
+        >
+          <view class="record-left">
+            <view
+              class="record-icon"
+              :class="item.fromType === 'in' ? 'income' : 'expense'"
+            >
+              <nmr-icon name="jifen" size="60" color="#333"></nmr-icon>
+            </view>
+            <view class="record-info">
+              <view class="record-title">{{ item.dictName }}</view>
+              <view class="record-desc">{{ item.remark }}</view>
+              <view class="record-time">{{ item.createTime }}</view>
+            </view>
+          </view>
+          <view class="record-right">
+            <view
+              class="record-points"
+              :class="item.fromType === 'in' ? 'income' : 'expense'"
+            >
+              {{ item.points }}
+            </view>
+          </view>
+        </view>
+
+        <!-- 加载更多提示 -->
+        <view class="load-more" v-if="hasMore">
+          <text class="load-text">{{
+            loading ? "加载中..." : "上拉加载更多"
+          }}</text>
+        </view>
+
+        <!-- 没有更多数据 -->
+        <view class="no-more" v-if="!hasMore && pointsList.length > 0">
+          <text class="no-more-text">没有更多数据了</text>
+        </view>
+      </template>
+
+      <!-- 空状态 -->
+      <view class="empty-state" v-if="pointsList.length === 0 && !loading">
+        <image
+          class="empty-icon"
+          src="https://epic.js-dyyj.com/uploads/20250808/c16267f9cc2b7a68bf23713b5847987e.png"
+          mode="aspectFit"
+        ></image>
+        <text class="empty-text">暂无积分记录</text>
+      </view>
+    </scroll-view>
+
+    <!-- 兑换弹窗 -->
+    <uni-popup ref="exchangePopup" type="center" :mask-click="false">
+      <view class="exchange-modal">
+        <view class="modal-header">
+          <text class="modal-title">时间奖励兑换</text>
+          <view class="close-btn" @click="closeExchangeModal">
+            <uni-icons type="closeempty" size="20" color="#999"></uni-icons>
+          </view>
+        </view>
+
+        <view class="modal-content">
+          <view class="current-reward">
+            <text class="reward-label">当前时间奖励值：</text>
+            <text class="reward-value">{{
+              (userInfo && userInfo.hourValue) || 0
+            }}</text>
+          </view>
+
+          <view class="exchange-form">
+            <view class="form-item">
+              <text class="form-label">兑换数量：</text>
+              <input
+                class="form-input"
+                v-model="exchangeAmount"
+                type="number"
+                placeholder="请输入兑换数量"
+              />
+            </view>
+          </view>
+
+          <view class="exchange-rules">
+            <text class="rules-title">兑换规则：</text>
+            <view class="rules-list">
+              <text class="rule-item"
+                >• 1个时间奖励值 = {{ pointInfo.points || 0 }}积分</text
+              >
+            </view>
+          </view>
+        </view>
+
+        <view class="modal-footer">
+          <button class="cancel-btn" @click="closeExchangeModal">取消</button>
+          <button class="confirm-btn" @click="confirmExchange">确认兑换</button>
+        </view>
+      </view>
+    </uni-popup>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				totalPoints: 0,
-				currentTab: "all",
-				pointsList: [],
-				page: 1,
-				pageSize: 20,
-				hasMore: true,
-				loading: false,
-				refreshing: false,
-				userInfo: null,
-				timeReward: 0,
-				exchangeAmount: '',
-				exchangeResult: 0,
-				pointInfo: null
-			};
-		},
-
-
-
-		onLoad() {
-			this.getUserInfo();
-			this.loadPointsData();
-			this.getTotalPoints();
-		},
-
-		methods: {
-			getUserInfo() {
-
-				this.Post({}, "/framework/user/getInfo", "DES").then((res) => {
-					this.userInfo =
-						(uni.getStorageSync("userInfo") &&
-							JSON.parse(uni.getStorageSync("userInfo"))) ||
-						this.$store.state.user.userInfo || {};
-					res.data.token = this.userInfo.token;
-					uni.setStorageSync("userInfo", JSON.stringify(res.data));
-					this.userInfo = res.data;
-				});
-			},
-			// 返回上一页
-			goBack() {
-				uni.navigateBack();
-			},
-
-			// 切换筛选标签
-			switchTab(tab) {
-				if (this.currentTab === tab) return;
-				this.currentTab = tab;
-				this.resetData();
-				this.loadPointsData();
-			},
-
-			// 重置数据
-			resetData() {
-				this.pointsList = [];
-				this.page = 1;
-				this.hasMore = true;
-			},
-
-			// 获取总积分
-			async getTotalPoints() {
-				try {
-					this.Post({}, '/framework/points/getLastBalance', 'DES').then(res => {
-						if (res.code === 200) {
-							this.pointInfo = res.data
-							this.totalPoints = res.data.balance || 0;
-						}
-					})
-
-				} catch (error) {
-					console.error("获取总积分失败:", error);
-				}
-			},
-
-			// 加载积分数据
-			async loadPointsData() {
-				if (this.loading) return;
-
-				this.loading = true;
-
-				try {
-					const params = {
-						page: this.page,
-						pageSize: this.pageSize,
-					};
-
-					if (this.currentTab !== "all") {
-						params.fromType = this.currentTab;
-					}
-
-					this.Post(params, '/framework/points/list', 'DES')
-						.then(res => {
-							console.log(res)
-							if (res.code === 200) {
-								const newData = res.rows || [];
-
-								if (this.page === 1) {
-									this.pointsList = newData;
-								} else {
-									this.pointsList = [...this.pointsList, ...newData];
-								}
-
-								this.hasMore = newData.length === this.pageSize;
-
-								if (this.hasMore) {
-									this.page++;
-								}
-							} else {
-								uni.showToast({
-									title: res.msg || "加载失败",
-									icon: "none",
-								});
-							}
-						})
-
-
-				} catch (error) {
-					console.error("加载积分记录失败:", error);
-					uni.showToast({
-						title: "网络错误，请重试",
-						icon: "none",
-					});
-				} finally {
-					this.loading = false;
-					this.refreshing = false;
-				}
-			},
-
-			// 加载更多
-			loadMore() {
-				if (this.hasMore && !this.loading) {
-					this.loadPointsData();
-				}
-			},
-
-			// 下拉刷新
-			onRefresh() {
-				this.refreshing = true;
-				this.resetData();
-				this.loadPointsData();
-				this.getTotalPoints();
-			},
-
-
-
-
-
-			// 显示兑换弹窗
-			showExchangeModal() {
-				this.$refs.exchangePopup.open();
-			},
-
-			// 关闭兑换弹窗
-			closeExchangeModal() {
-				this.$refs.exchangePopup.close();
-				this.exchangeAmount = '';
-				this.exchangeResult = 0;
-			},
-			async confirmExchange() {
-				if (parseInt(this.exchangeAmount) > this.userInfo.hourValue) {
-					uni.showToast({
-						title: '兑换值大于可用值',
-						icon: 'none'
-					})
-					return
-				}
-				try {
-					const params = {
-						hour: parseInt(this.exchangeAmount),
-						method: 'post'
-					};
-					this.Post(params, '/framework/points/hourChange', 'DES').then(res => {
-						if (res.code === 200) {
-							uni.showToast({
-								title: '兑换成功',
-								icon: 'success'
-							});
-
-							// 刷新数据
-							this.getUserInfo();
-							this.getTotalPoints();
-							this.resetData();
-							this.loadPointsData();
-							this.closeExchangeModal();
-						} else {
-							uni.showToast({
-								title: res.msg || '兑换失败',
-								icon: 'none'
-							});
-						}
-					});
-				} catch (error) {
-					console.error('兑换失败:', error);
-					uni.showToast({
-						title: '网络错误，请重试',
-						icon: 'none'
-					});
-				}
-			},
-
-			// 格式化时间
-			formatTime(timestamp) {
-				const date = new Date(timestamp);
-				const now = new Date();
-				const diff = now.getTime() - date.getTime();
-
-				// 今天
-				if (diff < 24 * 60 * 60 * 1000 && now.getDate() === date.getDate()) {
-					return `今天 ${date.getHours().toString().padStart(2, "0")}:${date
+export default {
+  data() {
+    return {
+      totalPoints: 0,
+      currentTab: "all",
+      pointsList: [],
+      page: 1,
+      pageSize: 20,
+      hasMore: true,
+      loading: false,
+      refreshing: false,
+      userInfo: null,
+      timeReward: 0,
+      exchangeAmount: "",
+      exchangeResult: 0,
+      pointInfo: null,
+    };
+  },
+
+  onLoad() {
+    this.getUserInfo();
+    this.loadPointsData();
+    this.getTotalPoints();
+  },
+
+  methods: {
+    getUserInfo() {
+      this.Post({}, "/framework/user/getInfo", "DES").then((res) => {
+        this.userInfo =
+          (uni.getStorageSync("userInfo") &&
+            JSON.parse(uni.getStorageSync("userInfo"))) ||
+          this.$store.state.user.userInfo ||
+          {};
+        res.data.token = this.userInfo.token;
+        uni.setStorageSync("userInfo", JSON.stringify(res.data));
+        this.userInfo = res.data;
+      });
+    },
+    // 返回上一页
+    goBack() {
+      uni.navigateBack();
+    },
+
+    // 切换筛选标签
+    switchTab(tab) {
+      if (this.currentTab === tab) return;
+      this.currentTab = tab;
+      this.resetData();
+      this.loadPointsData();
+    },
+
+    // 重置数据
+    resetData() {
+      this.pointsList = [];
+      this.page = 1;
+      this.hasMore = true;
+    },
+
+    // 获取总积分
+    async getTotalPoints() {
+      try {
+        this.Post({}, "/framework/points/getLastBalance", "DES").then((res) => {
+          if (res.code === 200) {
+            this.pointInfo = res.data;
+            this.totalPoints = res.data.balance || 0;
+          }
+        });
+      } catch (error) {
+        console.error("获取总积分失败:", error);
+      }
+    },
+
+    // 加载积分数据
+    async loadPointsData() {
+      if (this.loading) return;
+
+      this.loading = true;
+
+      try {
+        const params = {
+          page: this.page,
+          pageSize: this.pageSize,
+        };
+
+        if (this.currentTab !== "all") {
+          params.fromType = this.currentTab;
+        }
+
+        this.Post(params, "/framework/points/list", "DES").then((res) => {
+          console.log(res);
+          if (res.code === 200) {
+            const newData = res.rows || [];
+
+            if (this.page === 1) {
+              this.pointsList = newData;
+            } else {
+              this.pointsList = [...this.pointsList, ...newData];
+            }
+
+            this.hasMore = newData.length === this.pageSize;
+
+            if (this.hasMore) {
+              this.page++;
+            }
+          } else {
+            uni.showToast({
+              title: res.msg || "加载失败",
+              icon: "none",
+            });
+          }
+        });
+      } catch (error) {
+        console.error("加载积分记录失败:", error);
+        uni.showToast({
+          title: "网络错误，请重试",
+          icon: "none",
+        });
+      } finally {
+        this.loading = false;
+        this.refreshing = false;
+      }
+    },
+
+    // 加载更多
+    loadMore() {
+      if (this.hasMore && !this.loading) {
+        this.loadPointsData();
+      }
+    },
+
+    // 下拉刷新
+    onRefresh() {
+      this.refreshing = true;
+      this.resetData();
+      this.loadPointsData();
+      this.getTotalPoints();
+    },
+
+    // 显示兑换弹窗
+    showExchangeModal() {
+      this.$refs.exchangePopup.open();
+    },
+
+    // 关闭兑换弹窗
+    closeExchangeModal() {
+      this.$refs.exchangePopup.close();
+      this.exchangeAmount = "";
+      this.exchangeResult = 0;
+    },
+    async confirmExchange() {
+      if (parseInt(this.exchangeAmount) > this.userInfo.hourValue) {
+        uni.showToast({
+          title: "兑换值大于可用值",
+          icon: "none",
+        });
+        return;
+      }
+      try {
+        const params = {
+          hour: parseInt(this.exchangeAmount),
+          method: "post",
+        };
+        this.Post(params, "/framework/points/hourChange", "DES").then((res) => {
+          if (res.code === 200) {
+            uni.showToast({
+              title: "兑换成功",
+              icon: "success",
+            });
+
+            // 刷新数据
+            this.getUserInfo();
+            this.getTotalPoints();
+            this.resetData();
+            this.loadPointsData();
+            this.closeExchangeModal();
+          } else {
+            uni.showToast({
+              title: res.msg || "兑换失败",
+              icon: "none",
+            });
+          }
+        });
+      } catch (error) {
+        console.error("兑换失败:", error);
+        uni.showToast({
+          title: "网络错误，请重试",
+          icon: "none",
+        });
+      }
+    },
+
+    // 格式化时间
+    formatTime(timestamp) {
+      const date = new Date(timestamp);
+      const now = new Date();
+      const diff = now.getTime() - date.getTime();
+
+      // 今天
+      if (diff < 24 * 60 * 60 * 1000 && now.getDate() === date.getDate()) {
+        return `今天 ${date.getHours().toString().padStart(2, "0")}:${date
           .getMinutes()
           .toString()
           .padStart(2, "0")}`;
-				}
+      }
 
-				// 昨天
-				const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000);
-				if (yesterday.getDate() === date.getDate()) {
-					return `昨天 ${date.getHours().toString().padStart(2, "0")}:${date
+      // 昨天
+      const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000);
+      if (yesterday.getDate() === date.getDate()) {
+        return `昨天 ${date.getHours().toString().padStart(2, "0")}:${date
           .getMinutes()
           .toString()
           .padStart(2, "0")}`;
-				}
+      }
 
-				// 其他日期
-				return `${date.getMonth() + 1}-${date.getDate()} ${date
+      // 其他日期
+      return `${date.getMonth() + 1}-${date.getDate()} ${date
         .getHours()
         .toString()
         .padStart(2, "0")}:${date.getMinutes().toString().padStart(2, "0")}`;
-			},
-		},
-	};
+    },
+  },
+};
 </script>
 
 <style scoped>
-	.points-detail-page {
-		min-height: 100vh;
-		background-color: #f5f5f5;
-	}
-
-	/* 导航栏 */
-	.nav-bar {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		height: 88rpx;
-		padding: 0 32rpx;
-		background-color: #fff;
-		border-bottom: 1rpx solid #eee;
-	}
-
-	.nav-back {
-		width: 60rpx;
-		height: 60rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.nav-back .iconfont {
-		font-size: 36rpx;
-		color: #333;
-	}
-
-	.nav-title {
-		font-size: 36rpx;
-		font-weight: 600;
-		color: #333;
-	}
-
-	.nav-placeholder {
-		width: 60rpx;
-	}
-
-	/* 积分总览 */
-	.points-overview {
-		background: linear-gradient(135deg, #77f3f9 0%, #764ba2 100%);
-		padding: 60rpx 32rpx;
-		text-align: center;
-		position: relative;
-	}
-
-	.total-points {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.points-number {
-		font-size: 72rpx;
-		font-weight: bold;
-		color: #fff;
-		margin-bottom: 12rpx;
-	}
-
-	.points-label {
-		font-size: 28rpx;
-		color: rgba(255, 255, 255, 0.8);
-	}
-
-	/* 时间奖励值 */
-	.time-reward {
-		position: absolute;
-		top: 30rpx;
-		right: 32rpx;
-		display: flex;
-		align-items: center;
-		background: rgba(255, 255, 255, 0.2);
-		border-radius: 30rpx;
-		padding: 6rpx 10rpx;
-		border: 1rpx solid rgba(255, 255, 255, 0.3);
-	}
-
-	.reward-icon {
-		margin-right: 8rpx;
-		font-size: 26rpx;
-		display: flex;
-		align-items: center;
-		color: white;
-	}
-
-	/* 筛选标签 */
-	.filter-tabs {
-		display: flex;
-		background-color: #fff;
-		padding: 0 32rpx;
-	}
-
-	.tab-item {
-		flex: 1;
-		text-align: center;
-		padding: 32rpx 0;
-		font-size: 30rpx;
-		color: #666;
-		position: relative;
-	}
-
-	.tab-item.active {
-		color: #77f3f9;
-		font-weight: 600;
-	}
-
-	.tab-item.active::after {
-		content: "";
-		position: absolute;
-		bottom: 0;
-		left: 50%;
-		transform: translateX(-50%);
-		width: 60rpx;
-		height: 4rpx;
-		background-color: #77f3f9;
-		border-radius: 2rpx;
-	}
-
-	/* 积分记录列表 */
-	.points-list {
-		height: calc(100vh - 368rpx);
-		padding: 0 30rpx;
-		width: 690rpx;
-	}
-
-	.record-item {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		background-color: #fff;
-		padding: 32rpx 24rpx;
-		margin-top: 20rpx;
-		border-radius: 16rpx;
-		box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
-	}
-
-	.record-left {
-		display: flex;
-		align-items: center;
-		flex: 1;
-	}
-
-	.record-icon {
-		width: 80rpx;
-		height: 80rpx;
-		border-radius: 50%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin-right: 24rpx;
-	}
-
-	.record-icon.income {
-		background-color: #e8f5e8;
-	}
-
-	.record-icon.expense {
-		background-color: #ffeaea;
-	}
-
-	.record-icon .iconfont {
-		font-size: 36rpx;
-	}
-
-	.record-icon.income .iconfont {
-		color: #52c41a;
-	}
-
-	.record-icon.expense .iconfont {
-		color: #ff4d4f;
-	}
-
-	.record-info {
-		flex: 1;
-	}
-
-	.record-title {
-		font-size: 32rpx;
-		color: #333;
-		font-weight: 500;
-		margin-bottom: 8rpx;
-	}
-
-	.record-desc {
-		font-size: 26rpx;
-		color: #999;
-		margin-bottom: 8rpx;
-	}
-
-	.record-time {
-		font-size: 24rpx;
-		color: #ccc;
-	}
-
-	.record-right {
-		text-align: right;
-	}
-
-	.record-points {
-		font-size: 32rpx;
-		font-weight: 600;
-	}
-
-	.record-points.income {
-		color: #52c41a;
-	}
-
-	.record-points.expense {
-		color: #ff4d4f;
-	}
-
-	/* 加载状态 */
-	.load-more,
-	.no-more {
-		text-align: center;
-		padding: 40rpx 0;
-	}
-
-	.load-text,
-	.no-more-text {
-		font-size: 28rpx;
-		color: #999;
-	}
-
-	/* 空状态 */
-	.empty-state {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		padding: 120rpx 0;
-	}
-
-	.empty-icon {
-		width: 200rpx;
-		height: 200rpx;
-		margin-bottom: 32rpx;
-		opacity: 0.6;
-	}
-
-	.empty-text {
-		font-size: 28rpx;
-		color: #999;
-	}
-
-	/* 兑换弹窗样式 */
-	.exchange-modal {
-		width: 600rpx;
-		background: #fff;
-		border-radius: 20rpx;
-		overflow: hidden;
-	}
-
-	.modal-header {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 40rpx 40rpx 20rpx;
-		border-bottom: 1rpx solid #f0f0f0;
-	}
-
-	.modal-title {
-		font-size: 36rpx;
-		font-weight: 600;
-		color: #333;
-	}
-
-	.close-btn {
-		width: 60rpx;
-		height: 60rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.modal-content {
-		padding: 40rpx;
-	}
-
-	.current-reward {
-		display: flex;
-		align-items: center;
-		margin-bottom: 40rpx;
-		padding: 20rpx;
-		background: #f8f9fa;
-		border-radius: 12rpx;
-	}
-
-	.reward-label {
-		font-size: 28rpx;
-		color: #666;
-	}
-
-	.reward-value {
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #77f3f9;
-		margin-left: 10rpx;
-	}
-
-	.exchange-form {
-		margin-bottom: 40rpx;
-	}
-
-	.form-item {
-		margin-bottom: 20rpx;
-	}
-
-	.form-label {
-		font-size: 28rpx;
-		color: #333;
-		margin-bottom: 12rpx;
-		display: block;
-	}
-
-	.form-input {
-		width: 100%;
-		height: 80rpx;
-		border: 1rpx solid #ddd;
-		border-radius: 8rpx;
-		padding: 0 20rpx;
-		font-size: 28rpx;
-		box-sizing: border-box;
-	}
-
-	.exchange-result {
-		padding: 20rpx;
-		background: #e8f5e8;
-		border-radius: 8rpx;
-		margin-top: 20rpx;
-	}
-
-	.result-text {
-		font-size: 28rpx;
-		color: #52c41a;
-		font-weight: 500;
-	}
-
-	.exchange-rules {
-		padding: 20rpx;
-		background: #f8f9fa;
-		border-radius: 12rpx;
-	}
-
-	.rules-title {
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #333;
-		margin-bottom: 16rpx;
-		display: block;
-	}
-
-	.rules-list {
-		display: flex;
-		flex-direction: column;
-		gap: 8rpx;
-	}
-
-	.rule-item {
-		font-size: 24rpx;
-		color: #666;
-		line-height: 1.5;
-	}
-
-	.modal-footer {
-		display: flex;
-		gap: 20rpx;
-		padding: 20rpx 40rpx 40rpx;
-	}
-
-	.cancel-btn,
-	.confirm-btn {
-		flex: 1;
-		height: 80rpx;
-		border-radius: 8rpx;
-		font-size: 28rpx;
-		border: none;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.cancel-btn {
-		background: #f5f5f5;
-		color: #666;
-	}
-
-	.confirm-btn {
-		background: #77f3f9;
-		color: #fff;
-	}
-
-	.confirm-btn:disabled {
-		background: #ccc;
-		color: #999;
-	}
-</style>
\ No newline at end of file
+.points-detail-page {
+  min-height: 100vh;
+  background-color: #f5f5f5;
+}
+
+/* 导航栏 */
+.nav-bar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 88rpx;
+  padding: 0 32rpx;
+  background-color: #fff;
+  border-bottom: 1rpx solid #eee;
+}
+
+.nav-back {
+  width: 60rpx;
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.nav-back .iconfont {
+  font-size: 36rpx;
+  color: #333;
+}
+
+.nav-title {
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+.nav-placeholder {
+  width: 60rpx;
+}
+
+/* 积分总览 */
+.points-overview {
+  background: linear-gradient(135deg, #77f3f9 0%, #764ba2 100%);
+  padding: 60rpx 32rpx;
+  text-align: center;
+  position: relative;
+}
+
+.total-points {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.points-number {
+  font-size: 72rpx;
+  font-weight: bold;
+  color: #fff;
+  margin-bottom: 12rpx;
+}
+
+.points-label {
+  font-size: 28rpx;
+  color: rgba(255, 255, 255, 0.8);
+}
+
+/* 时间奖励值 */
+.time-reward {
+  position: absolute;
+  top: 30rpx;
+  right: 32rpx;
+  display: flex;
+  align-items: center;
+  background: rgba(255, 255, 255, 0.2);
+  border-radius: 30rpx;
+  padding: 6rpx 10rpx;
+  border: 1rpx solid rgba(255, 255, 255, 0.3);
+}
+
+.reward-icon {
+  margin-right: 8rpx;
+  font-size: 26rpx;
+  display: flex;
+  align-items: center;
+  color: white;
+}
+
+/* 筛选标签 */
+.filter-tabs {
+  display: flex;
+  background-color: #fff;
+  padding: 0 32rpx;
+}
+
+.tab-item {
+  flex: 1;
+  text-align: center;
+  padding: 32rpx 0;
+  font-size: 30rpx;
+  color: #666;
+  position: relative;
+}
+
+.tab-item.active {
+  color: #77f3f9;
+  font-weight: 600;
+}
+
+.tab-item.active::after {
+  content: "";
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 60rpx;
+  height: 4rpx;
+  background-color: #77f3f9;
+  border-radius: 2rpx;
+}
+
+/* 积分记录列表 */
+.points-list {
+  height: calc(100vh - 368rpx);
+  padding: 0 30rpx;
+  width: 690rpx;
+}
+
+.record-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background-color: #fff;
+  padding: 32rpx 24rpx;
+  margin-top: 20rpx;
+  border-radius: 16rpx;
+  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.05);
+}
+
+.record-left {
+  display: flex;
+  align-items: center;
+  flex: 1;
+}
+
+.record-icon {
+  width: 80rpx;
+  height: 80rpx;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 24rpx;
+}
+
+.record-icon.income {
+  background-color: #e8f5e8;
+}
+
+.record-icon.expense {
+  background-color: #ffeaea;
+}
+
+.record-icon .iconfont {
+  font-size: 36rpx;
+}
+
+.record-icon.income .iconfont {
+  color: #52c41a;
+}
+
+.record-icon.expense .iconfont {
+  color: #ff4d4f;
+}
+
+.record-info {
+  flex: 1;
+}
+
+.record-title {
+  font-size: 32rpx;
+  color: #333;
+  font-weight: 500;
+  margin-bottom: 8rpx;
+}
+
+.record-desc {
+  font-size: 26rpx;
+  color: #999;
+  margin-bottom: 8rpx;
+}
+
+.record-time {
+  font-size: 24rpx;
+  color: #ccc;
+}
+
+.record-right {
+  text-align: right;
+}
+
+.record-points {
+  font-size: 32rpx;
+  font-weight: 600;
+}
+
+.record-points.income {
+  color: #52c41a;
+}
+
+.record-points.expense {
+  color: #ff4d4f;
+}
+
+/* 加载状态 */
+.load-more,
+.no-more {
+  text-align: center;
+  padding: 40rpx 0;
+}
+
+.load-text,
+.no-more-text {
+  font-size: 28rpx;
+  color: #999;
+}
+
+/* 空状态 */
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 120rpx 0;
+}
+
+.empty-icon {
+  width: 200rpx;
+  height: 200rpx;
+  margin-bottom: 32rpx;
+  opacity: 0.6;
+}
+
+.empty-text {
+  font-size: 28rpx;
+  color: #999;
+}
+
+/* 兑换弹窗样式 */
+.exchange-modal {
+  width: 600rpx;
+  background: #fff;
+  border-radius: 20rpx;
+  overflow: hidden;
+}
+
+.modal-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 40rpx 40rpx 20rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+}
+
+.modal-title {
+  font-size: 36rpx;
+  font-weight: 600;
+  color: #333;
+}
+
+.close-btn {
+  width: 60rpx;
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.modal-content {
+  padding: 40rpx;
+}
+
+.current-reward {
+  display: flex;
+  align-items: center;
+  margin-bottom: 40rpx;
+  padding: 20rpx;
+  background: #f8f9fa;
+  border-radius: 12rpx;
+}
+
+.reward-label {
+  font-size: 28rpx;
+  color: #666;
+}
+
+.reward-value {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #77f3f9;
+  margin-left: 10rpx;
+}
+
+.exchange-form {
+  margin-bottom: 40rpx;
+}
+
+.form-item {
+  margin-bottom: 20rpx;
+}
+
+.form-label {
+  font-size: 28rpx;
+  color: #333;
+  margin-bottom: 12rpx;
+  display: block;
+}
+
+.form-input {
+  width: 100%;
+  height: 80rpx;
+  border: 1rpx solid #ddd;
+  border-radius: 8rpx;
+  padding: 0 20rpx;
+  font-size: 28rpx;
+  box-sizing: border-box;
+}
+
+.exchange-result {
+  padding: 20rpx;
+  background: #e8f5e8;
+  border-radius: 8rpx;
+  margin-top: 20rpx;
+}
+
+.result-text {
+  font-size: 28rpx;
+  color: #52c41a;
+  font-weight: 500;
+}
+
+.exchange-rules {
+  padding: 20rpx;
+  background: #f8f9fa;
+  border-radius: 12rpx;
+}
+
+.rules-title {
+  font-size: 28rpx;
+  font-weight: 600;
+  color: #333;
+  margin-bottom: 16rpx;
+  display: block;
+}
+
+.rules-list {
+  display: flex;
+  flex-direction: column;
+  gap: 8rpx;
+}
+
+.rule-item {
+  font-size: 24rpx;
+  color: #666;
+  line-height: 1.5;
+}
+
+.modal-footer {
+  display: flex;
+  gap: 20rpx;
+  padding: 20rpx 40rpx 40rpx;
+}
+
+.cancel-btn,
+.confirm-btn {
+  flex: 1;
+  height: 80rpx;
+  border-radius: 8rpx;
+  font-size: 28rpx;
+  border: none;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.cancel-btn {
+  background: #f5f5f5;
+  color: #666;
+}
+
+.confirm-btn {
+  background: #77f3f9;
+  color: #fff;
+}
+
+.confirm-btn:disabled {
+  background: #ccc;
+  color: #999;
+}
+</style>
diff --git a/subPackages/techan/detail.vue b/subPackages/techan/detail.vue
index b652de6..82b28dc 100644
--- a/subPackages/techan/detail.vue
+++ b/subPackages/techan/detail.vue
@@ -288,22 +288,17 @@
 					
 				}
 			},
-			order(item) {
+			order() {
 				let goods = this.sku[this.productIndex]
 				goods.buyNum = this.buyNum
-				
-				let orderInfo = {
-					// is_post: goods.is_post || "2",
-					is_post: 1,
-					goods: [{goodsInfo: this.info, skuInfo: goods }],
-					post: 0,
-				}
-				
-				uni.setStorageSync('teChanOrder', JSON.stringify(orderInfo)); //规格
-				// uni.setStorageSync('teChanInfo', JSON.stringify(this.info)); //商品
-				uni.navigateTo({
-					url: '/subPackages/techan/order'
-				});
+				let list = [{
+					...goods,
+					specUrl:goods.imageUrl,
+					goodsName:this.info.goodsName,
+					quantity:goods.buyNum
+				}]
+				this.$store.commit("changeOrderSCart", list);
+				this.gotoPath("/subPackages/techan/order");
 			},
 			addToCart () {
 				let goods = this.sku[this.productIndex]
diff --git a/subPackages/techan/order - 副本.vue b/subPackages/techan/order - 副本.vue
new file mode 100644
index 0000000..de98c67
--- /dev/null
+++ b/subPackages/techan/order - 副本.vue	
@@ -0,0 +1,1278 @@
+<template>
+	<!-- 解决滚动穿透 -->
+	<page-meta :page-style="'overflow:'+(popShow?'hidden':'visible')"></page-meta>
+	<view class="bg" v-if="info">
+		<!-- <view class="sendwayArea" :style="{'width': isPost==3?'340rpx':'170rpx'}" v-if="isPost>=1&&isPost<=3">
+			<view v-if="isPost==1||isPost==3" :class="['sendway-item',info.is_post==1?'active':'']"
+			 @click="info.is_post=1" style="left: -2rpx;">邮寄配送</view>
+			<view v-if="isPost==2||isPost==3" :class="['sendway-item',info.is_post==2?'active':'']" 
+			@click="info.is_post=2" style="right: -2rpx;">到店自提</view>
+			
+		</view> -->
+		
+		<!-- 邮寄 -->
+		<view class="address" style="margin-bottom: 36rpx;">
+			<view class="a-title">
+				<view>收货地址</view>
+				<view>
+					<view class="more-person flex-center" v-if="addressList.length>0" @click="changeAddressPopup('open', '', null)">
+						更多<uni-icons style="width: 14rpx;" type="right" size="14"></uni-icons>
+					</view>
+				</view>
+			</view>
+
+			<view class="btn-box">
+				<view class="contacts box" v-if="contacts">
+					<view class="contacts-left">
+						<view class="name-phone">
+							<view class="name">{{ contacts.name }}</view>
+							<view class="phone">{{ contacts.tel }}</view>
+						</view>
+						<view class="adds text-overflowRows">{{ contacts.province_text + contacts.city_text + contacts.district_text + contacts.detail_addr }}</view>
+					</view>
+					<image @click="changeAddressAddPopup('open', '', contacts)" :src="showImg('/uploads/20250514/dd77d7706bc9bffd2bb928d1772e8413.png')" mode="aspectFill"></image>
+				</view>
+				<view v-else class="a-img flex-center" @click.stop="changeAddressAddPopup('open','',{})">
+					<uni-icons style="width: 32rpx;" type="plusempty" size="14"></uni-icons>添加
+				</view>
+			</view>
+		</view>
+		
+		<!-- 自提 -->
+<!-- 		<view v-if="info.is_post==2 && info.goods[0]">
+
+			<view class="pickself" >
+				<navigator :url="`/subPackages/techan/selfPickUpPoint?pickupId=${pickupAddress.id}&goodsId=${info.goods[0].skuInfo.goods_id}`">
+					<view class="pickpoint">
+						<view class="flex-shrink-0">自提点</view>
+						<view class="pickpointAddress">
+							<view class="pointAddressText text-overflow">{{pickupAddress.extract_name||'选择提货地址'}}</view>
+							<uni-icons style="height: 36rpx;" type="right" size="18"></uni-icons>
+						</view>
+					</view>
+				</navigator>
+			</view>
+			
+			<view class="pickup-person-area">
+				<view class="pickpoint">
+					<view>提货人信息</view>
+					<view></view>
+				</view>
+
+				<view class="btn-box flex-column">
+					<view class="p_name line flex-between w-full">
+						<view class="left">姓名</view>
+						<input class="input" type="text" placeholder="请输入提货人姓名" v-model="pickupPerson.name" />
+					</view>
+					<view class="p_tel flex-between w-full">
+						<view class="left">手机号</view>
+						<view class="flex flex-items-center">
+							<input class="input" type="text" placeholder="请输入手机号" v-model="pickupPerson.phone" />
+							<uni-icons v-if="pickupPerson.phone.length>0" style="margin-left: 30rpx;"
+								type="closeempty" size="14" @click="pickupPerson.phone = ''"></uni-icons>
+						</view>
+						
+					</view>
+				</view>
+			</view>
+		</view> -->
+		
+		<template v-for="(merchantGroup,merchantIndex) in orderGoods">
+		<view class="new-box" v-for="(sku,index) in merchantGroup" :key="index">
+			<view class="box shop-name text-overflow" v-if="sku.goodsInfo.merchant_name">
+				{{sku.goodsInfo.merchant_name}}
+			</view>
+			<view class="commodity box">
+				<image class="img" :src="showImg(sku.goodsInfo.image)" mode="aspectFill"></image>
+				<view class="title flex-c">
+					<view class="commodity-info">
+						<view class="text-overflowRows">{{ sku.goodsInfo.title }}</view>
+						<view class="commodity-price">
+							{{sku.skuInfo.money/100}}
+						</view>
+					</view>
+					<view class="commodity-info">
+						<view class="text-overflowRows">{{ sku.skuInfo.title }}</view>
+						<view class="commodity-num">
+							x{{sku.skuInfo.buyNum}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="commodity box sb" style="padding-left: 10rpx;">
+				<view class="title" style="font-weight: bold;">
+					购买数量
+				</view>
+				<view class="num-box">
+					<!-- <image src="https://yjdtadmin.sz-trip.com/uploads/20231225/4b61998e657784d08c8dfdb08da84553.png" mode="aspectFill" class="ctrl" @click="reduce()"></image> -->
+					<view :class="['ctrl',sku.skuInfo.buyNum>1||info.goods.length>1?'':'disabled']" @click="reduce(sku.skuInfo,index)">-</view>
+					<input class="num" type="text" v-model="sku.skuInfo.buyNum" :disabled='true' />
+					<view :class="['ctrl']" @click="plus(sku.skuInfo)">+</view>
+				</view>
+				
+			</view>
+			<view class="post top-line flex-between" v-show="info.is_post==1">
+				<view class="">
+					运费
+				</view>
+				<view style="font-weight: 500;" >
+					{{!sku.post?'免邮':sku.post/100}}
+				</view>
+			</view>
+
+			
+		</view>
+		</template>
+		
+		<!-- <view  class="tickets-box flex-between">
+		<view class="remark">
+			<view class="remark-title" >订单备注:</view>
+			<input style="z-index:0;text-align: right;" type="text" placeholder="选填" v-model="remark" maxlength="50"/>
+		</view>
+		</view> -->
+		
+		<!-- 优惠券 -->
+
+		<!-- <view @click="goOrderCoupon" class="tickets-box flex-between">
+			<view class="order-title">优惠券</view>
+			<view class="coupon-btn" v-if="coupon==''">
+				<view class="select">选择优惠券</view>
+				<uni-icons style="height: 42rpx;" color="#999999" type="right" size="18"></uni-icons>
+			</view>
+			<div class="coupon-price" v-else>
+				<span v-if="coupon.percent == 0">-￥{{coupon.discounts/100}}</span>
+				<span v-else>-{{coupon.percent}}%</span>
+				<span style="margin:0 31rpx 0 8rpx;color: #6C7A94;">></span>
+			</div>
+		 </view> -->
+
+		
+
+
+		
+		<view class="btn-list">
+			<view class="price-box">
+				<view class="text">合计:</view>
+				<view class="price">{{ total() }}</view>
+				<view class="post-text" v-if="info.is_post==1&&post">含邮费:¥{{ post / 100 }}</view>
+			</view>
+			<view class="btn" @click="order()">立即支付</view>
+		</view>
+
+		<!-- 选择收货地址弹窗 -->
+		<uni-popup ref="addressPopup" type="bottom" backgroundColor="#F4F4F4" @change="changPopShow">
+			<view class="people-popup">
+				<view class="top-box">
+					<view class="top flex-between">
+						<text class="text-overflow" @click="changeAddressPopup('close')">取消</text>
+						<text class="confirm" @click="changeAddressPopup('close', 'confirm')">确定</text>
+					</view>
+				</view>
+				<!-- <navigator url="/subPackages/user/myAddressAdd" class="button">添加收货地址</navigator> -->
+				<view class="button" @click="changeAddressAddPopup('open','',{})">添加收货地址</view>
+				<view class="popup-list" v-if="addressList.length > 0">
+					<view :class="['popup-item',contacts.id==item.id?'active':'']" v-for="(item, index) in addressList" :key="index" @click="seldThisAddress(item)">
+						<view class="item-top flex-between">
+							<view style="padding-right: 71rpx;">
+								<view class="name flex-start">
+									{{ item.name }}
+									<text>{{ item.tel }}</text>
+									<text class="tag" v-if="item.is_default == 1">默认</text>
+								</view>
+								<view class="subtitle text-overflowRows">{{ item.province_text + item.city_text + item.district_text + item.detail_addr }}</view>
+							</view>
+							<view>
+								<img @click.stop="changeAddressAddPopup('open', '', item)" :src="showImg('/uploads/20250514/dd77d7706bc9bffd2bb928d1772e8413.png')" alt="" />
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<!-- 新增编辑收货地址弹窗 -->
+		<uni-popup ref="addressAddPopup" type="bottom" backgroundColor="#F4F4F4" 
+			@change="changPopShow" style="border-radius: 13rpx 13rpx 0 0;">
+			<view class="people-popup">
+				<view class="top-box">
+					<view class="top flex-between" style="height: fit-content;">
+						<text class="text-overflow" @click="changeAddressAddPopup('close')">取消</text>
+						<text style="font-size: 35rpx;font-weight: 600;">{{addressTitle}}</text>
+						<text style="color: #515150;" class="confirm" @click="saveAddress">保存</text>
+					</view>
+				</view>
+				
+				<view class="add-edit-content">
+					<addressAddVue ref="addressAddVueRef"></addressAddVue>
+				</view>
+				
+				
+			</view>
+		</uni-popup>
+		
+		
+
+	</view>
+</template>
+
+<script>
+import addressAddVue from '../../components/addressAdd.vue';
+export default {
+	components: {addressAddVue},
+	data() {
+		return {
+			contacts: null,
+			info: null,//规格的信息
+			detail:null,//商品的信息
+			
+			orderGoods: [],
+			
+			post: 0,
+			flag: true,
+			addressList: [],
+			reserve_name: '',
+			reserve_idcard: '',
+			reserve_phone: '',
+			remark: '',
+			coupon: "",
+			allprice: 0,
+			
+			isPost: "1", //0=核销，1=邮寄，2=自取，3=邮寄/自提
+			sendType: 1, // 0=核销，1=邮寄，2=自取，3=邮寄/自提
+			pickupAddress: {id: null, address:''},
+			pickupPerson: {name:'',phone:''},
+			popShow: false, // 解决滚动穿透
+			
+			addressTitle: '添加收货地址'
+			
+		};
+	},
+	onLoad() {
+		this.info = this.$store.state.user.sshoppingCart
+		if (!this.info) {
+			uni.navigateBack();
+			return
+		}
+		console.log(this.info);
+		
+		// 根据规格信息 记录发货方式 is_post  ，使用方式：0=核销，1=邮寄，2=自取，3=邮寄/自提
+		if (this.info) {
+			this.isPost = this.info.is_post || "1"
+			// this.info.is_post = this.isPost==3?1:this.isPost
+		}
+		// this.handleOrderGoods()
+		console.log(this.isPost)
+	},
+	onShow() {
+		// this.coupon = this.$store.state.user.coupon
+		this.getAllAddressList();
+		
+		// 更新自提点
+		uni.$on("updateDataByConnect",this.getDataByConnect)
+	},
+	onUnload(){
+		uni.$off("updateDataByConnect",this.getDataByConnect)
+	},
+	onReady () {
+		this.$nextTick(()=>{
+			setTimeout(()=>{
+				// this.getMaxCouponData()
+			},1000)
+		})
+		
+		
+	},
+	methods: {
+		handleOrderGoods () {
+			let merchantArray = new Set(this.info.goods.map(v=>v.goodsInfo.merchant_name))
+			this.orderGoods = []
+			merchantArray.forEach(x=>{
+				// let tempArray = this.info.goods.filter(v=>v.goodsInfo.merchant_name==x)
+				// this.orderGoods.push(tempArray)
+				
+				// 不用filter 用for循环一个个找 可以用引用对象地址修改this.info的goods 这样下面的代码不用改
+				let tempArray = []
+				this.info.goods.forEach(v=>{
+					if(v.goodsInfo.merchant_name == x) {
+						tempArray.push(v)
+					}
+				})
+				this.orderGoods.push(tempArray)
+				
+			})
+			console.log(this.orderGoods)
+		},
+		
+		
+		goOrderCoupon () {
+			let allPrice = 0
+			let skuIds= []
+			this.info.goods.forEach(v=>{
+				allPrice+= v.skuInfo.money*v.skuInfo.buyNum
+				if (v.skuInfo.buyNum>0) {
+					skuIds.push(v.skuInfo.id)
+				}
+			})
+			uni.navigateTo({
+				url: `/subPackages/order/orderCoupon?allprice=${allPrice}&sku_ids=${skuIds.join(',')}`
+			})
+		},
+		
+		getContacts() {
+			if (this.info.is_post == 0) {
+				return;
+			}
+			
+			this.Post({}, '/api/user/getDefaultConsignee').then(res => {
+				if (res) {
+					this.contacts = res.data;
+					this.getPost();
+				}
+			});
+		},
+		getPost() {
+			if (this.info.is_post == 0 || !this.contacts) {
+				return;
+			}
+			this.flag = false;
+			
+			let param = []
+			this.info.goods.forEach(v=>{
+				param.push({specifications_id: v.skuInfo.id, num: v.skuInfo.buyNum, consignee_id:this.contacts.id})
+			})
+			
+			let data = JSON.stringify(param);
+			// console.log(data);
+			this.Post({ data: data }, '/api/order/getNewPost').then(res => {
+				if (res) {
+					for(let i=0;i<this.info.goods.length;i++) {
+						this.info.goods[i].post = res.data[i].post_money;
+					}
+					this.flag = true;
+				}
+			}).catch(err=>{
+				console.log(err,'aaaaaaa');
+				this.flag = true;
+			});
+		},
+
+		plus(sku) {
+			this.$nextTick(() => {
+				this.$store.commit("choseCoupon","");
+				this.coupon = this.$store.state.user.coupon
+				sku.buyNum += 1;
+				if (this.flag) {
+					this.getPost();
+				}
+			});
+		},
+		reduce(sku,index) {
+			if (sku.buyNum > 1) {
+				this.$store.commit("choseCoupon","");
+				this.coupon = this.$store.state.user.coupon
+				this.$nextTick(() => {
+					sku.buyNum -= 1;
+					if (this.flag) {
+						this.getPost();
+					}
+				});
+			} else if (sku.buyNum == 1&&this.info.goods.length>1) {
+				this.$store.commit("choseCoupon","");
+				this.coupon = this.$store.state.user.coupon
+				this.$nextTick(() => {
+					this.info.goods.splice(index,1)
+					if (this.flag) {
+						this.getPost();
+					}
+					this.handleOrderGoods()
+				});
+				
+			}
+		},
+		// 选择收货地址弹窗
+		changeAddressPopup(type, confirm, index) {
+			if (type == 'open') this.$refs.addressPopup.open('bottom');
+			else this.$refs.addressPopup.close();
+			this.$forceUpdate();
+		},
+		// 获取收货地址列表
+		getAllAddressList() {
+			this.Post({}, '/api/user/consigneeList').then(res => {
+				let oldId = (this.contacts || {}).id
+				console.log(this.contacts)
+				if (res.code == 200) this.addressList = res.data || [];
+				if (this.addressList.some(v=>v.id==oldId)) {
+					this.contacts = this.addressList.find(v=>v.id==oldId)
+					this.getPost();
+				} else if (this.addressList.some(v=>v.is_default==1)) {
+					this.contacts = this.addressList.find(v=>v.is_default==1)
+					this.getPost();
+				} else if (this.addressList.length>0) {
+					this.contacts = this.addressList[0]
+					this.getPost()
+				}
+			});
+		},
+		// 选择收货地址
+		seldThisAddress(item) {
+			if (!this.contacts) this.contacts = {};
+			this.contacts = item
+			console.log(this.flag,1111111);
+			if (this.flag) {
+				this.getPost();
+			}
+			this.$refs.addressPopup.close();
+			this.$forceUpdate();
+		},
+		// 收货地址新增弹窗
+		changeAddressAddPopup(type, confirm, item) {
+			if (type == 'open') {
+				this.addressTitle = '新增收货地址'
+				if (item.id) { this.addressTitle = '编辑收货地址' }
+				// this.id = item.id
+
+				this.$refs.addressAddPopup.open('bottom');
+				
+				this.$nextTick(()=>{
+					this.$refs.addressAddVueRef.init(item)
+				})
+			}
+			else {this.$refs.addressAddPopup.close();}
+			this.$forceUpdate();
+		},
+		
+		// 保存地址
+		async saveAddress () {
+			let res = await this.$refs.addressAddVueRef.postSave()
+			if (res && (res.code == 1 || res.code==200)) {
+				this.contacts = res.data
+				this.getAllAddressList();
+				this.changeAddressAddPopup('close')
+			}
+		},
+
+
+
+		// 总价
+		total() {
+			let price = 0
+			let postPrice = 0
+			let allPrice = 0
+			
+			if (this.info && Array.isArray(this.info.goods)) {
+				this.info.goods.forEach(v=>{
+					allPrice += v.skuInfo.money*v.skuInfo.buyNum
+					if (this.info.is_post == 1) {
+						postPrice+=(v.post || 0)
+					}
+				})
+			}
+			console.log(postPrice)
+			this.allprice = allPrice + postPrice
+			if (this.coupon) {
+				if (this.coupon.percent == 0) {
+					if (this.coupon.discounts>allPrice) {
+						price =postPrice
+					}else{
+						price = allPrice + postPrice - (this.coupon.discounts)
+					}
+					
+				} else{
+					// 有bug折扣券不加邮费
+					price = (allPrice + postPrice) - (allPrice * this.coupon.percent/100)
+				}
+			} else {
+				price = allPrice + postPrice
+			}
+			return price < 0 ? 0 : (price/100).toFixed(2)
+		},
+		// 预定
+		order() {
+			if (this.info.is_post == 1 || this.info.is_post == 3) {
+				console.log(this.info.is_post)
+				if (this.info.is_post == 1 && !this.contacts) {
+					uni.showToast({
+						title: '请选择收货地址',
+						icon: 'none'
+					});
+					return;
+				}
+				
+				if (this.info.is_post == 2) {
+					if (!this.pickupAddress.id) {
+						uni.showToast({title: '请选择自提点',icon: 'none'});
+						return;
+					}
+
+					if (this.pickupPerson.name.trim().length<0) {
+						uni.showToast({
+							title: '请输入自提人姓名',
+							icon: 'none'
+						});
+						return;
+					}
+					if (!this.IsTel(this.pickupPerson.phone)) {
+						uni.showToast({
+							title: '请输入自提人手机号',
+							icon: 'none'
+						});
+						return;
+					}
+					
+
+				}
+			}
+
+			let goods = [];
+			this.info.goods.forEach(v=>{
+				let goodsItem = {
+					specifications_id: v.skuInfo.id,
+					num: v.skuInfo.buyNum,
+					// consignee_id: this.info.is_post == 1 ? this.contacts.id : null
+				};
+				
+				if (this.info.is_post == 2) {
+					goodsItem.extract_id = this.pickupAddress.id;
+				} else if (this.info.is_post == 1){
+					goodsItem.consignee_id = this.contacts.id 
+				}
+				goods.push(goodsItem);
+			})
+			
+			
+			
+			let data = {
+				goods: goods,
+				coupon: this.coupon ? this.coupon.id : "",
+				remark: this.remark,
+				is_post: this.info.is_post,
+				reserve_name: this.pickupPerson.name,
+				reserve_phone: this.pickupPerson.phone,
+			};
+			this.Post(
+				{
+					method: 'POST',
+					data: JSON.stringify(data)
+				},
+				'/api/order/place'
+			).then(res => {
+				uni.removeStorageSync('teChanOrder')
+				uni.removeStorageSync('teChanInfo')
+				if (res.code == 1 || res.code==200) {
+					this.Post(
+						{
+							order_id: res.data.order_id,
+							type: 'miniprogram',
+							platform: 'miniprogram'
+						},
+						'/api/pay/unify'
+					).then(res => {
+						if (res.data) {
+							uni.requestPayment({
+								nonceStr: res.data.nonceStr,
+								package: res.data.package,
+								paySign: res.data.paySign,
+								signType: res.data.signType,
+								timeStamp: res.data.timeStamp,
+								success: () => {
+									this.getSubscribeMessage()
+								},
+								fail() {
+									uni.navigateTo({
+										url: '/subPackages/order/trades'
+									})
+								}
+							});
+						}
+					});
+				}
+			});
+		},
+		
+		// ---------------自提-----------------------
+		changPopShow (e) {
+			this.popShow = e.show
+		},
+		
+		getDataByConnect(data) {
+			if (data.msgType == "updatePickUpPoint") {
+				this.pickupAddress = data.data
+			}
+		},
+		
+		// 获取最大优惠券
+		async getMaxCouponData () {
+			let allPrice =0
+			let skuIds = []
+			if (this.info && Array.isArray(this.info.goods)) {
+				this.info.goods.forEach(v=>{
+					allPrice += v.skuInfo.money*v.skuInfo.buyNum
+					if (v.skuInfo.buyNum>0) {
+						skuIds.push(v.skuInfo.id)
+					}
+				})
+			}
+			let param = {money:allPrice,sku_ids:skuIds.join(',')}
+			let res = await this.getMaxCoupon(param)
+			if (res.id) {
+				this.coupon = res
+			}
+		}
+		
+		
+		
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.bg {
+	min-height: 100vh;
+	overflow-x: hidden;
+	background: #f2f4f7;
+	padding-bottom: 200rpx;
+}
+view {
+	box-sizing: border-box;
+}
+.flex-shrink-0{
+	flex-shrink: 0;
+}
+.box {
+	width: 100%;
+	min-height: 100rpx;
+	padding: 20rpx;
+	background: #ffffff;
+	border-radius: 16rpx;
+}
+.address {
+	width: 697rpx;
+	height: 291rpx;
+	background: #FFFFFF;
+	border-radius: 13rpx;
+	margin: 0 auto;
+	margin-top: 26rpx;
+	.a-title{
+		font-size: 31rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #000000;
+		padding: 30rpx 18rpx;
+		justify-content: space-between;
+		align-items: center;
+		display: flex;
+		width: 100%;
+		.more-person{
+			width: 133rpx;
+			height: 60rpx;
+			border-radius: 30rpx;
+			border: 1px solid #999999;
+			font-family: PingFang SC;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #000000;
+			line-height: 16rpx;
+		}
+	}
+	.btn-box{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-top:1rpx solid rgba(216, 216, 216, 1) ;
+		height: 176rpx;
+		.a-img{
+			width: 219rpx;
+			height: 73rpx;
+			border-radius: 37rpx;
+			border: 1px solid #333333;
+			font-family: PingFang SC;
+			font-weight: 400;
+			font-size: 29rpx;
+			color: #000000;
+		}
+	}
+}
+
+.pickself{
+	width: 697rpx;
+	height: 120rpx;
+	background: #FFFFFF;
+	border-radius: 13rpx;
+	margin: 0 auto;
+	margin-top: 26rpx;
+	.pickpoint{
+		display: flex;
+		width: 100%;
+		font-size: 31rpx;
+		font-weight: bold;
+		padding: 40rpx 18rpx;
+	}
+	.pickpointAddress{
+		display: flex;
+		font-weight: 500;
+		flex: 1;
+		width: 10rpx;
+		align-items: center;
+		justify-content: flex-end;
+	}
+	.pickpointImg{
+		width: 20rpx;
+		height: 20rpx;
+	}
+	.pointAddressText{
+		padding: 0 20rpx 0 40rpx;
+		flex: 1;
+		text-align: right;
+		width: 10rpx;
+	}
+
+}
+
+.pickup-person-area{
+	width: 697rpx;
+	background: #FFFFFF;
+	border-radius: 13rpx;
+	margin: 0 auto;
+	margin-top: 26rpx;
+	margin-bottom: 30rpx;
+	.pickpoint{
+		display: flex;
+		width: 100%;
+		font-size: 31rpx;
+		font-weight: bold;
+		padding: 40rpx 18rpx;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.more-person{
+		width: 140rpx;
+		height: 58rpx;
+	}
+	.btn-box{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0 20rpx;
+		border-top:1rpx solid rgba(216, 216, 216, 1) ;
+	}
+	.pickup-person-list{
+		border-top: 1rpx solid #d8d8d8;
+		.person-list-area{
+			display: flex;
+			flex-wrap: wrap;
+			padding: 40rpx 21rpx;
+			.person-item{
+				width: 160rpx;
+				height: 74rpx;
+				line-height: 68rpx;
+				background: rgba(153,153,153,0.1);
+				border-radius: 11rpx;
+				border: 1px solid #999999;
+				position: relative;
+				font-size: 29rpx;
+				font-weight: 400;
+				font-size: 29rpx;
+				color: #000000;
+				text-align: center;
+				padding:0 22rpx;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				white-space: nowrap;
+				font-weight: bold;
+				margin-right: 24rpx;
+				margin-bottom: 24rpx;
+			}
+			.person-item.active{
+				background: rgba(254,180,25,0.1);
+				border: 2px solid #FEB419;
+			}
+			.person-item-active-img{
+				width: 24rpx;
+				height: 24rpx;
+				position: absolute;
+				right: 0;
+				bottom: 0;
+				background-color: #FEB419;
+				color: white;
+				font-size: 20rpx;
+				line-height: 1.2;
+				border-radius:  10rpx 0rpx 10rpx 0rpx;
+			}
+		}
+		.current-person{
+			display: flex;
+			align-items: center;
+			padding:0 44rpx 22rpx;
+			image{
+				width: 44rpx;
+				height: 44rpx;
+			}
+			.name{
+				 text{
+					padding-left: 20rpx;
+					font-size: 25rpx;
+					color: #666666;
+				}
+			}
+		}
+	}
+}
+
+
+.commodity {
+	display: flex;
+	// align-items: center;
+	.img {
+		width: 174rpx;
+		height: 142rpx;
+		background: #f2f4f7;
+		border-radius: 10rpx;
+		flex-shrink: 0;
+	}
+	.title {
+		flex: 1;
+		margin-left: 20rpx;
+		font-size: 31rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #000000;
+
+	}
+	.num-box {
+		display: flex;
+		align-items: center;
+		margin-left: 20rpx;
+		width: 160rpx;
+		justify-content: space-between;
+		.num {
+			text-align: center;
+			width: 50rpx;
+		}
+		.ctrl {
+			width: 47rpx;
+			height: 47rpx;
+			background: #74A5AA;
+			border-radius: 50%;
+			font-family: PingFang SC;
+			font-weight: 400;
+			font-size: 34rpx;
+			color: #FFFFFF;
+			line-height: 47rpx;
+			text-align: center;
+		}
+		.ctrl.disabled{
+			background: #E8E8E8;
+			color: #999999;
+		}
+	}
+}
+.btn-list {
+	width: 100%;
+	height: 166rpx;
+	background: #ffffff;
+	box-shadow: 0rpx -3rpx 9rpx 1rpx rgba(227, 229, 232, 0.5);
+	display: flex;
+	position: fixed;
+	bottom: 0;
+	padding: 20rpx 20rpx 40rpx;
+	align-items: center;
+	justify-content: space-between;
+	.btn {
+			width: 250rpx;
+			height: 80rpx;
+			background: #74A5AA;
+			border-radius: 40rpx;
+			text-align: center;
+			line-height: 80rpx;
+
+			font-weight: bold;
+			font-size: 32rpx;
+			color: #FFFFFF;
+	
+	}
+	.price-box {
+		display: flex;
+		align-items: flex-end;
+		.text {
+			font-size: 29rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 500;
+			color: #333;
+		}
+		.price {
+			margin-left: 15rpx;
+			font-size: 48rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: bold;
+			color: #FC5109;
+			line-height: 1;
+			&:before {
+				content: '¥';
+				display: inline-block;
+				font-size: 24rpx;
+			}
+		}
+		.post-text {
+			margin-left: 15rpx;
+			color: #fc5109;
+			font-size: 24rpx;
+		}
+	}
+}
+.contacts {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 100%;
+	image {
+		width: 36rpx;
+		height: 36rpx;
+	}
+	.contacts-left {
+		.name-phone {
+			display: flex;
+			align-items: baseline;
+			.name {
+				font-size: 32rpx;
+				font-family:  PingFang SC;
+				font-weight: 400;
+				color: #222222;
+			}
+			.phone {
+				margin-left: 27rpx;
+				font-size: 25rpx;
+				font-family:  PingFang SC;
+				font-weight: 400;
+				color: #666666;
+			}
+		}
+		.adds {
+			font-size: 27rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #6C7A94;
+			margin-top: 20rpx;
+			max-width: 500rpx;
+		}
+	}
+}
+.people-popup {
+	padding: 26rpx;
+	min-height: 800rpx;
+
+	.top-box {
+		height: 80rpx;
+
+		.top {
+			position: fixed;
+			left: 0;
+			right: 0;
+			color: #000;
+			height: 80rpx;
+			font-size: 0;
+			overflow: hidden;
+			padding: 0 26rpx;
+
+			text {
+				text-align: left;
+				font-size: 31rpx;
+				font-weight: 400;
+				color: #000000;
+			}
+
+			.confirm {
+				font-weight: 400;
+				color: #000000;
+			}
+		}
+	}
+
+	.popup-list {
+		height: 666rpx;
+		overflow: scroll;
+
+		.popup-item {
+			border-radius: 12rpx;
+			padding: 2rpx;
+			margin-top: 24rpx;
+			font-size: 24rpx;
+			color: #333333;
+			font-weight: 400;
+			background-color: #ffffff;
+
+			.item-top {
+				border-radius: 12rpx;
+				padding: 30rpx 40rpx;
+				background-color: #ffffff;
+				
+				img {
+					color: #666666;
+					width: 40rpx;
+					height: 40rpx;
+				}
+
+				.name {
+					overflow: hidden;
+					font-family: PingFang SC;
+					font-weight: 400;
+					font-size: 32rpx;
+					display: flex;
+					align-items: baseline;
+
+					text {
+						color: #666;
+						font-size: 25rpx;
+						padding: 0 24rpx;
+					}
+
+					.tag {
+						padding: 0 8rpx;
+						height: 32rpx;
+						border-radius: 7rpx;
+						line-height: 30rpx;
+						text-align: center;
+						font-size: 23rpx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #ffffff;
+						background: #74A5AA;
+
+					}
+				}
+
+				.com-flex-start {
+					margin: 0 0 30rpx;
+				}
+
+				.subtitle {
+					font-weight: 400;
+					flex: 1;
+					text-align: left;
+					margin-top: 33rpx;
+					color: #333333;
+					font-size: 25rpx;
+
+				}
+			}
+
+		}
+		
+		.popup-item.active{
+			background: #60989E;
+		}
+	}
+
+	.button {
+
+		text-align: center;
+		width: 100%;
+		height: 80rpx;
+		line-height: 80rpx;
+		background-color: #ffffff;
+		border-radius: 40rpx;
+		font-family: PingFang SC;
+		font-weight: 400;
+		font-size: 33rpx;
+		color: #000000;
+
+	}
+}
+
+.person-info {
+	padding: 30rpx 30rpx 15rpx 30rpx;
+	background: #fff;
+	margin-top: 30rpx;
+	border-radius: 16rpx;
+}
+.person-title {
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #000;
+}
+.line {
+	border-bottom: 1px solid #e3e5e8;
+}
+.flex {
+	display: flex;
+	align-items: center;
+}
+.left {
+	width: 140rpx;
+	height: 104rpx;
+	line-height: 104rpx;
+	font-family: PingFang;
+	font-weight: bold;
+	font-size: 31rpx;
+	color: #000000;
+}
+.input {
+	font-size: 31rpx;
+	font-weight: 400;
+	text-align: right;
+}
+.remark {
+	padding:30rpx;
+	display: flex;
+	align-items: center;
+	width: 698rpx;
+	min-height: 120rpx;
+	background: #ffffff;
+	margin: 0 auto;
+	border-radius: 14rpx;
+	.remark-title{
+
+		font-size: 31rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #000000;
+		flex-shrink: 0;
+
+	}
+	input {
+		margin-left: 64rpx;
+		width: 500rpx;
+		font-size: 31rpx;
+	}
+}
+.sb{
+	justify-content: space-between;
+}
+	.tag {
+		margin-top: 10rpx;
+		// display: flex;
+		// align-items: center;
+		.tag-item {
+			background: rgba(252, 81, 9, .08);
+			border-radius: 4rpx;
+			padding: 2rpx 6rpx;
+			font-size: 20rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: rgba(252, 81, 9, 1);
+			margin-right: 18rpx;
+		}
+	}
+	.flex-c{
+		display: flex;
+		flex-direction: column;
+		// justify-content: space-between;
+	}
+	.new-box{
+		background: #fff;
+		width: 698rpx;
+		margin: 0 auto 20rpx;
+		border-radius: 14rpx;
+	}
+	
+	.tickets-box {
+		width: 698rpx;
+		margin: 26rpx auto 0;
+		border-radius: 13rpx;
+		background: #fff;
+		height: 120rpx;
+		.order-title {
+			margin: 31rpx 0 31rpx 30rpx;
+			font-size: 31rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #000000;
+		}
+
+		.coupon-price {
+			color:#DD0000;
+			font-size: 30rpx;
+			font-weight: bold;
+		}
+	}
+	.commodity-info{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 32rpx;
+		&:last-child{
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #666666;
+			padding-top: 20rpx;
+		}
+		.commodity-price{
+			&:before{
+				
+				content:"￥";
+				font-size: 24rpx;
+			}
+		}
+	}
+	.top-line{
+		border-top:rgba(216, 216, 216, 1) solid 2rpx ;
+	}
+	.post{
+		height: 120rpx;
+		padding: 0 30rpx;
+
+		font-size: 32rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #000000;
+
+	}
+
+.sendwayArea{
+	margin: 26rpx;
+	display: flex;
+	border: 1px solid #515150;
+	border-radius: 13rpx;
+	width: fit-content;
+	background-color: white;
+	height: 94rpx;
+	position: relative;
+	.sendway-item{
+		padding: 26rpx;
+		width: 170rpx;
+		font-size: 28rpx;
+		border-radius: 13rpx;
+		font-weight: 500;
+		position: absolute;
+		top: -2rpx;
+		bottom: -2rpx;
+	}
+	.sendway-item.active{
+		background-image: linear-gradient(135deg, #9EE4FE, #7FD491);
+	}
+
+}
+
+.add-edit-content{
+	background-color: white;
+	padding: 0 20rpx;
+	border-radius: 20rpx;
+}
+
+		.coupon-btn {
+			color: #999999;;
+			display: flex;
+			align-items: center;
+			.select {
+				display: block;
+				width: 153rpx;
+				height: 40rpx;
+				background: #C3282E;
+				border-radius: 9rpx;
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #FFFFFF;
+				text-align: center;
+				line-height: 40rpx;
+				font-family: PingFang SC;
+				margin-right: 20rpx;
+		
+			}
+		}
+.shop-name{
+	font-weight: bold;
+	font-size: 31rpx;
+	color: #333333;
+	padding-bottom: 12rpx;
+	min-height: fit-content;
+}
+</style>
\ No newline at end of file
diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue
index a560f95..e39e8c9 100644
--- a/subPackages/techan/order.vue
+++ b/subPackages/techan/order.vue
@@ -1,1281 +1,2002 @@
 <template>
-	<!-- 解决滚动穿透 -->
-	<page-meta :page-style="'overflow:'+(popShow?'hidden':'visible')"></page-meta>
-	<view class="bg" v-if="info">
-		<!-- <view class="sendwayArea" :style="{'width': isPost==3?'340rpx':'170rpx'}" v-if="isPost>=1&&isPost<=3">
+  <!-- 解决滚动穿透 -->
+  <page-meta
+    :page-style="'overflow:' + (popShow ? 'hidden' : 'visible')"
+  ></page-meta>
+  <view class="bg" v-if="info">
+    <!-- <view class="sendwayArea" :style="{'width': isPost==3?'340rpx':'170rpx'}" v-if="isPost>=1&&isPost<=3">
 			<view v-if="isPost==1||isPost==3" :class="['sendway-item',info.is_post==1?'active':'']"
 			 @click="info.is_post=1" style="left: -2rpx;">邮寄配送</view>
 			<view v-if="isPost==2||isPost==3" :class="['sendway-item',info.is_post==2?'active':'']" 
 			@click="info.is_post=2" style="right: -2rpx;">到店自提</view>
 			
 		</view> -->
-		
-		<!-- 邮寄 -->
-		<view class="address" style="margin-bottom: 36rpx;">
-			<view class="a-title">
-				<view>收货地址</view>
-				<view>
-					<view class="more-person flex-center" v-if="addressList.length>0" @click="changeAddressPopup('open', '', null)">
-						更多<uni-icons style="width: 14rpx;" type="right" size="14"></uni-icons>
-					</view>
-				</view>
-			</view>
-
-			<view class="btn-box">
-				<view class="contacts box" v-if="contacts">
-					<view class="contacts-left">
-						<view class="name-phone">
-							<view class="name">{{ contacts.name }}</view>
-							<view class="phone">{{ contacts.tel }}</view>
-						</view>
-						<view class="adds text-overflowRows">{{ contacts.province_text + contacts.city_text + contacts.district_text + contacts.detail_addr }}</view>
-					</view>
-					<image @click="changeAddressAddPopup('open', '', contacts)" :src="showImg('/uploads/20250514/dd77d7706bc9bffd2bb928d1772e8413.png')" mode="aspectFill"></image>
-				</view>
-				<view v-else class="a-img flex-center" @click.stop="changeAddressAddPopup('open','',{})">
-					<uni-icons style="width: 32rpx;" type="plusempty" size="14"></uni-icons>添加
-				</view>
-			</view>
-		</view>
-		
-		<!-- 自提 -->
-<!-- 		<view v-if="info.is_post==2 && info.goods[0]">
-
-			<view class="pickself" >
-				<navigator :url="`/subPackages/techan/selfPickUpPoint?pickupId=${pickupAddress.id}&goodsId=${info.goods[0].skuInfo.goods_id}`">
-					<view class="pickpoint">
-						<view class="flex-shrink-0">自提点</view>
-						<view class="pickpointAddress">
-							<view class="pointAddressText text-overflow">{{pickupAddress.extract_name||'选择提货地址'}}</view>
-							<uni-icons style="height: 36rpx;" type="right" size="18"></uni-icons>
-						</view>
-					</view>
-				</navigator>
-			</view>
-			
-			<view class="pickup-person-area">
-				<view class="pickpoint">
-					<view>提货人信息</view>
-					<view></view>
-				</view>
-
-				<view class="btn-box flex-column">
-					<view class="p_name line flex-between w-full">
-						<view class="left">姓名</view>
-						<input class="input" type="text" placeholder="请输入提货人姓名" v-model="pickupPerson.name" />
-					</view>
-					<view class="p_tel flex-between w-full">
-						<view class="left">手机号</view>
-						<view class="flex flex-items-center">
-							<input class="input" type="text" placeholder="请输入手机号" v-model="pickupPerson.phone" />
-							<uni-icons v-if="pickupPerson.phone.length>0" style="margin-left: 30rpx;"
-								type="closeempty" size="14" @click="pickupPerson.phone = ''"></uni-icons>
-						</view>
-						
-					</view>
-				</view>
-			</view>
-		</view> -->
-		
-		<template v-for="(merchantGroup,merchantIndex) in orderGoods">
-		<view class="new-box" v-for="(sku,index) in merchantGroup" :key="index">
-			<view class="box shop-name text-overflow" v-if="sku.goodsInfo.merchant_name">
+
+    <!-- 邮寄 -->
+    <view class="address" style="margin-bottom: 36rpx">
+      <view class="a-title">
+        <view>收货地址</view>
+        <view>
+          <view
+            class="more-person flex-center"
+            v-if="addressList.length > 0"
+            @click="changeAddressPopup('open', '', null)"
+          >
+            更多<uni-icons
+              style="width: 14rpx"
+              type="right"
+              size="14"
+            ></uni-icons>
+          </view>
+        </view>
+      </view>
+
+      <view class="btn-box">
+        <view class="contacts box" v-if="contacts">
+          <view class="contacts-left">
+            <view class="name-phone">
+              <view class="name">{{ contacts.name }}</view>
+              <view class="phone">{{ contacts.tel }}</view>
+            </view>
+            <view class="adds text-overflowRows">{{
+              contacts.province_text +
+              contacts.city_text +
+              contacts.district_text +
+              contacts.detail_addr
+            }}</view>
+          </view>
+          <image
+            @click="changeAddressAddPopup('open', '', contacts)"
+            :src="
+              showImg('/uploads/20250514/dd77d7706bc9bffd2bb928d1772e8413.png')
+            "
+            mode="aspectFill"
+          ></image>
+        </view>
+        <view
+          v-else
+          class="a-img flex-center"
+          @click.stop="changeAddressAddPopup('open', '', {})"
+        >
+          <uni-icons style="width: 32rpx" type="plusempty" size="14"></uni-icons
+          >添加
+        </view>
+      </view>
+    </view>
+    <view class="new-box" v-for="(sku, index) in info" :key="index">
+      <!-- <view class="box shop-name text-overflow" v-if="sku.goodsInfo.merchant_name">
 				{{sku.goodsInfo.merchant_name}}
-			</view>
-			<view class="commodity box">
-				<image class="img" :src="showImg(sku.goodsInfo.image)" mode="aspectFill"></image>
-				<view class="title flex-c">
-					<view class="commodity-info">
-						<view class="text-overflowRows">{{ sku.goodsInfo.title }}</view>
-						<view class="commodity-price">
-							{{sku.skuInfo.money/100}}
-						</view>
-					</view>
-					<view class="commodity-info">
-						<view class="text-overflowRows">{{ sku.skuInfo.title }}</view>
-						<view class="commodity-num">
-							x{{sku.skuInfo.buyNum}}
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="commodity box sb" style="padding-left: 10rpx;">
-				<view class="title" style="font-weight: bold;">
-					购买数量
-				</view>
-				<view class="num-box">
-					<!-- <image src="https://yjdtadmin.sz-trip.com/uploads/20231225/4b61998e657784d08c8dfdb08da84553.png" mode="aspectFill" class="ctrl" @click="reduce()"></image> -->
-					<view :class="['ctrl',sku.skuInfo.buyNum>1||info.goods.length>1?'':'disabled']" @click="reduce(sku.skuInfo,index)">-</view>
-					<input class="num" type="text" v-model="sku.skuInfo.buyNum" :disabled='true' />
-					<view :class="['ctrl']" @click="plus(sku.skuInfo)">+</view>
-				</view>
-				
-			</view>
-			<view class="post top-line flex-between" v-show="info.is_post==1">
-				<view class="">
-					运费
-				</view>
-				<view style="font-weight: 500;" >
-					{{!sku.post?'免邮':sku.post/100}}
-				</view>
-			</view>
+			</view> -->
+      <view class="commodity box">
+        <image
+          class="img"
+          :src="showImg(sku.specUrl)"
+          mode="aspectFill"
+        ></image>
+        <view class="title flex-c">
+          <view class="commodity-info">
+            <view class="text-overflowRows">{{ sku.goodsName }}</view>
+            <view class="commodity-price">
+              {{ sku.salePrice }}
+            </view>
+          </view>
+          <view class="commodity-info">
+            <view class="text-overflowRows"
+              >{{ sku.specValueOne }}-{{ sku.specValueTwo }}</view
+            >
+            <view class="commodity-num"> x{{ sku.quantity }} </view>
+          </view>
+        </view>
+      </view>
+      <view class="commodity box sb" style="padding-left: 10rpx" v-if="false">
+        <view class="title" style="font-weight: bold"> 购买数量 </view>
+        <view class="num-box">
+          <!-- <image src="https://yjdtadmin.sz-trip.com/uploads/20231225/4b61998e657784d08c8dfdb08da84553.png" mode="aspectFill" class="ctrl" @click="reduce()"></image> -->
+          <view
+            :class="['ctrl', sku.quantity > 1 ? '' : 'disabled']"
+            @click="reduce(sku, index)"
+            >-</view
+          >
+          <input
+            class="num"
+            type="text"
+            v-model="sku.quantity"
+            :disabled="true"
+          />
+          <view :class="['ctrl']" @click="plus(sku)">+</view>
+        </view>
+      </view>
+    </view>
 
-			
-		</view>
-		</template>
-		
-		<!-- <view  class="tickets-box flex-between">
-		<view class="remark">
-			<view class="remark-title" >订单备注:</view>
-			<input style="z-index:0;text-align: right;" type="text" placeholder="选填" v-model="remark" maxlength="50"/>
-		</view>
-		</view> -->
-		
-		<!-- 优惠券 -->
-
-		<!-- <view @click="goOrderCoupon" class="tickets-box flex-between">
-			<view class="order-title">优惠券</view>
-			<view class="coupon-btn" v-if="coupon==''">
-				<view class="select">选择优惠券</view>
-				<uni-icons style="height: 42rpx;" color="#999999" type="right" size="18"></uni-icons>
-			</view>
-			<div class="coupon-price" v-else>
-				<span v-if="coupon.percent == 0">-￥{{coupon.discounts/100}}</span>
-				<span v-else>-{{coupon.percent}}%</span>
-				<span style="margin:0 31rpx 0 8rpx;color: #6C7A94;">></span>
-			</div>
-		 </view> -->
-
-		
-
-
-		
-		<view class="btn-list">
-			<view class="price-box">
-				<view class="text">合计:</view>
-				<view class="price">{{ total() }}</view>
-				<view class="post-text" v-if="info.is_post==1&&post">含邮费:¥{{ post / 100 }}</view>
-			</view>
-			<view class="btn" @click="order()">立即支付</view>
-		</view>
-
-		<!-- 选择收货地址弹窗 -->
-		<uni-popup ref="addressPopup" type="bottom" backgroundColor="#F4F4F4" @change="changPopShow">
-			<view class="people-popup">
-				<view class="top-box">
-					<view class="top flex-between">
-						<text class="text-overflow" @click="changeAddressPopup('close')">取消</text>
-						<text class="confirm" @click="changeAddressPopup('close', 'confirm')">确定</text>
-					</view>
-				</view>
-				<!-- <navigator url="/subPackages/user/myAddressAdd" class="button">添加收货地址</navigator> -->
-				<view class="button" @click="changeAddressAddPopup('open','',{})">添加收货地址</view>
-				<view class="popup-list" v-if="addressList.length > 0">
-					<view :class="['popup-item',contacts.id==item.id?'active':'']" v-for="(item, index) in addressList" :key="index" @click="seldThisAddress(item)">
-						<view class="item-top flex-between">
-							<view style="padding-right: 71rpx;">
-								<view class="name flex-start">
-									{{ item.name }}
-									<text>{{ item.tel }}</text>
-									<text class="tag" v-if="item.is_default == 1">默认</text>
-								</view>
-								<view class="subtitle text-overflowRows">{{ item.province_text + item.city_text + item.district_text + item.detail_addr }}</view>
-							</view>
-							<view>
-								<img @click.stop="changeAddressAddPopup('open', '', item)" :src="showImg('/uploads/20250514/dd77d7706bc9bffd2bb928d1772e8413.png')" alt="" />
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</uni-popup>
-		<!-- 新增编辑收货地址弹窗 -->
-		<uni-popup ref="addressAddPopup" type="bottom" backgroundColor="#F4F4F4" 
-			@change="changPopShow" style="border-radius: 13rpx 13rpx 0 0;">
-			<view class="people-popup">
-				<view class="top-box">
-					<view class="top flex-between" style="height: fit-content;">
-						<text class="text-overflow" @click="changeAddressAddPopup('close')">取消</text>
-						<text style="font-size: 35rpx;font-weight: 600;">{{addressTitle}}</text>
-						<text style="color: #515150;" class="confirm" @click="saveAddress">保存</text>
-					</view>
-				</view>
-				
-				<view class="add-edit-content">
-					<addressAddVue ref="addressAddVueRef"></addressAddVue>
-				</view>
-				
-				
-			</view>
-		</uni-popup>
-		
-		
-
-	</view>
+    <!-- 订单信息卡片 -->
+    <view class="order-info-card" style="margin-bottom: 36rpx">
+      <!-- 积分兑换 -->
+      <view class="card-section">
+        <view class="section-row" @click="openPointsPopup">
+          <text class="section-label">积分兑换</text>
+          <div style="display: flex; align-items: center">
+            <view class="section-value coupon">{{
+              usePoints > 0
+                ? `已抵扣¥${(usePoints / POINTS_TO_YUAN_RATIO).toFixed(2)}`
+                : "可用积分" + userPoints
+            }}</view>
+            <uni-icons type="right" color="#999999" size="16"></uni-icons>
+          </div>
+        </view>
+      </view>
+
+      <!-- 备注 -->
+      <view class="card-section">
+        <view class="section-row">
+          <text class="section-label">备注</text>
+          <view class="note-input">
+            <input
+              v-model="remark"
+              placeholder="选填"
+              placeholder-class="placeholder"
+              maxlength="200"
+            />
+          </view>
+        </view>
+      </view>
+
+      <!-- 运费 -->
+      <view class="card-section">
+        <view class="section-row">
+          <text class="section-label">运费</text>
+          <text class="section-value">包邮</text>
+        </view>
+      </view>
+
+      <!-- 费用明细 -->
+      <view class="card-section price-section">
+        <view class="price-detail">
+          <view class="text">商品总价:</view>
+          <view class="price">{{ getGoodsTotal() }}</view>
+        </view>
+        <view class="price-detail" v-if="usePoints > 0">
+          <view class="text">积分抵扣:</view>
+          <view class="price deduction"
+            >-¥{{ (usePoints / POINTS_TO_YUAN_RATIO).toFixed(2) }}</view
+          >
+        </view>
+      </view>
+    </view>
+
+    <!-- 底部支付区域 -->
+    <view class="payment-bottom">
+      <view class="total-amount">
+        <text class="total-label">实付金额:</text>
+        <text class="total-price">{{ total() }}</text>
+      </view>
+      <view class="btn" :class="{ loading: isOrderLoading }" @click="order()">
+        <text v-if="!isOrderLoading">立即支付</text>
+        <text v-else>支付中...</text>
+      </view>
+    </view>
+
+    <!-- 选择收货地址弹窗 -->
+    <uni-popup
+      ref="addressPopup"
+      type="bottom"
+      backgroundColor="#F4F4F4"
+      @change="changPopShow"
+    >
+      <view class="people-popup">
+        <view class="top-box">
+          <view class="top flex-between">
+            <text class="text-overflow" @click="changeAddressPopup('close')"
+              >取消</text
+            >
+            <text
+              class="confirm"
+              @click="changeAddressPopup('close', 'confirm')"
+              >确定</text
+            >
+          </view>
+        </view>
+        <!-- <navigator url="/subPackages/user/myAddressAdd" class="button">添加收货地址</navigator> -->
+        <view class="button" @click="changeAddressAddPopup('open', '', {})"
+          >添加收货地址</view
+        >
+        <view class="popup-list" v-if="addressList.length > 0">
+          <view
+            :class="['popup-item', contacts.id == item.id ? 'active' : '']"
+            v-for="(item, index) in addressList"
+            :key="index"
+            @click="seldThisAddress(item)"
+          >
+            <view class="item-top flex-between">
+              <view style="padding-right: 71rpx">
+                <view class="name flex-start">
+                  {{ item.name }}
+                  <text>{{ item.tel }}</text>
+                  <text class="tag" v-if="item.is_default == 1">默认</text>
+                </view>
+                <view class="subtitle text-overflowRows">{{
+                  item.province_text +
+                  item.city_text +
+                  item.district_text +
+                  item.detail_addr
+                }}</view>
+              </view>
+              <view>
+                <img
+                  @click.stop="changeAddressAddPopup('open', '', item)"
+                  :src="
+                    showImg(
+                      '/uploads/20250514/dd77d7706bc9bffd2bb928d1772e8413.png'
+                    )
+                  "
+                  alt=""
+                />
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </uni-popup>
+    <!-- 新增编辑收货地址弹窗 -->
+    <uni-popup
+      ref="addressAddPopup"
+      type="bottom"
+      backgroundColor="#F4F4F4"
+      @change="changPopShow"
+      style="border-radius: 13rpx 13rpx 0 0"
+    >
+      <view class="people-popup">
+        <view class="top-box">
+          <view class="top flex-between" style="height: fit-content">
+            <text class="text-overflow" @click="changeAddressAddPopup('close')"
+              >取消</text
+            >
+            <text style="font-size: 35rpx; font-weight: 600">{{
+              addressTitle
+            }}</text>
+            <text style="color: #515150" class="confirm" @click="saveAddress"
+              >保存</text
+            >
+          </view>
+        </view>
+
+        <view class="add-edit-content">
+          <addressAddVue ref="addressAddVueRef"></addressAddVue>
+        </view>
+      </view>
+    </uni-popup>
+
+    <!-- 积分兑换弹窗 -->
+    <uni-popup
+      ref="pointsPopup"
+      type="bottom"
+      backgroundColor="#F4F4F4"
+      @change="changPopShow"
+    >
+      <view class="points-popup">
+        <view class="popup-header">
+          <text class="popup-close" @click="closePointsPopup">取消</text>
+          <text class="popup-title">积分兑换</text>
+          <text class="popup-confirm" @click="confirmPointsUse">确定</text>
+        </view>
+
+        <view class="popup-content">
+          <!-- 兑换规则 -->
+          <view class="exchange-rule">
+            <text class="rule-title">兑换规则</text>
+            <text class="rule-desc">{{ POINTS_TO_YUAN_RATIO }}积分抵扣1元</text>
+          </view>
+
+          <!-- 当前积分 -->
+          <view class="current-points">
+            <text class="points-label">当前{{ userPoints }}积分</text>
+            <text class="points-value"
+              >本订单最多可用{{ getMaxUsablePoints() }}积分（{{
+                (getMaxUsablePoints() / POINTS_TO_YUAN_RATIO).toFixed(2)
+              }}元）</text
+            >
+          </view>
+
+          <!-- 积分选择 -->
+          <view class="points-options-section">
+            <view
+              class="option-item"
+              :class="{ active: tempUsePoints == 0 }"
+              @click="selectPointsOption(0)"
+            >
+              <view class="option-radio">
+                <view class="radio-dot" v-if="tempUsePoints == 0"></view>
+              </view>
+              <view class="option-content">
+                <text class="option-title">不使用积分</text>
+              </view>
+            </view>
+
+            <view
+              class="option-item"
+              :class="{ active: tempUsePoints == getMaxUsablePoints() }"
+              @click="selectPointsOption(getMaxUsablePoints())"
+              v-if="getMaxUsablePoints() > 0"
+            >
+              <view class="option-radio">
+                <view
+                  class="radio-dot"
+                  v-if="tempUsePoints == getMaxUsablePoints()"
+                ></view>
+              </view>
+              <view class="option-content">
+                <text class="option-title"
+                  >使用全部可用积分{{ getMaxUsablePoints() }}积分抵扣{{
+                    (getMaxUsablePoints() / POINTS_TO_YUAN_RATIO).toFixed(2)
+                  }}元</text
+                >
+                <text class="option-desc">最大可用积分数量</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </uni-popup>
+  </view>
 </template>
 
 <script>
-import addressAddVue from '../../components/addressAdd.vue';
+import addressAddVue from "../../components/addressAdd.vue";
+import Decimal from "decimal.js";
 export default {
-	components: {addressAddVue},
-	data() {
-		return {
-			contacts: null,
-			info: null,//规格的信息
-			detail:null,//商品的信息
-			
-			orderGoods: [],
-			
-			post: 0,
-			flag: true,
-			addressList: [],
-			reserve_name: '',
-			reserve_idcard: '',
-			reserve_phone: '',
-			remark: '',
-			coupon: "",
-			allprice: 0,
-			
-			isPost: "1", //0=核销，1=邮寄，2=自取，3=邮寄/自提
-			sendType: 1, // 0=核销，1=邮寄，2=自取，3=邮寄/自提
-			pickupAddress: {id: null, address:''},
-			pickupPerson: {name:'',phone:''},
-			popShow: false, // 解决滚动穿透
-			
-			addressTitle: '添加收货地址'
-			
-		};
-	},
-	onLoad() {
-		this.$store.commit("choseCoupon", "");
-		this.info = JSON.parse(uni.getStorageSync('teChanOrder'));
-		
-		
-		if (!this.info) {
-			uni.navigateBack();
-			return
-		}
-		console.log(this.info);
-		
-		// 根据规格信息 记录发货方式 is_post  ，使用方式：0=核销，1=邮寄，2=自取，3=邮寄/自提
-		if (this.info) {
-			this.isPost = this.info.is_post || "1"
-			// this.info.is_post = this.isPost==3?1:this.isPost
-		}
-		this.handleOrderGoods()
-		console.log(this.isPost)
-	},
-	onShow() {
-		// this.coupon = this.$store.state.user.coupon
-		this.getAllAddressList();
-		
-		// 更新自提点
-		uni.$on("updateDataByConnect",this.getDataByConnect)
-	},
-	onUnload(){
-		uni.$off("updateDataByConnect",this.getDataByConnect)
-	},
-	onReady () {
-		this.$nextTick(()=>{
-			setTimeout(()=>{
-				// this.getMaxCouponData()
-			},1000)
-		})
-		
-		
-	},
-	methods: {
-		handleOrderGoods () {
-			let merchantArray = new Set(this.info.goods.map(v=>v.goodsInfo.merchant_name))
-			this.orderGoods = []
-			merchantArray.forEach(x=>{
-				// let tempArray = this.info.goods.filter(v=>v.goodsInfo.merchant_name==x)
-				// this.orderGoods.push(tempArray)
-				
-				// 不用filter 用for循环一个个找 可以用引用对象地址修改this.info的goods 这样下面的代码不用改
-				let tempArray = []
-				this.info.goods.forEach(v=>{
-					if(v.goodsInfo.merchant_name == x) {
-						tempArray.push(v)
-					}
-				})
-				this.orderGoods.push(tempArray)
-				
-			})
-			console.log(this.orderGoods)
-		},
-		
-		
-		goOrderCoupon () {
-			let allPrice = 0
-			let skuIds= []
-			this.info.goods.forEach(v=>{
-				allPrice+= v.skuInfo.money*v.skuInfo.buyNum
-				if (v.skuInfo.buyNum>0) {
-					skuIds.push(v.skuInfo.id)
-				}
-			})
-			uni.navigateTo({
-				url: `/subPackages/order/orderCoupon?allprice=${allPrice}&sku_ids=${skuIds.join(',')}`
-			})
-		},
-		
-		getContacts() {
-			if (this.info.is_post == 0) {
-				return;
-			}
-			
-			this.Post({}, '/api/user/getDefaultConsignee').then(res => {
-				if (res) {
-					this.contacts = res.data;
-					this.getPost();
-				}
-			});
-		},
-		getPost() {
-			if (this.info.is_post == 0 || !this.contacts) {
-				return;
-			}
-			this.flag = false;
-			
-			let param = []
-			this.info.goods.forEach(v=>{
-				param.push({specifications_id: v.skuInfo.id, num: v.skuInfo.buyNum, consignee_id:this.contacts.id})
-			})
-			
-			let data = JSON.stringify(param);
-			// console.log(data);
-			this.Post({ data: data }, '/api/order/getNewPost').then(res => {
-				if (res) {
-					for(let i=0;i<this.info.goods.length;i++) {
-						this.info.goods[i].post = res.data[i].post_money;
-					}
-					this.flag = true;
-				}
-			}).catch(err=>{
-				console.log(err,'aaaaaaa');
-				this.flag = true;
-			});
-		},
-
-		plus(sku) {
-			this.$nextTick(() => {
-				this.$store.commit("choseCoupon","");
-				this.coupon = this.$store.state.user.coupon
-				sku.buyNum += 1;
-				if (this.flag) {
-					this.getPost();
-				}
-			});
-		},
-		reduce(sku,index) {
-			if (sku.buyNum > 1) {
-				this.$store.commit("choseCoupon","");
-				this.coupon = this.$store.state.user.coupon
-				this.$nextTick(() => {
-					sku.buyNum -= 1;
-					if (this.flag) {
-						this.getPost();
-					}
-				});
-			} else if (sku.buyNum == 1&&this.info.goods.length>1) {
-				this.$store.commit("choseCoupon","");
-				this.coupon = this.$store.state.user.coupon
-				this.$nextTick(() => {
-					this.info.goods.splice(index,1)
-					if (this.flag) {
-						this.getPost();
-					}
-					this.handleOrderGoods()
-				});
-				
-			}
-		},
-		// 选择收货地址弹窗
-		changeAddressPopup(type, confirm, index) {
-			if (type == 'open') this.$refs.addressPopup.open('bottom');
-			else this.$refs.addressPopup.close();
-			this.$forceUpdate();
-		},
-		// 获取收货地址列表
-		getAllAddressList() {
-			this.Post({}, '/api/user/consigneeList').then(res => {
-				let oldId = (this.contacts || {}).id
-				console.log(this.contacts)
-				if (res.code == 200) this.addressList = res.data || [];
-				if (this.addressList.some(v=>v.id==oldId)) {
-					this.contacts = this.addressList.find(v=>v.id==oldId)
-					this.getPost();
-				} else if (this.addressList.some(v=>v.is_default==1)) {
-					this.contacts = this.addressList.find(v=>v.is_default==1)
-					this.getPost();
-				} else if (this.addressList.length>0) {
-					this.contacts = this.addressList[0]
-					this.getPost()
-				}
-			});
-		},
-		// 选择收货地址
-		seldThisAddress(item) {
-			if (!this.contacts) this.contacts = {};
-			this.contacts = item
-			console.log(this.flag,1111111);
-			if (this.flag) {
-				this.getPost();
-			}
-			this.$refs.addressPopup.close();
-			this.$forceUpdate();
-		},
-		// 收货地址新增弹窗
-		changeAddressAddPopup(type, confirm, item) {
-			if (type == 'open') {
-				this.addressTitle = '新增收货地址'
-				if (item.id) { this.addressTitle = '编辑收货地址' }
-				// this.id = item.id
-
-				this.$refs.addressAddPopup.open('bottom');
-				
-				this.$nextTick(()=>{
-					this.$refs.addressAddVueRef.init(item)
-				})
-			}
-			else {this.$refs.addressAddPopup.close();}
-			this.$forceUpdate();
-		},
-		
-		// 保存地址
-		async saveAddress () {
-			let res = await this.$refs.addressAddVueRef.postSave()
-			if (res && (res.code == 1 || res.code==200)) {
-				this.contacts = res.data
-				this.getAllAddressList();
-				this.changeAddressAddPopup('close')
-			}
-		},
-
-
-
-		// 总价
-		total() {
-			let price = 0
-			let postPrice = 0
-			let allPrice = 0
-			
-			if (this.info && Array.isArray(this.info.goods)) {
-				this.info.goods.forEach(v=>{
-					allPrice += v.skuInfo.money*v.skuInfo.buyNum
-					if (this.info.is_post == 1) {
-						postPrice+=(v.post || 0)
-					}
-				})
-			}
-			console.log(postPrice)
-			this.allprice = allPrice + postPrice
-			if (this.coupon) {
-				if (this.coupon.percent == 0) {
-					if (this.coupon.discounts>allPrice) {
-						price =postPrice
-					}else{
-						price = allPrice + postPrice - (this.coupon.discounts)
-					}
-					
-				} else{
-					// 有bug折扣券不加邮费
-					price = (allPrice + postPrice) - (allPrice * this.coupon.percent/100)
-				}
-			} else {
-				price = allPrice + postPrice
-			}
-			return price < 0 ? 0 : (price/100).toFixed(2)
-		},
-		// 预定
-		order() {
-			if (this.info.is_post == 1 || this.info.is_post == 3) {
-				console.log(this.info.is_post)
-				if (this.info.is_post == 1 && !this.contacts) {
-					uni.showToast({
-						title: '请选择收货地址',
-						icon: 'none'
-					});
-					return;
-				}
-				
-				if (this.info.is_post == 2) {
-					if (!this.pickupAddress.id) {
-						uni.showToast({title: '请选择自提点',icon: 'none'});
-						return;
-					}
-
-					if (this.pickupPerson.name.trim().length<0) {
-						uni.showToast({
-							title: '请输入自提人姓名',
-							icon: 'none'
-						});
-						return;
-					}
-					if (!this.IsTel(this.pickupPerson.phone)) {
-						uni.showToast({
-							title: '请输入自提人手机号',
-							icon: 'none'
-						});
-						return;
-					}
-					
-
-				}
-			}
-
-			let goods = [];
-			this.info.goods.forEach(v=>{
-				let goodsItem = {
-					specifications_id: v.skuInfo.id,
-					num: v.skuInfo.buyNum,
-					// consignee_id: this.info.is_post == 1 ? this.contacts.id : null
-				};
-				
-				if (this.info.is_post == 2) {
-					goodsItem.extract_id = this.pickupAddress.id;
-				} else if (this.info.is_post == 1){
-					goodsItem.consignee_id = this.contacts.id 
-				}
-				goods.push(goodsItem);
-			})
-			
-			
-			
-			let data = {
-				goods: goods,
-				coupon: this.coupon ? this.coupon.id : "",
-				remark: this.remark,
-				is_post: this.info.is_post,
-				reserve_name: this.pickupPerson.name,
-				reserve_phone: this.pickupPerson.phone,
-			};
-			this.Post(
-				{
-					method: 'POST',
-					data: JSON.stringify(data)
-				},
-				'/api/order/place'
-			).then(res => {
-				uni.removeStorageSync('teChanOrder')
-				uni.removeStorageSync('teChanInfo')
-				if (res.code == 1 || res.code==200) {
-					this.Post(
-						{
-							order_id: res.data.order_id,
-							type: 'miniprogram',
-							platform: 'miniprogram'
-						},
-						'/api/pay/unify'
-					).then(res => {
-						if (res.data) {
-							uni.requestPayment({
-								nonceStr: res.data.nonceStr,
-								package: res.data.package,
-								paySign: res.data.paySign,
-								signType: res.data.signType,
-								timeStamp: res.data.timeStamp,
-								success: () => {
-									this.getSubscribeMessage()
-								},
-								fail() {
-									uni.navigateTo({
-										url: '/subPackages/order/trades'
-									})
-								}
-							});
-						}
-					});
-				}
-			});
-		},
-		
-		// ---------------自提-----------------------
-		changPopShow (e) {
-			this.popShow = e.show
-		},
-		
-		getDataByConnect(data) {
-			if (data.msgType == "updatePickUpPoint") {
-				this.pickupAddress = data.data
-			}
-		},
-		
-		// 获取最大优惠券
-		async getMaxCouponData () {
-			let allPrice =0
-			let skuIds = []
-			if (this.info && Array.isArray(this.info.goods)) {
-				this.info.goods.forEach(v=>{
-					allPrice += v.skuInfo.money*v.skuInfo.buyNum
-					if (v.skuInfo.buyNum>0) {
-						skuIds.push(v.skuInfo.id)
-					}
-				})
-			}
-			let param = {money:allPrice,sku_ids:skuIds.join(',')}
-			let res = await this.getMaxCoupon(param)
-			if (res.id) {
-				this.coupon = res
-			}
-		}
-		
-		
-		
-	}
+  components: { addressAddVue },
+  data() {
+    return {
+      contacts: null,
+      info: null, //规格的信息
+      detail: null, //商品的信息
+
+      orderGoods: [],
+
+      post: 0,
+      flag: true,
+      addressList: [],
+      reserve_name: "",
+      reserve_idcard: "",
+      reserve_phone: "",
+      remark: "",
+      coupon: "",
+      allprice: 0,
+
+      // 积分相关
+      userPoints: 0, // 用户可用积分
+      usePoints: 0, // 使用的积分数量
+      tempUsePoints: 0, // 弹窗中临时的积分数量
+
+      // 积分常量
+      POINTS_EXCHANGE_AMOUNT: 650, // 积分兑换数量
+      POINTS_EXCHANGE_VALUE: 6.5, // 积分兑换价值（元）
+      POINTS_TO_YUAN_RATIO: 100, // 积分与元的兑换比例（100积分=1元）
+
+      // 加载状态
+      isOrderLoading: false, // 下单加载状态
+      isPolling: false, // 轮询状态标志
+
+      isPost: "1", //0=核销，1=邮寄，2=自取，3=邮寄/自提
+      sendType: 1, // 0=核销，1=邮寄，2=自取，3=邮寄/自提
+      pickupAddress: { id: null, address: "" },
+      pickupPerson: { name: "", phone: "" },
+      popShow: false, // 解决滚动穿透
+
+      addressTitle: "添加收货地址",
+    };
+  },
+  onLoad() {
+    this.info = this.$store.state.user.sshoppingCart;
+    if (!this.info) {
+      uni.navigateBack();
+      return;
+    }
+    // console.log(this.info);
+
+    // 根据规格信息 记录发货方式 is_post  ，使用方式：0=核销，1=邮寄，2=自取，3=邮寄/自提
+    if (this.info) {
+      this.isPost = this.info.is_post || "1";
+      // this.info.is_post = this.isPost==3?1:this.isPost
+    }
+    // this.handleOrderGoods()
+    // console.log(this.isPost);
+  },
+  onShow() {
+    this.getTotalPoints();
+
+    // this.coupon = this.$store.state.user.coupon
+    this.getAllAddressList();
+    this.tempUsePoints = this.usePoints; // 初始化临时积分
+
+    // 更新自提点
+    uni.$on("updateDataByConnect", this.getDataByConnect);
+  },
+  onUnload() {
+    uni.$off("updateDataByConnect", this.getDataByConnect);
+    // 停止轮询
+    this.isPolling = false;
+    this.isOrderLoading = false;
+  },
+  onReady() {
+    // 页面准备完成后的初始化操作
+  },
+  methods: {
+    // 获取总积分
+    async getTotalPoints() {
+      try {
+        this.Post({}, "/framework/points/getLastBalance", "DES").then((res) => {
+          if (res.code === 200) {
+            this.userPoints = res.data.balance || 0;
+            this.POINTS_TO_YUAN_RATIO = res.data.changeValue;
+          }
+        });
+      } catch (error) {
+        console.error("获取总积分失败:", error);
+      }
+    },
+
+    // 轮询查询订单状态
+    async pollOrderStatus(params = {}) {
+      const {
+        maxAttempts = 30, // 最大轮询次数，默认30次
+        interval = 2000, // 轮询间隔，默认2秒
+        onSuccess = null, // 成功回调
+        onFailure = null, // 失败回调
+        onTimeout = null, // 超时回调
+        ...requestParams // 其他请求参数
+      } = params;
+
+      let attempts = 0;
+      this.isPolling = true; // 开始轮询
+
+      const poll = async () => {
+        // 检查页面是否已销毁或轮询是否已停止
+        if (!this.isPolling) {
+          return;
+        }
+
+        try {
+          attempts++;
+
+          const res = await this.Post(
+            requestParams,
+            "/framework/ygOrder/queryToken",
+            "DES"
+          );
+
+          // 再次检查轮询状态
+          if (!this.isPolling) {
+            return;
+          }
+
+          if (res && res.code === 200) {
+            const status = res.data?.status;
+
+            if (status === 1) {
+              // 成功状态，停止轮询
+              this.isPolling = false;
+              if (onSuccess && typeof onSuccess === "function") {
+                onSuccess(res.data);
+              }
+              return;
+            } else if (status === 2) {
+              // 失败状态，停止轮询
+              this.isPolling = false;
+              if (onFailure && typeof onFailure === "function") {
+                onFailure(res.data);
+              }
+              return;
+            } else if (status === 0) {
+              // 下单中，继续轮询
+              if (attempts >= maxAttempts) {
+                // 达到最大轮询次数，停止轮询
+                this.isPolling = false;
+                if (onTimeout && typeof onTimeout === "function") {
+                  onTimeout({ message: "轮询超时", attempts });
+                }
+                return;
+              }
+
+              // 继续轮询
+              setTimeout(() => {
+                if (this.isPolling) {
+                  poll();
+                }
+              }, interval);
+            } else {
+              // 未知状态，停止轮询
+              this.isPolling = false;
+              if (onFailure && typeof onFailure === "function") {
+                onFailure({ message: "未知状态", status, data: res.data });
+              }
+            }
+          } else if (res && res.code === 500) {
+            // 服务器错误，直接调用失败回调
+            this.isPolling = false;
+            onFailure({ message: "服务器错误", code: res.code, error: res });
+            return;
+          }
+        } catch (error) {
+          // 异常处理，直接调用失败回调
+          this.isPolling = false;
+          if (onFailure && typeof onFailure === "function") {
+            onFailure({ message: "请求异常", attempts, error });
+          }
+          return;
+        }
+      };
+
+      // 开始轮询
+      poll();
+    },
+
+    getContacts() {
+      if (this.info.is_post == 0) {
+        return;
+      }
+
+      this.Post({}, "/api/user/getDefaultConsignee").then((res) => {
+        if (res) {
+          this.contacts = res.data;
+          this.getPost();
+        }
+      });
+    },
+    getPost() {
+      if (this.info.is_post == 0 || !this.contacts) {
+        return;
+      }
+      this.flag = false;
+
+      let param = [];
+      this.info.goods.forEach((v) => {
+        param.push({
+          specifications_id: v.skuInfo.id,
+          num: v.skuInfo.quantity,
+          consignee_id: this.contacts.id,
+        });
+      });
+
+      let data = JSON.stringify(param);
+      // console.log(data);
+      this.Post({ data: data }, "/api/order/getNewPost")
+        .then((res) => {
+          if (res) {
+            for (let i = 0; i < this.info.goods.length; i++) {
+              this.info.goods[i].post = res.data[i].post_money;
+            }
+            this.flag = true;
+          }
+        })
+        .catch((err) => {
+          // console.log(err, "aaaaaaa");
+          this.flag = true;
+        });
+    },
+
+    plus(sku) {
+      this.$nextTick(() => {
+        sku.quantity += 1;
+        if (this.flag) {
+          this.getPost();
+        }
+      });
+    },
+    reduce(sku, index) {
+      if (sku.quantity > 1) {
+        this.$nextTick(() => {
+          sku.quantity -= 1;
+          if (this.flag) {
+            this.getPost();
+          }
+        });
+      } else if (sku.quantity == 1) {
+        this.$nextTick(() => {
+          this.info.splice(index, 1);
+          if (this.flag) {
+            this.getPost();
+          }
+          this.handleOrderGoods();
+        });
+      }
+    },
+    // 选择收货地址弹窗
+    changeAddressPopup(type, confirm, index) {
+      if (type == "open") this.$refs.addressPopup.open("bottom");
+      else this.$refs.addressPopup.close();
+      this.$forceUpdate();
+    },
+    // 获取收货地址列表
+    getAllAddressList() {
+      this.Post({}, "/api/user/consigneeList").then((res) => {
+        let oldId = (this.contacts || {}).id;
+        if (res.code == 200) this.addressList = res.data || [];
+        if (this.addressList.some((v) => v.id == oldId)) {
+          this.contacts = this.addressList.find((v) => v.id == oldId);
+          this.getPost();
+        } else if (this.addressList.some((v) => v.is_default == 1)) {
+          this.contacts = this.addressList.find((v) => v.is_default == 1);
+          this.getPost();
+        } else if (this.addressList.length > 0) {
+          this.contacts = this.addressList[0];
+          this.getPost();
+        }
+      });
+    },
+    // 选择收货地址
+    seldThisAddress(item) {
+      if (!this.contacts) this.contacts = {};
+      this.contacts = item;
+      if (this.flag) {
+        this.getPost();
+      }
+      this.$refs.addressPopup.close();
+      this.$forceUpdate();
+    },
+    // 收货地址新增弹窗
+    changeAddressAddPopup(type, confirm, item) {
+      if (type == "open") {
+        this.addressTitle = "新增收货地址";
+        if (item.id) {
+          this.addressTitle = "编辑收货地址";
+        }
+        // this.id = item.id
+
+        this.$refs.addressAddPopup.open("bottom");
+
+        this.$nextTick(() => {
+          this.$refs.addressAddVueRef.init(item);
+        });
+      } else {
+        this.$refs.addressAddPopup.close();
+      }
+      this.$forceUpdate();
+    },
+
+    // 保存地址
+    async saveAddress() {
+      let res = await this.$refs.addressAddVueRef.postSave();
+      if (res && (res.code == 1 || res.code == 200)) {
+        this.contacts = res.data;
+        this.getAllAddressList();
+        this.changeAddressAddPopup("close");
+      }
+    },
+
+    // 计算积分抵扣
+    calculatePointsDeduction() {
+      let points = parseInt(this.usePoints) || 0;
+      // 限制使用积分不能超过可用积分
+      if (points > this.userPoints) {
+        points = this.userPoints;
+        this.usePoints = points;
+      }
+
+      // 计算实际支付金额（不含积分抵扣）
+      let actualPaymentAmount = this.getActualPaymentAmount();
+      let actualPaymentDecimal = new Decimal(actualPaymentAmount);
+      let ratioDecimal = new Decimal(this.POINTS_TO_YUAN_RATIO);
+
+      // 限制积分抵扣金额不能超过实际支付金额
+      let maxPoints = actualPaymentDecimal.mul(ratioDecimal).floor().toNumber();
+      if (points > maxPoints) {
+        points = maxPoints;
+        this.usePoints = points;
+      }
+    },
+
+    // 全部使用积分
+    useAllPoints() {
+      // 计算实际支付金额（不含积分抵扣）
+      let actualPaymentAmount = this.getActualPaymentAmount();
+      let actualPaymentDecimal = new Decimal(actualPaymentAmount);
+      let ratioDecimal = new Decimal(this.POINTS_TO_YUAN_RATIO);
+
+      // 根据实际支付金额计算最大可用积分
+      let maxPointsFromPayment = actualPaymentDecimal
+        .mul(ratioDecimal)
+        .floor()
+        .toNumber();
+      let maxPoints = Math.min(this.userPoints, maxPointsFromPayment);
+      this.usePoints = maxPoints;
+    },
+
+    // 获取商品总价（不含运费，单位：元）
+    getGoodsTotalAmount() {
+      let allPriceDecimal = new Decimal(0);
+      if (this.info && Array.isArray(this.info)) {
+        this.info.forEach((sku) => {
+          // 解析商品价格（单位：元）
+
+          if (sku.salePrice) {
+            let priceStr = sku.salePrice
+              .toString()
+              .replace("¥", "")
+              .replace("￥", "");
+            try {
+              let priceDecimal = new Decimal(priceStr);
+              let quantityDecimal = new Decimal(sku.quantity || 0);
+
+              if (priceDecimal.isPositive() && quantityDecimal.isPositive()) {
+                // 使用Decimal进行精确计算
+                allPriceDecimal = allPriceDecimal.plus(
+                  priceDecimal.mul(quantityDecimal)
+                );
+              }
+            } catch (error) {}
+          }
+        });
+      }
+
+      return allPriceDecimal.toNumber();
+    },
+
+    // 获取商品总价（显示用，单位：元）
+    getGoodsTotal() {
+      let allPriceYuan = this.getGoodsTotalAmount();
+      return "¥" + allPriceYuan.toFixed(2);
+    },
+
+    // 获取总运费（单位：分）
+    getTotalPost() {
+      // 运费暂时设为0
+      return 0;
+    },
+
+    // 获取当前订单最大可用积分
+    getMaxUsablePoints() {
+      let actualPaymentAmount = this.getActualPaymentAmount();
+      let actualPaymentDecimal = new Decimal(actualPaymentAmount);
+      let minPaymentDecimal = new Decimal(0.01); // 最少支付0.01元
+
+      // 最大可兑换金额 = 实际支付金额 - 0.01元
+      let maxExchangeAmount = actualPaymentDecimal.minus(minPaymentDecimal);
+
+      // 如果实际支付金额小于等于0.01元，则不能使用积分
+      if (maxExchangeAmount.lessThanOrEqualTo(0)) {
+        return 0;
+      }
+
+      let ratioDecimal = new Decimal(this.POINTS_TO_YUAN_RATIO);
+      let maxPointsFromPayment = maxExchangeAmount
+        .mul(ratioDecimal)
+        .floor()
+        .toNumber();
+      return Math.min(this.userPoints, maxPointsFromPayment);
+    },
+
+    // 获取实际支付金额（不含积分抵扣，单位：元）
+    getActualPaymentAmount() {
+      let goodsPriceDecimal = new Decimal(this.getGoodsTotalAmount()); // 商品总价（元）
+      let postPriceDecimal = new Decimal(this.getTotalPost()); // 运费（元）
+      let totalPriceDecimal = goodsPriceDecimal.plus(postPriceDecimal);
+
+      // 优惠券计算（以元为单位）
+      if (this.coupon) {
+        if (this.coupon.percent == 0) {
+          // 满减券
+          let discountsDecimal = new Decimal(this.coupon.discounts);
+          if (discountsDecimal.greaterThan(goodsPriceDecimal)) {
+            totalPriceDecimal = postPriceDecimal;
+          } else {
+            totalPriceDecimal = goodsPriceDecimal
+              .plus(postPriceDecimal)
+              .minus(discountsDecimal);
+          }
+        } else {
+          // 折扣券
+          let percentDecimal = new Decimal(this.coupon.percent);
+          let hundredDecimal = new Decimal(100);
+          let discountDecimal = goodsPriceDecimal
+            .mul(percentDecimal)
+            .div(hundredDecimal);
+          totalPriceDecimal = goodsPriceDecimal
+            .plus(postPriceDecimal)
+            .minus(discountDecimal);
+        }
+      }
+
+      // 确保金额不为负数
+      let zeroDecimal = new Decimal(0);
+      return totalPriceDecimal.lessThan(zeroDecimal)
+        ? 0
+        : totalPriceDecimal.toNumber();
+    },
+
+    // 总价计算（最终支付金额）
+    total() {
+      let goodsPriceDecimal = new Decimal(this.getGoodsTotalAmount()); // 商品总价（元）
+      let postPriceDecimal = new Decimal(this.getTotalPost()); // 运费（元）
+      let usePointsDecimal = new Decimal(parseInt(this.usePoints) || 0);
+      let ratioDecimal = new Decimal(this.POINTS_TO_YUAN_RATIO);
+      let pointsDeductionDecimal = usePointsDecimal.div(ratioDecimal); // 积分抵扣（元，100积分=1元）
+
+      let totalPriceDecimal = goodsPriceDecimal.plus(postPriceDecimal);
+
+      // 优惠券计算（以元为单位）
+      if (this.coupon) {
+        if (this.coupon.percent == 0) {
+          // 满减券
+          let discountsDecimal = new Decimal(this.coupon.discounts);
+          if (discountsDecimal.greaterThan(goodsPriceDecimal)) {
+            totalPriceDecimal = postPriceDecimal;
+          } else {
+            totalPriceDecimal = goodsPriceDecimal
+              .plus(postPriceDecimal)
+              .minus(discountsDecimal);
+          }
+        } else {
+          // 折扣券
+          let percentDecimal = new Decimal(this.coupon.percent);
+          let hundredDecimal = new Decimal(100);
+          let discountDecimal = goodsPriceDecimal
+            .mul(percentDecimal)
+            .div(hundredDecimal);
+          totalPriceDecimal = goodsPriceDecimal
+            .plus(postPriceDecimal)
+            .minus(discountDecimal);
+        }
+      }
+
+      // 积分抵扣（积分只能抵扣商品价格，不能抵扣运费）
+      totalPriceDecimal = totalPriceDecimal.minus(pointsDeductionDecimal);
+
+      // 保存总价用于订单提交
+      this.allprice = totalPriceDecimal.toNumber();
+
+      let zeroDecimal = new Decimal(0);
+      return totalPriceDecimal.lessThan(zeroDecimal)
+        ? "¥0.00"
+        : "¥" + totalPriceDecimal.toFixed(2);
+    },
+    // 预定
+    order() {
+      if (this.isOrderLoading) {
+        return; // 防止重复点击
+      }
+
+      if (!this.contacts) {
+        uni.showToast({
+          title: "请选择收货地址",
+          icon: "none",
+        });
+        return;
+      }
+
+      this.isOrderLoading = true; // 开始加载
+
+      let data = {
+        shoppingCartBoList: this.info,
+        userContactId: this.contacts.id,
+        remark: this.remark,
+        expectedAmount: this.allprice,
+        usePoints: this.usePoints ? 0 : 1, // 是否使用积分
+        pointsQuantity: parseInt(this.usePoints) || 0, // 使用的积分数量
+      };
+
+      this.Post(
+        {
+          method: "POST",
+          ...data,
+        },
+        "/framework/ygOrder/preAddOrder",
+        "DES"
+      )
+        .then((res) => {
+          if (res.code == 200) {
+            this.pollOrderStatus({
+              authToken: res.msg,
+              maxAttempts: 20,
+              interval: 2000,
+              onSuccess: (data) => {
+                this.isOrderLoading = false; // 结束加载
+                // 处理成功逻辑
+                uni.showToast({
+                  title: "订单创建成功",
+                  icon: "success",
+                });
+              },
+              onFailure: (data) => {
+                this.isOrderLoading = false; // 结束加载
+                // 处理失败逻辑
+                uni.showToast({
+                  title: data.msg,
+                  icon: "none",
+                });
+              },
+              onTimeout: (info) => {
+                this.isOrderLoading = false; // 结束加载
+                // 处理超时逻辑
+                uni.showToast({
+                  title: "订单处理超时",
+                  icon: "error",
+                });
+              },
+            });
+          } else {
+            this.isOrderLoading = false; // 结束加载
+            uni.showToast({
+              title: res.msg || "下单失败",
+              icon: "error",
+            });
+          }
+        })
+        .catch((error) => {
+          this.isOrderLoading = false; // 结束加载
+          uni.showToast({
+            title: "网络错误，请重试",
+            icon: "error",
+          });
+        });
+    },
+
+    // ---------------自提-----------------------
+    changPopShow(e) {
+      this.popShow = e.show;
+    },
+
+    getDataByConnect(data) {
+      if (data.msgType == "updatePickUpPoint") {
+        this.pickupAddress = data.data;
+      }
+    },
+
+    // 打开积分兑换弹窗
+    openPointsPopup() {
+      this.tempUsePoints = this.usePoints;
+      this.$refs.pointsPopup.open("bottom");
+    },
+
+    // 关闭积分兑换弹窗
+    closePointsPopup() {
+      this.$refs.pointsPopup.close();
+    },
+
+    // 选择积分选项
+    selectPointsOption(points) {
+      // 如果选择使用积分，需要检查用户是否有足够积分
+      if (points > 0 && this.userPoints < points) {
+        uni.showToast({
+          title: "积分不足",
+          icon: "none",
+        });
+        return;
+      }
+
+      // 检查积分兑换是否超过实际支付金额
+      if (points > 0) {
+        let actualPaymentAmount = this.getActualPaymentAmount();
+        let actualPaymentDecimal = new Decimal(actualPaymentAmount);
+        let ratioDecimal = new Decimal(this.POINTS_TO_YUAN_RATIO);
+        let maxPoints = actualPaymentDecimal
+          .mul(ratioDecimal)
+          .floor()
+          .toNumber();
+
+        if (points > maxPoints) {
+          uni.showToast({
+            title: `最多只能使用${maxPoints}积分`,
+            icon: "none",
+          });
+          return;
+        }
+      }
+
+      this.tempUsePoints = points;
+    },
+
+    // 确认使用积分
+    confirmPointsUse() {
+      // 最终确认前再次验证积分使用是否合法
+      if (this.tempUsePoints > 0) {
+        // 检查用户积分是否足够
+        if (this.userPoints < this.tempUsePoints) {
+          uni.showToast({
+            title: "积分不足",
+            icon: "none",
+          });
+          return;
+        }
+
+        // 检查是否超过实际支付金额
+        let actualPaymentAmount = this.getActualPaymentAmount();
+        let actualPaymentDecimal = new Decimal(actualPaymentAmount);
+        let ratioDecimal = new Decimal(this.POINTS_TO_YUAN_RATIO);
+        let maxPoints = actualPaymentDecimal
+          .mul(ratioDecimal)
+          .floor()
+          .toNumber();
+
+        if (this.tempUsePoints > maxPoints) {
+          uni.showToast({
+            title: `最多只能使用${maxPoints}积分`,
+            icon: "none",
+          });
+          return;
+        }
+      }
+
+      this.usePoints = this.tempUsePoints;
+      this.closePointsPopup();
+      uni.showToast({
+        title:
+          this.usePoints > 0 ? `已使用${this.usePoints}积分` : "已取消积分使用",
+        icon: "none",
+      });
+    },
+
+    // 获取最大优惠券
+    async getMaxCouponData() {
+      let allPrice = 0;
+      let skuIds = [];
+      if (this.info && Array.isArray(this.info.goods)) {
+        this.info.goods.forEach((v) => {
+          allPrice += v.skuInfo.money * v.skuInfo.quantity;
+          if (v.skuInfo.quantity > 0) {
+            skuIds.push(v.skuInfo.id);
+          }
+        });
+      }
+      let param = { money: allPrice, sku_ids: skuIds.join(",") };
+      let res = await this.getMaxCoupon(param);
+      if (res.id) {
+        this.coupon = res;
+      }
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .bg {
-	min-height: 100vh;
-	overflow-x: hidden;
-	background: #f2f4f7;
-	padding-bottom: 200rpx;
+  min-height: 100vh;
+  overflow-x: hidden;
+  background: #f2f4f7;
+  padding-bottom: 200rpx;
 }
 view {
-	box-sizing: border-box;
+  box-sizing: border-box;
 }
-.flex-shrink-0{
-	flex-shrink: 0;
+.flex-shrink-0 {
+  flex-shrink: 0;
 }
 .box {
-	width: 100%;
-	min-height: 100rpx;
-	padding: 20rpx;
-	background: #ffffff;
-	border-radius: 16rpx;
+  width: 100%;
+  min-height: 100rpx;
+  padding: 20rpx;
+  background: #ffffff;
+  border-radius: 16rpx;
 }
 .address {
-	width: 697rpx;
-	height: 291rpx;
-	background: #FFFFFF;
-	border-radius: 13rpx;
-	margin: 0 auto;
-	margin-top: 26rpx;
-	.a-title{
-		font-size: 31rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #000000;
-		padding: 30rpx 18rpx;
-		justify-content: space-between;
-		align-items: center;
-		display: flex;
-		width: 100%;
-		.more-person{
-			width: 133rpx;
-			height: 60rpx;
-			border-radius: 30rpx;
-			border: 1px solid #999999;
-			font-family: PingFang SC;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #000000;
-			line-height: 16rpx;
-		}
-	}
-	.btn-box{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border-top:1rpx solid rgba(216, 216, 216, 1) ;
-		height: 176rpx;
-		.a-img{
-			width: 219rpx;
-			height: 73rpx;
-			border-radius: 37rpx;
-			border: 1px solid #333333;
-			font-family: PingFang SC;
-			font-weight: 400;
-			font-size: 29rpx;
-			color: #000000;
-		}
-	}
+  width: 697rpx;
+  height: 291rpx;
+  background: #ffffff;
+  border-radius: 13rpx;
+  margin: 0 auto;
+  margin-top: 26rpx;
+  .a-title {
+    font-size: 31rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #000000;
+    padding: 30rpx 18rpx;
+    justify-content: space-between;
+    align-items: center;
+    display: flex;
+    width: 100%;
+    .more-person {
+      width: 133rpx;
+      height: 60rpx;
+      border-radius: 30rpx;
+      border: 1px solid #999999;
+      font-family: PingFang SC;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #000000;
+      line-height: 16rpx;
+    }
+  }
+  .btn-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-top: 1rpx solid rgba(216, 216, 216, 1);
+    height: 176rpx;
+    .a-img {
+      width: 219rpx;
+      height: 73rpx;
+      border-radius: 37rpx;
+      border: 1px solid #333333;
+      font-family: PingFang SC;
+      font-weight: 400;
+      font-size: 29rpx;
+      color: #000000;
+    }
+  }
+}
+
+.pickself {
+  width: 697rpx;
+  height: 120rpx;
+  background: #ffffff;
+  border-radius: 13rpx;
+  margin: 0 auto;
+  margin-top: 26rpx;
+  .pickpoint {
+    display: flex;
+    width: 100%;
+    font-size: 31rpx;
+    font-weight: bold;
+    padding: 40rpx 18rpx;
+  }
+  .pickpointAddress {
+    display: flex;
+    font-weight: 500;
+    flex: 1;
+    width: 10rpx;
+    align-items: center;
+    justify-content: flex-end;
+  }
+  .pickpointImg {
+    width: 20rpx;
+    height: 20rpx;
+  }
+  .pointAddressText {
+    padding: 0 20rpx 0 40rpx;
+    flex: 1;
+    text-align: right;
+    width: 10rpx;
+  }
 }
 
-.pickself{
-	width: 697rpx;
-	height: 120rpx;
-	background: #FFFFFF;
-	border-radius: 13rpx;
-	margin: 0 auto;
-	margin-top: 26rpx;
-	.pickpoint{
-		display: flex;
-		width: 100%;
-		font-size: 31rpx;
-		font-weight: bold;
-		padding: 40rpx 18rpx;
-	}
-	.pickpointAddress{
-		display: flex;
-		font-weight: 500;
-		flex: 1;
-		width: 10rpx;
-		align-items: center;
-		justify-content: flex-end;
-	}
-	.pickpointImg{
-		width: 20rpx;
-		height: 20rpx;
-	}
-	.pointAddressText{
-		padding: 0 20rpx 0 40rpx;
-		flex: 1;
-		text-align: right;
-		width: 10rpx;
-	}
+.pickup-person-area {
+  width: 697rpx;
+  background: #ffffff;
+  border-radius: 13rpx;
+  margin: 0 auto;
+  margin-top: 26rpx;
+  margin-bottom: 30rpx;
+  .pickpoint {
+    display: flex;
+    width: 100%;
+    font-size: 31rpx;
+    font-weight: bold;
+    padding: 40rpx 18rpx;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .more-person {
+    width: 140rpx;
+    height: 58rpx;
+  }
+  .btn-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 20rpx;
+    border-top: 1rpx solid rgba(216, 216, 216, 1);
+  }
+  .pickup-person-list {
+    border-top: 1rpx solid #d8d8d8;
+    .person-list-area {
+      display: flex;
+      flex-wrap: wrap;
+      padding: 40rpx 21rpx;
+      .person-item {
+        width: 160rpx;
+        height: 74rpx;
+        line-height: 68rpx;
+        background: rgba(153, 153, 153, 0.1);
+        border-radius: 11rpx;
+        border: 1px solid #999999;
+        position: relative;
+        font-size: 29rpx;
+        font-weight: 400;
+        font-size: 29rpx;
+        color: #000000;
+        text-align: center;
+        padding: 0 22rpx;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        font-weight: bold;
+        margin-right: 24rpx;
+        margin-bottom: 24rpx;
+      }
+      .person-item.active {
+        background: rgba(116, 165, 170, 0.1);
+        border: 2px solid #74a5aa;
+      }
+      .person-item-active-img {
+        width: 24rpx;
+        height: 24rpx;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        background-color: #74a5aa;
+        color: white;
+        font-size: 20rpx;
+        line-height: 1.2;
+        border-radius: 10rpx 0rpx 10rpx 0rpx;
+      }
+    }
+    .current-person {
+      display: flex;
+      align-items: center;
+      padding: 0 44rpx 22rpx;
+      image {
+        width: 44rpx;
+        height: 44rpx;
+      }
+      .name {
+        text {
+          padding-left: 20rpx;
+          font-size: 25rpx;
+          color: #666666;
+        }
+      }
+    }
+  }
+}
 
+.commodity {
+  display: flex;
+  // align-items: center;
+  .img {
+    width: 174rpx;
+    height: 174rpx;
+    background: #f2f4f7;
+    border-radius: 10rpx;
+    flex-shrink: 0;
+  }
+  .title {
+    flex: 1;
+    margin-left: 20rpx;
+    font-size: 31rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #000000;
+  }
+  .num-box {
+    display: flex;
+    align-items: center;
+    margin-left: 20rpx;
+    width: 160rpx;
+    justify-content: space-between;
+    .num {
+      text-align: center;
+      width: 50rpx;
+    }
+    .ctrl {
+      width: 47rpx;
+      height: 47rpx;
+      background: #74a5aa;
+      border-radius: 50%;
+      font-family: PingFang SC;
+      font-weight: 400;
+      font-size: 34rpx;
+      color: #ffffff;
+      line-height: 47rpx;
+      text-align: center;
+    }
+    .ctrl.disabled {
+      background: #e8e8e8;
+      color: #999999;
+    }
+  }
 }
+// 主题色彩变量
+$primary-color: #74a5aa;
+$secondary-color: #f8f9fa;
+$text-primary: #333333;
+$text-secondary: #666666;
+$text-muted: #999999;
+$border-color: #e8e8e8;
+$success-color: #74a5aa;
+$warning-color: #74a5aa;
+$danger-color: #74a5aa;
+$bg-light: #f9f9f9;
 
-.pickup-person-area{
-	width: 697rpx;
-	background: #FFFFFF;
-	border-radius: 13rpx;
-	margin: 0 auto;
-	margin-top: 26rpx;
-	margin-bottom: 30rpx;
-	.pickpoint{
-		display: flex;
-		width: 100%;
-		font-size: 31rpx;
-		font-weight: bold;
-		padding: 40rpx 18rpx;
-		justify-content: space-between;
-		align-items: center;
-	}
-	.more-person{
-		width: 140rpx;
-		height: 58rpx;
-	}
-	.btn-box{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		padding: 0 20rpx;
-		border-top:1rpx solid rgba(216, 216, 216, 1) ;
-	}
-	.pickup-person-list{
-		border-top: 1rpx solid #d8d8d8;
-		.person-list-area{
-			display: flex;
-			flex-wrap: wrap;
-			padding: 40rpx 21rpx;
-			.person-item{
-				width: 160rpx;
-				height: 74rpx;
-				line-height: 68rpx;
-				background: rgba(153,153,153,0.1);
-				border-radius: 11rpx;
-				border: 1px solid #999999;
-				position: relative;
-				font-size: 29rpx;
-				font-weight: 400;
-				font-size: 29rpx;
-				color: #000000;
-				text-align: center;
-				padding:0 22rpx;
-				text-overflow: ellipsis;
-				overflow: hidden;
-				white-space: nowrap;
-				font-weight: bold;
-				margin-right: 24rpx;
-				margin-bottom: 24rpx;
-			}
-			.person-item.active{
-				background: rgba(254,180,25,0.1);
-				border: 2px solid #FEB419;
-			}
-			.person-item-active-img{
-				width: 24rpx;
-				height: 24rpx;
-				position: absolute;
-				right: 0;
-				bottom: 0;
-				background-color: #FEB419;
-				color: white;
-				font-size: 20rpx;
-				line-height: 1.2;
-				border-radius:  10rpx 0rpx 10rpx 0rpx;
-			}
-		}
-		.current-person{
-			display: flex;
-			align-items: center;
-			padding:0 44rpx 22rpx;
-			image{
-				width: 44rpx;
-				height: 44rpx;
-			}
-			.name{
-				 text{
-					padding-left: 20rpx;
-					font-size: 25rpx;
-					color: #666666;
-				}
-			}
-		}
-	}
+.section-label {
+  font-size: 28rpx;
+  color: $text-primary;
+  font-weight: 500;
 }
 
+// 订单信息卡片样式
+.order-info-card {
+  background-color: #ffffff;
+  border-radius: 16rpx;
+  padding: 24rpx 30rpx;
+  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
+  width: 697rpx;
+  margin: 0 auto;
 
-.commodity {
-	display: flex;
-	// align-items: center;
-	.img {
-		width: 174rpx;
-		height: 142rpx;
-		background: #f2f4f7;
-		border-radius: 10rpx;
-		flex-shrink: 0;
-	}
-	.title {
-		flex: 1;
-		margin-left: 20rpx;
-		font-size: 31rpx;
-		font-family: PingFangSC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #000000;
-
-	}
-	.num-box {
-		display: flex;
-		align-items: center;
-		margin-left: 20rpx;
-		width: 160rpx;
-		justify-content: space-between;
-		.num {
-			text-align: center;
-			width: 50rpx;
-		}
-		.ctrl {
-			width: 47rpx;
-			height: 47rpx;
-			background: #74A5AA;
-			border-radius: 50%;
-			font-family: PingFang SC;
-			font-weight: 400;
-			font-size: 34rpx;
-			color: #FFFFFF;
-			line-height: 47rpx;
-			text-align: center;
-		}
-		.ctrl.disabled{
-			background: #E8E8E8;
-			color: #999999;
-		}
-	}
+  .card-section {
+    &:not(:last-child) {
+      border-bottom: 1rpx solid #f0f0f0;
+      padding-bottom: 20rpx;
+      margin-bottom: 20rpx;
+    }
+
+    .section-row {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      cursor: pointer;
+      transition: background-color 0.3s;
+      border-radius: 8rpx;
+      min-height: 60rpx;
+      &:active {
+        background-color: rgba(116, 165, 170, 0.05);
+      }
+
+      .section-label {
+        font-size: 28rpx;
+        color: $text-primary;
+        font-weight: 500;
+      }
+
+      .section-value {
+        font-size: 26rpx;
+        color: $text-primary;
+
+        &.coupon {
+          color: $text-muted;
+        }
+      }
+    }
+
+    .note-input {
+      flex: 1;
+      margin-left: 40rpx;
+
+      input {
+        font-size: 26rpx;
+        color: $text-primary;
+        text-align: right;
+        width: 100%;
+      }
+
+      .placeholder {
+        color: $text-muted;
+      }
+    }
+
+    // 价格明细区域
+    &.price-section {
+      .price-detail {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 8rpx 0;
+
+        .text {
+          font-size: 26rpx;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #666;
+        }
+
+        .price {
+          font-size: 26rpx;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 500;
+          color: #ff4757;
+
+          &.deduction {
+            color: #ff4757;
+          }
+
+          &.final {
+            font-size: 32rpx;
+            font-weight: bold;
+            color: #ff4757;
+          }
+        }
+      }
+
+      .total-price {
+        padding-top: 12rpx;
+        margin-top: 12rpx;
+        border-top: 1rpx solid #e8e8e8;
+
+        .text {
+          font-size: 28rpx;
+          font-weight: 600;
+          color: #333;
+        }
+      }
+    }
+  }
+}
+
+// 积分兑换弹窗样式
+.points-popup {
+  background: white;
+  border-radius: 24rpx 24rpx 0 0;
+  max-height: 80vh;
+  overflow: hidden;
+}
+
+.popup-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 32rpx 30rpx 24rpx;
+  border-bottom: 1rpx solid $border-color;
+
+  .popup-title {
+    font-size: 32rpx;
+    font-weight: 600;
+    color: $text-primary;
+  }
+
+  .popup-close,
+  .popup-confirm {
+    font-size: 28rpx;
+    color: $text-secondary;
+    padding: 8rpx;
+    cursor: pointer;
+    transition: color 0.3s;
+
+    &:active {
+      color: $text-primary;
+    }
+  }
+
+  .popup-confirm {
+    color: $primary-color;
+    font-weight: 600;
+  }
 }
+
+.popup-content {
+  padding: 30rpx;
+  max-height: 60vh;
+  overflow-y: auto;
+}
+
+// 兑换规则
+.exchange-rule {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 24rpx;
+  background: $bg-light;
+  border-radius: 16rpx;
+  margin-bottom: 30rpx;
+
+  .rule-title {
+    font-size: 28rpx;
+    color: $text-primary;
+    font-weight: 600;
+  }
+
+  .rule-desc {
+    font-size: 26rpx;
+    color: $primary-color;
+    font-weight: 500;
+  }
+}
+
+// 当前积分
+.current-points {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx 0;
+  border-bottom: 1rpx solid $border-color;
+  margin-bottom: 30rpx;
+
+  .points-label {
+    font-size: 28rpx;
+    color: $text-primary;
+    font-weight: 500;
+  }
+
+  .points-value {
+    font-size: 26rpx;
+    color: $success-color;
+    font-weight: 600;
+  }
+}
+
+// 积分选项区域
+.points-options-section {
+  display: flex;
+  flex-direction: column;
+  gap: 20rpx;
+
+  .option-item {
+    display: flex;
+    align-items: center;
+    padding: 24rpx 20rpx;
+    border: 2rpx solid #e8e8e8;
+    border-radius: 16rpx;
+    background: #ffffff;
+    cursor: pointer;
+    transition: all 0.3s;
+
+    &.active {
+      border-color: $primary-color;
+      background: rgba(116, 165, 170, 0.05);
+    }
+
+    &:active {
+      transform: scale(0.98);
+    }
+
+    .option-radio {
+      width: 40rpx;
+      height: 40rpx;
+      border: 2rpx solid #ddd;
+      border-radius: 50%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-right: 24rpx;
+      transition: all 0.3s;
+
+      .radio-dot {
+        width: 20rpx;
+        height: 20rpx;
+        background: $primary-color;
+        border-radius: 50%;
+      }
+    }
+
+    &.active .option-radio {
+      border-color: $primary-color;
+    }
+
+    .option-content {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      gap: 8rpx;
+
+      .option-title {
+        font-size: 30rpx;
+        color: $text-primary;
+        font-weight: 500;
+      }
+
+      .option-desc {
+        font-size: 24rpx;
+        color: #999;
+      }
+    }
+  }
+}
+
+// 底部支付区域
+.payment-bottom {
+  width: 100%;
+  min-height: 166rpx;
+  background: #ffffff;
+  box-shadow: 0rpx -3rpx 9rpx 1rpx rgba(227, 229, 232, 0.5);
+  display: flex;
+  position: fixed;
+  bottom: 0;
+  padding: 20rpx 20rpx 40rpx;
+  align-items: center;
+  justify-content: space-between;
+
+  .total-amount {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+
+    .total-label {
+      font-size: 24rpx;
+      color: #666666;
+      margin-bottom: 4rpx;
+    }
+
+    .total-price {
+      font-size: 32rpx;
+      font-weight: bold;
+      color: #ff4757;
+    }
+  }
+
+  .btn {
+    width: 250rpx;
+    height: 80rpx;
+    background: #74a5aa;
+    border-radius: 40rpx;
+    text-align: center;
+    line-height: 80rpx;
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #ffffff;
+    transition: all 0.3s ease;
+
+    &.loading {
+      background: #cccccc;
+      opacity: 0.8;
+      pointer-events: none;
+    }
+  }
+}
+
 .btn-list {
-	width: 100%;
-	height: 166rpx;
-	background: #ffffff;
-	box-shadow: 0rpx -3rpx 9rpx 1rpx rgba(227, 229, 232, 0.5);
-	display: flex;
-	position: fixed;
-	bottom: 0;
-	padding: 20rpx 20rpx 40rpx;
-	align-items: center;
-	justify-content: space-between;
-	.btn {
-			width: 250rpx;
-			height: 80rpx;
-			background: #74A5AA;
-			border-radius: 40rpx;
-			text-align: center;
-			line-height: 80rpx;
-
-			font-weight: bold;
-			font-size: 32rpx;
-			color: #FFFFFF;
-	
-	}
-	.price-box {
-		display: flex;
-		align-items: flex-end;
-		.text {
-			font-size: 29rpx;
-			font-family: PingFangSC-Regular, PingFang SC;
-			font-weight: 500;
-			color: #333;
-		}
-		.price {
-			margin-left: 15rpx;
-			font-size: 48rpx;
-			font-family: PingFangSC-Regular, PingFang SC;
-			font-weight: bold;
-			color: #FC5109;
-			line-height: 1;
-			&:before {
-				content: '¥';
-				display: inline-block;
-				font-size: 24rpx;
-			}
-		}
-		.post-text {
-			margin-left: 15rpx;
-			color: #fc5109;
-			font-size: 24rpx;
-		}
-	}
+  width: 100%;
+  min-height: 166rpx;
+  background: #ffffff;
+  box-shadow: 0rpx -3rpx 9rpx 1rpx rgba(227, 229, 232, 0.5);
+  display: flex;
+  position: fixed;
+  bottom: 0;
+  padding: 20rpx 20rpx 40rpx;
+  align-items: center;
+  justify-content: space-between;
+  .btn {
+    width: 250rpx;
+    height: 80rpx;
+    background: #74a5aa;
+    border-radius: 40rpx;
+    text-align: center;
+    line-height: 80rpx;
+
+    font-weight: bold;
+    font-size: 32rpx;
+    color: #ffffff;
+    transition: all 0.3s ease;
+
+    &.loading {
+      background: #cccccc;
+      opacity: 0.8;
+      pointer-events: none;
+    }
+  }
 }
 .contacts {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	height: 100%;
-	image {
-		width: 36rpx;
-		height: 36rpx;
-	}
-	.contacts-left {
-		.name-phone {
-			display: flex;
-			align-items: baseline;
-			.name {
-				font-size: 32rpx;
-				font-family:  PingFang SC;
-				font-weight: 400;
-				color: #222222;
-			}
-			.phone {
-				margin-left: 27rpx;
-				font-size: 25rpx;
-				font-family:  PingFang SC;
-				font-weight: 400;
-				color: #666666;
-			}
-		}
-		.adds {
-			font-size: 27rpx;
-			font-family: PingFang SC;
-			font-weight: 400;
-			color: #6C7A94;
-			margin-top: 20rpx;
-			max-width: 500rpx;
-		}
-	}
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 100%;
+  image {
+    width: 36rpx;
+    height: 36rpx;
+  }
+  .contacts-left {
+    .name-phone {
+      display: flex;
+      align-items: baseline;
+      .name {
+        font-size: 32rpx;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #222222;
+      }
+      .phone {
+        margin-left: 27rpx;
+        font-size: 25rpx;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: #666666;
+      }
+    }
+    .adds {
+      font-size: 27rpx;
+      font-family: PingFang SC;
+      font-weight: 400;
+      color: #6c7a94;
+      margin-top: 20rpx;
+      max-width: 500rpx;
+    }
+  }
 }
 .people-popup {
-	padding: 26rpx;
-	min-height: 800rpx;
-
-	.top-box {
-		height: 80rpx;
-
-		.top {
-			position: fixed;
-			left: 0;
-			right: 0;
-			color: #000;
-			height: 80rpx;
-			font-size: 0;
-			overflow: hidden;
-			padding: 0 26rpx;
-
-			text {
-				text-align: left;
-				font-size: 31rpx;
-				font-weight: 400;
-				color: #000000;
-			}
-
-			.confirm {
-				font-weight: 400;
-				color: #000000;
-			}
-		}
-	}
-
-	.popup-list {
-		height: 666rpx;
-		overflow: scroll;
-
-		.popup-item {
-			border-radius: 12rpx;
-			padding: 2rpx;
-			margin-top: 24rpx;
-			font-size: 24rpx;
-			color: #333333;
-			font-weight: 400;
-			background-color: #ffffff;
-
-			.item-top {
-				border-radius: 12rpx;
-				padding: 30rpx 40rpx;
-				background-color: #ffffff;
-				
-				img {
-					color: #666666;
-					width: 40rpx;
-					height: 40rpx;
-				}
-
-				.name {
-					overflow: hidden;
-					font-family: PingFang SC;
-					font-weight: 400;
-					font-size: 32rpx;
-					display: flex;
-					align-items: baseline;
-
-					text {
-						color: #666;
-						font-size: 25rpx;
-						padding: 0 24rpx;
-					}
-
-					.tag {
-						padding: 0 8rpx;
-						height: 32rpx;
-						border-radius: 7rpx;
-						line-height: 30rpx;
-						text-align: center;
-						font-size: 23rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #ffffff;
-						background: #74A5AA;
-
-					}
-				}
-
-				.com-flex-start {
-					margin: 0 0 30rpx;
-				}
-
-				.subtitle {
-					font-weight: 400;
-					flex: 1;
-					text-align: left;
-					margin-top: 33rpx;
-					color: #333333;
-					font-size: 25rpx;
-
-				}
-			}
-
-		}
-		
-		.popup-item.active{
-			background: #60989E;
-		}
-	}
-
-	.button {
-
-		text-align: center;
-		width: 100%;
-		height: 80rpx;
-		line-height: 80rpx;
-		background-color: #ffffff;
-		border-radius: 40rpx;
-		font-family: PingFang SC;
-		font-weight: 400;
-		font-size: 33rpx;
-		color: #000000;
-
-	}
+  padding: 26rpx;
+  min-height: 800rpx;
+
+  .top-box {
+    height: 80rpx;
+
+    .top {
+      position: fixed;
+      left: 0;
+      right: 0;
+      color: #000;
+      height: 80rpx;
+      font-size: 0;
+      overflow: hidden;
+      padding: 0 26rpx;
+
+      text {
+        text-align: left;
+        font-size: 31rpx;
+        font-weight: 400;
+        color: #000000;
+      }
+
+      .confirm {
+        font-weight: 400;
+        color: #000000;
+      }
+    }
+  }
+
+  .popup-list {
+    height: 666rpx;
+    overflow: scroll;
+
+    .popup-item {
+      border-radius: 12rpx;
+      padding: 2rpx;
+      margin-top: 24rpx;
+      font-size: 24rpx;
+      color: #333333;
+      font-weight: 400;
+      background-color: #ffffff;
+
+      .item-top {
+        border-radius: 12rpx;
+        padding: 30rpx 40rpx;
+        background-color: #ffffff;
+
+        img {
+          color: #666666;
+          width: 40rpx;
+          height: 40rpx;
+        }
+
+        .name {
+          overflow: hidden;
+          font-family: PingFang SC;
+          font-weight: 400;
+          font-size: 32rpx;
+          display: flex;
+          align-items: baseline;
+
+          text {
+            color: #666;
+            font-size: 25rpx;
+            padding: 0 24rpx;
+          }
+
+          .tag {
+            padding: 0 8rpx;
+            height: 32rpx;
+            border-radius: 7rpx;
+            line-height: 30rpx;
+            text-align: center;
+            font-size: 23rpx;
+            font-family: PingFang SC;
+            font-weight: 500;
+            color: #ffffff;
+            background: #74a5aa;
+          }
+        }
+
+        .com-flex-start {
+          margin: 0 0 30rpx;
+        }
+
+        .subtitle {
+          font-weight: 400;
+          flex: 1;
+          text-align: left;
+          margin-top: 33rpx;
+          color: #333333;
+          font-size: 25rpx;
+        }
+      }
+    }
+
+    .popup-item.active {
+      background: #74a5aa;
+    }
+  }
+
+  .button {
+    text-align: center;
+    width: 100%;
+    height: 80rpx;
+    line-height: 80rpx;
+    background-color: #ffffff;
+    border-radius: 40rpx;
+    font-family: PingFang SC;
+    font-weight: 400;
+    font-size: 33rpx;
+    color: #000000;
+  }
 }
 
 .person-info {
-	padding: 30rpx 30rpx 15rpx 30rpx;
-	background: #fff;
-	margin-top: 30rpx;
-	border-radius: 16rpx;
+  padding: 30rpx 30rpx 15rpx 30rpx;
+  background: #fff;
+  margin-top: 30rpx;
+  border-radius: 16rpx;
 }
 .person-title {
-	font-size: 32rpx;
-	font-weight: bold;
-	color: #000;
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #000;
 }
 .line {
-	border-bottom: 1px solid #e3e5e8;
+  border-bottom: 1px solid #e3e5e8;
 }
 .flex {
-	display: flex;
-	align-items: center;
+  display: flex;
+  align-items: center;
 }
 .left {
-	width: 140rpx;
-	height: 104rpx;
-	line-height: 104rpx;
-	font-family: PingFang;
-	font-weight: bold;
-	font-size: 31rpx;
-	color: #000000;
+  width: 140rpx;
+  height: 104rpx;
+  line-height: 104rpx;
+  font-family: PingFang;
+  font-weight: bold;
+  font-size: 31rpx;
+  color: #000000;
 }
 .input {
-	font-size: 31rpx;
-	font-weight: 400;
-	text-align: right;
+  font-size: 31rpx;
+  font-weight: 400;
+  text-align: right;
 }
 .remark {
-	padding:30rpx;
-	display: flex;
-	align-items: center;
-	width: 698rpx;
-	min-height: 120rpx;
-	background: #ffffff;
-	margin: 0 auto;
-	border-radius: 14rpx;
-	.remark-title{
-
-		font-size: 31rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #000000;
-		flex-shrink: 0;
-
-	}
-	input {
-		margin-left: 64rpx;
-		width: 500rpx;
-		font-size: 31rpx;
-	}
+  padding: 30rpx;
+  display: flex;
+  align-items: center;
+  width: 698rpx;
+  min-height: 120rpx;
+  background: #ffffff;
+  margin: 0 auto;
+  border-radius: 14rpx;
+  .remark-title {
+    font-size: 31rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #000000;
+    flex-shrink: 0;
+  }
+  input {
+    margin-left: 64rpx;
+    width: 500rpx;
+    font-size: 31rpx;
+  }
 }
-.sb{
-	justify-content: space-between;
+.sb {
+  justify-content: space-between;
+}
+.tag {
+  margin-top: 10rpx;
+  // display: flex;
+  // align-items: center;
+  .tag-item {
+    background: rgba(116, 165, 170, 0.08);
+    border-radius: 4rpx;
+    padding: 2rpx 6rpx;
+    font-size: 20rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(116, 165, 170, 1);
+    margin-right: 18rpx;
+  }
+}
+.flex-c {
+  display: flex;
+  flex-direction: column;
+  // justify-content: space-between;
+}
+.new-box {
+  background: #fff;
+  width: 698rpx;
+  margin: 0 auto 20rpx;
+  border-radius: 14rpx;
 }
-	.tag {
-		margin-top: 10rpx;
-		// display: flex;
-		// align-items: center;
-		.tag-item {
-			background: rgba(252, 81, 9, .08);
-			border-radius: 4rpx;
-			padding: 2rpx 6rpx;
-			font-size: 20rpx;
-			font-family: PingFangSC-Regular, PingFang SC;
-			font-weight: 400;
-			color: rgba(252, 81, 9, 1);
-			margin-right: 18rpx;
-		}
-	}
-	.flex-c{
-		display: flex;
-		flex-direction: column;
-		// justify-content: space-between;
-	}
-	.new-box{
-		background: #fff;
-		width: 698rpx;
-		margin: 0 auto 20rpx;
-		border-radius: 14rpx;
-	}
-	
-	.tickets-box {
-		width: 698rpx;
-		margin: 26rpx auto 0;
-		border-radius: 13rpx;
-		background: #fff;
-		height: 120rpx;
-		.order-title {
-			margin: 31rpx 0 31rpx 30rpx;
-			font-size: 31rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #000000;
-		}
-
-		.coupon-price {
-			color:#DD0000;
-			font-size: 30rpx;
-			font-weight: bold;
-		}
-	}
-	.commodity-info{
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		font-size: 32rpx;
-		&:last-child{
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 400;
-			color: #666666;
-			padding-top: 20rpx;
-		}
-		.commodity-price{
-			&:before{
-				
-				content:"￥";
-				font-size: 24rpx;
-			}
-		}
-	}
-	.top-line{
-		border-top:rgba(216, 216, 216, 1) solid 2rpx ;
-	}
-	.post{
-		height: 120rpx;
-		padding: 0 30rpx;
-
-		font-size: 32rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #000000;
-
-	}
-
-.sendwayArea{
-	margin: 26rpx;
-	display: flex;
-	border: 1px solid #515150;
-	border-radius: 13rpx;
-	width: fit-content;
-	background-color: white;
-	height: 94rpx;
-	position: relative;
-	.sendway-item{
-		padding: 26rpx;
-		width: 170rpx;
-		font-size: 28rpx;
-		border-radius: 13rpx;
-		font-weight: 500;
-		position: absolute;
-		top: -2rpx;
-		bottom: -2rpx;
-	}
-	.sendway-item.active{
-		background-image: linear-gradient(135deg, #9EE4FE, #7FD491);
-	}
 
+.tickets-box {
+  width: 698rpx;
+  margin: 26rpx auto 0;
+  border-radius: 13rpx;
+  background: #fff;
+  height: 120rpx;
+  .order-title {
+    margin: 31rpx 0 31rpx 30rpx;
+    font-size: 31rpx;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #000000;
+  }
+
+  .coupon-price {
+    color: #ff4757;
+    font-size: 30rpx;
+    font-weight: bold;
+  }
+}
+.commodity-info {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 32rpx;
+  &:last-child {
+    font-size: 24rpx;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: #666666;
+    padding-top: 20rpx;
+  }
+  .commodity-price {
+    color: #ff4757;
+    &:before {
+      content: "￥";
+      font-size: 24rpx;
+    }
+  }
+}
+.top-line {
+  border-top: rgba(216, 216, 216, 1) solid 2rpx;
 }
+.post {
+  height: 120rpx;
+  padding: 0 30rpx;
 
-.add-edit-content{
-	background-color: white;
-	padding: 0 20rpx;
-	border-radius: 20rpx;
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #000000;
 }
 
-		.coupon-btn {
-			color: #999999;;
-			display: flex;
-			align-items: center;
-			.select {
-				display: block;
-				width: 153rpx;
-				height: 40rpx;
-				background: #C3282E;
-				border-radius: 9rpx;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #FFFFFF;
-				text-align: center;
-				line-height: 40rpx;
-				font-family: PingFang SC;
-				margin-right: 20rpx;
-		
-			}
-		}
-.shop-name{
-	font-weight: bold;
-	font-size: 31rpx;
-	color: #333333;
-	padding-bottom: 12rpx;
-	min-height: fit-content;
+.sendwayArea {
+  margin: 26rpx;
+  display: flex;
+  border: 1px solid #515150;
+  border-radius: 13rpx;
+  width: fit-content;
+  background-color: white;
+  height: 94rpx;
+  position: relative;
+  .sendway-item {
+    padding: 26rpx;
+    width: 170rpx;
+    font-size: 28rpx;
+    border-radius: 13rpx;
+    font-weight: 500;
+    position: absolute;
+    top: -2rpx;
+    bottom: -2rpx;
+  }
+  .sendway-item.active {
+    background-image: linear-gradient(135deg, #9ee4fe, #7fd491);
+  }
+}
+
+.add-edit-content {
+  background-color: white;
+  padding: 0 20rpx;
+  border-radius: 20rpx;
+}
+
+.coupon-btn {
+  color: #999999;
+  display: flex;
+  align-items: center;
+  .select {
+    display: block;
+    width: 153rpx;
+    height: 40rpx;
+    background: #c3282e;
+    border-radius: 9rpx;
+    font-weight: 500;
+    font-size: 24rpx;
+    color: #ffffff;
+    text-align: center;
+    line-height: 40rpx;
+    font-family: PingFang SC;
+    margin-right: 20rpx;
+  }
+}
+.shop-name {
+  font-weight: bold;
+  font-size: 31rpx;
+  color: #333333;
+  padding-bottom: 12rpx;
+  min-height: fit-content;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/subPackages/user/gwc.vue b/subPackages/user/gwc.vue
index ebecf76..afac28e 100644
--- a/subPackages/user/gwc.vue
+++ b/subPackages/user/gwc.vue
@@ -374,7 +374,8 @@
 					.then((res) => {
 						if (res.data.canOrder) {
 							this.$store.commit("changeOrderSCart", list);
-							this.gotoPath("/subPackages/order/gwcOrder");
+							this.gotoPath("/subPackages/techan/order");
+							
 						} else {
 							uni.showToast({
 								title: res.message,