From 55479046ed3346c5fe32e9761ff3e7c5a9206eac Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Fri, 21 Apr 2023 10:33:21 +0800
Subject: [PATCH] update

---
 App.vue                                       |  13 +-
 Utils/physicalObject.js                       |  33 +-
 components/dataList/dataList.vue              | 553 ----------
 components/dataList/emptyImage.js             |   3 -
 components/pick-regions/pick-regions.vue      |   1 +
 pages.json                                    |  14 +-
 pages/address/addNewAddress/addNewAddress.vue |  10 +-
 pages/address/addNewAddress/demo.vue          | 350 -------
 pages/address/address.vue                     | 354 ++++---
 pages/classify/cart-choose/cart-choose.vue    |  43 +-
 pages/classify/cart-choose/data.json          |  46 -
 pages/classify/cart/cart.vue                  | 199 ++--
 pages/classify/goods-list/goods-list.vue      |   4 +-
 pages/classify/goods-search/data2.json        | 582 -----------
 pages/classify/goods-search/goods-search.vue  |  11 +-
 pages/classify/goodsDetail/data.json          |  46 -
 pages/classify/goodsDetail/goodsDetail.vue    | 876 ++++++++--------
 pages/classify/order/orderDetail.vue          |  54 +-
 pages/classify/order/orderList.vue            |   2 +-
 pages/classify/order/pay.vue                  | 600 ++++++++---
 pages/classify/order/paymentResult.vue        |  70 +-
 .../detail-popup/detail-popup.vue             | 497 +++++----
 pages/settleAccounts/settleAccounts.vue       | 987 ++++++++++++++----
 pages/tabBar/classify/classify.vue            |   3 +-
 pages/user/order_list/order_list.vue          |  78 +-
 uni.scss                                      |   8 +
 26 files changed, 2512 insertions(+), 2925 deletions(-)
 delete mode 100644 components/dataList/dataList.vue
 delete mode 100644 components/dataList/emptyImage.js
 delete mode 100644 pages/address/addNewAddress/demo.vue
 delete mode 100644 pages/classify/cart-choose/data.json
 delete mode 100644 pages/classify/goods-search/data2.json
 delete mode 100644 pages/classify/goodsDetail/data.json

diff --git a/App.vue b/App.vue
index a4a6c6b..7448537 100644
--- a/App.vue
+++ b/App.vue
@@ -66,8 +66,7 @@
 			pelletoilList: '',
 			//分享领取次数
 			shareNum:0,
-			// 购物车数量
-			cartNum:0,
+			
 
 		},
 		onLaunch: function() {},
@@ -231,15 +230,7 @@
 					}
 				}
 			})
-			uni.getStorage({
-				key: 'cartNum',
-				success(e) {
-					if (e.data) {
-						that.globalData.cartNum = e.data;
-						console.log(that.globalData.cartNum,"getStorage")
-					}
-				}
-			})
+			
 			// #endif
 		},
 		onHide: function() {}
diff --git a/Utils/physicalObject.js b/Utils/physicalObject.js
index 02c281f..58f022e 100644
--- a/Utils/physicalObject.js
+++ b/Utils/physicalObject.js
@@ -2,8 +2,13 @@ import {
 	POST
 } from "./Request.js";
 let app = getApp();
+
 let base = app.globalData.url;
-// let orderbase = app.globalData.orderurl;
+
+// let base = "http://192.168.1.16:9301/crest/";
+
+let orderbase = app.globalData.orderurl;
+
 // let userbase = app.globalData.userurl;
 // let v1base = app.globalData.v1url;
 // let brestBase = app.globalData.brestUrl;
@@ -37,8 +42,8 @@ export const insertShoppingCart = params => {
 }
 
 // 增加商品数量
-export const goodsAddNum = params => {
-	return POST('GET', `${base}/shoppingCart/goodsAddNum`, params).then(res => res.data);
+export const goodsEditNum = params => {
+	return POST('GET', `${base}/shoppingCart/goodsEditNum`, params).then(res => res.data);
 }
 // 删除购物车商品
 export const deleteShoppingCart = params => {
@@ -77,7 +82,7 @@ export const findDeliveryAddressById = params => {
 
 // 根据id 删除收货地址
 export const deleteAddress = params => {
-	return POST('GET', `${base}/deliveryAddress/deleteShoppingCart`, params).then(res => res.data);
+	return POST('GET', `${base}/deliveryAddress/deleteDeliveryAddress`, params).then(res => res.data);
 }
 
 // 查询物流信息
@@ -87,4 +92,24 @@ export const getLogisticsMsg = params => {
 // 根据区域查询运费和包邮价格
 export const getRegionFreight = params => {
 	return POST('GET', `${base}/common/getRegionFreight`, params).then(res => res.data);
+}
+
+// 查询收货地址包邮金额和运费金额
+export const getAddressPrice = params => {
+	return POST('GET', `${base}/deliveryAddress/getAddressPrice`, params).then(res => res.data);
+}
+
+//查询可用优惠券
+export const getUserExclusiveDiscount = params => {
+	return POST('GET', `${base}/userDiscount/getUserExclusiveDiscount`, params).then(res => res.data);
+}
+
+//下单
+export const createOrder = params => {
+	return POST('POST', `${orderbase}/create`, params).then(res => res.data);
+}
+
+//查询用户相关内容，积分
+export const findUser = params => {
+	return POST('GET', `${base}/highUser/findUser`, params).then(res => res.data);
 }
\ No newline at end of file
diff --git a/components/dataList/dataList.vue b/components/dataList/dataList.vue
deleted file mode 100644
index aa305c2..0000000
--- a/components/dataList/dataList.vue
+++ /dev/null
@@ -1,553 +0,0 @@
-<template>
-	<view
-		class="data-list-components "	
-		@touchmove.stop.prevent
-	>
-	<!-- :class="{ 'safe-area-inset-bottom': safeAreaInsetBottom  }"    -->
-	<!-- :style="[dataListStyle]" -->
-		<scroll-view
-			class="scroll-view"
-			:scroll-top="scrollTop"
-			:scroll-y="scrollingEnabled"
-			:lower-threshold="lowerThreshold"
-			:enable-back-to-top="enableBackToTop"
-			@scroll="handleScroll"
-			@scrolltolower="handleScrolltolower"
-			@touchstart="handleTouchStart"
-			@touchmove="handleTouchMove"
-			@touchend="handleTouchEnd"
-		>
-			<view class="scroll-content" :style="[scrollContentStyle]">
-				<!-- 下拉 -->
-				<view class="pull-down-view">
-					<slot name="refresh" v-if="$slots.refresh"></slot>
-					<view class="refresh-view" v-else>
-					<text :class="' pull-down-text icon-ymt '+(refreshStatus == 'soon'?' to-blod-down ':refreshStatus == 'sure'?' to-blod-up ':' ') " >{{ refreshText[refreshStatus] }}</text>
-					</view>
-				</view>
-				
-				<view class="scroll-list"><slot></slot></view>
-				
-				<view class="loading-view" v-if="loadingMask">
-					<view class="loading-animation"></view>
-					<text class="loading-text">加载中...</text>
-				</view>
-				
-				<!-- 空 -->
-				<view class=" empty-content" v-if="showEmpty">
-						<!-- <image class="empty-image" :src="emptyImage || defaultEmptyImage" mode=""></image> -->
-						<text class="empty-text">{{ emptyText }}</text>
-				</view>
-				
-				<!-- 底部上滑 -->
-				<view class="pull-up-view" >
-					<slot name="load" v-if="$slots.load"></slot>
-					<view class="load-view" v-else>
-						<view class="loading-animation" v-if="loadStatus == 'loading'"></view>
-						<text :class="' loading-text icon-ymt '+(loadStatus == 'soon'?' to-blod-up ':loadStatus == 'sure'?' to-blod-down ':' ') " >{{ loadText[loadStatus] }}</text>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-/**
- * data-list 数据列表
- * @description 数据列表展示，上拉加载更多数据，下拉刷新数据
- * @tips 如果父组件有设置padding，可能造成组件高度不正确的问题
- * @property {Number, String} page 默认分页
- * @property {Number, String} size 默认分页大小
- * @property {Boolean} loading 是否显示首次加载时的loading遮罩层
- * @property {Boolean} safeAreaInsetBottom 是否开启底部安全区域适配
- * @property {String} emptyImage 空数据提示图片
- * @property {String} emptyText 空数据提示文字
- * @property {Boolean} enableBackToTop iOS点击顶部状态栏、安卓双击标题栏时，滚动条返回顶部
- * @property {Number, String} refresherThreshold 下拉刷新阈值（单位px），触发 refresherrefresh 事件
- * @property {Number, String} lowerThreshold 距底部多远时（单位px），触发 scrolltolower 事件
- * @methods {Function} loadData 加载数据方法
- * @methods {Function} refreshData 刷新数据方法
- * @methods {Function} computedHeight 重新计算高度方法（有时候页面某些地方布局被改变了，会造成组件高度不能撑满的问题，就调用此方法）
- * @event {Function} load 加载 事件（参数一：分页请求参数，参数二：回调方法，需要将列表和数据总数回调回去计算 {list:数据列表对象,total:后端数据总数}）
- * @event {Function} refresh 刷新 事件（参数一：分页请求参数，参数二：回调方法，需要将列表和数据总数回调回去计算 {list:数据列表对象,total:后端数据总数}）
- * @event {Function} scroll 滚动 事件
- * @event {Function} scrolltolower 上拉触底 事件
- * @event {Function} refresherpulling 正在下拉 事件
- * @event {Function} refresherrestore 下拉刷新被复位 事件
- * @event {Function} refresherabort 下拉刷新被终止 事件
- * @event {Function} refresherrefresh 下拉刷新被触发 事件
- * @example <data-list class="data-list" ref="list" @load="handleLoad" @refresh="handleRefresh" @scroll="handleScroll"></data-list>
- */
-import emptyImages from './emptyImage.js';
-export default {
-	name: 'data-list',
-	props: {
-		page: {
-			type: [Number, String],
-			default: 1
-		},
-		size: {
-			type: [Number, String],
-			default: 15
-		},
-		loading: {
-			type: Boolean,
-			default: false
-		},
-		safeAreaInsetBottom: {
-			type: Boolean,
-			default: true
-		},
-		emptyImage: {
-			type: String
-		},
-		emptyText: {
-			type: String,
-			default: '暂无数据~'
-		},
-		enableBackToTop: {
-			type: Boolean,
-			default: false
-		},
-		showEmpty:{
-			type: Boolean,
-			default: false
-		},
-		refresherThreshold: {
-			type: [Number, String],
-			default: 50
-		},
-		lowerThreshold: {
-			type: [Number, String],
-			default: 50
-		},
-		selectObject:{
-			type:Object,
-			default:{
-				selectIndex:0,
-				length:0
-			}
-		}
-	},
-	data() {
-		return {
-			list: [], // 数据列表
-			total: -1, // 数据总数
-			currentPage: 1, // 当前分页页码
-			currentSize: 10, // 当前分页大小
-			// showEmpty: false, // 是否显示空数据
-			waiting: false, // 是否等待加载中
-			loadingMask: false, // 是否显示加载中遮罩
-			scrollTop: 0, // 设置竖向滚动条位置
-			currentScrollTop: 0, // 当前竖向滚动条位置
-			scrollingEnabled: true, // 是否启用竖向滚动
-			
-			pullingDown: false, // 是否正在下拉
-			pullDownHeight: 0, // 下拉高度
-			pullDownTimeStamp: 0, // 下拉时的时间戳
-			
-			pullingUp: false, // 是否正在上拉
-			pullUpHeight: 0, // 上拉高度
-			pullUpTimeStamp: 0, // 上拉时的时间戳
-			
-			maxDistance:100,
-			touchDirection:'top',
-			
-			loadStatus: 'soon',
-			loadText: {
-				loading: '加载中~',
-				nomore: '没有更多啦~',
-				
-				soon: '上滑查看下一分类',
-				sure: '释放查看下一分类',
-			},
-			refreshStatus: 'soon',
-			refreshText: {
-				soon: '下滑查看上一分类',
-				sure: '释放查看上一分类',
-				
-				nomore: '没有更多啦~',
-				refreshing: '正在刷新中~'
-			},
-			defaultEmptyImage: emptyImages.data,
-			componentsHeight: 'auto' // 组件高度属性
-		};
-	},
-	watch:{
-		selectObject:{
-			handler(n, o) {
-				if(n.selectIndex == n.length-1){
-					this.loadStatus = "nomore"
-				}else{
-					this.loadStatus = "soon"
-				}
-				if(n.selectIndex == 0){
-					this.refreshStatus = "nomore"
-				}else{
-					this.refreshStatus = "soon"
-				}
-				
-			},
-			deep:true, // 深度监听
-			immediate:false, // 初始化监听
-		},
-		
-	},
-	computed: {
-		// dataListStyle() {
-		// 	const { componentsHeight } = this;
-		// 	return {
-		// 		height: componentsHeight
-		// 	};
-		// },
-		scrollContentStyle() {
-			const style = {};
-			const { pullDownHeight, pullingDown,pullUpHeight, pullingUp } = this;
-			
-			// if(this.touchDirection == 'top'){
-				
-				style.transform = pullingDown ? `translateY(${pullDownHeight}px)` : `translateY(0px)`;
-				style.transition = pullingDown ? `transform .1s linear` : `transform 0.3s cubic-bezier(0.19,1.64,0.42,0.72)`;
-			
-			
-			// }else if(this.touchDirection == 'bottom'){
-			// 	style.transform = pullingUp ? `translateY(0px)` : `translateY(0px)`;
-				
-				
-			// 	style.transition = pullingUp ? `transform .1s linear` : `transform 0.3s cubic-bezier(0.19,1.64,0.42,0.72)`;
-			// }
-
-			return style;
-		}
-	},
-	mounted() {
-		this.handleInit();
-	},
-	methods: {
-		// 下滑触底后 数据加载
-		loadData() {
-			this.waiting = true;
-			
-			this.$emit('load',res => {
-				this.waiting = false;
-				this.list = res.list;
-				this.total = res.total;
-				this.currentPage++;
-				this.handleComputeData();
-				// this.computedHeight();
-			});
-		},
-		
-		// 计算高度
-		computedHeight() {
-			// this.getRect('.data-list-components').then(res => {
-			// 	console.log(res,"res")
-			// 	// #ifdef H5
-			// 	this.componentsHeight = `calc(100vh - ${res.top}px - var(--window-top))`;
-			// 	// #endif
-			// 	// #ifndef H5
-			// 	this.componentsHeight = `calc(100vh - ${res.top}px)`;
-			// 	// #endif
-				
-			// });
-		},
-		// 计算数据
-		handleComputeData() {
-			const len = this.list.length;
-			const total = this.total;
-			console.log(len,total)
-			 if (len >= this.total) {
-				this.loadStatus = 'soon';
-			} else if (len < this.total) {
-				this.loadStatus = 'loading';
-			}
-		},
-		// 下滑触底事件
-		handleScrolltolower(e) {
-			this.$emit('scrolltolower', e);
-			if (this.loadStatus == 'nomore' || this.waiting) return;
-			this.loadData();
-		},
-		// 滚动事件
-		handleScroll(e) {
-			// this.currentScrollTop = e.detail.scrollTop;
-			
-			// if (e.detail.scrollTop <= 20) {
-			// 	this.touchDirection = 'top';
-			// } else {
-			// 	this.touchDirection = 'bottom';
-			// } 
-			// console.log(e.detail.scrollTop)
-			this.$emit('scroll', e);
-		},
-		// 触摸按下处理
-		handleTouchStart(e) {
-			
-			// if (e.detail.scrollTop <= 20) {
-				
-			// }
-			// console.log(e)
-			
-			
-			// if(this.touchDirection=='top'){
-				this.pullingDown = true;
-			// }else if(this.touchDirection=='bottom'){
-			// 	this.pullingUp =true;
-			// }
-
-			this.currentTouchStartY = e.touches[0].clientY;
-		},
-		// 触摸按下滑动处理
-		handleTouchMove(e) {
-			
-			// this.$emit('refresherpulling', e);
-			// 顶部下滑
-			console.log(e.touches[0].clientY >= this.currentTouchStartY)
-			if (e.touches[0].clientY >= this.currentTouchStartY){
-				this.touchDirection=='top'
-				const currentTouchMoveY = e.touches[0].clientY;
-				let movingDistance = (currentTouchMoveY - this.currentTouchStartY) ;
-				if(this.selectObject.selectIndex == 0){
-					this.refreshStatus = 'nomore'
-				}
-				else if(movingDistance > this.refresherThreshold){
-					this.refreshStatus = 'sure';// 释放
-				}else{
-					this.refreshStatus = 'soon';// 划
-				}
-				let computeDistance = movingDistance;
-				if(computeDistance > this.maxDistance){
-					computeDistance = this.maxDistance;
-				}
-				this.pullDownHeight = computeDistance ;
-			}else{
-				// 底部上滑
-				this.touchDirection=='bottom';
-				const currentTouchMoveY = e.touches[0].clientY;
-				let movingDistance = (this.currentTouchStartY - currentTouchMoveY ) ;
-				if(this.selectObject.selectIndex == this.selectObject.length-1){
-					this.loadStatus = 'nomore';
-				}else if (movingDistance >= this.lowerThreshold) {
-					this.loadStatus = 'sure';//释放
-				
-				} else {
-					this.loadStatus = 'soon';//划
-					
-				}
-				let computeDistance = movingDistance;
-				if(computeDistance > this.maxDistance){
-					computeDistance = this.maxDistance;
-				}
-				this.pullUpHeight = computeDistance;
-						
-			}
-			
-			
-		},
-		// 触摸松开处理
-		handleTouchEnd(e) {		
-			console.log(this.touchDirection)
-			// 顶部下滑
-			if(this.touchDirection == 'top'){				
-				if(this.pullDownHeight>=this.refresherThreshold&&this.selectObject.selectIndex > 0){
-					this.$emit('refresherrefresh', "prev");
-				}
-				this.pullingDown = false;
-				this.pullDownHeight = 0;
-			// 底部上滑
-			}else if(this.touchDirection == 'bottom'){
-				
-				if(this.pullUpHeight>=this.lowerThreshold&&this.selectObject.selectIndex < (this.selectObject.length-1)){
-					this.$emit('refresherrefresh', "next");
-					
-				}
-				this.pullingUp = false;
-				this.pullUpHeight = 0;	
-			}
-		},
-		// 初始化
-		handleInit() {
-			this.currentPage = this.page;
-			this.currentSize = this.size;
-			// console.log()
-			// this.computedHeight();
-		},
-		// 查询dom节点信息
-		getRect(selector, all) {
-			return new Promise(resolve => {
-				uni.createSelectorQuery()
-					.in(this)
-					[all ? 'selectAll' : 'select'](selector)
-					.boundingClientRect(rect => {
-						if (all && Array.isArray(rect) && rect.length) {
-							resolve(rect);
-						}
-						if (!all && rect) {
-							resolve(rect);
-						}
-					})
-					.exec();
-			});
-		}
-	}
-};
-</script>
-
-<style scoped lang="scss">
-.data-list-components {
-	height: 100%;
-	.scroll-view {
-		height: 100%;
-		.scroll-content {
-			width: 100%;
-			height: 100%;
-			position: relative;
-			.empty-view {
-				width: 100%;
-				height: 100%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				
-			}
-			.empty-content {
-				height:calc(100% - 20px) ;
-				display: flex;
-				align-items: center;
-				flex-direction: column;
-				justify-content: center;
-				.empty-image {
-					width: 100%;
-					// height: 100%;
-				}
-				.empty-text {
-					
-					display: block;
-					color: #606266;
-					margin-top: 20rpx;
-				}
-			}
-			.pull-down-view {
-				top: 0;
-				left: 0;
-				width: 100%;
-				padding: 30rpx 0;
-				display: flex;
-				position: absolute;
-				align-items: center;
-				flex-direction: column;
-				justify-content: center;
-				transform: translateY(-100%);
-				.refresh-view {
-					display: flex;
-					align-items: center;
-					flex-direction: column;
-					.loading-animation {
-						width: 50rpx;
-						height: 50rpx;
-					}
-					.pull-down-text {
-						color: #606266;
-						font-size: 24rpx;
-						margin-top: 10rpx;
-					}
-				}
-			}
-			.scroll-list {
-				display: flex;
-				flex-direction: column;
-			}
-			.loading-view {
-				width: 100%;
-				height: 100%;
-				display: flex;
-				align-items: center;
-				flex-direction: column;
-				justify-content: center;
-				.loading-animation {
-					width: 40rpx;
-					height: 40rpx;
-				}
-				.loading-text {
-					color: #606266;
-					font-size: 24rpx;
-					margin-top: 10rpx;
-				}
-			}
-			.pull-up-view {
-				width: 100%;
-				// padding: 15rpx 0;
-				height: 20px;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				.load-view {
-					display: flex;
-					align-items: center;
-					// .loading-animation {
-					// 	width: 30rpx;
-					// 	height: 30rpx;
-					// }
-					.loading-text {
-						color: #606266;
-						font-size: 24rpx;
-						margin-left: 20rpx;
-					}
-				}
-			}
-			.loading-animation {
-				position: relative;
-				&::after,
-				&::before {
-					left: 0;
-					width: 100%;
-					position: absolute;
-					border: 0 solid currentColor;
-					background-color: #b7b7b7;
-				}
-				&::after {
-					content: '';
-					top: -25%;
-					z-index: 1;
-					height: 100%;
-					border-radius: 10%;
-					animation: spin 0.6s -0.1s linear infinite;
-				}
-				&::before {
-					content: '';
-					bottom: -9%;
-					height: 10%;
-					background: #000;
-					border-radius: 50%;
-					opacity: 0.2;
-					animation: shadow 0.6s -0.1s linear infinite;
-				}
-				@keyframes spin {
-					17% {
-						border-bottom-right-radius: 10%;
-					}
-					25% {
-						transform: translateY(25%) rotate(22.5deg);
-					}
-					50% {
-						border-bottom-right-radius: 100%;
-						transform: translateY(50%) scale(1, 0.9) rotate(45deg);
-					}
-					75% {
-						transform: translateY(25%) rotate(67.5deg);
-					}
-					100% {
-						transform: translateY(0) rotate(90deg);
-					}
-				}
-				@keyframes shadow {
-					50% {
-						transform: scale(1.25, 1);
-					}
-				}
-			}
-		}
-	}
-}
-</style>
diff --git a/components/dataList/emptyImage.js b/components/dataList/emptyImage.js
deleted file mode 100644
index e511579..0000000
--- a/components/dataList/emptyImage.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-	data: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAMAAABOo35HAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAABEZVhJZk1NACoAAAAIAAGHaQAEAAAAAQAAABoAAAAAAAOgAQADAAAAAQABAACgAgAEAAAAAQAAASygAwAEAAAAAQAAASwAAAAA2GCC5wAAAvFQTFRFR3BM7fD49Pf78PP3////9/f79/f7v8vf8PT35+716e305Ovx8PT44ejy+Pv85u30+/v/6fD08/P33+Xv2uPt1+Dt3uXv+/v77fD42uPs8/f71d/q7PD46u30ztro4+rx9/v73Obv8/f36fH08/f74ejy4eju0tzp097q3ujw5Ovy5+rzzNnn8/f39/v7+/v/6e708/f73OLs2OLu7fD07fD07PT44Ofx1d/q09vq5+v0v83fyNXl6e/z7vD37PD0z9no5+rxytLo0dzo+v//0tLi5+7x5+71wczgytbm2ODs8/P3+/v70d3rxMTy2+Xv5Orz6fH42uLrzNfnxuPtws3g2d7u3OPvz9fo6/H1wc3hw87i3+bzwtDi3eTw5evz5evzwMzg+vr/3OTv4+r05u3xxc7hytfm2OHqwczi3eXv3OTx2ePt3eXx3eTy2eLu2+Lw3eXz3eXy3OTx3OXx5evzwM/h6/D32uPw0dvo4Ojx2uLv1+Dp2+Px7PL23OTy3OTx6u/26u70wM/hwM/h0dzu3OXy1+Dt3OTvwtDi1uDs3OTy3eXy3eXx8fX72uLu3+bx3uXx6/H48vf88ff86/L5wM7hwM/hwM/hxdLk0Nvn3uXy5+707fL53eTx7/X78vf9wc7hw9Dhwc3hzdvo3uby9ff5zNnn8vX53OTx3uby3+Xw5uzz8PX78fb77PH36/D26/L46/D3wM/hv83hwNDiwM/gwM/h2uLw2+Px8PX6093s8Pb77vP48ff76/H48PX81N/r6vH27PH1wM/gwdDh4Obx2uLvzNnt7/T61+Lvv87g8PX74+v42eHv7/P45+737/T52+Pw7PL59fr/1uHv1uLv4Oj23eby3OXx2eHu3+fz1N7u4un0y9ntztvt4+z65+326e/23+fy0dzu7vP61uDu5ez1+f//+P3/3ePp5Ov06fD49/z/4Or38vf95evx8/n+4uju2eTw4Obr3uTr2OPv6e3z6fH95u788vb5+eR7wQAAAMd0Uk5TAEVAQjE+P0BDSUdLREw+SDxGQU9RU049RlJBVURIWUo9UEFHP01NV1ZOTEpbQD89ZUJQVEZFREtUVmZgXWNDRFhJCFgxA0lKOFxSQjwMAU9oRwZaBTIKURBjKhcXIyJeWTwxWBJIExtUHiahHf7PZzH56d57UqpguCwqOVPBL9arZtizmP7zNkhFQbHvmepEcmx9+vWo/LplPUjFN/7J0/BdUFdMjh1SOYqD407ByodzsJDXW3Hsxv2VumLftdmd5D6Yy3WHtXTNFCUAABFoSURBVHja7J37TxPZHsD7W/8A4SaEhISf4Cb8QOCHRWATU0KCJgJBiwQBl0BAEAWBa0QluF4XBEXh+tao6ytGzXrvuu6urrs+1nu3D2aqlGJbCshDRQV87d57d+9P98xMHzPtPM600M6U74dJO22nPdMPM+d8z2N6NBoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPuaW5IAGT/FJtaT5owKNOq9WWgwYsSrQU60EEBkWVtKyTq0GFdIal1zLkFYEMKcq1HvRQJEqwXuujVEX/4m0R+M8WV7JkaevU4qr4m4G94Y9G87QcalQia9vAwMCJcCdaynWlrVRHkfgtcjVwrDv80SiXvLUqcKU9Rska+C6seWyJNhC98us9td8NMHwTzlxDzyNL+ZG87vsBD8fDeB7o8gJdKb+OuHfARziLxEBbyg8eTgyw+TaCtmqVn7v/lSPr+9yI2VJDy4PuOMvV8eLwpp2nLldoj33H1rZwBzpeW5VqCd+LPLb2hr9+6LZVWaKaWvRaxta/InJc56mnouO2RdUN/xmhXCBPm1es0ajK1rETkUpbp9dp1MXaSg0AAAAAAAtGRHqKVEpEeorUSkR6ilRKRHqKVEpEeopUSmR6itRJhHqK1EmkeorUyCL0FJVEbcy28D1FuovaaB3KvOA9RbndWVn6qM3gF7inKC8LEbUDvxe2p6iccpV1PmoHfi9kT1HNeVpW1sWoHfi9cD1FuotZbi4URa+tBeop6s7yEr1VzYXqKao773F1q1YDSFU03bZuwaU92LYuloAJHNbfQrk7XASFbeuCDixgx1rQ0gMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoVDRKDYsuysdeua9tN1pnrgjPAx353X76Q0wQIZxsamTdFpJQVs7m+0G+9uOvrIlbyp33y9bSafBYLCSm/jHzvYgVwgXef1axZJWVVx12vHWamCY4LXVc8Duft1BHuhtWrKqqvs77B4TjK3Ay1L2HXD5NnCSW3cfWpJzDTS0tpAsEbSt3f5j9/Z1cjexkpvb05fcAL8dl5v9VSHI3dxC70+dAdtY7fYtjdVLrACccBh4mNjPthW71cW3kZ1saW1YMgXgfqYA5IPc7hudnc7vymCwuMjmyzuWRAHY7iCtBkEmvLaqtjqEN3NMdG7aGfUF4Ba7XUQVlYW3M1dJfCbmiikat38Sxb/OwlMA8p2Jp6lYvdHhkNrQ+tYVtdUg/gIwkNuULQxXdF5vj8pqUJdQAch3bLW3Wp2Y20ZfNQgVgLdJ3K9vMLwc/X128wjmxpboqgbpJApALiMvvzAanxBn8HVRef3++qhQVdIoVQByVI0+MxopWSZiaAb/6PpjezTkXLWoALRjn38WRhUty2QiXkxuHrFgZXL7o6BQrL+KVwByjiqvLKRrcGoaQ9dEFLjq2nQAuwBEqr4w+nDLQrpMU9MGCV3+1W/1kX9IpAbIUwCyVbFkUbrOjBlGRF2pvM1Gl97uxC8A/VVxZCFdxJkx4bye3F2salXyCsBAVX6yKF+CkYQCXcmZZ7dMVgE48vKZ0SgpyyQUSSjQlax5dita/gimAJSQ5Y4k/F1tUl5+JW+e3YoOEtOVgCp+WVQk4Rd4CXWfRTQPkjmDC56tEUFVQrL8IwklupI/zy6GLRRWjRtly6J0zU1bLSIdjRHOsIKYZ7dii7itl8/FVInJcgdeFmUeV8HNs9sgZgupkkBMFl00zlpdvQpsUw5ynl1hWzxhlVxZKE4ltijQVdDz7PLbsojk6nKOrDFXi/J6WoOfZzefxxYqAMeNocoikCqUxdsLFCcrlHl2a8+S2LGCnNKQzt4NZK8So9Hg59ktY9saGTWOG0OVxYqzXC0Ka5gJdZ5dny3xsAo/gmeFpI5Dcupri1+FDHWe3Xy3LctzWaoE64YOC6uyM3FZTviz+DNPhz7PbtlpO0ZYhdnqwG0xdXVgV6JrwjLzdMjz7OZXd4yOj4csi4pC/RuXrVbckSFM+LP40z+EPM9ucYdT7jkYIIuJFQL7Ka7JC3/qwmxL/s+A9jishmHZujht8HO8qgwG+1m8fKhUfpC4ELaC+MnUqxNM4C5PF1bvjvV2k7zwJwxzlIY0z+7aLXZZ9Ry/fkPTpFhH2EQfZuauld9uEqKtoObZbbptlVkt5PRIO0T7DO3t0pVpHaduq88Nj62gjuH8PhKrGZlHFvFixinRu2rtlBwOkusXKoZhRqSg59nNb7fLa/XzyhqasUr325P9cuu2YSgSg55nt6LTKbeRlGZ21oozIuTtdqm6fEgVkDDTyNumJaXr2agBa/CMwXmgQXbd9qRiB0bsf8s/tEhMF1KF3e1I3pVft1XqhDNlzU7hkVh8usaNz18aZEDull231St1lotYO8bANY6qYYMsnM3iWVBRgC29Yq8g7iVldEjLV4Vk/V6lkWWrTbGXGaxucWH33yNVFrmqqHHKUsO6ubZKlXu1Yg/GuD+mkj3+bFS2KhfZfBVjBDzbVrmCr+xkKtGSw7OeG4NQZXC2tOKNUF6rD67dMrwUbXEZFg37WeyqqsdWnYJdaZq2Yo7+m5bvyiwZvLP/a3plh+4UrRN4X9w6I1uVWZYs+thS9jS5AZVowQPriVmuKpmyNLl6hU9fVG/Ay7IsM3NmuarkylI8Zb2Y1wzMTT2VqyrqZGk0FVhXozhNU0/NMlU9HZ74RRNt1La2SF1lYRkjnmDJ8poyDw87J20/RZmq/JLyvCvXSYmAcwpLFkuV2TFpIuYfdevrouUCaV2tvntNNmKPTbzbwTpEyTLjq5p+YiJMpvlH1Idf7G5br+4fIsuvKT15IdvDHpvolV3oLJSUxVblmqNUmQb/d/DOXXcKl/LKVXqIlZRqV2Sz2WNjjUDjkTUpJYul6j9jQ3SH4uDjx48/2A5+3bgyeyVaUCpXTpar7Hqn1eUnr2RnU1+AgvoS6IaSReniH6+AzkITLcssrepXn6pBk8n2+ktGlpdLeQ0qmes3t7brQoqXlSkr0UKvMrKEhndYpk0issysWOHXWUbVY0aV7cH9xpRsT1oUdHqn9OuV/gNbuvKHK1L8WZOyBi0+WbwDhywzhKAstirnzAufKmL+w73eu37peLnS1aDcPL+k7dSahDUJNGiF3vGEFGYdwZJFD0nz62YeEjqyWOffU+ekVxXa/DVx7nJ2AkrCl45f+jk99UrM8muariSIw5EVMNjRYfLIMguHVXSs4FH16vCjawkYnGpTlq8a/aWcnJwVOSs4oCdyEnIS0EK/tmc+YMSxb2iMZZbgk8UJq6aYWIFW9e7VkR9a3Wl4EE5fOb5K2i4lcViRxOxoUg772f7r74cI4QHaUzyyOLHCHEvVh1dfft1PfypKxC8dgfQP1Uc+oihuO5WclJyUtDxpOVqY++TlyWhh7t2v5Vz76si7929+myMEhv5vfuE7Dc1iYRUdKxw82uj+fAqM9On1nopIBhS5DQ+pnY1Pjo9fHr+cxvMFKDw7jF6vOnrk1QfC9N83/54iCJ6LSkbGCD9Z7LBqlqWKsNl+/PkuJx2M9NFCPZPRVRaheKK6KS2el/T4dLT47uOpfW08evC1jSCQrkmCCLxcaYoty8wJq2a8qqgC8N25m1Xx4vCk7+NSBLIvXf2pDIr0jHS0ZHjxPKbuKej1qs82ZBYW/oPRNfXbm0lT4Nlo4pM17A2r3KoO3/hbMi3BkyZW+qz1+Iz4+J6GsPZGV3ftit24MXZjLM1G1rofjKf+Qoa+ow/mGV3vTXyXmfjJYppgvLECKgC/ao3NCExTJH0vu2J3ocXzqKApXC3xuRWHVq2KWxVHg1bo9di42NhVsb51tCBPn2YWZrpFFWZSa333f7QhXUMf37x/QYjL8jTBUKoG6QLwpz7qc31piqfPvL4rjpFEPfY8T7/nYW0Ycq/VOz6Ji2F2JCYuJoZap+5XxTA7Sj8XR3uioWShG2aVov/ne+/mCeLxxzcfAyMJnyxfE4y3ACz0pCWZPms7Sgx6kcbv/fvqF7dwzC/buY5JODEmMXFd4rp1MegxuqHv6R3yecr8PDM1Fd14KXTbu3kOVVSIwfcBuryy6FiBpWr+wf0N3HSE0mdDbYNuvAS8/89d1Yt5/qVRJKYl0qAV7+OCxAK0JKYjVamZ6O/zVGpBwlJTOY+RP7Ry88ZhpMtEB15EgCxuEwwxb7t3s4pKg52eQPre5z3b+9/7v79ncc7Govp9yxgKlhUUpBWkpS1LYx4nLktEi/e1xL9QR1eqGJ+m/v3G/9s3n5fGriiOm1+PvJe8vLwIiQ15JLyYQAz+CJi4iiLYZJFYmkFEYZgZrG6ki9mIYEGYv2AgM0tLuxIXWm2XA9OuBRcjQ/sHFIa6KcOUzr7n3Ov1XTMTjYlQjOfD4d1zz7nfd8MhyTs3kBdnJ9BJfJQbLyzWHy1tFRyWDzec+3ewPxiPYQGF317//NGtPxsXt6aig9FBsGg0F83lBnOODxcG5hEex5JtlifOq1Zu8coTzYOXZ++hXP86jdfJm9/ltuoUD8sHTXY/cf/O9+dxoblKf8tfXktPsxm+eSaayeTAz+ay2UyW++LFYg4u7AVAguW+YCVbBsplLNPyBHjML5ebr348+3AMncTHv/hj7+SN+AnmVByWj6Q9u9k/2pF+auvWDo6r32UZelYHy16Am+kZHezyKNaIfFbf38CSSSzzy9FrVq7v/zlvvN5Kv1bhYfnrS/frfv/r9VNP52+nVCP6CEMf0XX05VFGzon1Io4MYsk2+TsLLsyOfoa2/hg7CWy83r4TbRX2Co9b9L3uf42+93Kt7uh6QA8EpgJTYM6IyL6gdR2IW/TwLoOa4Qdzc3mz/HjjyW/Q1kO5sJM4fucclr9po+91/yv02/O9lSpZTSYDyQAYH/OBfL6ar4Ll88m8k0OqSR6HRYxqoFptp+cle7KPsY1fWFuPjRfvFd7DA/Aafa/7t9F3X67VHVXNq3kwVU2qSTBnLnNVrjP9xuGvH7Bcf57yw3L1hvpe95dy3ZVraWdWnQVTVUu1rIpVqagVVTVUw5g1eFyAsYpRqcxWeBwWsrU30e8f/gCnIHgAvjg46kbf6/6SfvvGT8bFbcPQDA3MMCzDAjOMNWNtzVrjPiLiwkdwnjbSYDfTa4ba/Onk75evn3Wn73V/WV/culHf9WBrSGs00o10WktrYGlwGw2toWmWZllpi8cRzAlfnje60Tdfbfak73X/i/l05139wqNpc8gcAjNNzdTATIaI4agNaWBDDNnHvLz2ruqHv+3ozPjl7qg5OemadDFMl2lOns/hwsaiqwjGc0WT+yInr7/b+r0O/onwcC/oCrpcCVcCjN+4VCyVgqUgi5dcJTD+QiBwEYNFbFMR6wf9zjU/p86vJILBRDABFgzOBGdmSjN8IxGTc3C5AOeJmU/X3G39Vd/0D9Zr/iuY9k+D+f0JfwLMmcu5PtOP7rb5pv9qN+VhFDyFgr/g93v8fA4O82ueWq1QK0DaiYm1cGHxvtPvrX6+X/fY/IZ2zbbRj3giYB5P3BOPR+Lch4Qdt+MQ4nlIMCBo96n+0yZ1cTsScUfcYJGIHbFtt+0Gs8Hl8bibbyh8uDBEHOlX/fD6Qssn0K0obsUNpiijyijDPcrnGIcJhB0fc4gi6fpXL7cRS3PDyrCijCljYM4IQYbIDY9xH+MwYWsQnPe7XnwWF9ZDHF/IxwCH+TgqIQXMmcujWBu6D/o6ey4+3Ev5UqlYKhbzxXy+cd84GBehHxvncbjEQrFQaDzE85hLjadA6vPdE713dWA7HE6FU2DhcCwcAwtfAmP1WL2eql9eUw87sXujH/B6vXPeOTBvW+T8incFrH2+r/UDBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQBEEQ/zf/AWlElrMd+pdyAAAAAElFTkSuQmCC'
-}
\ No newline at end of file
diff --git a/components/pick-regions/pick-regions.vue b/components/pick-regions/pick-regions.vue
index 0e584dc..1c9cb75 100644
--- a/components/pick-regions/pick-regions.vue
+++ b/components/pick-regions/pick-regions.vue
@@ -68,6 +68,7 @@
                     }else if(region&&region.length == 6){
                         this.handleDefaultRegion(region)
                     }else{
+						console.log(region)
                         console.warn('defaultRegion非有效格式')
                     }
                 },
diff --git a/pages.json b/pages.json
index 0c85258..dc99681 100644
--- a/pages.json
+++ b/pages.json
@@ -117,13 +117,13 @@
 		// 		"enablePullDownRefresh": false
 		// 	}
 		// },
-		// {
-		// 	"path": "pages/classify/order/pay",
-		// 	"style": {
-		// 		"navigationBarTitleText": "收银台页",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
+		{
+			"path": "pages/classify/order/pay",
+			"style": {
+				"navigationBarTitleText": "收银台页",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/classify/order/paymentResult",
 			"style": {
diff --git a/pages/address/addNewAddress/addNewAddress.vue b/pages/address/addNewAddress/addNewAddress.vue
index 0ed682c..17de1d3 100644
--- a/pages/address/addNewAddress/addNewAddress.vue
+++ b/pages/address/addNewAddress/addNewAddress.vue
@@ -10,7 +10,7 @@
 					</view>
 					<view class="form-gorup-item-right">
 						<view class="form-gorup-title marb10">联系电话<text class="form-group-tips-must">*</text></view>
-						<input type="text" name="tel" v-model="userAddress.tel" maxlength="11"
+						<input type="number" name="tel" v-model="userAddress.tel" maxlength="11"
 							placeholder-class="fcor666" class="fcor666" placeholder="手机号">
 					</view>
 				</view>
@@ -147,9 +147,10 @@
 									address: resData.address,
 									is_default: resData.whetherDefault,
 								}
-								console.log(this.defaultRegionCode)
-								this.defaultRegionCode = resData.regionId		
-						console.log(this.defaultRegionCode)
+								// console.log(this.defaultRegionCode)
+								this.defaultRegionCode = resData.regionId;
+								this.regionId = resData.regionId;
+								// console.log(this.defaultRegionCode)
 					
 					}else{
 						uni.showToast({
@@ -209,7 +210,6 @@
 				
 				let isVali = this.fields_check(this.userAddress, validation);
 				if(isVali){
-					
 					if(this.dataParams.id){
 						this.updateAddress(this.dataParams.id)
 					}else{
diff --git a/pages/address/addNewAddress/demo.vue b/pages/address/addNewAddress/demo.vue
deleted file mode 100644
index 9a3877d..0000000
--- a/pages/address/addNewAddress/demo.vue
+++ /dev/null
@@ -1,350 +0,0 @@
-<template>
-	<view class="container">
-	
-		<view class='addAddress'>
-			<!-- <view class="pad30">
-				<view class='default acea-row row-middle borderRadius15'>
-					<input v-model="addressValue" type="text" placeholder="粘贴地址信息，自动拆分姓名、电话和地址" 
-					placeholder-class='placeholder' style="width:100%;" 
-					@blur="identify()">
-				</view>
-			</view> -->
-			<view class="pad30 mt-22">
-				<view class='list borderRadius15'>
-					<uni-forms ref="form"  label-position="left"  :modelValue="userAddress">
-						<uni-forms-item  label="姓名"  name="real_name" class='item acea-row row-between-wrapper'>
-							
-							<input type='text' placeholder='请输入姓名' name='real_name' :value="userAddress.real_name"
-								placeholder-class='placeholder' class="width100"></input>
-						</uni-forms-item>
-						
-						<uni-forms-item label="联系电话" name="phone" class='item acea-row row-between-wrapper'>
-							
-							<input type='number' placeholder='请输入联系电话' name="phone" v-model='userAddress.phone'
-								placeholder-class='placeholder' pattern="\d*"></input>
-						</uni-forms-item>
-						
-						<uni-forms-item label="所在地区"  name="region" class='item acea-row row-between-wrapper'>
-							
-							<view class="address acea-row row-between height100" @click="chooseAddress">
-								<input type='text' placeholder='请选择地址' :disabled="true" name='region' placeholder-class='placeholder'
-									v-model='userAddress.region' class="detail"></input>
-									<view class="icon-ymt to-right font14 fcor666">
-										
-									</view>
-							</view>
-							
-						</uni-forms-item>	
-						
-						<uni-forms-item label="详细地址" name="detail" class='item acea-row row-between-wrapper'>
-							
-							
-								<input type='text' placeholder='请填写具体地址' name='detail' placeholder-class='placeholder'
-									v-model='userAddress.detail' class="detail"></input>
-							
-						</uni-forms-item>		
-					</uni-forms>
-				</view>
-			</view>
-			<button class='keepBnt bg-color' @click="formSubmit">立即保存</button>
-		</view>
-			
-		
-		
-		<AddressPicker ref="AddressPicker" @getAddress="getAddress"></AddressPicker>
-	</view>
-</template>
-<script>
-	import uniForms from '@/components/uni-forms/components/uni-forms/uni-forms.vue'
-	import uniFormsItem from '@/components/uni-forms/components/uni-forms-item/uni-forms-item.vue'
-	
-	import AddressPicker from '@/pages/address/addNewAddress/addressPicker.vue'
-	let dataList = require('./address.json')
-	export default {
-		data() {
-			return {
-				userAddress: {
-					real_name:"",
-					phone:"",
-					region:"",
-					detail:"",
-				}, //地址详情
-				addressValue:"",
-				addressId:null,
-				/* rulesObject:{
-					real_name:{
-						rules:[
-								// 校验 name 不能为空
-								{
-									required: true,
-									errorMessage: '请填写姓名',
-								},
-								// 对name字段进行长度验证
-								{
-									minLength: 2,
-									maxLength: 5,
-									errorMessage: '{label}长度在 {minLength} 到 {maxLength} 个字符',
-								}
-							],
-					},
-					phone:{
-						rules:[
-								{
-									required: true,
-									errorMessage: '请输入手机号',
-								},
-								{
-									validateFunction: function(rule, value, data, callback) {
-										let iphoneReg = /^1[0-9]{10}$/
-										if (!iphoneReg.test(value)) {
-											callback('手机号码格式不正确，请重新填写')
-										}
-										return true
-									}
-								}
-								
-							],
-					},
-					region:{
-						rules:[
-								{
-									required: true,
-									errorMessage: '请选择地址',
-								},
-								
-							],
-					},
-					detail:{
-						rules:[
-								{
-									required: true,
-									errorMessage: '请填写详细地址',
-								},
-								{
-									minLength: 5,
-									
-									errorMessage: '{label}长度不能少于{minLength}个字符',
-								}
-								
-						],
-					},
-					
-				}
-				*/
-			
-			}
-		},
-		components:{
-			AddressPicker,
-			"uni-forms":uniForms,
-			"uni-forms-item":uniFormsItem
-			// uniForms,
-			// uniFormsItem
-		},
-		onReady() {
-				// 需要在onReady中设置规则
-			// this.$refs.form.setRules(this.rulesObject)
-			
-			// if(this.addressId){
-			// 	uni.setNavigationBarTitle({
-			// 		title: '编辑地址'
-			// 	});
-			// }
-		},
-		onLoad(options){
-			
-			if(options.id){
-				this.addressId = options.id
-				uni.setNavigationBarTitle({
-					title: '编辑地址'
-				});
-				
-			}
-			
-			
-			
-		},
-		
-		methods: {
-			identify(){
-				const options = {
-				  type: 0, // 哪种方式解析，0：正则，1：树查找
-				  textFilter: [], // 预清洗的字段
-				  nameMaxLength: 4, // 查找最大的中文名字长度
-				}
-				// type参数0表示使用正则解析，1表示采用树查找, textFilter地址预清洗过滤字段。
-				// if(!!this.addressValue){
-				// 	const parseResult = AddressParse(this.addressValue, options)
-				// 	// console.log(parseResult);
-				// 	this.userAddress.real_name = parseResult.name;
-				// 	this.userAddress.phone = parseResult.phone;
-				// 	this.userAddress.detail = parseResult.detail;
-				// 	this.userAddress.region = parseResult.province + '/' + parseResult.city + '/' + parseResult.area;
-				// }
-			},
-			
-			formSubmit(form) {
-				
-				// 暂时不起作用
-				
-					// this.$refs.form.validate().then(res => {
-					// 	console.log('success', res);
-					// 	uni.showToast({
-					// 		title: `校验通过`
-					// 	})
-					// }).catch(err => {
-					// 	console.log('err', err);
-					// })
-				
-				let _this = this;
-				
-				this.$refs.form.validate().then(res=>{
-					console.log(_this.userAddress,res)
-				})
-				
-			},
-			chooseAddress(){	
-				this.$refs.AddressPicker.show()
-			},
-			getAddress(address){
-				console.log(address,"address")
-				this.userAddress.region=address
-			}
-			
-			
-		},
-	}
-</script>
-<style lang="scss" scoped>
-	.container{
-		background-color: #f5f5f5;
-		height: 100vh;
-		box-sizing: border-box;
-		padding-top:30rpx;
-	}
-	
-	/deep/ .uni-forms-item__label .label-text{
-		font-size: 30rpx !important;
-	}
-	
-	/deep/ .uni-forms-item{
-		width: 100% !important;
-	}
-	
-	.pad30 {
-		padding: 0 30rpx
-	}
-	
-	
-	
-	.acea-row {
-		display: flex;
-		align-items: center;
-	}
-	.row-middle {
-		align-items: center
-	}
-	.row-between-wrapper {
-		align-items: center;
-		justify-content: space-between
-	}
-	.borderRadius15 {
-		border-radius: 15rpx !important;
-	}
-	
-	.addAddress .list {
-		background-color: #fff;
-	}
-	
-	.addAddress .list .item {
-		padding: 30rpx ;
-		padding-bottom: 0;
-		border-top: 1rpx solid #eee;
-		position: relative;
-	}
-	
-	.addAddress .list .item .detail{
-		// width: 368rpx;
-	}
-	
-	.addAddress .list .item .location{
-		position: absolute;
-		right: 46rpx;
-		top: 50%;
-		margin-top: -40rpx!important;
-		font-size: 24rpx;
-		text-align: center;
-	}
-	
-	
-	
-	.addAddress .list .item .name {
-		width: 195rpx;
-		font-size: 30rpx;
-		color: #333;
-	}
-	
-	.addAddress .list .item .address {
-		flex: 1;
-	}
-	
-	.addAddress .list .item .address .addressCon{
-		width: 360rpx;
-	}
-	
-	.addAddress .list .item .address .addressCon .tip{
-		font-size: 21rpx;
-		margin-top: 4rpx;
-	}
-	
-	.addAddress .list .item input {
-		// width: 475rpx;
-		flex: 1;
-		font-size: 30rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		height: 100%;
-	}
-	
-	.placeholder {
-		color: #ccc;
-	}
-	
-	.addAddress .list .item .picker {
-		width: 430rpx;
-		font-size: 30rpx;
-	}
-	
-	
-	
-	.addAddress .default {
-		padding: 0 30rpx;
-		height: 90rpx;
-		background-color: #fff;
-	}
-	
-	
-	
-	.addAddress .keepBnt {
-		width: 690rpx;
-		height: 86rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 86rpx;
-		margin: 50rpx auto;
-		font-size: 32rpx;
-		color: #fff;
-	}
-	
-	
-	.mt-22{
-		margin-top: 22rpx;
-	}
-	.bg-color {
-		background-color: #dd524d;
-	}
-	
-	
-	
-</style>
diff --git a/pages/address/address.vue b/pages/address/address.vue
index 4e3b159..322a935 100644
--- a/pages/address/address.vue
+++ b/pages/address/address.vue
@@ -1,135 +1,152 @@
 <template>
 	<view class="user-address backcor9 ">
-		
-		
-		<scroll-view scroll-y="true" class="address-contain paading10" >
+
+
+		<scroll-view scroll-y="true" class="address-contain paading10">
 			<radio-group @change="radioChange">
-			<view v-for="(item,index) in addressList" :key="item.id" class="border-8r paading10 backcolorfff marb10">
-				<view class="user-msg border-b paddbotm5">
-					<view class=" mart3 " >
-						<text class="address-name">{{item.consignee}}</text>
-						<text class=" margle10 ">{{item.phone}}</text>
-					</view>
-					<view class="color999 mart5" >
-						地址:{{item.regionName +" " +item.address}}
-					</view>
-					
-				</view>
-				<view class="user-handle mart10">
-					<view class="handle-left">
-						<!-- <radio  :checked="item.whetherDefault" style="transform:scale(0.7)"  :value="item.id" color="#FF1A34" /> -->
-						<radio  :checked="selectId == item.id" style="transform:scale(0.7)"  :value="item.id" color="#FF1A34" />
-						<text  class=" margle">默认地址</text>
+				<view v-for="(item,index) in addressList" @click.stop="chooseAddress(item)" :key="item.id"
+					class="border-8r paading10 backcolorfff marb10">
+					<view class="user-msg border-b paddbotm5">
+						<view class=" mart3 ">
+							<text class="address-name">{{item.consignee}}</text>
+							<text class=" margle10 ">{{item.phone}}</text>
+						</view>
+						<view class="color999 mart5">
+							地址:{{item.regionName +" " +item.address}}
+						</view>
+
 					</view>
-					<view class="handle-right">
-						<button type="primary" class="marRight10" plain="true" size="mini" @click="editAddress(item.id)">编辑</button>
-						<button type="warn" plain="true" size="mini" @click="deleteAddress(item.id)">删除</button>
+					<view class="user-handle mart10">
+						<view class="handle-left">
+							<!-- <radio  :checked="item.whetherDefault" style="transform:scale(0.7)"  :value="item.id" color="#FF1A34" /> -->
+							<radio :checked="selectId == item.id" style="transform:scale(0.7)" :value="item.id"
+								color="#FF1A34" />
+							<text class=" margle">默认地址</text>
+						</view>
+						<view class="handle-right">
+							<button type="primary" class="marRight10" plain="true" size="mini"
+								@click.stop="editAddress(item.id)">编辑</button>
+							<button type="warn" plain="true" size="mini"
+								@click.stop="deleteAddress(item.id)">删除</button>
+						</view>
 					</view>
+
 				</view>
-				
-			</view>
 			</radio-group>
 			<noMore></noMore>
 		</scroll-view>
-		
-		
+
+
 		<view class="address-btn  fcorfff font16">
 			<view class="add-btn" @click="addNewAddress">添加新地址</view>
-			<view class="add-btn" @click="daoRu">导入系统地址</view>
+			<!-- <view class="add-btn" @click="daoRu">导入系统地址</view> -->
 		</view>
 	</view>
 </template>
 
 <script>
 	import noMore from '@/pages/classify/no-more/no-more.vue'
-	import { getDeliveryAddressList,deleteAddress,updateDeliveryAddress } from '@/Utils/physicalObject.js'
-	
-	
+	import {
+		getDeliveryAddressList,
+		deleteAddress,
+		updateDeliveryAddress
+	} from '@/Utils/physicalObject.js'
+
+
 	export default {
-		components:{
+		components: {
 			noMore,
-			
+
 		},
-		data(){
-			return{
-				addressId:[
-					111,222,333,444
+		data() {
+			return {
+				addressId: [
+					111, 222, 333, 444
 				],
-				selectId:0,
-				addressList:[]
+				selectId: 0,
+				addressList: [],
+				status: 0, //其他页面调过来的状态码。
 			}
 		},
-		onLoad(){
+		onLoad(options) {
+			if (options.status) { //1:从订单确认页面跳过来的
+				this.status = options.status;
+			}
 			this.initData()
 		},
-		methods:{
-			initData(){
+		methods: {
+			initData() {
 				this.selectId = 0;
-				getDeliveryAddressList().then(res=>{
+				uni.showLoading({
+						title: '加载中',
+						mask:true,
+					});
+				getDeliveryAddressList().then(res => {
+					uni.hideLoading();
 					if (res.return_code == '000000') {
-										
-						if(res.return_data.length>0){
-						// console.log(res.return_data)
-						this.addressList = res.return_data;
-						this.addressList.map(item=>{
-							if(item.whetherDefault){
-								this.selectId = item.id;
-							}
-						})
+
+						if (res.return_data.length > 0) {
+							// console.log(res.return_data)
+							this.addressList = res.return_data;
+							this.addressList.map(item => {
+								if (item.whetherDefault) {
+									this.selectId = item.id;
+								}
+							})
 						}
-					
-					}else{
+
+					} else {
 						uni.showToast({
 							title: res.return_msg,
 							icon: 'none',
 							duration: 2000
 						})
 					}
-					
+
 				})
 			},
-			
+
 			// 修改默认地址
-			radioChange(e){
-				
-				let select =  e.detail.value
-				let content =null;
-				this.addressList.map(item=>{
-					if(item.id == select){
+			radioChange(e) {
+				console.log(e)
+				let select = e.detail.value
+				let content = null;
+				this.addressList.map(item => {
+					if (item.id == select) {
 						content = item;
 					}
 				})
-				let params ={
+				let params = {
 					"id": content.id,
 					"address": content.address,
 					"consignee": content.consignee,
 					"phone": content.phone,
 					"regionId": content.regionId,
-					"regionName":content.regionName,
+					"regionName": content.regionName,
 					"whetherDefault": true
 				}
-				updateDeliveryAddress(params).then(res=>{
-					let title ;
-					
-						if (res.return_code == '000000') {
-							title = res.return_data;
-							this.selectId = e.detail.value;
-						}else{
-							title = res.return_msg;
-						}
-						uni.showToast({
-							title: title,
-							icon: 'none',
-							duration: 2000
-						})		
-				})		
+				updateDeliveryAddress(params).then(res => {
+					let title;
+
+					if (res.return_code == '000000') {
+						title = res.return_data;
+						this.selectId = e.detail.value;
+					} else {
+						title = res.return_msg;
+					}
+					uni.showToast({
+						title: title,
+						icon: 'none',
+						duration: 2000
+					})
+				})
 			},
-			editAddress(id){
+			editAddress(id) {
 				uni.navigateTo({
-					url:"./addNewAddress/addNewAddress?id="+id
+					url: "./addNewAddress/addNewAddress?id=" + id
 				})
 			},
-			deleteAddress(id){
+			deleteAddress(id) {
 				uni
 				let _this = this;
 				uni.showModal({
@@ -137,123 +154,142 @@
 					content: '确定删除该地址吗?',
 					success: function(res) {
 						if (res.confirm) {
-							let params={
-								id:id
+							let params = {
+								id: id
 							}
-							deleteAddress(params).then(res=>{
-								let title ;
+							deleteAddress(params).then(res => {
+								let title;
 								if (res.return_code == '000000') {
-										title = res.return_data;				
-								}else{
+									title = res.return_data;
+								} else {
 									title = res.return_msg;
 								}
 								uni.showToast({
 									title: title,
 									icon: 'none',
 									duration: 2000
-								})		
-								
+								})
+
 								_this.initData();
-								
+
 							})
-							
+
 						} else if (res.cancel) {
-				
+
 							// console.log('用户点击取消');
 						}
 					}
 				});
-				
-				
+
+
 			},
 			// 新增地址
-			addNewAddress(){
+			addNewAddress() {
 				uni.navigateTo({
-					url:"./addNewAddress/addNewAddress"
+					url: "./addNewAddress/addNewAddress"
 				})
 			},
 			// 导入系统地址
-			daoRu(){
-			 uni.chooseAddress({
+			daoRu() {
+				uni.chooseAddress({
 					success: (res) => {
 						console.log(res)
 						var data = {
-						    "name": res.userName || '',
-						    "tel": res.telNumber || '',
-						    "province": res.provinceName || '',
-						    "city": res.cityName || '',
-						    "county": res.countyName || '',
-						    "address": res.detailInfo || ''
+							"name": res.userName || '',
+							"tel": res.telNumber || '',
+							"province": res.provinceName || '',
+							"city": res.cityName || '',
+							"county": res.countyName || '',
+							"address": res.detailInfo || ''
 						};
-						
+
 						// 之后再发起一个添加地址的请求
-						
+
 					},
 					fail: (err) => {
-						
+
 					}
 				})
-				
-			
+
+
+			},
+			chooseAddress(addressItem) {
+
+				console.log(addressItem, "addressItem")
+
+				if (this.status == 1) {
+					let pages = getCurrentPages(); // 当前页面
+					let beforePage = pages[pages.length - 2]; // 上一页        
+					uni.navigateBack({
+						success: function() {
+							beforePage.$vm.getRegiFreight(addressItem);
+							console.log("返回成功!");
+						}
+					})
+				}
+
+
+
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.border-b {
+		border-bottom: 1px solid #f6f6f6;
+	}
+
+	.user-address {
+		height: 100vh;
+		overflow: hidden;
+
+		.address-contain {
+			height: calc(100vh - 70px);
+			width: calc(100% - 20px);
+		}
+
+		.user-handle {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+		}
 
-.border-b{
-	border-bottom: 1px solid #f6f6f6;
-}	
-
-.user-address{
-	height: 100vh;
-	overflow: hidden;
-	
-	.address-contain{
-		height: calc(100vh - 70px);
-		width: calc(100% - 20px);
+		.handle-right {
+			vertical-align: middle;
+		}
 	}
-	
-	.user-handle{
+
+
+
+	// 底部按钮
+	.address-btn {
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		height: 50px;
+		line-height: 50px;
+		box-sizing: border-box;
 		display: flex;
+		justify-content: space-around;
 		align-items: center;
-		justify-content: space-between;
-	}
-	
-	.handle-right{
-		vertical-align: middle;
-	}
-}
-
-
-
-// 底部按钮
-.address-btn{
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	height: 50px;
-	line-height: 50px;
-	box-sizing: border-box;
-	display: flex;
-	justify-content: space-around;
-	align-items: center;
-	.add-btn{
-		width:45%;
-		height: 40px;
-		line-height: 40px;
-		text-align: center;
-		border-radius: 20px;
-		&:first-of-type{
-			background-color:#F6C133;
-		}
-		&:last-of-type{
-			background-color: #3da7e7;
+
+		.add-btn {
+			width: 45%;
+			height: 40px;
+			line-height: 40px;
+			text-align: center;
+			border-radius: 20px;
+
+			&:first-of-type {
+				background-color: #F6C133;
+			}
+
+			&:last-of-type {
+				background-color: #3da7e7;
+			}
+
 		}
-		
 	}
-}
-
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/classify/cart-choose/cart-choose.vue b/pages/classify/cart-choose/cart-choose.vue
index c138c39..29a1a1a 100644
--- a/pages/classify/cart-choose/cart-choose.vue
+++ b/pages/classify/cart-choose/cart-choose.vue
@@ -16,7 +16,7 @@
 			</view>
 			
 			<!-- 地址 -->
-			<view class="select-address  width100 mart10 " @click="goAddress">
+			<!-- <view class="select-address  width100 mart10 " @click="goAddress">
 				<view v-if="true" class="address-left font14">
 					<view class=" " >
 						重庆市渝中区不是的聚钓具偶家
@@ -34,7 +34,7 @@
 				</view>
 				
 				<view class="icon-ymt to-right"></view>	
-			</view>
+			</view> -->
 			
 			<!-- 选分类 -->
 			<view class="choose-bottom">
@@ -69,7 +69,7 @@
 						加入购物车
 					</view>
 					<view class="fcorfff way bgcolor-ri" @click="toBuy">
-						领券购买
+						立即购买
 					</view>
 				</view>
 				<view class="choose-way" v-if="status == 0">
@@ -77,6 +77,11 @@
 						加入购物车
 					</view>
 				</view>
+				<view class="choose-way" v-if="status == 2">
+					<view class="fcorfff way1 bgcolor-left" @click="toBuy">
+						立即购买
+					</view>
+				</view>
 			</view>
 			
 		</view>
@@ -108,6 +113,10 @@
 			status:{
 				type:Number,
 				default:0,
+			},
+			goodsDetail:{
+				type:Object,
+				default:{}
 			}
 		},
 		components:{
@@ -157,7 +166,7 @@
 					goodsId:this.specificationList[this.chooseIndex].goodsId,
 					num:this.chooseNumber,
 					sku:this.specificationList[this.chooseIndex].id,
-					whetherCheck:true
+					whetherCheck:false
 				}
 				
 				insertShoppingCart(params).then(async res=>{
@@ -175,7 +184,7 @@
 						duration: 2000
 					})		
 					
-					
+					this.chooseNumber = 1;
 					
 					this.$emit("close")
 					
@@ -184,9 +193,29 @@
 				
 			},
 			
-			//领券购买
+			//立即购买
 			toBuy(){
-				this.$emit("close")
+				
+				console.log(this.specificationList[this.chooseIndex],this.goodsDetail)
+				
+			let _this = this	
+			let obj =[{	
+				goodsId:_this.specificationList[this.chooseIndex].goodsId,
+				img: _this.specificationList[this.chooseIndex].showImg,
+				num: _this.chooseNumber,
+				price: _this.specificationList[this.chooseIndex].price,
+				sku: _this.specificationList[this.chooseIndex].id,
+				skuName: _this.specificationList[this.chooseIndex].name,
+				title: _this.goodsDetail.name,
+				originalPrice:_this.specificationList[this.chooseIndex].originalPrice
+				}]
+				obj = JSON.stringify(obj)
+				
+				uni.navigateTo({
+					url: '/pages/settleAccounts/settleAccounts?goodsList='+obj
+				})
+				
+				// this.$emit("close")
 			},
 			//
 			select(index){
diff --git a/pages/classify/cart-choose/data.json b/pages/classify/cart-choose/data.json
deleted file mode 100644
index 55d4dcd..0000000
--- a/pages/classify/cart-choose/data.json
+++ /dev/null
@@ -1,46 +0,0 @@
-
-	{
-	      "id": "2",
-	      "realstore_id": "0",
-	      "realstore_goods_id": "0",
-	      "shop_id": "1",
-	      "shop_user_id": "1",
-	      "shop_category_id": "1",
-	      "shop_settle_price": "0.00",
-	      "shop_settle_rate": "0.00",
-	      "brand_id": "2",
-	      "site_type": "-1",
-	      "title": "苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G",
-	      "title_color": "",
-	      "simple_desc": "1.芯片功能强大 iPhone芯片的更新频率比友商少,但每次iPhone芯片更新时,都会成为关注和追赶的对象。",
-	      "model": "iPhone 6 Plus",
-	      "place_origin": "0",
-	      "inventory": "7983",
-	      "inventory_unit": "步",
-	      "images": ["https://gw.alicdn.com/bao/uploaded/i2/708446530/O1CN01WZY06s1y6mybMkFwh_!!708446530.jpg_300x300q90.jpg_.webp","https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg"],
-	      "original_price": "4500.00-6800.00",
-	      "min_original_price": "4500.00",
-	      "max_original_price": "6800.00",
-	      "price": "4500.00-6800.00",
-	      "min_price": "4500.00",
-	      "max_price": "6800.00",
-	      "give_integral": "30",
-	      "buy_min_number": "1",
-	      "buy_max_number": "0",
-	      "is_deduction_inventory": "1",
-	      "is_shelves": "1",
-	      "content_web": "<p style=\"margin:0;\"><a href=\"https://store.shopxo.net/\" target=\"_blank\" title=\"进入指定页面&gt;&gt;\">进入指定页面&gt;&gt;</a></p><p style=\"margin:0;\"><video class=\"edui-faked-video        video-js\" controls=\"\" preload=\"none\" width=\"420\" height=\"280\" src=\"https://d1.shopxo.vip/static/upload/video/goods/2019/01/14/1547458876723311.mp4\" data-setup=\"{}\"></video></p><p style=\"margin:0;\"><a href=\"https://shopxo.net/?q=test&u=hello你好！\" target=\"_blank\" title=\"打开一个a标签地址\"><strong><span style=\"font-size: 24px; color: rgb(255, 0, 0);\">打开一个a标签地址</span></strong></a><br/></p><p style=\"margin:0;\"><a href=\"/pages/plugins/blog/index/index\" target=\"_self\" title=\"进入博客页面\">进入博客</a></p><p style=\"margin:0;\"><img style=\"max-width:100%;height:auto;margin:0;padding:0;display:block;\" src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451595700972.jpg\" title=\"1547451595700972.jpg\"/></p><p style=\"margin:0;\"><img style=\"max-width:100%;height:auto;margin:0;padding:0;display:block;\" src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451595528800.jpg\" title=\"1547451595528800.jpg\"/></p><p style=\"margin:0;\"><img style=\"max-width:100%;height:auto;margin:0;padding:0;display:block;\" src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451595616298.jpg\" title=\"1547451595616298.jpg\"/></p><p style=\"margin:0;\"><br/></p>",
-	      "photo_count": "2",
-	      "sales_count": "266",
-	      "access_count": "13333",
-	      "is_exist_many_spec": "1",
-	      "spec_base": "",
-	      "plugins_membershiplevelvip_price_extends": "",
-	      "seo_title": "",
-	      "seo_keywords": "",
-	      "seo_desc": "",
-	      "is_delete_time": "0",
-	      "add_time": "2019-01-14 15:40:24",
-	      "upd_time": "2023-03-24 17:46:26"
-	      
-	}
diff --git a/pages/classify/cart/cart.vue b/pages/classify/cart/cart.vue
index df4e7d0..25cc02c 100644
--- a/pages/classify/cart/cart.vue
+++ b/pages/classify/cart/cart.vue
@@ -1,27 +1,27 @@
 <template>
 	<view class="">
 		<!-- v-if="cartList.length>0"  -->
-		
-		<view  class="cart-container backcor9">
+
+		<view class="cart-container backcor9">
 			<scroll-view :scroll-y="true" class="cart-list">
 
 				<uni-swipe-action>
 
 					<!-- 从这里开始遍历-->
 					<view v-for="(item,index) in cartList"
-						:class="(item.isFailure?' isFailure ':' ')+'marb10 border-8r backcolorfff paading10'"
+						:class="(item.loseEfficacy?' loseEfficacy ':' ')+'marb10 border-8r backcolorfff paading10'"
 						:key="item.id">
 
-						<!-- :disabled="item.isFailure" -->
+						<!-- :disabled="item.loseEfficacy" -->
 						<uni-swipe-action-item :auto-close="autoClose" :right-options="swipe_options"
 							@click="swipe_opt_event($event,item.id)" @change="swipe_change($event, item.id)">
 
 							<view class="cart-container2">
 								<checkbox-group @change="checkClick(item)">
-									<checkbox class="mycheck" :disabled="!isEdit&&item.isFailure" color="#FFC71E"
+									<checkbox class="mycheck" :disabled="!isEdit&&item.loseEfficacy" color="#FFC71E"
 										:value="item.id" :checked="item.whetherCheck" />
 								</checkbox-group>
-								<view class="cart-detail">
+								<view class="cart-detail" >
 									<view class="cart-img">
 										<image :src="imageUrl+item.img" class="img border-8r" mode="aspectFill"></image>
 									</view>
@@ -33,14 +33,21 @@
 										</view>
 
 										<view class="cart-msg-price">
-											<view class="cart-price font16 fcorred">
-												<!-- ¥ <text class="font20">18 </text>.8 -->
-												¥{{item.price}}
+											<view class="dis-flex">
+												<view class="cart-price font16 fcorred">
+													<!-- ¥ <text class="font20">18 </text>.8 -->
+													¥{{item.price}}
+												</view>
+												<!-- <view class="fcor666 margle10 font14 text-lt">
+													¥{{item.originalPrice}}
+												</view> -->
 											</view>
-											<view class="cart-num">
+											
+											<view :class="'cart-num'+(item.loseEfficacy?' pont-event ':' ')">
 
-												<uni-number-box v-model="item.num" :min="1" @noMoreLess="noMoreLess(item.id+'')"
-													@change="changeNumValue($event,item.id)" />
+												<uni-number-box v-model="item.num" :min="1"
+													@noMoreLess="noMoreLess(item.id+'')"
+													@change="changeNumValue($event,item.id)" :max="999999999" />
 											</view>
 										</view>
 
@@ -75,7 +82,11 @@
 				<text v-if="isEdit" class="tool-right paddleft5 fcorred" @click="editDelete">退出编辑</text>
 				<view v-if="!isEdit" class="tool-right">
 					<view class="tool-jiesuan marRight10 ">
+					
+					<!-- <text v-if="priceOrigin > 0" class="fcor666 margle10 marRight10 font14 text-lt">¥{{priceOrigin}}</text> -->
 						合计:<text class="fcorred">¥{{priceAll}}</text>
+						
+						
 					</view>
 					<view class="jiesuan-btn fcorfff " @click="settleAccount">
 						结算
@@ -103,7 +114,7 @@
 	import uniNumberBox from '@/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue'
 	import {
 		getShoppingCartList,
-		goodsAddNum,
+		goodsEditNum,
 		deleteShoppingCart
 	} from '@/Utils/physicalObject.js'
 
@@ -123,20 +134,24 @@
 				},
 
 				// 
-				swipe_options: [{
-					isCheck: false,
-				 text: "收藏",
-					icon: ' shoucang32 ',
-					style: {
-				  backgroundColor: '#f6c133'
-					}
-				}, {
-					text: '删除',
-					icon: ' delete ',
-					style: {
-						backgroundColor: '#E64340'
-					}
-				}],
+				swipe_options: [
+					{
+						text: '删除',
+						icon: ' delete ',
+						style: {
+							backgroundColor: '#E64340'
+						}
+					},
+					// {
+					// 	isCheck: false,
+					// 	text: "收藏",
+					// 	icon: ' shoucang32 ',
+					// 	style: {
+					// 		backgroundColor: '#f6c133'
+					// 	}
+					// },
+					
+				],
 				swipe_item_index: null,
 				numberValue: 0,
 				cartList: [],
@@ -154,8 +169,8 @@
 			"uni-number-box": uniNumberBox
 		},
 		computed: {
+			//现价金额
 			priceAll() {
-				//总计金额
 				var str = 0;
 				for (var i = 0; i < this.cartList.length; i++) {
 					if (this.cartList[i].whetherCheck) {
@@ -163,15 +178,22 @@
 					}
 				}
 				return str;
+			},
+			// 原价
+			priceOrigin(){
+				var str = 0;
+				for (var i = 0; i < this.cartList.length; i++) {
+					if (this.cartList[i].whetherCheck) {
+						str += this.cartList[i].num * this.cartList[i].originalPrice;
+					}
+				}
+				return str;
+				
+				
 			}
 		},
 		onLoad() {
-			// this.cartList=[
-			// {id:111,name:"小香风",isFailure:true,img:"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg",title:"夏季复古ins风格网红SP同款",price:20,num:1},
-			// {id:222,name:"小香风",isFailure:false,img:"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg",title:"夏季复古ins风格网红SP同款",price:30,num:1},
-			// {id:333,name:"小香风",isFailure:false,img:"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg",title:"夏季复古ins风格网红SP同款",price:20,num:1},
-			// {id:444,name:"小香风",isFailure:false,img:"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg",title:"夏季复古ins风格网红SP同款",price:30,num:1},
-			// ]
+			
 			// this.cartList.map(item=>{
 			// 	this.$set(item, 'checked', false);
 			// })
@@ -187,7 +209,7 @@
 						console.log(res.return_data)
 						this.cartList = res.return_data;
 						this.allCheckInit();
-						
+
 					} else {
 						uni.showToast({
 							title: res.return_msg,
@@ -201,7 +223,7 @@
 				this.isEdit = !this.isEdit;
 				if (!this.isEdit) { //退出编辑
 					this.cartList.map(item => {
-						if (item.whetherCheck && item.isFailure) {
+						if (item.whetherCheck && item.loseEfficacy) {
 							item.whetherCheck = false;
 						}
 					})
@@ -220,8 +242,8 @@
 				this.allCheck.whetherCheck = !this.allCheck.whetherCheck;
 				if (this.allCheck.whetherCheck) {
 					this.cartList.map(item => {
-						if (!this.isEdit) { //商品的全选事件
-							if (!item.isFailure) {
+						if (!this.isEdit) { //商品的全选事件,loseEfficacy商品的失效，默认undefined
+							if (!item.loseEfficacy) {
 								item.whetherCheck = true
 							}
 						} else { //编辑的全选事件
@@ -239,9 +261,9 @@
 			// 单个商品的选择
 			checkClick(item) {
 				item.whetherCheck = !item.whetherCheck;
-
+				
 				if (!item.whetherCheck) {
-					if (!this.isEdit && !item.isFailure) { //商品
+					if (!this.isEdit && !item.loseEfficacy) { //商品
 						this.allCheck.whetherCheck = false;
 					} else if (this.isEdit) {
 						this.allCheck.whetherCheck = false;
@@ -251,7 +273,7 @@
 					// 				// 判断每一个商品是否是被选择的状态
 					// 				const goods = this.cartList.every(item => {
 					// 					if(!this.isEdit){//商品
-					// 						if(item.isFailure){
+					// 						if(item.loseEfficacy){
 					// 							return true;
 					// 						}
 					// 					}
@@ -269,19 +291,19 @@
 				}
 			},
 			allCheckInit() {
-				
-				if(this.cartList.length == 0){
+
+				if (this.cartList.length == 0) {
 					this.allCheck.whetherCheck = false;
 					return
 				}
-				
+
 				// 判断每一个商品是否是被选择的状态
 				const goods = this.cartList.every(item => {
-					// if (!this.isEdit) { //商品
-					// 	if (item.isFailure) {
-					// 		return true;
-					// 	}
-					// }
+					if (!this.isEdit) { //商品
+						if (item.loseEfficacy) {
+							return true;
+						}
+					}
 					return item.whetherCheck === true
 				})
 				if (goods) {
@@ -289,7 +311,7 @@
 				} else {
 					this.allCheck.whetherCheck = false
 				}
-				// console.log(this.allCheck.whetherCheck,goods)
+				
 			},
 
 			// 判断购物车内是否有商品
@@ -324,7 +346,7 @@
 					return
 				} else {
 					// console.log(select.join(), "要移除的商品id")
-					let str=select.join();
+					let str = select.join();
 					this.noMoreLess(str)
 				}
 
@@ -335,8 +357,12 @@
 				if (!this.isHaveGoods()) return;
 
 				if (this.priceAll > 0) {
+					let selestArr = this.cartList.filter(item=>item.whetherCheck == true)
+					selestArr = JSON.stringify(selestArr)
+					
+					// console.log(selestArr)
 					uni.navigateTo({
-						url: '/pages/settleAccounts/settleAccounts'
+						url: '/pages/settleAccounts/settleAccounts?goodsList='+selestArr
 					})
 				} else {
 					uni.showToast({
@@ -348,10 +374,10 @@
 
 			},
 			// 滑动点击
-			swipe_opt_event(e,id) {
+			swipe_opt_event(e, id) {
 				console.log(e, "dianji")
 
-				if (e.index == 0) { //收藏
+				if (e.index == 1) { //收藏
 
 					// console.log(e.content.isCheck)
 					// e.content.isCheck=!e.content.isCheck
@@ -365,16 +391,11 @@
 
 					return
 				}
-				if (e.index == 1) { //删除
-					
-					this.noMoreLess(id+"")
-
-
-					// this.showAction = 'right';
-
+				if (e.index == 0) { //删除
+					this.noMoreLess(id + "")
 					return
 				}
-				
+
 			},
 			// 滑动事件
 			swipe_change(e, id) {
@@ -389,25 +410,27 @@
 					content: '确定把该商品移除购物车吗?',
 					success: function(res) {
 						if (res.confirm) {
-							console.log('用户点击确定,要删除的id',ids);
-							let params={ids:ids};
-							deleteShoppingCart(params).then(res=>{
-								let title ;
+							console.log('用户点击确定,要删除的id', ids);
+							let params = {
+								ids: ids
+							};
+							deleteShoppingCart(params).then(res => {
+								let title;
 								if (res.return_code == '000000') {
-										title = res.return_data;				
-								}else{
+									title = res.return_data;
+								} else {
 									title = res.return_msg;
 								}
 								uni.showToast({
 									title: title,
 									icon: 'none',
 									duration: 2000
-								})		
-								
+								})
+
 								_this.initData();
-								
+
 							})
-							
+
 						} else if (res.cancel) {
 
 							console.log('用户点击取消');
@@ -416,15 +439,16 @@
 				});
 
 			},
-			
+
 			changeNumValue(v, id) {
-				// console.log(v,id)
+				console.log(v,id)
 				// console.log(this.cartList)
 				let params = {
-					id: id
+					id: id,
+					num:v
 				}
-				goodsAddNum(params).then(res => {
-
+				
+				goodsEditNum(params).then(res => {
 					if (res.return_code == '000000') {
 						uni.showToast({
 							title: res.return_data,
@@ -432,12 +456,26 @@
 							duration: 2000
 						})
 					} else {
+						//增加数量失败
+						// this.cartList.map(item=>{
+						// 	if(item.id == id){
+						// 		item.num = 1;
+						// 	}
+						// })
+						
+						
+						//重新刷新数据
+						this.initData();
+						
 						uni.showToast({
 							title: res.return_msg,
 							icon: 'none',
 							duration: 2000
 						})
 					}
+					
+					
+					
 				})
 
 			}
@@ -516,8 +554,13 @@
 	}
 
 
+.pont-event{
+	 pointer-events: none; 
+}
+
 	// 失效
-	.isFailure {
+	.loseEfficacy {
+		
 		.cart-img {
 			position: relative;
 
diff --git a/pages/classify/goods-list/goods-list.vue b/pages/classify/goods-list/goods-list.vue
index 73246aa..875037a 100644
--- a/pages/classify/goods-list/goods-list.vue
+++ b/pages/classify/goods-list/goods-list.vue
@@ -34,7 +34,7 @@
 								        <view class="goods-title">
 								            <view class="goods-text">{{item.name}}</view>
 								            <!-- <view v-if="(item.simple_desc || null) != null" class="goods-desc">{{item.simple_desc}}</view> -->
-											<view  class="goods-desc">{{item.listDescribe}}</view>
+											<view  class="goods-desc">{{item.listDescribe || ''}}</view>
 										</view>
 										<view class="goods-item-bottom">
 											<view class="goods-price">
@@ -93,7 +93,7 @@
 								<view class="goods-title">
 									<view class="goods-text">{{item.name}}</view>
 									<!-- <view v-if="(item.simple_desc || null) != null" class="goods-desc">{{item.simple_desc}}</view> -->
-									<view  class="goods-desc">{{item.listDescribe}}</view>
+									<view  class="goods-desc">{{item.listDescribe || ''}}</view>
 								</view>
 								<view class="goods-item-bottom">
 									<view class="goods-price">
diff --git a/pages/classify/goods-search/data2.json b/pages/classify/goods-search/data2.json
deleted file mode 100644
index 8ae5059..0000000
--- a/pages/classify/goods-search/data2.json
+++ /dev/null
@@ -1,582 +0,0 @@
-[
-  {
-    "id": "11",
-    "realstore_id": "0",
-    "realstore_goods_id": "0",
-    "shop_id": "0",
-    "shop_user_id": "0",
-    "shop_category_id": "0",
-    "shop_settle_price": "0.00",
-    "shop_settle_rate": "0.00",
-    "brand_id": "3",
-    "site_type": "3",
-    "title": "夏季复古ins风格网红SP同款 短袖大圆领香槟色蕾丝绣花钉珠连衣裙",
-    "title_color": "",
-    "simple_desc": "",
-    "model": "",
-    "place_origin": "0",
-    "inventory": "2659",
-    "inventory_unit": "件",
-    "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547455566118614.jpg",
-    "original_price": "160.00-258.00",
-    "min_original_price": "160.00",
-    "max_original_price": "258.00",
-    "price": "160.00-258.00",
-    "min_price": "160.00",
-    "max_price": "258.00",
-    "give_integral": "0",
-    "buy_min_number": "1",
-    "buy_max_number": "0",
-    "is_deduction_inventory": "1",
-    "is_shelves": "1",
-    "content_web": "<p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><strong><span style=\"color: rgb(153, 51, 255);\">【品牌】欧单 学媛风 猫咪良品</span></strong></strong></span></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><span style=\"color: rgb(153, 51, 255);\"><strong><strong>【吊牌】xueyuanfeng&nbsp;</strong></strong></span></strong></span><strong style=\"font-size: 18px; line-height: 27px;\"><strong><span style=\"color: rgb(153, 51, 255);\">猫咪良品</span></strong></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><strong><strong>【面料质地】网纱绣花钉珠拼接蕾丝</strong></strong></strong></span><span style=\"font-size: 18px;\"><strong><strong><strong>&nbsp;</strong></strong></strong></span><span style=\"font-size: 18px;\"><strong><strong><strong>有</strong></strong></strong></span><strong style=\"font-size: 18px; line-height: 1.5;\"><strong><strong>拉链有内衬</strong></strong></strong><strong style=\"font-size: 18px;\"><strong><strong><span style=\"font-family: 微软雅黑;\"><strong>（非专业机构鉴定，介意请慎拍）</strong></span></strong></strong></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><strong><span style=\"font-size: 18px;\"><span style=\"color: rgb(153, 51, 255);\"></span><span style=\"color: rgb(153, 51, 255);\"></span><span style=\"color: rgb(153, 51, 255);\"><span style=\"background-color: rgb(255, 255, 0);\"><strong style=\"color: rgb(0, 0, 0);\"><span style=\"color: rgb(153, 51, 255);\">好的衣服需要好好呵护，务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~</span></strong></span></span></span></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><span style=\"color: rgb(153, 51, 255);\"><strong><span style=\"color: rgb(153, 51, 153);\"><strong>【商品颜色】实物拍摄 香槟色 颜色很难拍有小色差属正常现象哦</strong></span></strong></span></strong></span></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><span style=\"color: rgb(153, 51, 255);\"><strong><span style=\"color: rgb(153, 51, 153);\"></span></strong></span></strong></span><span style=\"font-size: 18px;\"><strong><span style=\"color: rgb(153, 51, 255);\"><strong><span style=\"color: rgb(153, 51, 153);\"></span></strong></span></strong></span></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><span style=\"color: rgb(153, 51, 255);\"><strong><strong>【商品尺寸】XS/S/M/L<strong style=\"color: rgb(0, 0, 0);\"><span style=\"color: rgb(153, 51, 255);\"><strong><strong>&nbsp;小高腰设计 胸那考虑撑开因素哦 微弹的哦</strong></strong></span></strong><br/></strong></strong></span></strong></span></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><span style=\"color: rgb(153, 51, 255);\"></span></strong></span></p><p style=\"white-space: normal; text-align: center;\"><span style=\"color: rgb(255, 0, 0); font-family: 微软雅黑;\"><span style=\"font-size: 18px; line-height: 27px;\"></span></span></p><p style=\"white-space: normal;\"><br/></p><p style=\"white-space: normal; text-align: center;\"><strong><strong><span style=\"color: rgb(64, 64, 64);\"><strong><span style=\"color: rgb(255, 0, 0);\"><span style=\"font-family: 微软雅黑;\">XS码尺寸: 衣长82CM.胸围80</span></span></strong></span><strong style=\"color: rgb(64, 64, 64);\"><span style=\"color: rgb(255, 0, 0);\"><span style=\"font-family: 微软雅黑;\">内合适</span></span></strong><span style=\"color: rgb(64, 64, 64);\"><strong><span style=\"color: rgb(255, 0, 0);\"><span style=\"font-family: 微软雅黑;\">.腰围63CM</span></span></strong></span><strong style=\"color: rgb(64, 64, 64);\"><span style=\"color: rgb(255, 0, 0);\"><span style=\"font-family: 微软雅黑;\">.臀围86CM</span></span></strong></strong></strong></p><p style=\"white-space: normal;\"><br/></p><p style=\"white-space: normal; text-align: center;\"><strong><strong><span style=\"color: rgb(255, 0, 0);\">S码尺寸: 衣长83CM.胸围84</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">内合适</span></strong><strong><span style=\"color: rgb(255, 0, 0);\">.腰围67CM</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">.臀围90CM</span></strong></strong></p><p style=\"white-space: normal; text-align: center;\"><strong><strong><span style=\"color: rgb(255, 0, 0);\">M码尺寸: 衣长84CM.胸围88</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">内合适</span></strong><strong><span style=\"color: rgb(255, 0, 0);\">.腰围71CM</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">.臀围94CM</span></strong></strong></p><p style=\"white-space: normal; text-align: center;\"><strong><strong><span style=\"color: rgb(255, 0, 0);\">L码尺寸: 衣长85CM.胸围92</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">内合适</span></strong><strong><span style=\"color: rgb(255, 0, 0);\">.腰围75CM</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">.臀围98CM</span></strong></strong></p><p style=\"white-space: normal;\"><br/></p><p style=\"white-space: normal; text-align: center;\"><strong style=\"font-size: 18px; line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\"><span style=\"font-family: 微软雅黑;\"><strong><strong style=\"color: rgb(0, 0, 0);\"><span style=\"color: rgb(153, 51, 255);\"><strong><span style=\"color: rgb(0, 0, 255);\"><strong><span style=\"color: rgb(255, 0, 0); font-family: 新宋体;\">（测量单位是CM，每个人的测量方式不一样，测量的尺寸数据可能会有1~3厘米的差异，请MM们谅解哦）</span></strong></span></strong></span></strong></strong></span></span></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><strong><span style=\"color: rgb(153, 51, 255);\"><strong><span style=\"color: rgb(153, 51, 153);\"><span style=\"color: rgb(0, 0, 255);\"><span style=\"color: rgb(255, 0, 0); font-family: 新宋体;\"></span></span></span></strong></span></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><strong style=\"color: rgb(64, 64, 64);\"><span style=\"color: rgb(68, 68, 68);\"><span style=\"background-color: rgb(92, 81, 80);\"><span style=\"background-color: rgb(255, 255, 255);\">PS：常规码数，可按平时号选择哦。修身</span></span></span></strong><strong style=\"line-height: 1.5; color: rgb(64, 64, 64);\"><span style=\"color: rgb(68, 68, 68);\"><span style=\"background-color: rgb(92, 81, 80);\"><span style=\"background-color: rgb(255, 255, 255);\">版型，如果腰粗可以适当考虑大1号哦~</span></span></span></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><strong style=\"line-height: 1.5; color: rgb(64, 64, 64);\"><span style=\"color: rgb(68, 68, 68);\"><span style=\"background-color: rgb(92, 81, 80);\"><span style=\"background-color: rgb(255, 255, 255);\">大圆领，每个人的身材曲线不同，领口不会很平的哦，请谅解~</span></span></span></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><strong style=\"line-height: 1.5; color: rgb(64, 64, 64);\"><span style=\"color: rgb(68, 68, 68);\"><span style=\"background-color: rgb(92, 81, 80);\"><span style=\"background-color: rgb(255, 255, 255);\">肩膀那有暗扣哦，可以很好的隐藏了内衣的肩带哦~袖子那略硬哦~</span></span></span></strong></p><p><br/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547455601898622.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547455601528614.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547455601314107.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547455601168384.jpg\"/></p><p><br/></p>",
-    "photo_count": "4",
-    "sales_count": "405",
-    "access_count": "20298",
-    "video": "https://d1.shopxo.vip/static/upload/video/goods/2022/05/26/1653551880214151.mp4",
-    "is_exist_many_spec": "1",
-    "spec_base": "",
-    "plugins_membershiplevelvip_price_extends": "",
-    "seo_title": "",
-    "seo_keywords": "",
-    "seo_desc": "",
-    "is_delete_time": "0",
-    "add_time": "2019-01-14 16:48:20",
-    "upd_time": "2023-03-24 11:29:13",
-    "price_container": {
-      "price": "160.00-258.00",
-      "min_price": "160.00",
-      "max_price": "258.00",
-      "original_price": "268.00-422.00",
-      "min_original_price": "268.00",
-      "max_original_price": "422.00"
-    },
-    "goods_url": "/pages/goods-detail/goods-detail?id=11",
-    "images_old": "/static/upload/images/goods/2019/01/14/1547455566118614.jpg",
-    "video_old": "/static/upload/video/goods/2022/05/26/1653551880214151.mp4",
-    "place_origin_name": null,
-    "brand_name": "阿迪达斯",
-    "specifications": {
-      "choose": [
-        {
-          "id": "566",
-          "goods_id": "11",
-          "value": [
-            {
-              "name": "M",
-              "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547455907486857.jpg",
-              "is_only_level_one": 1,
-              "inventory": "885"
-            },
-            {
-              "name": "L",
-              "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547455907256518.jpg",
-              "is_only_level_one": 1,
-              "inventory": "887"
-            },
-            {
-              "name": "XL",
-              "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547455601528614.jpg",
-              "is_only_level_one": 1,
-              "inventory": "887"
-            }
-          ],
-          "name": "尺码",
-          "add_time": "2023-03-27 13:43:53"
-        }
-      ]
-    },
-    "show_field_original_price_text": "原价",
-    "show_field_price_text": "<a href=\"https://d1.shopxo.vip/plugins/index/pluginsname/activity.html\" class=\"plugins-activity-goods-price-icon\" title=\"活动价\">活动价</a>",
-    "plugins_view_panel_data": [],
-    "plugins_view_icon_data": []
-  },
-  {
-    "id": "1",
-    "realstore_id": "0",
-    "realstore_goods_id": "0",
-    "shop_id": "1",
-    "shop_user_id": "1",
-    "shop_category_id": "1",
-    "shop_settle_price": "0.00",
-    "shop_settle_rate": "0.00",
-    "brand_id": "1",
-    "site_type": "-1",
-    "title": "MIUI/小米 小米手机4 小米4代 MI4智能4G手机包邮 黑色 D-LTE（4G）/TD-SCD",
-    "title_color": "",
-    "simple_desc": "国产知名品牌，国民手机",
-    "model": "",
-    "place_origin": "0",
-    "inventory": "882",
-    "inventory_unit": "步",
-    "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547450781101144.jpg",
-    "original_price": "2100.00",
-    "min_original_price": "2100.00",
-    "max_original_price": "2100.00",
-    "price": "2100.00",
-    "min_price": "2100.00",
-    "max_price": "2100.00",
-    "give_integral": "10",
-    "buy_min_number": "1",
-    "buy_max_number": "0",
-    "is_deduction_inventory": "1",
-    "is_shelves": "1",
-    "content_web": "<p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547450880620837.png\" title=\"1547450880620837.png\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547450880750687.png\" title=\"1547450880750687.png\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547450880917418.png\" title=\"1547450880917418.png\"/></p><p><br/></p>",
-    "photo_count": "2",
-    "sales_count": "398",
-    "access_count": "19933",
-    "video": "",
-    "is_exist_many_spec": "0",
-    "spec_base": "",
-    "plugins_membershiplevelvip_price_extends": "",
-    "seo_title": "",
-    "seo_keywords": "",
-    "seo_desc": "",
-    "is_delete_time": "0",
-    "add_time": "2019-01-14 15:28:41",
-    "upd_time": "2023-03-26 00:59:12",
-    "price_container": {
-      "price": "2100.00",
-      "min_price": "2100.00",
-      "max_price": "2100.00",
-      "original_price": "3200.00",
-      "min_original_price": "3200.00",
-      "max_original_price": "3200.00"
-    },
-    "goods_url": "/pages/goods-detail/goods-detail?id=1",
-    "images_old": "/static/upload/images/goods/2019/01/14/1547450781101144.jpg",
-    "video_old": "",
-    "place_origin_name": null,
-    "brand_name": "强生",
-    "specifications": {
-      "choose": []
-    },
-    "show_field_original_price_text": "原价",
-    "show_field_price_text": "<a href=\"https://d1.shopxo.vip/plugins/index/pluginsname/activity.html\" class=\"plugins-activity-goods-price-icon\" title=\"活动价\">活动价</a>",
-    "plugins_view_panel_data": [],
-    "plugins_view_icon_data": []
-  },
-  {
-    "id": "2",
-    "realstore_id": "0",
-    "realstore_goods_id": "0",
-    "shop_id": "1",
-    "shop_user_id": "1",
-    "shop_category_id": "1",
-    "shop_settle_price": "0.00",
-    "shop_settle_rate": "0.00",
-    "brand_id": "2",
-    "site_type": "-1",
-    "title": "苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G",
-    "title_color": "",
-    "simple_desc": "1.芯片功能强大 iPhone芯片的更新频率比友商少,但每次iPhone芯片更新时,都会成为关注和追赶的对象。",
-    "model": "iPhone 6 Plus",
-    "place_origin": "0",
-    "inventory": "7983",
-    "inventory_unit": "步",
-    "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg",
-    "original_price": "4500.00-6800.00",
-    "min_original_price": "4500.00",
-    "max_original_price": "6800.00",
-    "price": "4500.00-6800.00",
-    "min_price": "4500.00",
-    "max_price": "6800.00",
-    "give_integral": "30",
-    "buy_min_number": "1",
-    "buy_max_number": "0",
-    "is_deduction_inventory": "1",
-    "is_shelves": "1",
-    "content_web": "<p><a href=\"https://store.shopxo.net/\" target=\"_blank\" title=\"进入指定页面&gt;&gt;\">进入指定页面&gt;&gt;</a></p><p><video class=\"edui-faked-video        video-js\" controls=\"\" preload=\"none\" width=\"420\" height=\"280\" src=\"https://d1.shopxo.vip/static/upload/video/goods/2019/01/14/1547458876723311.mp4\" data-setup=\"{}\"></video></p><p><a href=\"https://shopxo.net/?q=test&u=hello你好！\" target=\"_blank\" title=\"打开一个a标签地址\"><strong><span style=\"font-size: 24px; color: rgb(255, 0, 0);\">打开一个a标签地址</span></strong></a><br/></p><p><a href=\"/pages/plugins/blog/index/index\" target=\"_self\" title=\"进入博客页面\">进入博客</a></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451595700972.jpg\" title=\"1547451595700972.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451595528800.jpg\" title=\"1547451595528800.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451595616298.jpg\" title=\"1547451595616298.jpg\"/></p><p><br/></p>",
-    "photo_count": "2",
-    "sales_count": "266",
-    "access_count": "13330",
-    "video": "https://d1.shopxo.vip/static/upload/video/goods/2019/01/14/1547458876723311.mp4",
-    "is_exist_many_spec": "1",
-    "spec_base": "",
-    "plugins_membershiplevelvip_price_extends": "",
-    "seo_title": "",
-    "seo_keywords": "",
-    "seo_desc": "",
-    "is_delete_time": "0",
-    "add_time": "2019-01-14 15:40:24",
-    "upd_time": "2023-03-24 17:46:26",
-    "price_container": {
-      "price": "4500.00-6800.00",
-      "min_price": "4500.00",
-      "max_price": "6800.00",
-      "original_price": "6000.00-7600.00",
-      "min_original_price": "6000.00",
-      "max_original_price": "7600.00"
-    },
-    "goods_url": "/pages/goods-detail/goods-detail?id=2",
-    "images_old": "/static/upload/images/goods/2019/01/14/1547451274847894.jpg",
-    "video_old": "/static/upload/video/goods/2019/01/14/1547458876723311.mp4",
-    "place_origin_name": null,
-    "brand_name": "佳洁士",
-    "specifications": {
-      "choose": [
-        {
-          "id": "562",
-          "goods_id": "2",
-          "value": [
-            {
-              "name": "套餐一",
-              "images": ""
-            },
-            {
-              "name": "套餐二",
-              "images": ""
-            }
-          ],
-          "name": "套餐",
-          "add_time": "2023-03-27 13:43:53"
-        },
-        {
-          "id": "563",
-          "goods_id": "2",
-          "value": [
-            {
-              "name": "金色",
-              "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg"
-            },
-            {
-              "name": "银色",
-              "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451576558478.jpg"
-            }
-          ],
-          "name": "颜色",
-          "add_time": "2023-03-27 13:43:53"
-        },
-        {
-          "id": "564",
-          "goods_id": "2",
-          "value": [
-            {
-              "name": "32G",
-              "images": ""
-            },
-            {
-              "name": "64G",
-              "images": ""
-            },
-            {
-              "name": "128G",
-              "images": ""
-            }
-          ],
-          "name": "容量",
-          "add_time": "2023-03-27 13:43:53"
-        }
-      ]
-    },
-    "show_field_original_price_text": "原价",
-    "show_field_price_text": "<a href=\"https://d1.shopxo.vip/plugins/index/pluginsname/activity.html\" class=\"plugins-activity-goods-price-icon\" title=\"活动价\">活动价</a>",
-    "plugins_view_panel_data": [],
-    "plugins_view_icon_data": []
-  },
-  {
-    "id": "4",
-    "realstore_id": "0",
-    "realstore_goods_id": "0",
-    "shop_id": "1",
-    "shop_user_id": "1",
-    "shop_category_id": "1",
-    "shop_settle_price": "0.00",
-    "shop_settle_rate": "0.00",
-    "brand_id": "1",
-    "site_type": "-1",
-    "title": "Huawei/华为 H60-L01 荣耀6 移动4G版智能手机 安卓",
-    "title_color": "",
-    "simple_desc": "",
-    "model": "",
-    "place_origin": "0",
-    "inventory": "878",
-    "inventory_unit": "步",
-    "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547452474332334.jpg",
-    "original_price": "1999.00",
-    "min_original_price": "1999.00",
-    "max_original_price": "1999.00",
-    "price": "1999.00",
-    "min_price": "1999.00",
-    "max_price": "1999.00",
-    "give_integral": "19",
-    "buy_min_number": "1",
-    "buy_max_number": "0",
-    "is_deduction_inventory": "1",
-    "is_shelves": "1",
-    "content_web": "<p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547452505568604.jpg\" title=\"1547452505568604.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547452505349986.jpg\" title=\"1547452505349986.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547452505184884.jpg\" title=\"1547452505184884.jpg\"/></p><p><br/></p>",
-    "photo_count": "2",
-    "sales_count": "219",
-    "access_count": "10998",
-    "video": "",
-    "is_exist_many_spec": "0",
-    "spec_base": "",
-    "plugins_membershiplevelvip_price_extends": "{\"4\":{\"min_price\":\"1600.00\",\"max_price\":\"1600.00\",\"price\":\"1600.00\"}}",
-    "seo_title": "",
-    "seo_keywords": "",
-    "seo_desc": "",
-    "is_delete_time": "0",
-    "add_time": "2019-01-14 15:55:53",
-    "upd_time": "2023-03-21 20:44:15",
-    "price_container": {
-      "price": "1999.00",
-      "min_price": "1999.00",
-      "max_price": "1999.00",
-      "original_price": "2300.00",
-      "min_original_price": "2300.00",
-      "max_original_price": "2300.00"
-    },
-    "goods_url": "/pages/goods-detail/goods-detail?id=4",
-    "images_old": "/static/upload/images/goods/2019/01/14/1547452474332334.jpg",
-    "video_old": "",
-    "place_origin_name": null,
-    "brand_name": "强生",
-    "specifications": {
-      "choose": []
-    },
-    "show_field_original_price_text": "原价",
-    "show_field_price_text": "<a href=\"https://d1.shopxo.vip/plugins/index/pluginsname/activity.html\" class=\"plugins-activity-goods-price-icon\" title=\"活动价\">活动价</a>",
-    "plugins_view_panel_data": [],
-    "plugins_view_icon_data": []
-  },
-  {
-    "id": "3",
-    "realstore_id": "0",
-    "realstore_goods_id": "0",
-    "shop_id": "1",
-    "shop_user_id": "1",
-    "shop_category_id": "1",
-    "shop_settle_price": "0.00",
-    "shop_settle_rate": "0.00",
-    "brand_id": "2",
-    "site_type": "-1",
-    "title": "Samsung/三星 SM-G8508S GALAXY Alpha四核智能手机 新品 闪耀白",
-    "title_color": "",
-    "simple_desc": "",
-    "model": "",
-    "place_origin": "0",
-    "inventory": "885",
-    "inventory_unit": "步",
-    "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451909951171.jpg",
-    "original_price": "3888.00",
-    "min_original_price": "3888.00",
-    "max_original_price": "3888.00",
-    "price": "3888.00",
-    "min_price": "3888.00",
-    "max_price": "3888.00",
-    "give_integral": "20",
-    "buy_min_number": "1",
-    "buy_max_number": "0",
-    "is_deduction_inventory": "1",
-    "is_shelves": "1",
-    "content_web": "<p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451947383902.jpg\" title=\"1547451947383902.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451947686990.jpg\" title=\"1547451947686990.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451947676180.jpg\" title=\"1547451947676180.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451947791154.jpg\" title=\"1547451947791154.jpg\"/></p><p><br/></p>",
-    "photo_count": "2",
-    "sales_count": "207",
-    "access_count": "10375",
-    "video": "",
-    "is_exist_many_spec": "0",
-    "spec_base": "",
-    "plugins_membershiplevelvip_price_extends": null,
-    "seo_title": "",
-    "seo_keywords": "",
-    "seo_desc": "",
-    "is_delete_time": "0",
-    "add_time": "2019-01-14 15:46:47",
-    "upd_time": "2023-03-27 04:16:09",
-    "price_container": {
-      "price": "3888.00",
-      "min_price": "3888.00",
-      "max_price": "3888.00",
-      "original_price": "6866.00",
-      "min_original_price": "6866.00",
-      "max_original_price": "6866.00"
-    },
-    "goods_url": "/pages/goods-detail/goods-detail?id=3",
-    "images_old": "/static/upload/images/goods/2019/01/14/1547451909951171.jpg",
-    "video_old": "",
-    "place_origin_name": null,
-    "brand_name": "佳洁士",
-    "specifications": {
-      "choose": []
-    },
-    "show_field_original_price_text": "原价",
-    "show_field_price_text": "<a href=\"https://d1.shopxo.vip/plugins/index/pluginsname/activity.html\" class=\"plugins-activity-goods-price-icon\" title=\"活动价\">活动价</a>",
-    "plugins_view_panel_data": [],
-    "plugins_view_icon_data": []
-  },
-  {
-    "id": "10",
-    "realstore_id": "0",
-    "realstore_goods_id": "0",
-    "shop_id": "0",
-    "shop_user_id": "0",
-    "shop_category_id": "0",
-    "shop_settle_price": "0.00",
-    "shop_settle_rate": "0.00",
-    "brand_id": "0",
-    "site_type": "1",
-    "title": "夏装女装古力娜扎明星同款一字领露肩蓝色蕾丝修身显瘦连衣裙礼服",
-    "title_color": "",
-    "simple_desc": "",
-    "model": "",
-    "place_origin": "0",
-    "inventory": "888",
-    "inventory_unit": "件",
-    "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547455222990904.jpg",
-    "original_price": "228.00",
-    "min_original_price": "228.00",
-    "max_original_price": "228.00",
-    "price": "228.00",
-    "min_price": "228.00",
-    "max_price": "228.00",
-    "give_integral": "20",
-    "buy_min_number": "1",
-    "buy_max_number": "1",
-    "is_deduction_inventory": "1",
-    "is_shelves": "1",
-    "content_web": "<p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><strong><span style=\"color: rgb(153, 51, 255);\">【品牌】欧单 学媛风 猫咪良品</span></strong></strong></span></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><span style=\"color: rgb(153, 51, 255);\"><strong><strong>【吊牌】xueyuanfeng&nbsp;</strong></strong></span></strong></span><strong style=\"font-size: 18px; line-height: 27px;\"><strong><span style=\"color: rgb(153, 51, 255);\">猫咪良品</span></strong></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><strong><strong>【面料质地】涤棉</strong></strong></strong></span><span style=\"font-size: 18px;\"><strong><strong><strong>拼接蕾丝&nbsp;</strong></strong></strong></span><span style=\"font-size: 18px;\"><strong><strong><strong>&nbsp;</strong></strong></strong></span><strong style=\"font-size: 18px; line-height: 1.5;\"><strong><strong>后中拉链 有内衬</strong></strong></strong><strong style=\"font-size: 18px;\"><strong><strong><span style=\"font-family: 微软雅黑;\"><strong>（非专业机构鉴定，介意请慎拍）</strong></span></strong></strong></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><strong><span style=\"font-size: 18px;\"><span style=\"color: rgb(153, 51, 255);\"></span><span style=\"color: rgb(153, 51, 255);\"></span><span style=\"color: rgb(153, 51, 255);\"><span style=\"background-color: rgb(255, 255, 0);\"><strong style=\"color: rgb(0, 0, 0);\"><span style=\"color: rgb(153, 51, 255);\">好的衣服需要好好呵护，务必请冷水手洗(切记别浸泡)拧干就晾晒或则干洗哦~</span></strong></span></span></span></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><span style=\"color: rgb(153, 51, 255);\"><strong><span style=\"color: rgb(153, 51, 153);\"><strong>【商品颜色】实物拍摄 蓝色 颜色很难拍有小色差属正常现象哦</strong></span></strong></span></strong></span></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><span style=\"color: rgb(153, 51, 255);\"><strong><span style=\"color: rgb(153, 51, 153);\"></span></strong></span></strong></span><span style=\"font-size: 18px;\"><strong><span style=\"color: rgb(153, 51, 255);\"><strong><span style=\"color: rgb(153, 51, 153);\"></span><strong>【商品尺寸】XS/S/M/L 小高腰设计 胸口纽扣是装饰的哦</strong></strong></span></strong></span></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><span style=\"font-size: 18px;\"><strong><span style=\"color: rgb(153, 51, 255);\"></span></strong></span></p><p style=\"white-space: normal;\"><span style=\"color: rgb(255, 0, 0); font-family: 微软雅黑;\"><span style=\"font-size: 18px; line-height: 27px;\"></span></span></p><p style=\"white-space: normal;\"><br/></p><p style=\"white-space: normal; text-align: center;\"><strong><strong><span style=\"color: rgb(64, 64, 64);\"><strong><span style=\"color: rgb(255, 0, 0);\"><span style=\"font-family: 微软雅黑;\">XS码尺寸: 悬挂衣长81CM.胸围80</span></span></strong></span><strong style=\"color: rgb(64, 64, 64);\"><span style=\"color: rgb(255, 0, 0);\"><span style=\"font-family: 微软雅黑;\">内合适</span></span></strong><span style=\"color: rgb(64, 64, 64);\"><strong><span style=\"color: rgb(255, 0, 0);\"><span style=\"font-family: 微软雅黑;\">.腰围63CM</span></span></strong></span><strong style=\"color: rgb(64, 64, 64);\"><span style=\"color: rgb(255, 0, 0);\"><span style=\"font-family: 微软雅黑;\">.臀围86CM</span></span></strong></strong></strong></p><p style=\"white-space: normal;\"><br/></p><p style=\"white-space: normal; text-align: center;\"><strong><strong><span style=\"color: rgb(255, 0, 0);\">S码尺寸: 悬挂衣长82CM.胸围84</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">内合适</span></strong><strong><span style=\"color: rgb(255, 0, 0);\">.腰围67CM</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">.臀围90CM</span></strong></strong></p><p style=\"white-space: normal; text-align: center;\"><strong><strong><span style=\"color: rgb(255, 0, 0);\">M码尺寸: 悬挂衣长83CM.胸围88</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">内合适</span></strong><strong><span style=\"color: rgb(255, 0, 0);\">.腰围71CM</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">.臀围94CM</span></strong></strong></p><p style=\"white-space: normal; text-align: center;\"><strong><strong><span style=\"color: rgb(255, 0, 0);\">L码尺寸: 悬挂衣长84CM.胸围92</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">内合适</span></strong><strong><span style=\"color: rgb(255, 0, 0);\">.腰围75CM</span></strong><strong style=\"line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\">.臀围98CM</span></strong></strong></p><p style=\"white-space: normal;\"><br/></p><p style=\"white-space: normal; text-align: center;\"><strong style=\"font-size: 18px; line-height: 27px;\"><span style=\"color: rgb(255, 0, 0);\"><span style=\"font-family: 微软雅黑;\"><strong><strong style=\"color: rgb(0, 0, 0);\"><span style=\"color: rgb(153, 51, 255);\"><strong><span style=\"color: rgb(0, 0, 255);\"><strong><span style=\"color: rgb(255, 0, 0); font-family: 新宋体;\">（测量单位是CM，每个人的测量方式不一样，测量的尺寸数据可能会有1~3厘米的差异，请MM们谅解哦）</span></strong></span></strong></span></strong></strong></span></span></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><strong><span style=\"color: rgb(153, 51, 255);\"><strong><span style=\"color: rgb(153, 51, 153);\"><span style=\"color: rgb(0, 0, 255);\"><span style=\"color: rgb(255, 0, 0); font-family: 新宋体;\"></span></span></span></strong></span></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><strong style=\"color: rgb(64, 64, 64);\"><span style=\"color: rgb(68, 68, 68);\"><span style=\"background-color: rgb(92, 81, 80);\"><span style=\"background-color: rgb(255, 255, 255);\">PS：常规码数，可按平时号选择哦。修身</span></span></span></strong><strong style=\"line-height: 1.5; color: rgb(64, 64, 64);\"><span style=\"color: rgb(68, 68, 68);\"><span style=\"background-color: rgb(92, 81, 80);\"><span style=\"background-color: rgb(255, 255, 255);\">版型~如果上身偏大可以适当考虑大1号~下摆蕾丝拼接不会很平整的哦~</span></span></span></strong></p><p style=\"margin-top: 1.12em; margin-bottom: 1.12em; white-space: normal; padding: 0px; font-family: tahoma, arial, 宋体, sans-serif; font-size: 14px; background-color: rgb(255, 255, 255); text-align: center;\"><strong>蕾丝花是手工修剪出来的，每件都有不同和不规则的哦，有小线头和节点是正常现象哦~请亲们谅解哦~</strong></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547455266234658.jpg\" title=\"1547455266234658.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547455266527628.jpg\" title=\"1547455266527628.jpg\"/></p><p><br/></p>",
-    "photo_count": "2",
-    "sales_count": "204",
-    "access_count": "10235",
-    "video": "",
-    "is_exist_many_spec": "0",
-    "spec_base": "",
-    "plugins_membershiplevelvip_price_extends": null,
-    "seo_title": "",
-    "seo_keywords": "",
-    "seo_desc": "",
-    "is_delete_time": "0",
-    "add_time": "2019-01-14 16:42:55",
-    "upd_time": "2023-03-23 16:03:19",
-    "price_container": {
-      "price": "228.00",
-      "min_price": "228.00",
-      "max_price": "228.00",
-      "original_price": "568.00",
-      "min_original_price": "568.00",
-      "max_original_price": "568.00"
-    },
-    "goods_url": "/pages/goods-detail/goods-detail?id=10",
-    "images_old": "/static/upload/images/goods/2019/01/14/1547455222990904.jpg",
-    "video_old": "",
-    "place_origin_name": null,
-    "brand_name": null,
-    "specifications": {
-      "choose": []
-    },
-    "show_field_original_price_text": "原价",
-    "show_field_price_text": "<a href=\"https://d1.shopxo.vip/plugins/index/pluginsname/activity.html\" class=\"plugins-activity-goods-price-icon\" title=\"活动价\">活动价</a>",
-    "plugins_view_panel_data": [],
-    "plugins_view_icon_data": []
-  },
-  {
-    "id": "9",
-    "realstore_id": "0",
-    "realstore_goods_id": "0",
-    "shop_id": "0",
-    "shop_user_id": "0",
-    "shop_category_id": "0",
-    "shop_settle_price": "0.00",
-    "shop_settle_rate": "0.00",
-    "brand_id": "2",
-    "site_type": "2",
-    "title": "睡衣女长袖春秋季纯棉韩版女士大码薄款春夏季全棉家居服两件套装",
-    "title_color": "",
-    "simple_desc": "",
-    "model": "",
-    "place_origin": "0",
-    "inventory": "7979",
-    "inventory_unit": "件",
-    "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547454567172116.jpg",
-    "original_price": "120.00-158.00",
-    "min_original_price": "120.00",
-    "max_original_price": "158.00",
-    "price": "120.00-158.00",
-    "min_price": "120.00",
-    "max_price": "158.00",
-    "give_integral": "2",
-    "buy_min_number": "1",
-    "buy_max_number": "0",
-    "is_deduction_inventory": "1",
-    "is_shelves": "1",
-    "content_web": "<p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547454712270511.jpg\" title=\"1547454712270511.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547454713556301.jpg\" title=\"1547454713556301.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547454713800333.jpg\" title=\"1547454713800333.jpg\"/></p><p><img src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547454713456602.jpg\" title=\"1547454713456602.jpg\"/></p><p><br/></p>",
-    "photo_count": "3",
-    "sales_count": "154",
-    "access_count": "7726",
-    "video": "",
-    "is_exist_many_spec": "1",
-    "spec_base": "",
-    "plugins_membershiplevelvip_price_extends": "",
-    "seo_title": "",
-    "seo_keywords": "",
-    "seo_desc": "",
-    "is_delete_time": "0",
-    "add_time": "2019-01-14 16:33:06",
-    "upd_time": "2023-03-24 01:49:20",
-    "price_container": {
-      "price": "120.00-158.00",
-      "min_price": "120.00",
-      "max_price": "158.00",
-      "original_price": "160.00-216.00",
-      "min_original_price": "160.00",
-      "max_original_price": "216.00"
-    },
-    "goods_url": "/pages/goods-detail/goods-detail?id=9",
-    "images_old": "/static/upload/images/goods/2019/01/14/1547454567172116.jpg",
-    "video_old": "",
-    "place_origin_name": null,
-    "brand_name": "佳洁士",
-    "specifications": {
-      "choose": [
-        {
-          "id": "526",
-          "goods_id": "9",
-          "value": [
-            {
-              "name": "白色",
-              "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547454702543219.jpg"
-            },
-            {
-              "name": "粉色",
-              "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547454702272215.jpg"
-            },
-            {
-              "name": "黑色",
-              "images": "https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547454702814719.jpg"
-            }
-          ],
-          "name": "颜色",
-          "add_time": "2023-03-27 13:43:53"
-        },
-        {
-          "id": "527",
-          "goods_id": "9",
-          "value": [
-            {
-              "name": "S",
-              "images": ""
-            },
-            {
-              "name": "M",
-              "images": ""
-            },
-            {
-              "name": "L",
-              "images": ""
-            },
-            {
-              "name": "XL",
-              "images": ""
-            }
-          ],
-          "name": "尺码",
-          "add_time": "2023-03-27 13:43:53"
-        }
-      ]
-    },
-    "show_field_original_price_text": "原价",
-    "show_field_price_text": "<a href=\"https://d1.shopxo.vip/plugins/index/pluginsname/activity.html\" class=\"plugins-activity-goods-price-icon\" title=\"活动价\">活动价</a>",
-    "plugins_view_panel_data": [],
-    "plugins_view_icon_data": []
-  }
-]
\ No newline at end of file
diff --git a/pages/classify/goods-search/goods-search.vue b/pages/classify/goods-search/goods-search.vue
index b00787b..ace319b 100644
--- a/pages/classify/goods-search/goods-search.vue
+++ b/pages/classify/goods-search/goods-search.vue
@@ -10,7 +10,7 @@
 			</block>
 			<!-- 搜索列表 -->
 			<view class="search-list">
-				<goodsList typeList="goodsSearch" @loadData="loadData" :propData="data_list" :paddBottom="0">
+				<goodsList v-if="hackReset" typeList="goodsSearch" @loadData="loadData" :propData="data_list" :paddBottom="0">
 				</goodsList>
 
 			</view>
@@ -37,13 +37,20 @@
 					pageNum: 7, //每页有多少条数据
 					navigateLastPage: 1, //总共有几页
 					allData: 0 //总共有多少条数据
-				}
+				},
+				hackReset:false,
 			}
 		},
 		components: {
 			componentSearch,
 			goodsList
 		},
+		onShow(){
+				this.hackReset = false;
+				this.$nextTick(() => {
+					this.hackReset = true;
+				})
+		},
 		methods: {
 			//搜索事件
 			search_button_event(keywords) {
diff --git a/pages/classify/goodsDetail/data.json b/pages/classify/goodsDetail/data.json
deleted file mode 100644
index e285a3f..0000000
--- a/pages/classify/goodsDetail/data.json
+++ /dev/null
@@ -1,46 +0,0 @@
-
-	{
-	      "id": "2",
-	      "realstore_id": "0",
-	      "realstore_goods_id": "0",
-	      "shop_id": "1",
-	      "shop_user_id": "1",
-	      "shop_category_id": "1",
-	      "shop_settle_price": "0.00",
-	      "shop_settle_rate": "0.00",
-	      "brand_id": "2",
-	      "site_type": "-1",
-	      "title": "苹果（Apple）iPhone 6 Plus (A1524)移动联通电信4G手机 金色 16G",
-	      "title_color": "",
-	      "simple_desc": "1.芯片功能强大 iPhone芯片的更新频率比友商少,但每次iPhone芯片更新时,都会成为关注和追赶的对象。",
-	      "model": "iPhone 6 Plus",
-	      "place_origin": "0",
-	      "inventory": "7983",
-	      "inventory_unit": "步",
-	      "images": ["https://gw.alicdn.com/bao/uploaded/i2/2200817857369/O1CN013I5Mae24J3O6w9wOE_!!2-item_pic.png_300x300q90.jpg_.webp","https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg"],
-	      "original_price": "4500.00-6800.00",
-	      "min_original_price": "4500.00",
-	      "max_original_price": "6800.00",
-	      "price": "4500.00-6800.00",
-	      "min_price": "4500.00",
-	      "max_price": "6800.00",
-	      "give_integral": "30",
-	      "buy_min_number": "1",
-	      "buy_max_number": "0",
-	      "is_deduction_inventory": "1",
-	      "is_shelves": "1",
-	      "content_web": "<p style=\"margin:0;\"><a href=\"https://store.shopxo.net/\" target=\"_blank\" title=\"进入指定页面&gt;&gt;\">进入指定页面&gt;&gt;</a></p><p style=\"margin:0;\"><video class=\"edui-faked-video        video-js\" controls=\"\" preload=\"none\" width=\"420\" height=\"280\" src=\"https://d1.shopxo.vip/static/upload/video/goods/2019/01/14/1547458876723311.mp4\" data-setup=\"{}\"></video></p><p style=\"margin:0;\"><a href=\"https://shopxo.net/?q=test&u=hello你好！\" target=\"_blank\" title=\"打开一个a标签地址\"><strong><span style=\"font-size: 24px; color: rgb(255, 0, 0);\">打开一个a标签地址</span></strong></a><br/></p><p style=\"margin:0;\"><a href=\"/pages/plugins/blog/index/index\" target=\"_self\" title=\"进入博客页面\">进入博客</a></p><p style=\"margin:0;\"><img style=\"max-width:100%;height:auto;margin:0;padding:0;display:block;\" src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451595700972.jpg\" title=\"1547451595700972.jpg\"/></p><p style=\"margin:0;\"><img style=\"max-width:100%;height:auto;margin:0;padding:0;display:block;\" src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451595528800.jpg\" title=\"1547451595528800.jpg\"/></p><p style=\"margin:0;\"><img style=\"max-width:100%;height:auto;margin:0;padding:0;display:block;\" src=\"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451595616298.jpg\" title=\"1547451595616298.jpg\"/></p><p style=\"margin:0;\"><br/></p>",
-	      "photo_count": "2",
-	      "sales_count": "266",
-	      "access_count": "13333",
-	      "is_exist_many_spec": "1",
-	      "spec_base": "",
-	      "plugins_membershiplevelvip_price_extends": "",
-	      "seo_title": "",
-	      "seo_keywords": "",
-	      "seo_desc": "",
-	      "is_delete_time": "0",
-	      "add_time": "2019-01-14 15:40:24",
-	      "upd_time": "2023-03-24 17:46:26"
-	      
-	}
diff --git a/pages/classify/goodsDetail/goodsDetail.vue b/pages/classify/goodsDetail/goodsDetail.vue
index eb67af5..a420630 100644
--- a/pages/classify/goodsDetail/goodsDetail.vue
+++ b/pages/classify/goodsDetail/goodsDetail.vue
@@ -9,44 +9,44 @@
 			</swiper>
 			<view class="indicator">{{currentSwiper+1}}/{{goodsDetail.bannerImg.length}}</view>
 		</view>
-		
+
 		<!-- 商品信息 -->
 		<view class="goods-container ">
 			<!-- 商品信息 -->
 			<view class="goods-message br bg-white marb10">
 				<view class="goods-price">
-					<text>&yen;19</text>
-					<text class="old">&yen;26</text>
-				</view>	
+					<text>&yen;{{goodsDetail.price}}</text>
+					<text class="old">&yen;{{goodsDetail.originalPrice}}</text>
+				</view>
 				<view class="goods-title">
-				    <view class="goods-text">{{goodsDetail.name || ''}}</view>
-					<view  class="goods-desc">{{goodsDetail.listDescribe || ''}}</view>
+					<view class="goods-text">{{goodsDetail.name || ''}}</view>
+					<view class="goods-desc">{{goodsDetail.listDescribe || ''}}</view>
 				</view>
 			</view>
-			
+
 			<!-- 选择参数 -->
 			<view class="br bg-white parameter  width100 " @click="showPopup(1)">
-				<view class="color999 " >
+				<view class="color999 ">
 					选择
 				</view>
-				<view class=" " >
-					颜色分类
+				<view class=" ">
+					规格
 				</view>
-				<view class="icon-ymt to-right"></view>	
+				<view class="icon-ymt to-right"></view>
 			</view>
 			<!-- 保障 -->
 			<view class="br bg-white parameter  width100 " @click="showPopup(2)">
-				<view class="color999 " >
+				<view class="color999 ">
 					保障
 				</view>
-				<view class=" " >
+				<view class=" ">
 					破损包赔 · 假一赔四 · 退货运费险
 				</view>
-				<view class="icon-ymt to-right"></view>	
+				<view class="icon-ymt to-right"></view>
 			</view>
-			
+
 			<!--评论-->
-			<view class="br bg-white   width100 marb10" @click="goComment">
+			<!-- <view class="br bg-white   width100 marb10" @click="goComment">
 				<view class="parameter">
 					<view class="color999 " >
 						评论
@@ -57,57 +57,58 @@
 					<view class="icon-ymt to-right"></view>	
 				</view>
 				
-			</view>
-			
+			</view> -->
+
 			<!-- 详情 -->
 			<view class="goods-desc-img br tc marb10 colorccc">
 				———— 商品详情 ————
 			</view>
 			<view style="font-size: 0;">
-				<image mode="widthFix" class="width100" v-for="(item,index) in  goodsDetail.detailImg" :key="key" :src="item"
-					@click="perImage(index,goodsDetail.detailImg)">
+				<image mode="widthFix" class="width100" v-for="(item,index) in  goodsDetail.detailImg" :key="key"
+					:src="item" @click="perImage(index,goodsDetail.detailImg)">
 				</image>
 			</view>
 			<noMore></noMore>
 		</view>
-		
+
 		<!-- 底部购物车 -->
 		<view class="uni-container">
-				<view class="goods-carts">
-					<uniGoodsNav :options="options" :fill="true" :button-group="buttonGroup" @click="onClick"
-						@buttonClick="buttonClick" />
-				</view>
-		
+			<view class="goods-carts">
+				<uniGoodsNav :options="options" :fill="true" :button-group="buttonGroup" @click="onClick"
+					@buttonClick="buttonClick" />
+			</view>
+
 		</view>
-			
-		
-		
-		
-		
-		
-		
-		
-		
+
+
+
+
+
+
+
+
+
 		<!-- 选择类别 -->
 		<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
 
-			<cart-choose :status="1" @refreshCartNum="refreshCartNum"  :specificationList="specificationList"  @close="close" ></cart-choose>
+			<cart-choose :goodsDetail="goodsDetail" :status="status" @refreshCartNum="refreshCartNum"
+				:specificationList="specificationList" @close="close"></cart-choose>
 		</wybPopup>
-		
+
 		<!-- 保障 -->
 		<wybPopup ref="popup2" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
-			 
+
 			<view class="choose-detail baozhang-detail">
-				
-				<view >
+
+				<view>
 					<view class="baozhangTitle fontwig6 font16 mart10">
-						破损包退 
+						破损包退
 					</view>
 					<view class="baozhangDescDesc  font13 mart10">
-						签收72小时之内。发现商品破损或商品变形等，保存有限证件，商家24小时内响应并退款，诚信用户享受极速退款 
+						签收72小时之内。发现商品破损或商品变形等，保存有限证件，商家24小时内响应并退款，诚信用户享受极速退款
 					</view>
 				</view>
-				<view >
+				<view>
 					<view class="baozhangTitle fontwig6 font16 mart10">
 						假一赔四
 					</view>
@@ -115,56 +116,61 @@
 						正品保障,假一赔四
 					</view>
 				</view>
-				<view >
+				<view>
 					<view class="baozhangTitle fontwig6 font16 mart10">
-						七天无理由退换 
+						七天无理由退换
 					</view>
 					<view class="baozhangDescDesc  font13 mart10">
 						满足相应条件时，消费者可申请"七天无理由退换货"
 					</view>
 				</view>
-				
-				
+
+
 				<view class="fcorfff baozhang-btn " @click="closeBaoZhang">
 					我知道了
 				</view>
-				
-				
-					
-				
-				
+
+
+
+
+
 			</view>
-			
+
 		</wybPopup>
-		
-		
+
+
 	</view>
 </template>
 
 <script>
 	import noMore from '@/pages/classify/no-more/no-more.vue'
 	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue'
-	
+
 	import cartChoose from '@/pages/classify/cart-choose/cart-choose.vue'
 	import uniGoodsNav from '@/components/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue'
-	
-	
-	
-	import { findGoodsDetailById ,getShoppingCartList,insertShoppingCart,findGoodsSkuByGoodsId} from '@/Utils/physicalObject.js';
+
+
+
+	import {
+		findGoodsDetailById,
+		getShoppingCartList,
+		insertShoppingCart,
+		findGoodsSkuByGoodsId
+	} from '@/Utils/physicalObject.js';
 	const app = getApp();
 	export default {
-		data(){
-			return{
-				imageUrl: app.globalData.imgUrl,//图片地址
+		data() {
+			return {
+				imageUrl: app.globalData.imgUrl, //图片地址
 				//轮播图下标
 				currentSwiper: 0,
-				
-				isStar:false,
-				
-				
-				
+
+				isStar: false,
+
+
+
 				// 
-				options:[
+				options: [
 					// {
 					// 			icon: 'chat',
 					// 			text: '客服',
@@ -172,12 +178,13 @@
 					// 			icon: 'shoucang31',
 					// 			text: '收藏',
 					// 		}, 
-							{
-								icon: 'cart',
-								text: '购物车',
-								info: 0,
-								color:"#646566"
-						}],
+					{
+						icon: 'cart',
+						text: '购物车',
+						info: 0,
+						color: "#646566"
+					}
+				],
 				buttonGroup: [{
 						text: '加入购物车',
 						backgroundColor: 'linear-gradient(90deg, #FFCD1E, #FF8A18)',
@@ -189,93 +196,106 @@
 						color: '#fff'
 					}
 				],
-				isShowCang:false,
+				isShowCang: false,
 				// scIcon:'shoucang31-select'
 				// scIcon:'shoucang31'
-				
-				
-				goodsId:0,
-				goodsDetail:null,
-				specificationList:[]
-				
-				
-				
-				
+
+
+				goodsId: 0,
+				goodsDetail: null,
+				specificationList: [],
+
+				// 0,加入购物车，1：加入购物车，直接购买，2：直接购买
+				status: 1
+
+
+
+
 			}
 		},
 		watch: {
-		        isShowCang: function (n) {
-				  if(n){
-					  this.options[1].icon="shoucang31-select"
-				  }else{
-					   this.options[1].icon="shoucang31"
-				  }
-				  
-				  return
-		        }
+			isShowCang: function(n) {
+				if (n) {
+					this.options[1].icon = "shoucang31-select"
+				} else {
+					this.options[1].icon = "shoucang31"
+				}
+
+				return
+		 }
 		},
-		onLoad(options){
+		onLoad(options) {
 			this.goodsId = options.goodsId;
 			this.findGoodsById();
-			this.refreshCartNum()
+
 		},
-		components:{
+		components: {
 			wybPopup,
 			cartChoose,
 			uniGoodsNav,
 			noMore
 		},
-		onShow(){
-			
-			
+		onShow() {
+			this.refreshCartNum();
+
 			// if(this.options[1].shoucang == true){
-				
-				
+
+
 			// }
-			
+
 			// this.isStar=this.options[1].shoucang
-			
-			
+
+
 			// 判断是否收藏了该物品
-			 
-			
+
+
 			// this.isShowCang?
-			
-			
+
+
 		},
-		
-		methods:{
+
+		methods: {
 			// 刷新购物车数量
-			refreshCartNum(){
-				getShoppingCartList().then( res=>{
+			refreshCartNum() {
+				getShoppingCartList().then(res => {
 					if (res.return_code == '000000') {
 						this.options[0].info = res.return_data.length;
-						
-					}else{
+
+					} else {
 						uni.showToast({
 							title: res.return_msg,
 							icon: 'none',
 							duration: 2000
 						})
 					}
-				})	
+				})
 			},
-			findGoodsById(){
+			findGoodsById() {
 				let _this = this;
-				let params ={
-					id:_this.goodsId
+				let params = {
+					id: _this.goodsId
 				}
-				findGoodsDetailById(params).then(res=>{
+
+				uni.showLoading({
+					title: '加载中',
+					mask: true,
+				});
+
+				findGoodsDetailById(params).then(res => {
+					uni.hideLoading();
+
 					if (res.return_code == '000000') {
-					
-					this.goodsDetail = res.return_data;
-					this.goodsDetail.bannerImg = res.return_data.bannerImg.split(",").map(temp=>this.imageUrl + temp);
-					this.goodsDetail.detailImg = res.return_data.detailImg.split(",").map(temp=>this.imageUrl + temp);
-						console.log(this.goodsDetail,)			
-						
+
+						this.goodsDetail = res.return_data;
+						this.goodsDetail.bannerImg = res.return_data.bannerImg.split(",").map(temp => this
+							.imageUrl + temp);
+						this.goodsDetail.detailImg = res.return_data.detailImg.split(",").map(temp => this
+							.imageUrl + temp);
+						console.log(this.goodsDetail, )
+
 						// let list =item.map(temp=>this.imageUrl + temp)
-					
-					}else{
+
+					} else {
 						uni.showToast({
 							title: res.return_msg,
 							icon: 'none',
@@ -284,27 +304,28 @@
 					}
 				})
 			},
-			
-			
+
+
 			//显示弹出
-			 showPopup(num) {
-				if(num == 1){
-					 this.findGoodsSku(this.goodsId);	
-				}else if(num == 2){
+			showPopup(num) {
+				if (num == 1) { //选择规格弹出
+					this.status = 1;
+					this.findGoodsSku(this.goodsId);
+				} else if (num == 2) { //保障弹出
 					this.$refs.popup2.show();
 				}
-				
+
 			},
 			//关闭选择参数
-			close(){
+			close() {
 				this.$refs.popup.hide();
 			},
 			//关闭保障--我知道了
-			closeBaoZhang(){
+			closeBaoZhang() {
 				this.$refs.popup2.hide();
 			},
 			//查看大图
-			perImage(index,item) {
+			perImage(index, item) {
 				uni.previewImage({
 					current: Number(index), //预览图片的下标
 					urls: item //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
@@ -315,34 +336,34 @@
 				this.currentSwiper = event.detail.current;
 			},
 			//点击去评论页面
-			goComment(){
+			goComment() {
 				//要判断评论条数
-				
+
 				uni.navigateTo({
-					url:"../goods-comment/goods-comment?gid="+1598348
+					url: "../goods-comment/goods-comment?gid=" + 1598348
 				})
 			},
-			
-			
+
+
 			// 客服，收藏，购物车图标点击事件
 			onClick(e) {
-				
-				
+
+
 				// 购物车
-				if(e.index == 0){
-					// console.log("点击购物车")
-						uni.navigateTo({
-							url:"/pages/classify/cart/cart"
-						})
+				if (e.index == 0) {
+					// console.log("点击去购物车页面")
+					uni.navigateTo({
+						url: "/pages/classify/cart/cart"
+					})
 					return
-					
+
 				}
 				// 收藏
 				// if(e.index == 1){
 				// 	this.isShowCang = !this.isShowCang;
 				// 	console.log("点击收藏")
 				// 	return
-					
+
 				// }
 				// 购物车
 				// if(e.index == 2){
@@ -351,9 +372,9 @@
 				// 		url:"/pages/classify/cart/cart"
 				// 	})
 				// 	return
-					
+
 				// }
-				
+
 				// uni.showToast({
 				// 	title: `点击${e.content.text}`,
 				// 	icon: 'none'
@@ -361,35 +382,33 @@
 			},
 			//加入购物车，立即购买按钮点击事件
 			buttonClick(e) {
-				
-				this.options[2].info++
-				
+
+				this.findGoodsSku(this.goodsId);
 				// 加入购物车
-				if(e.index == 0){
-					console.log("加入购物车")
-					return
-				}
-				if(e.index == 1){
-					console.log("立即购买")
-					return
+				if (e.index == 0) {
+					this.status = 0;
+					// console.log("加入购物车")	
+				} else if (e.index == 1) {
+					this.status = 2;
+					// console.log("立即购买")
 				}
-				
+
 			},
 			//加入购物车
-			toCart(){
-				let params={
+			toCart() {
+				let params = {
 					// goodsId:this.specificationList[this.chooseIndex].goodsId,
 					// num:this.chooseNumber,
 					// sku:this.specificationList[this.chooseIndex].id,
 					// whetherCheck:true
 				}
-				
+
 				// insertShoppingCart(params).then(async res=>{
 				// 	let title ;
 				// 	if (res.return_code == '000000') {
 				// 		title = res.return_data;	
 				// 		this.$emit("refreshCartNum")
-							
+
 				// 	}else{
 				// 		title = res.return_msg;
 				// 	}
@@ -398,74 +417,73 @@
 				// 		icon: 'none',
 				// 		duration: 2000
 				// 	})		
-					
-					
-					
+
+
+
 				// 	this.$emit("close")
-					
+
 				// })
-				
-				
+
+
 			},
 			// 查询规格
-			findGoodsSku(id){
+			findGoodsSku(id) {
 				this.specificationList = [];
-				let params={
-					goodsId:id
+				let params = {
+					goodsId: id
 				};
-				
-				findGoodsSkuByGoodsId(params).then(res=>{
+
+				findGoodsSkuByGoodsId(params).then(res => {
 					if (res.return_code == '000000') {
-						if(res.return_data&&res.return_data.length>0){
+						if (res.return_data && res.return_data.length > 0) {
 							this.specificationList = res.return_data;
 							this.$refs.popup.show();
-						}else{
+						} else {
 							this.specificationList = [];
 						}
-						
-					}else{
+
+					} else {
 						uni.showToast({
 							title: res.return_msg,
 							icon: 'none',
 							duration: 2000
 						})
 					}
-					
-					
+
+
 				})
-				
-				
+
+
 			},
-			
-			
+
+
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	
 	// 修改uni-goods-nav默认图标颜色
-	
-	
-	
+
+
+
 	// 底部购物车
 	.goods-carts {
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			flex-direction: column;
-			position: fixed;
-			left: 0;
-			right: 0;
-			/* #ifdef H5 */
-			left: var(--window-left);
-			right: var(--window-right);
-			/* #endif */
-			bottom: 0;
-		}
-	
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		position: fixed;
+		left: 0;
+		right: 0;
+		/* #ifdef H5 */
+		left: var(--window-left);
+		right: var(--window-right);
+		/* #endif */
+		bottom: 0;
+	}
+
 	// 轮播图	
-.swiper-box {
+	.swiper-box {
 		position: relative;
 		width: 100%;
 
@@ -493,229 +511,231 @@
 			color: #fff;
 			background-color: rgba(0, 0, 0, 0.2);
 		}
-}
-
-
-.tc{
-	text-align: center;
-}
-
-.br{
-	border-radius: 10rpx;
-	box-sizing: border-box;
-	padding: 20rpx;
-}
-.bg-white{
-	background-color: #fff;
-}
-
-.price-tag{
-	font-family:Arial;
-	font-weight: bold;
-}
-
-
-//商品详情 
-.goods-container{
-	padding: 20rpx 20rpx 60px;
-	background-color:#F6F6F6;
-}
-
-.goods-price{
-	font-family:Arial;
-	font-weight: bold;
-	color: red;
-	font-size: 28px;
-	.old{
-		text-decoration: line-through;
-		color:#CCCCCC;
-		display: inline-block;
-		padding-left: 20rpx;
-		font-size: 20px;
 	}
-	
-}
 
-.goods-title {
+
+	.tc {
+		text-align: center;
+	}
+
+	.br {
+		border-radius: 10rpx;
+		box-sizing: border-box;
+		padding: 20rpx;
+	}
+
+	.bg-white {
+		background-color: #fff;
+	}
+
+	.price-tag {
+		font-family: Arial;
+		font-weight: bold;
+	}
+
+
+	//商品详情 
+	.goods-container {
+		padding: 20rpx 20rpx 60px;
+		background-color: #F6F6F6;
+	}
+
+	.goods-price {
+		font-family: Arial;
+		font-weight: bold;
+		color: red;
+		font-size: 28px;
+
+		.old {
+			text-decoration: line-through;
+			color: #CCCCCC;
+			display: inline-block;
+			padding-left: 20rpx;
+			font-size: 20px;
+		}
+
+	}
+
+	.goods-title {
 		width: 100%;
 		padding: 0 10rpx 0 0;
 		// height: 140rpx;
-		
-}
-.goods-title .goods-text {
-	height: 50rpx;
-	line-height: 50rpx;
-	font-size: 30rpx;
-	padding: 20rpx 0 10rpx;
-}
-.goods-title .goods-desc {
-	height: 40rpx;
-	line-height: 40rpx;
-	font-size: 24rpx;
-	color: #999999;
-}
-
-//选择参数
-.parameter {
-	display: flex;
-	justify-content: space-between;
-	border-bottom: 1px solid #F6F6F6;
-}
-.parameter:last-of-type{
-	border-bottom:none
-}
-
-//popUp
-.choose-detail {
-	position: relative;
-	padding: 20rpx;
-	//保障
-	&.baozhang-detail{
-		padding-top: 30px;
-		box-sizing: border-box;
-		height: 100%;
-		
-		.baozhangTitle{
-			
-		}
-		.baozhangDescDesc{
-			color: #999999;
-		}
-		.baozhang-btn{
-			position: fixed;
-			bottom: 20rpx;
-			width: calc(100% - 40rpx);
-			height: 60rpx;
-			line-height: 60rpx;
-			border-radius: 30rpx;
-			text-align: center;
-			background: linear-gradient(to right,#FF8E01,#FD5100);
-			
+
+	}
+
+	.goods-title .goods-text {
+		height: 50rpx;
+		line-height: 50rpx;
+		font-size: 30rpx;
+		padding: 20rpx 0 10rpx;
+	}
+
+	.goods-title .goods-desc {
+		height: 40rpx;
+		line-height: 40rpx;
+		font-size: 24rpx;
+		color: #999999;
+	}
+
+	//选择参数
+	.parameter {
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid #F6F6F6;
+	}
+
+	.parameter:last-of-type {
+		border-bottom: none
+	}
+
+	//popUp
+	.choose-detail {
+		position: relative;
+		padding: 20rpx;
+
+		//保障
+		&.baozhang-detail {
+			padding-top: 30px;
+			box-sizing: border-box;
+			height: 100%;
+
+			.baozhangTitle {}
+
+			.baozhangDescDesc {
+				color: #999999;
+			}
+
+			.baozhang-btn {
+				position: fixed;
+				bottom: 20rpx;
+				width: calc(100% - 40rpx);
+				height: 60rpx;
+				line-height: 60rpx;
+				border-radius: 30rpx;
+				text-align: center;
+				background: linear-gradient(to right, #FF8E01, #FD5100);
+
+			}
+
 		}
-		
+
+		//选择
+		// .choose-top {
+		// 	display: flex;
+		// 	align-items: center;
+		// 	height: 160rpx;
+		// 	color: red;
+		// 	.choose-img {
+		// 		width: 160rpx;
+		// 		height: 160rpx;
+		// 		border-radius: 20rpx;
+
+		// 	}
+		// 	.choose-price {
+
+		// 	}
+		// 	.choose-less-price {
+		// 		display: inline-block;
+		// 		height: 40rpx;
+		// 		line-height: 40rpx;
+		// 		padding:4rpx 10rpx;
+		// 		color: white;
+		// 		background-color:#F95100 ;
+		// 		border-radius: 20rpx;
+		// 	}
+		// }
+
+
+		// .choose-bottom {
+		// 	.choose-bottom-title{
+
+		// 	}
+		// 	.choose-select {
+		// 		.choose-item{
+		// 			display: flex;
+		// 			align-items: center;
+		// 			height: 60rpx;
+		// 			border-radius: 20rpx;
+		// 			overflow: hidden;
+		// 			background-color:#F6F6F6;
+		// 			border:1px solid transparent;
+		// 			width: fit-content;
+		// 			.img{
+		// 				width: 60rpx;
+		// 				height: 60rpx;
+		// 			}
+		// 		}
+		// 		.choose-active{
+		// 			border-color: #F95100;
+		// 		}
+		// 	}
+
+		// 	.choose-num{
+		// 		display: flex;
+		// 		height: 60rpx;
+		// 		justify-content: space-between;
+		// 		align-items: center;
+
+		// 		.choose-change{
+		// 			width: 240rpx;
+		// 			background-color:#F4F4F4;	
+		// 			height: 100%;
+		// 			border-radius: 30rpx;
+		// 			display: flex;
+		// 			.number{
+		// 				// width: 80rpx;
+		// 				height: 60rpx;
+		// 				line-height: 60rpx;
+		// 				text-align: center;
+		// 				color: #333333;
+		// 				font-size: 30rpx;
+		// 			}
+		// 			.width140{
+		// 				width: 120rpx !important;
+		// 			}
+		// 			.wid25{
+		// 				width: 60rpx !important;
+		// 				background-color:#f8f8f8 ;
+		// 				border-radius: 30rpx;
+		// 			}
+
+		// 		}
+		// 	}
+		// }
+
+		// .choose-cart{
+		// 	position: fixed;
+		// 	bottom: 0;
+		// 	width: calc(100% - 40rpx);
+		// 	padding-bottom: 20rpx;
+		// 	.choose-way{
+		// 		height: 60rpx;
+		// 		width: 100%;
+		// 		border-radius: 30rpx;
+		// 		overflow: hidden;
+		// 		display: flex;
+		// 		align-items: center;
+
+
+		// 		.way{
+		// 			width: 50%;
+		// 			height: 60rpx;
+		// 			line-height: 60rpx;
+		// 			text-align: center;
+		// 		}
+
+		// 		.bgcolor-ri{
+		// 			background-color:  #FD5100;
+		// 		}
+		// 		.bgcolor-left{
+		// 			background-color:  #FF8E01;
+		// 		}
+		// 	}
+		// }
+
 	}
-	
-	//选择
-	// .choose-top {
-	// 	display: flex;
-	// 	align-items: center;
-	// 	height: 160rpx;
-	// 	color: red;
-	// 	.choose-img {
-	// 		width: 160rpx;
-	// 		height: 160rpx;
-	// 		border-radius: 20rpx;
-			
-	// 	}
-	// 	.choose-price {
-			
-	// 	}
-	// 	.choose-less-price {
-	// 		display: inline-block;
-	// 		height: 40rpx;
-	// 		line-height: 40rpx;
-	// 		padding:4rpx 10rpx;
-	// 		color: white;
-	// 		background-color:#F95100 ;
-	// 		border-radius: 20rpx;
-	// 	}
-	// }
-	
-	
-	// .choose-bottom {
-	// 	.choose-bottom-title{
-			
-	// 	}
-	// 	.choose-select {
-	// 		.choose-item{
-	// 			display: flex;
-	// 			align-items: center;
-	// 			height: 60rpx;
-	// 			border-radius: 20rpx;
-	// 			overflow: hidden;
-	// 			background-color:#F6F6F6;
-	// 			border:1px solid transparent;
-	// 			width: fit-content;
-	// 			.img{
-	// 				width: 60rpx;
-	// 				height: 60rpx;
-	// 			}
-	// 		}
-	// 		.choose-active{
-	// 			border-color: #F95100;
-	// 		}
-	// 	}
-		
-	// 	.choose-num{
-	// 		display: flex;
-	// 		height: 60rpx;
-	// 		justify-content: space-between;
-	// 		align-items: center;
-			
-	// 		.choose-change{
-	// 			width: 240rpx;
-	// 			background-color:#F4F4F4;	
-	// 			height: 100%;
-	// 			border-radius: 30rpx;
-	// 			display: flex;
-	// 			.number{
-	// 				// width: 80rpx;
-	// 				height: 60rpx;
-	// 				line-height: 60rpx;
-	// 				text-align: center;
-	// 				color: #333333;
-	// 				font-size: 30rpx;
-	// 			}
-	// 			.width140{
-	// 				width: 120rpx !important;
-	// 			}
-	// 			.wid25{
-	// 				width: 60rpx !important;
-	// 				background-color:#f8f8f8 ;
-	// 				border-radius: 30rpx;
-	// 			}
-				
-	// 		}
-	// 	}
-	// }
-	
-	// .choose-cart{
-	// 	position: fixed;
-	// 	bottom: 0;
-	// 	width: calc(100% - 40rpx);
-	// 	padding-bottom: 20rpx;
-	// 	.choose-way{
-	// 		height: 60rpx;
-	// 		width: 100%;
-	// 		border-radius: 30rpx;
-	// 		overflow: hidden;
-	// 		display: flex;
-	// 		align-items: center;
-			
-			
-	// 		.way{
-	// 			width: 50%;
-	// 			height: 60rpx;
-	// 			line-height: 60rpx;
-	// 			text-align: center;
-	// 		}
-			
-	// 		.bgcolor-ri{
-	// 			background-color:  #FD5100;
-	// 		}
-	// 		.bgcolor-left{
-	// 			background-color:  #FF8E01;
-	// 		}
-	// 	}
-	// }
-	
-}
-
-
-//商品信息图片
-.goods-desc-img{
-	
-}
-
-
-</style>
\ No newline at end of file
+
+
+	//商品信息图片
+	.goods-desc-img {}
+</style>
diff --git a/pages/classify/order/orderDetail.vue b/pages/classify/order/orderDetail.vue
index a696299..f107c09 100644
--- a/pages/classify/order/orderDetail.vue
+++ b/pages/classify/order/orderDetail.vue
@@ -216,6 +216,7 @@
 <script>
 	import wuliuPopup from '@/components/wuliuPupup/wuliuPupup.vue'
 	const app =getApp()
+	import {getDetailByOrderNo} from '@/Utils/Api.js'
 	export default {
 		data(){
 			return{
@@ -228,24 +229,61 @@
 				countdownm: '', // 倒计时分
 				countdowns:'',//倒计时秒
 				timers:null,
-				recinfo:{
-					createTime:1680744355375,
-				}
+				// recinfo:{
+				// 	createTime:1680744355375,
+				// },
+				//
+				orderId:'',//订单id
+				recinfo: [],
 				
 			}
 		},
 		components:{
 			wuliuPopup
 		},
+		onLoad(option) {
+			this.orderId = option.id
+		},
+		onUnload() {
+			clearInterval(this.timers);
+		},
 		onShow(){
 			// 待支付状态
-			if(this.status == 0){
-				this.timers = setInterval(() => {
-					this.showtime()
-				}, 1000)
-			}
+			// if(this.status == 0){
+			// 	this.timers = setInterval(() => {
+			// 		this.showtime()
+			// 	}, 1000)
+			// }
+			
+			//页面显示时，加载订单信息
+			this.getDetailByOrderNo();
+			
 		},
 		methods:{
+			//查询订单详情
+			getDetailByOrderNo() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					orderNo: this.orderId,
+				}
+				getDetailByOrderNo(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.recinfo = res.return_data;
+						// if (res.return_data.productType == 6) {
+						// 	this.getOrderByOrderNo();
+						// }
+			
+						if (res.return_data.orderStatus == 1) {
+							this.timers = setInterval(() => {
+								this.showtime()
+							}, 1000)
+						}
+					}
+				})
+			},
 			showtime() {
 				var nowtime = (new Date()).getTime();//获取当前时间
 				var	endtime = this.recinfo.createTime + 600000; //定义结束时间 600000是10分钟
diff --git a/pages/classify/order/orderList.vue b/pages/classify/order/orderList.vue
index 485038a..0ae7d1c 100644
--- a/pages/classify/order/orderList.vue
+++ b/pages/classify/order/orderList.vue
@@ -55,7 +55,7 @@
 		props:{ //1单个商品，2多个商品
 			orderType:{
 				type:Number,
-				default:0,
+				default:2,
 			}
 		},
 		
diff --git a/pages/classify/order/pay.vue b/pages/classify/order/pay.vue
index 0ecc8f0..100e4c2 100644
--- a/pages/classify/order/pay.vue
+++ b/pages/classify/order/pay.vue
@@ -2,106 +2,226 @@
 	<view class="backcor9 pay-syt pd-main">
 		<view class="fotct">
 			<view class="">
-				¥<text class="font28 fontwig6">37.13</text>
+				¥<text class="font28 fontwig6">{{payPrice}}</text>
 			</view>
 			<view class="fcor666 font14 paddtop10 paddbotm10">
 				支付剩余时间<text class="paddleft10">{{countdownm}}:{{countdowns}}</text>
 			</view>
 		</view>
 		<view class="content pd-main backcolorfff border-8r">
-			<checkbox-group @change="changeCheckBox">
-			<view class="dis-flex border-b pd15-v">
-				<image class="pay-img paddtright10" src="../../../static/img/zfb.png" mode="aspectFit"></image>
-				<view class="flex-1 dis-flex flex-sp  ">
-					<view class="">
+			<!-- <radio-group @change="radioChange"> -->
+			<view v-for="(item,index) in paytypeList" :key="index" class="">
+
+
+				<view class="dis-flex bor-b pd15-v" v-if="item == 4" @tap="paytype='4'">
+					<image class="pay-img paddtright10" src="../../../static/img/yl.png" mode="aspectFit"></image>
+					<view class="flex-1 dis-flex flex-sp  ">
 						<view class="">
-							支付宝
-						</view>
-						<view class="fcor666">
-							周五，六，日，光大信用卡支付随机优惠
+							<view class="">
+								银联
+							</view>
+							<!-- <view class="fcor666">
+							建行信用卡支付满40减16,先到先得
+						</view> -->
 						</view>
+
+						<radio class="radio-ca" :checked="paytype=='4'" color="#FF1A34" />
 					</view>
-					
-					<checkbox class="mycheck" :value="1" color="#55B836"   :checked="isCheck[0]" />
 				</view>
-			</view>
-			<view class="dis-flex border-b pd15-v">
-				<image class="pay-img paddtright10" src="../../../static/img/yl.png" mode="aspectFit"></image>
-				<view class="flex-1 dis-flex flex-sp  ">
-					<view class="">
+				<view class="dis-flex bor-b  pd15-v" v-if="item == 2" @tap="paytype='2'">
+					<image class="pay-img paddtright10" src="../../../static/img/wechat.png" mode="aspectFit"></image>
+					<view class="flex-1 dis-flex flex-sp  ">
 						<view class="">
-							银联云闪付
-						</view>
-						<view class="fcor666">
-							建行信用卡支付满40减16,先到先得
+							<view class="">
+								微信支付
+							</view>
+
 						</view>
+
+						<radio class="radio-ca" :checked="paytype=='2'" color="#FF1A34" />
 					</view>
-					
-					<checkbox class="mycheck" :value="2" color="#55B836"  :checked="isCheck[1]" />
 				</view>
-			</view>
-			<view class="dis-flex  pd15-v">
-				<image class="pay-img paddtright10" src="../../../static/img/wechat.png" mode="aspectFit"></image>
-				<view class="flex-1 dis-flex flex-sp  ">
-					<view class="">
+				<view class="dis-flex bor-b  pd15-v" v-if="item == 3" @tap="paytype='3'">
+					<image class="pay-img paddtright10" src="../../../static/img/unioncard.png" mode="aspectFit">
+					</image>
+					<view class="flex-1 dis-flex flex-sp  ">
 						<view class="">
-							微信支付
+							<view class="">
+								汇联通工会卡<text class="font14 fcor666 margle">余额: {{tongCardPrice}}元</text>
+							</view>
+
 						</view>
-						
+
+						<radio class="radio-ca" :checked="paytype=='3'" @click="changeRiado()" color="#FF1A34" />
 					</view>
-					
-					<checkbox class="mycheck" :value="3" color="#55B836" :checked="isCheck[2]" />
 				</view>
 			</view>
-			</checkbox-group>
+			<!-- </radio-group> -->
 		</view>
-		
+
 		<view class="btn-contain backcolorfff">
-			<view class="btn-edit fotct fcorfff font18" @click="payMoney()">确认支付<text class="paddleft5">¥37.13</text></view>
+			<view class="btn-edit fotct fcorfff font18" @click="payMoney()">确认支付<text class="paddleft5">¥{{payPrice}}</text>
+			</view>
 		</view>
-		
+
+		<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
 	</view>
 </template>
 
 <script>
+	import {
+		getThirdPartyByDetail,
+		findUser,
+		getHuiLianTongCardBalance,
+		wechatPay,
+		cardPay
+	} from '@/Utils/Api.js'
+	import ssPaymentPassword from '@/components/sanshui-payment-password/index.vue'
+	const app = getApp();
+	// #ifdef H5
+	var jweixin = require('jweixin-module');
+	// #endif
 	export default {
-		data(){
-			return{
-				isCheck:[false,false,false],
+		data() {
+			return {
 				// 倒计时
 				countdownh: '', //倒计时时
 				countdownm: '', // 倒计时分
-				countdowns:'',//倒计时秒
-				timers:null,
-				recinfo:{
-					createTime:1680774642959,
+				countdowns: '', //倒计时秒
+				timers: null,
+				recinfo: {
+					createTime: 1680774642959,
 				},
-				
-			
+
+				//start
+				orderNo: '', //订单id 20230420145524695497
+				payPrice: '', //需要支付的金额
+				paytypeList: [], //支付方式
+
+				tongCardPrice: 0, //汇联通工会卡余额
+				paytype: '', //选择的支付方式，
+				user: '', //用户信息
+
+				PaymentPassword: '',
+
+
 			}
 		},
-		onShow(){
+		components: {
+			ssPaymentPassword
+		},
+		onShow() {
 			// 待支付状态
 			// if(this.status == 0){
-				this.timers = setInterval(() => {
-					this.showtime()
-				}, 1000)
+			this.timers = setInterval(() => {
+				this.showtime()
+			}, 1000)
 			// }
+
+			this.findUser()
+			this.getThirdPartyByDetail()
+		},
+		onLoad(options) {
+			let obj =JSON.parse(options.obj) 
+			this.orderNo = obj.orderNo;
+			this.recinfo.createTime = obj.createTime;
+			this.payPrice = obj.payPrice
+
 		},
-		methods:{
+		methods: {
+			//查询我的资料
+			findUser() {
+				let params;
+				findUser(params).then(res => {
+					if (res.return_code == '000000') {
+						app.globalData.userInfo = res.return_data;
+						this.user = res.return_data;
+						this.getHuiLianTongCardBalance(); //查询工会卡余额
+						uni.setStorage({
+							key: "user",
+							data: res.return_data
+						})
+					}
+				});
+			},
+			//汇联通工会卡的radioChange
+			changeRiado() {
+				if (!this.user.setHltCard) {
+					uni.showToast({
+						icon: 'none',
+						title: '当前账号还未绑定,前往绑定',
+						duration: 2000,
+						success() {
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '/pages/user/bindingCard/bindingCard'
+								})
+							}, 1000)
+						}
+					});
+					return;
+				}
+			},
+			//查询工会卡余额
+			getHuiLianTongCardBalance() {
+
+				if (this.user.setHltCard && this.user.hltCardNo && this.user.hltCardNo.cardNo) {
+					let params = {
+						cardNo: this.user.hltCardNo.cardNo
+					}
+					getHuiLianTongCardBalance(params).then(res => {
+						if (res.return_code == '000000') {
+							this.tongCardPrice = res.return_data.balance;
+						}
+
+					});
+				}
+
+			},
+			onUnload() {
+				clearInterval(this.timers);
+			},
+			//查询支付方式
+			getThirdPartyByDetail() {
+				// #ifdef H5
+				this.showType = 2;
+				// #endif
+				// #ifdef MP
+				this.showType = 1;
+				// #endif
+				let datas = {
+					platformId: this.showType,
+					"companyId": app.globalData.companyId,
+					productType: 10
+				}
+				getThirdPartyByDetail(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.paytypeList = res.return_data.productPayType.split(',');
+						this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
+						console.log(this.paytypeList, "this.paytypeList1111111111111111111")
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				});
+			},
+
 			// 倒计时
 			showtime() {
-				var nowtime = (new Date()).getTime();//获取当前时间
-				var	endtime = this.recinfo.createTime + 600000; //定义结束时间 600000是10分钟
+				var nowtime = (new Date()).getTime(); //获取当前时间
+				var endtime = this.recinfo.createTime + 600000; //定义结束时间 600000是10分钟
 				var lefttime = endtime - nowtime; //距离结束时间的毫秒数
-				var	leftd = Math.floor(lefttime / (1000 * 60 * 60 * 24)); //计算天数
-				var	lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime /
-						(1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
-						24); //计算小时数
-				var	leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? "0" + Math.floor(lefttime / (1000 * 60) % 60) :
+				var leftd = Math.floor(lefttime / (1000 * 60 * 60 * 24)); //计算天数
+				var lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime /
+					(1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
+					24); //计算小时数
+				var leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? "0" + Math.floor(lefttime / (1000 * 60) % 60) :
 					Math.floor(lefttime / (1000 * 60) % 60); //计算分钟数
-				var	lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
-						lefttime / 1000 % 60); //计算秒数
+				var lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
+					lefttime / 1000 % 60); //计算秒数
 				this.countdownh = lefth; //返回倒计时的字符串
 				this.countdownm = leftm; //返回倒计时的字符串
 				this.countdowns = lefts; //返回倒计时的字符串
@@ -110,100 +230,300 @@
 					clearInterval(this.timers);
 					// this.getDetailByOrderNo();
 					this.countdownh = this.countdownm = this.countdowns = "00";
+					
 				}
 			},
-			
+
 			//changeCheckBox
-			changeCheckBox(e){
-				if(e.detail.value.length>1){
-					let val = e.detail.value[e.detail.value.length-1]
-					 this.isCheck.map((item,index)=>{
-						 if(index-1 == val){
-							 this.isCheck=[]
-						 }
-					 })
-					 this.isCheck=[false,false,false];
-					 this.isCheck[val-1]=true;
-				}else if(e.detail.value.length==1){
-					this.isCheck=[false,false,false];
-					 this.isCheck[e.detail.value[0]-1]=true;
-					
-				}else{
-					this.isCheck=[false,false,false];
-				}
+			// radioChange(e) {
+			// 	// this.yhqType = e.detail.value;
+
+			// },
+
+			//确认支付
+			payMoney() {
+				// uni.reLaunch({
+				// 	url: "/pages/classify/order/paymentResult?id=202304201646301166509" 
+				// 	// url: '../../user/order_details/order_details?id=' +that.orderNo
+				// });
 				
-				// console.log(this.isCheck,e.detail.value)
+				// return
+				//
 				
-			},
-			
-			payMoney(){	
-				let isSelect=false;	
-				console.log(this.isCheck,"支付确认")
-				this.isCheck.map((item,index)=>{
-					if(item){
-						isSelect=true;
-						if(index == 0){
-							this.pay('zfb')
-							return
-						}
-						if(index == 1){	
-							this.pay('yl')
-							return
-						}
-						if(index == 2){	
-							this.pay('wx')
-							return
+				let that = this;
+				if (that.paytype == '') {
+					uni.showToast({
+						title: '请选择支付方式',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+				}
+				if (that.paytype == '2') {
+					// #ifdef H5
+					let params = {
+						"orderNo": that.orderNo,
+						"openId": app.globalData.openId,
+						"openIdType": 2
+					}
+					// #endif
+					// #ifdef MP
+					let params = {
+						"orderNo": that.orderNo,
+						"openId": app.globalData.openId,
+						"openIdType": 1
+					}
+					// #endif
+					wechatPay(params).then(res => {
+						if (res.return_code == '000000') {
+							// #ifdef MP
+							uni.showLoading({
+								title: '支付中...'
+							})
+							uni.requestPayment({
+								"appId": res.return_data.appId,
+								"nonceStr": res.return_data.nonceStr,
+								"package": res.return_data.package,
+								"paySign": res.return_data.sign,
+								"signType": "MD5",
+								"timeStamp": res.return_data.timeStamp,
+								success: function(res) {
+									uni.hideLoading();
+									uni.showToast({
+										title: '支付成功'
+									})
+									uni.reLaunch({
+										url: "/pages/classify/order/paymentResult?id=" + that
+											.orderNo
+										// url: '../../user/order_details/order_details?id=' +that.orderNo
+									});
+								},
+								fail: function(err) {
+									uni.hideLoading();
+									uni.navigateBack({})
+								},
+							});
+							// #endif
+
+							//判断是否是公众号
+							// #ifdef H5
+							//判断微信浏览器
+							that.payRequest(res);
+							// #endif
+
+						} else {
+							// that.cancel();
+							uni.showToast({
+								title: res.return_msg,
+								icon: 'none'
+							})
 						}
-						
-					}				
-				})
+					})
+					return;
+				}
+				//使用汇联通支付时需要填写支付密码
+				if (that.paytype == '3') {
+					if (!that.user.isSetPayPwd) {
+						uni.navigateTo({
+							url: '/pages/login/updatePas/updatePas'
+							// url: '../../login/updatePas/updatePas'
+						})
+						return;
+					}
+					if (!that.user.setHltCard) {
+						uni.showToast({
+							icon: 'none',
+							title: '当前账号还未绑定,前往绑定',
+							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateTo({
+										url: '/pages/user/bindingCard/bindingCard'
+										// url: '../../user/bindingCard/bindingCard'
+									})
+								}, 1000)
+							}
+						});
+						return;
+					}
+					that.$refs.paymentPassword.modalFun('show');
+				}
 				
-				if(!isSelect){
+
+			},
+			payRequest: function(self) {
+				let that = this;
+				uni.showLoading({
+					title: '支付中...'
+				})
+				jweixin.config({
+					// debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+					appId: self.return_data.appId, // 必填，公众号的唯一标识
+					timestamp: self.return_data.timeStamp, // 必填，生成签名的时间戳
+					nonceStr: self.return_data.nonceStr, // 必填，生成签名的随机串
+					signature: self.return_data.sign, // 必填，签名，见附录1
+					jsApiList: ['chooseWXPay'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+				});
+				uni.hideLoading();
+				jweixin.ready(function() {
+					jweixin.checkJsApi({
+						jsApiList: ['chooseWXPay'], // 需要检测的JS接口列表，所有JS接口列表见附录2,
+						success: function(res) {},
+						fail: function(res) {}
+					});
+					jweixin.chooseWXPay({
+						appId: self.return_data.appId,
+						timestamp: self.return_data
+							.timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+						nonceStr: self.return_data.nonceStr, // 支付签名随机串，不长于 32 位
+						package: self.return_data
+							.package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=***）
+						signType: 'MD5', // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
+						paySign: self.return_data.sign, // 支付签名
+						success: function(res) {
+							// 支付成功后的回调函数
+							uni.showToast({
+								title: '支付成功'
+							})
+							uni.reLaunch({
+								url: "/pages/classify/order/paymentResult?id=" + that
+									.orderNo
+								// url: '../../user/order_details/order_details?id=' +that.orderNo
+							});
+						},
+						cancel: function(r) {
+							uni.navigateBack({})
+						},
+						fail: function(res) {
+							uni.navigateBack({})
+						},
+						complete: function(res) {
+
+						}
+					});
+				});
+
+				jweixin.error(function(res) {
 					uni.showToast({
-						title: '请选择支付方式',
-						duration: 2000,
-						icon:"error"
+						icon: 'none',
+						title: '支付失败了',
+						duration: 4000
 					});
-				}
-	
+					// config信息验证失败会执行error函数，如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
+					/*alert("config信息验证失败");*/
+				});
 			},
-			pay(type){
-				uni.navigateTo({
-					url:"/pages/classify/order/paymentResult?type="+type
+
+			//输入密码完成
+			submitHandle(e) {
+				this.PaymentPassword = e.value;
+				if (this.PaymentPassword == '') {
+					uni.showToast({
+						title: '请勿手动关闭弹窗',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+				}
+				uni.showLoading({
+					title: '支付中...'
 				})
-			}
-		}
+
+
+				let cardNo;
+				if (this.paytype == 3) {
+					cardNo = this.user.hltCardNo.cardNo;
+				}
+
+				let params = {
+					"orderNo": this.orderNo,
+					"cardNo": cardNo,
+					"password": this.PaymentPassword,
+					"carLicensePlate": ''
+				}
+				cardPay(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						uni.showToast({
+							title: '支付成功'
+						})
+						uni.reLaunch({
+							url: "/pages/classify/order/paymentResult?id=" + that.orderNo
+							// url: '../../user/order_details/order_details?id=' +this.orderNo
+						})
+						return;
+					}
+					// if (res.return_code == '102130') {
+					// 	// this.cancel();//取消订单
+					// 	uni.navigateTo({
+					// 		url: '../../login/updatePas/updatePas'
+					// 	})
+					// 	return;
+					// }
+					// if (res.return_code == '102132') {
+					// 	// this.cancel();
+					// 	uni.showToast({
+					// 		title: res.return_msg,
+					// 		icon: 'none'
+					// 	})
+					// 	return;
+					// }
+					uni.navigateBack({})
+					uni.showToast({
+						title: res.return_msg,
+						icon: 'none'
+					})
+				})
+				return;
+			},
+
+		
+
+		// pay(type) {
+		// 	uni.navigateTo({
+		// 		url: "/pages/classify/order/paymentResult?type=" + type
+		// 	})
+		// }
+	}
 	}
 </script>
 
-<style scoped>
-.pay-syt{
-	height: 100vh;
-}
-
-.pay-img{
-	width: 30px;
-	height: 30px;
-}
-
-.pd15-v{
-	padding: 15px 0;
-}
-
-.btn-contain{
-position: fixed;
-	bottom: 0;
-	left: 0;
-	right: 0;
+<style lang="scss" scoped>
+	.bor-b {
+		border-bottom: 1px solid #f6f6f6;
+
+		&:last-of-type {
+			border-bottom: none;
+		}
+	}
+
+	.pay-syt {
+		height: 100vh;
+	}
+
+	.pay-img {
+		width: 30px;
+		height: 30px;
+	}
+
+	.pd15-v {
+		padding: 15px 0;
+	}
+
+	.btn-contain {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
 		padding: 10px;
 		box-sizing: border-box;
-}
-
-.btn-edit{
-	
-	height: 40px;
-	border-radius: 20px;
-	line-height: 40px;
-	background-color: #EA3E44;
-}
-</style>
\ No newline at end of file
+	}
+
+	.btn-edit {
+
+		height: 40px;
+		border-radius: 20px;
+		line-height: 40px;
+		background-color: #EA3E44;
+	}
+</style>
diff --git a/pages/classify/order/paymentResult.vue b/pages/classify/order/paymentResult.vue
index 8f52cc0..cb9a355 100644
--- a/pages/classify/order/paymentResult.vue
+++ b/pages/classify/order/paymentResult.vue
@@ -3,22 +3,22 @@
 		<view class="top-con font18">
 			<view class="colorgr icon-ymt zhenque font22"></view>
 			<view class="mart5">支付成功</view>
-			<view class="mart5">¥<text class="fontwig6 font24">32.9</text></view>
-			<view class="mart5 font16 color999">微信支付</view>
+			<view class="mart5">¥<text class="fontwig6 font24">{{recinfo.payablePrice}}</text></view>
+			<view class="mart5 font16 color999">{{ recinfo.payType | filtersType}}支付</view>
 		</view>
-		<view class="min-con color999 font18">
+		<!-- <view class="min-con color999 font18">
 			<view class="">
 				订单签收后奖励
 			</view>
 			<view class="">
 				26积分
 			</view>
-		</view>
+		</view> -->
 		<view class="bottom-con">
-			<view class="btn1 btn">
+			<view class="btn1 btn" @click="orderDetail">
 				查看订单
 			</view>
-			<view class="btn2 btn">
+			<view class="btn2 btn" @click="yaoqin">
 				邀请有礼
 			</view>
 		</view>
@@ -26,20 +26,72 @@
 </template>
 
 <script>
+	import { getDetailByOrderNo } from '@/Utils/Api.js'
 	export default {
 		data(){
 			return{
-				payType:'',
+				orderId:'',
+				recinfo:{},
+				
 			}
 			
 		},
 		
 		onLoad(option){
-			this.payType=option.type
+			this.orderId=option.id
 			console.log(option)
 		},
+		onShow(){
+			this.getDetailByOrderNo()
+		},
+		filters:{
+			filtersType(v){
+				if(v == 1){
+					return "支付宝"
+				}
+				if(v == 2){
+					return "微信"
+				}
+				if(v == 3){
+					return "金币"
+				}
+				if(v == 4){
+					return "汇联通工会卡"
+				}
+				if(v == 5){
+					return "银联"
+				}
+				
+				return ''
+			}
+		},
 		methods:{
-			
+			//查询订单详情
+			getDetailByOrderNo() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					orderNo: this.orderId,
+				}
+				getDetailByOrderNo(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.recinfo = res.return_data;
+						
+					}
+				})
+			},
+			orderDetail(){
+				uni.reLaunch({
+					url:"/pages/user/order_list/order_list"
+				})
+			},
+			yaoqin(){
+				uni.navigateTo({
+					url:"/pages/user/generatePoster/generatePoster"
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/settleAccounts/detail-popup/detail-popup.vue b/pages/settleAccounts/detail-popup/detail-popup.vue
index 9a226b1..b861470 100644
--- a/pages/settleAccounts/detail-popup/detail-popup.vue
+++ b/pages/settleAccounts/detail-popup/detail-popup.vue
@@ -1,274 +1,365 @@
 <template>
-	
-		<!-- 选择类别 -->
-		<wybPopup ref="popup" @hide="hide"  type="bottom" width="500" scrollY="true" radius="0" :showCloseIcon="true">
-			<!-- 货品 -->
-			<view v-if="keywords == 'goods'" class="pop-contain pd-main">
-				<view class="pop-title fontwig6"><text>商品列表</text></view>
-				<view class="pop-content">
-					<view class="flex-row bottom-border pd15">
-						<view class="">
-							即时达
-						</view>
-						<view class="">
-							共16件
-						</view>
+
+	<!-- 选择类别 -->
+	<wybPopup ref="popup" @hide="hide" type="bottom" width="500" scrollY="true" radius="0" :showCloseIcon="true">
+		<!-- 货品 -->
+		<view v-if="keywords == 'goods'" class="pop-contain pd-main">
+			<view class="pop-title fontwig6"><text>商品列表</text></view>
+			<view class="pop-content">
+				<view class="flex-row bottom-border pd15">
+					<view class="">
+						数量
 					</view>
-					<!-- 遍历商品 -->
-					<view v-for="item in [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]" class="goods-pop bottom-border pd15">
-						<view class="">
-							<image class="st-img" :src="images" mode="aspectFill"></image>
+					<view class="">
+						共{{getNumberAll}}件
+					</view>
+				</view>
+				<!-- 遍历商品 -->
+				<view v-for="(item,index) in goodsList" :key="index" class="goods-pop bottom-border pd15">
+					<view class="">
+						<image class="st-img" v-if="item.img" :src="imageUrl + item.img" mode="aspectFill"></image>
+					</view>
+					<view class="goods-flex1">
+						<view class="marb10 font16">
+							{{item.title}}
 						</view>
-						<view class="goods-flex1">
-							<view class="marb10 font16">
-								天友原味减糖活性乳酸菌饮品 300ml
-							</view>
-							<view class="flex-row">
+						<view class="flex-row">
+							<view class="dis-flex">
 								<view class="fcorred">
-									¥5.2 
+									¥{{item.price}}
 								</view>
-								<view class="fcor666">
-									×1
+								<view class="text-lt fcor666 margle10">
+									¥{{item.originalPrice}}
 								</view>
 							</view>
+							<view class="fcor666">
+								×{{item.num}}
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-			<!-- 运费 -->
-			<view v-if="keywords == 'freight'" class="pop-contain pd-main">
-				<view class="pop-title fontwig6"><text>运费说明</text></view>
-				<view class="pop-content">
-					<view class="flex-row  pd10">
-						<view class="font16">
-							运费总计
-						</view>
-						<view class="">
-							¥0
-						</view>
+		</view>
+		<!-- 运费 -->
+		<view v-if="keywords == 'freight'" class="pop-contain pd-main">
+			<view class="pop-title fontwig6"><text>运费说明</text></view>
+			<view class="pop-content">
+				<view class="flex-row  pd10">
+					<view class="font16">
+						运费总计
 					</view>
-					<view class="flex-row font14 color999 marb5">
-						<view class="">
-							<text class="font20 paddtright5">·</text>运费
-						</view>
-						<view class="">
-							¥6
-						</view>
-					</view>
-					<view class="flex-row font14 color999">
-						<view class="">
-							<text class="font20 paddtright5">·</text>运费优惠
-						</view>
-						<view class="">
-							-¥6
-						</view>
+					<view class="">
+						¥{{postPriceAll}}
 					</view>
-					<view class="pd10">
-						<view class="font15">
-							基础运费
-						</view>
+				</view>
+				<view class="flex-row font14 color999 marb5">
+					<view class="">
+						<text class="font20 paddtright5">·</text>运费
 					</view>
-					<view class="font14 color999 marb5">
-						基础运费6元
+					<view class="">
+						¥{{postPrice.freightPrice}}
 					</view>
-					<view class="font14 color999 marb5">
-						不同城市、地区之间收费规则会略有不同。
+				</view>
+				<view class="flex-row font14 color999">
+					<view class="">
+						<text class="font20 paddtright5">·</text>运费优惠
 					</view>
-					<view class="font14 color999 marb5">
-						运费优惠仅针对基础运费部分进行抵扣;
+					<view class="fcorred">
+						商品金额满{{postPrice.freePostPrice}}元包邮
 					</view>
 				</view>
+
+				<view class="font16 color999 mart10">
+					不同城市、地区之间收费规则会略有不同。
+				</view>
+
 			</view>
-			<!-- 积分 -->
-			<view v-if="keywords == 'integral'" class="pop-contain pd-main">
-				
-				<view class="pop-title fontwig6"><text>积分说明</text></view>
-				<view class="pop-content">
-					<view class="flex-row  pd10">
-						<view class="font16">
-							运费总计
-						</view>
-						<view class="">
-							¥0
-						</view>
+		</view>
+		<!-- 积分 -->
+		<view v-if="keywords == 'integral'" class="pop-contain pd-main">
+
+			<view class="pop-title fontwig6"><text>积分说明</text></view>
+			<view class="pop-content">
+				<view class="flex-row  pd10">
+					<view class="font16">
+						运费总计
 					</view>
-					<view class="flex-row font14 color999 marb5">
-						<view class="">
-							<text class="font20 paddtright5">·</text>运费
-						</view>
-						<view class="">
-							¥6
-						</view>
+					<view class="">
+						¥0
 					</view>
-					<view class="flex-row font14 color999">
-						<view class="">
-							<text class="font20 paddtright5">·</text>运费优惠
-						</view>
-						<view class="">
-							-¥6
-						</view>
+				</view>
+				<view class="flex-row font14 color999 marb5">
+					<view class="">
+						<text class="font20 paddtright5">·</text>运费
 					</view>
-					<view class="pd10">
-						<view class="font15">
-							基础运费
-						</view>
+					<view class="">
+						¥6
 					</view>
-					<view class="font14 color999 marb5">
-						基础运费6元
+				</view>
+				<view class="flex-row font14 color999">
+					<view class="">
+						<text class="font20 paddtright5">·</text>运费优惠
 					</view>
-					<view class="font14 color999 marb5">
-						不同城市、地区之间收费规则会略有不同。
+					<view class="">
+						-¥6
 					</view>
-					<view class="font14 color999 marb5">
-						运费优惠仅针对基础运费部分进行抵扣;
+				</view>
+				<view class="pd10">
+					<view class="font15">
+						基础运费
 					</view>
 				</view>
+				<view class="font14 color999 marb5">
+					基础运费6元
+				</view>
+				<view class="font14 color999 marb5">
+					不同城市、地区之间收费规则会略有不同。
+				</view>
+				<view class="font14 color999 marb5">
+					运费优惠仅针对基础运费部分进行抵扣;
+				</view>
 			</view>
-			
-			<!-- 优惠券 -->
-			<view v-if="keywords == 'coupon'" class="backcor9 height100  pop-contain pd-main">
-				<view class="pop-title fontwig6"><text>选择优惠券</text></view>
-				
-				<view @click="noUse" class="fcor666  fotct pd-main mart10 border-8r backcolorfff">
-					不使用优惠券
+		</view>
+
+		<!-- 优惠券 -->
+		<view v-if="keywords == 'coupon'"  class="backcor9  pop-contain pd-main">
+			<view class="pop-title fontwig6"><text>选择优惠券</text></view>
+			<radio-group @change="radioChange" >
+				<view  class="dis-flex flex-sp fcor666   pd-main mart10 border-8r backcolorfff">
+					<view class="">
+						不使用优惠券
+					</view> 
+					<view class="">
+						<radio  class="radio-ca" :checked="yhqType == 0" :value="0" color="#FF1A34" />
+					</view>	
 				</view>
-				
-				<radio-group @change="radioChange">
-				<view v-for="(item,index) in yhqId" :key="item" class="dis-flex flex-sp pd-main mart10 border-8r backcolorfff">
-					<view class="wid25 fotct paddtright5 right-border">
-						<view class="fotred font20 fontwig6">
-							8.8折券
-						</view>
-						<view class="font13 mart5 fcor666">
-							最高抵10元
+
+			
+				<view v-for="(item,index) in discountList" :key="index" class="pd-main mart10 border-8r backcolorfff" style="box-sizing: border-box;">
+					<view class="dis-flex flex-sp ">
+						<view class="wid25 fotct paddtright5 right-border">
+							<view class="fotred font20 fontwig6">
+								<image class="st-img" v-if="item.discountImg" :src="imageUrl+item.discountImg" mode="aspectFill">
+								</image>
+							</view>
 						</view>
-					</view>
-					<view class="flex-1 paddleft5">
-						<view class="font14">
-							【新人专享】全品类可用(特殊商品除外)
+						<view class="flex-1 paddleft5">
+							<view :class="' font14 '+item.discountCondition<=totalPrice?' ':' fcor666 '">
+								{{item.discountName}}
+							</view>
+							<view class="font13 mart5 fcor666">
+								截止时间:{{item.useEndTime | formatDate }}
+							</view>
 						</view>
-						<view class="font13 mart5 fcor666">
-							2023.03.27-2023.04.10
+						<view class=""  v-if="item.discountCondition<=totalPrice">
+							
+								<radio  class="radio-ca" :checked="yhqType == item.id" :value="item.id" color="#FF1A34" />
+							
 						</view>
 					</view>
-					<view class="">
-						<radio class="radio-ca" :checked="yhqType == item"  :value="item" color="#FF1A34" />
+					<view v-if="item.discountCondition>totalPrice&&item.discountType == 1"  class="paddtop10  mart10 border-t font14">
+						<view class="fotred  fontwig6 ">不可用原因</view> 
+						<view class="fcor666">
+							使用门槛为{{item.discountCondition}}元，还差{{item.discountCondition-totalPrice}}元才能使用
+						</view>
 					</view>
 				</view>
-				</radio-group>
 				
-			</view>
+			</radio-group>	
 			
-		
-		</wybPopup>
-	
+
+		</view>
+
+
+	</wybPopup>
+
 </template>
 
 <script>
 	import wybPopup from '@/components/wyb-popup/wyb-popup.vue'
+	const app = getApp();
 	export default {
-		data(){
-			return{
-				images:"https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg",
-				keywords:'',
-				yhqType:111,
-				yhqId:[
-					111,222,333,444
-				],
+		data() {
+			return {
+				imageUrl: app.globalData.imgUrl, //图片地址
+				keywords: '',
+				//
+				
+				// yhqId: [
+				// 	111, 222, 333, 444
+				// ],
+				//
 				
+				goodsList: [],//商品列表
+				imageUrl: app.globalData.imgUrl, //图片地址
+				postPrice: null, //运费信息
+				
+				discountList:[],//优惠券信息
+				totalPrice:0,//商品总金额
+				yhqType: 0,//选择的优惠券id
+				
+
 			}
 		},
-		components:{
+		filters:{
+			  formatDate(value, spe = '/') {
+			  		let data = new Date(value);
+			  		let year = data.getFullYear();
+			  		let month = data.getMonth() + 1;
+			  		let day = data.getDate();
+			  		let h = data.getHours();
+			  		let mm = data.getMinutes();
+			  		let s = data.getSeconds();
+			  		month = month >= 10 ? month : "0" + month;
+			  		day = day >= 10 ? day : "0" + day;
+			  		h = h >= 10 ? h : "0" + h;
+			  		mm = mm >= 10 ? mm : "0" + mm;
+			  		s = s >= 10 ? s : "0" + s;
+			  		return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
+			  	},
+		},
+		computed: {
+			getNumberAll() {
+				if (this.goodsList.length > 0) {
+					let num = 0;
+					this.goodsList.map(item => {
+						num += Number(item.num);
+					})
+
+					return num;
+				} else {
+					return 0
+				}
+
+			},
+			//计算运费
+			postPriceAll() {
+				if (this.postPrice) {
+					if (this.postPrice.totalPrice >= this.postPrice.freePostPrice) {
+						return 0
+					} else {
+						return this.postPrice.freightPrice;
+					}
+				} else {
+					return 0;
+				}
+			},
+		},
+		components: {
 			wybPopup
 		},
-		methods:{
-			
+		methods: {
+
 			// //goods货品， freight运费,integral积分,coupon优惠券
-			show(str){
+			show(str, data) {
+				
+				this.goodsList = [];
+				this.postPrice = null;
+				this.discountList = [];
+				this.totalPrice = 0;
+				
+				
 				this.keywords = str;
+				if (str == 'goods') {
+					this.goodsList = data;
+				} else if (str == 'freight') {
+					this.postPrice = data;
+					console.log(this.postPrice, "obj")
+				}else if(str == 'coupon'){
+					this.discountList =data.discountList//优惠券信息
+					this.totalPrice =data.totalPrice //商品总金额
+					
+				}
+
 				this.$refs.popup.show();
 			},
-			radioChange(e){
+			radioChange(e) {
 				this.yhqType = e.detail.value;
-				console.log(this.yhqType)
+				this.$refs.popup.close()
 			},
-			hide(){
-				console.log(this.yhqType)
+			// 关闭的时候弹射方法
+			hide() {
+				this.$emit('selectYhq',this.yhqType)
 			},
-			noUse(){
-				this.yhqType = 0 
-				this.$refs.popup.close();
-			}
+			// noUse() {
+			// 	this.yhqType = 0
+			// 	this.$refs.popup.close();
+			// }
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-.flex-row{
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-}
-.bottom-border{
-	border-bottom: 1px solid #f6f6f6;
-	&:last-of-type{
-		border-bottom: none;
+	.flex-row {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
 	}
-}
 
-.right-border{
-	border-right: 1px dotted #EEEEEE;
-	
-}
+	.bottom-border {
+		border-bottom: 1px solid #f6f6f6;
 
-.pd10{
-	padding: 10px 0;
-}
-.pd15{
-	padding: 15px 0;
-}
+		&:last-of-type {
+			border-bottom: none;
+		}
+	}
 
-.fotred{
-	color: #FF1A34;
-}
+	.right-border {
+		border-right: 1px dotted #EEEEEE;
 
-.pop-contain{
-	// text-align: center;
-	padding-top: 50px;
-	.pop-title{
-		text-align: center;
-		height: 50px;
-		line-height: 50px;
-		font-size: 18px;
-		position: fixed;
-		z-index:10;
-		top:0;
-		left: 0;
-		right: 0;
-		background-color: #ffffff;
 	}
-}
 
-// 商品
-.goods-pop{
-	display: flex;
-	align-items: center;
-	.st-img{
-		width: 82px;
-		height: 82px;
+	.pd10 {
+		padding: 10px 0;
 	}
-	.goods-flex1{
-		flex: 1;
-		padding: 0 20rpx;
-		text-align: left;
+
+	.pd15 {
+		padding: 15px 0;
 	}
-}
 
+	.fotred {
+		color: #FF1A34;
+	}
+
+	.pop-contain {
+		// text-align: center;
+		padding-top: 50px;
+
+		.pop-title {
+			text-align: center;
+			height: 50px;
+			line-height: 50px;
+			font-size: 18px;
+			position: fixed;
+			z-index: 10;
+			top: 0;
+			left: 0;
+			right: 0;
+			background-color: #ffffff;
+		}
+	}
+
+	// 商品
+	.goods-pop {
+		display: flex;
+		align-items: center;
 
-// 优惠券
-.radio-ca{
-	// width: 20rpx;
-	// height: 20rpx;
-}
+		
+
+		.goods-flex1 {
+			flex: 1;
+			padding: 0 20rpx;
+			text-align: left;
+		}
+	}
 
-</style>
\ No newline at end of file
+.st-img {
+			width: 82px;
+			height: 82px;
+		}
+	// 优惠券
+	.radio-ca {
+		// width: 20rpx;
+		// height: 20rpx;
+	}
+</style>
diff --git a/pages/settleAccounts/settleAccounts.vue b/pages/settleAccounts/settleAccounts.vue
index aaacb45..dc543e4 100644
--- a/pages/settleAccounts/settleAccounts.vue
+++ b/pages/settleAccounts/settleAccounts.vue
@@ -2,20 +2,26 @@
 	<view class="pd-main backcor9 settleAccounts">
 		<!-- 地址 -->
 		<view class="select-address backcolorfff paading10  border-8r  border-bt mart10 " @click="goAddress">
-			<view class="address-left font16">
-				<view class=" " >
-					重庆市渝中区不是的聚钓具偶家
+			<view v-if="haveAddress" class="address-left flex-1 font16">
+				<view class="text-ov ">
+					{{addressDetail.regionName+" "+addressDetail.address}}
+					<!-- 重庆市渝中区不是的聚钓具偶家 -->
 				</view>
-				<view class="color999 mart3" >
-					<text class="address-name">明明</text>
-					<text class="address-phone margle10">13563256324</text>
+				<view class="color999 mart3">
+					<text class="address-name">{{addressDetail.consignee}}</text>
+					<text class="address-phone margle10">{{addressDetail.phone}}</text>
 				</view>
 			</view>
-			<view class="icon-ymt to-right font14"></view>	
+			<view v-else class="address-left flex-1 font16">
+				<view class="color999 ">
+					请选择地址
+				</view>
+			</view>
+			<view class="icon-ymt to-right font14"></view>
 		</view>
-		
+
 		<!-- 选购的商品信息 -->
-		<view class=" backcolorfff paading10  border-8r  border-bt mart10 " >
+		<view class=" backcolorfff paading10  border-8r  border-bt mart10 ">
 			<!-- 及时达 -->
 			<!-- <view class="container-price select-address">
 				<view class="beizhu font16 ">
@@ -25,63 +31,74 @@
 					<text class="fcorred">尽快送达,预计11:58送达</text><text class="icon-ymt to-right font14"></text>
 				</view>
 			</view> -->
-			
-			
+
+
 			<!-- 当有多个商品时 -->
-			<view class="po-ra" v-if="isMoreThanOne"  @click="showPopup('goods')">
+			<view class="po-ra" v-if="isMoreThanOne" @click="showPopup('goods')">
 				<view class="po-ra">
-					<scroll-view class="settle-goods" scroll-x="true"  >
+					<scroll-view class="settle-goods" scroll-x="true">
 						<view class="settle-con">
-							<view class="settle-img" v-for="item in goodsData.images">
-								<image class="st-img" :src="item" mode="aspectFill"></image>
+							<view class="settle-img" v-for="(item,index) in goodsList" :key="index">
+								<image class="st-img" v-if="item.img" :src="imageUrl+item.img" mode="aspectFill">
+								</image>
 							</view>
-							
+
 						</view>
-						
+
 					</scroll-view>
 					<view class="fix-soon fcor666">
-						共{{goodsData.images.length}}件<text class="icon-ymt to-right font14 fcor666"></text>
+						共{{getNumberAll}}件<text class="icon-ymt to-right font14 fcor666"></text>
 					</view>
 				</view>
-				
 			</view>
-			
-			
+
+
 			<!-- 当只有一个商品时 -->
-			<view  v-if="!isMoreThanOne">
-				
+			<view v-if="!isMoreThanOne">
+
 				<view class="settle-con">
-					<view class="settle-img" >
-						<image class="st-img" :src="goodsData.images[0]" mode="aspectFill"></image>
+					<view class="settle-img">
+						<image class="st-img" v-if="goodsList[0].img" :src="imageUrl+goodsList[0].img"
+							mode="aspectFill"></image>
 					</view>
 					<view class="settle-msg">
 						<view class="settle-title marb5">
-							<text>云南高山荷兰豆160g</text>
-							<text class="font14 fcor666">共一件</text>
+							<text>{{goodsList[0].title}}</text>
+							<text class="font14 fcor666">共{{getNumberAll}}件</text>
+						</view>
+						<view v-if="yhqId == 0" class="settle-title">
+							<text>¥{{goodsList[0].price}}</text>
+							<text class="font14 fcor666">×{{goodsList[0].num}}</text>
 						</view>
-						<view class="settle-title">
-							<text>¥2.99</text>
-							<text class="font14 fcor666">×1</text>
+						<view v-else class="settle-title">
+							<text>¥{{goodsList[0].originalPrice}}</text>
+							<text class="font14 fcor666">×{{goodsList[0].num}}</text>
 						</view>
+						
 					</view>
-					
+
 				</view>
-					
-				
-			</view>	
-			
+
+
+			</view>
+
 		</view>
-		
-		
+
+
 		<!-- 金额费用 -->
-		<view class=" backcolorfff paading10  border-8r  border-bt mart10 " >
+		<view class=" backcolorfff paading10  border-8r  border-bt mart10 ">
 			<!-- 商品金额 -->
 			<view class="container-price select-address border-bt">
 				<view class="address-left ">
 					商品金额
 				</view>
-				<view class="to-right fontwig6">
-					¥22.97
+				<view class="to-right fontwig6 dis-flex">
+					<view class="" v-if="yhqId == 0">
+						¥{{priceAll}}
+					</view>
+					<view :class="'margle10'+(yhqId == 0?' text-lt fcor666 ':'  ')">
+						¥{{priceOrigin}}
+					</view>
 				</view>
 			</view>
 			<!-- 运费 -->
@@ -90,45 +107,61 @@
 					运费<text class="icon-ymt question font16 paddleft5 fcor666" @click="showPopup('freight')"></text>
 				</view>
 				<view class="to-right fontwig6">
-					¥6
+					¥{{postPriceAll}}
 				</view>
 			</view>
 			<!-- 优惠券 -->
-			<view class="container-price select-address border-bt">
-				<view class="address-left ">
-					优惠券
+			<view class="container-price select-address border-bt" @click="showPopup('coupon')">
+				<view class="address-left  ">
+					<text> 优惠券</text>
+					<view :class="' mart3 font14 '+(yhqUse>0?' fcorred ':' fcor666 ') ">
+						{{yhqUse}}张优惠券可用
+					</view>
 				</view>
-				<view @click="showPopup('coupon')" class="icon-ymt to-right font14">
-					
+				<view class="dis-flex font14">
+					<view class=" fcorred">
+						- ¥ {{yhqPrice}}
+					</view>
+					<view class="icon-ymt to-right "></view>
 				</view>
-			</view>	
+
+
+
+			</view>
 			<!-- 积分抵现 -->
-			<view class="container-price select-address border-bt">
+			<view class="container-price select-address border-bt" v-if="isShowjf">
 				<view class="address-left ">
-					<text  @click="showPopup('integral')">积分抵现
+					<text @click="showPopup('integral')">积分抵现
 						<text class="icon-ymt question font16 paddleft5 fcor666"></text>
 					</text>
-					<view class="font14 fcor666">当前积分63,满500可用</view> 
+					<!-- <view class="font14 fcor666" >当前积分{{availIntegal}}</view> -->
 				</view>
-				<view class="fontwig6 font14 fcor666">
-					暂无可用
+				<view class="dis-flex">
+					<view class=" font14 fcor666" v-if="availIntegal == 0">
+						暂无积分可用
+					</view>
+					<view class="dis-flex font12 fcor666" v-else>
+						<text class="fcorred">可用{{availIntegalUse}}积分抵扣{{parseFloat(availIntegalUse/percentage)}}元</text>
+						<radio @click="cilikRadio" :checked="isSelectJf" style="transform:scale(0.7)" color="#FF1A34" />
+					</view>
+					<!-- <view  class="icon-ymt to-right font14">
+					
+					</view> -->
 				</view>
-				<!-- <view class="icon-ymt to-right font14">	
-				</view> -->
-			</view>	
-				
+			</view>
+
 			<!-- 总结算 -->
 			<view class="container-price select-address ">
 				<view class="address-left ">
-					
+
 				</view>
 				<view class=" font14">
-					小计:<text class="fontwig6 font18 paddleft5">¥262.2</text>
+					小计:<text class="fontwig6 font18 paddleft5">¥{{priceSettle}}</text>
 				</view>
-			</view>	
+			</view>
 		</view>
 		<!-- 备注 -->
-		<view class=" backcolorfff paading10  border-8r  border-bt mart10 " >
+		<view class=" backcolorfff paading10  border-8r  border-bt mart10 ">
 			<view class="container-price select-address">
 				<view class="beizhu font16">
 					备注:
@@ -137,191 +170,725 @@
 					{{noteValue.length}}/40
 				</view>
 			</view>
-			<view class="width100" >
-				 <textarea class="border-8r backcor9 paading10 note" @blur="noteBlur" @input="noteInput" :focus="true"   :disable-default-padding="false" v-model="noteValue" maxlength="40" placeholder="请输入备注信息" ></textarea>
-				
+			<view class="width100">
+				<textarea class="border-8r backcor9 paading10 note" @blur="noteBlur" @input="noteInput" :focus="true"
+					:disable-default-padding="false" v-model="noteValue" maxlength="40"
+					placeholder="请输入备注信息"></textarea>
+
 			</view>
-				
+
 		</view>
-		
-		
+
+
 		<!-- 底部结算按钮 -->
 		<view class="tool-contain">
-			<view class="adressConfirm">
-				送至: {{'金科西城大院 5栋1714'}}
+			<view v-if="addressDetail" class="adressConfirm">
+				送至: {{addressDetail.regionName+" "+addressDetail.address}}
 			</view>
 			<view class="tool-right  backcolorfff">
 				<view class="tool-jiesuan marRight10 ">
-					合计:<text class="fcorred">¥{{100}}</text> 
+					合计:<text class="fcorred">¥{{priceSettle}}</text>
 				</view>
-				<view class="jiesuan-btn fcorfff"  @click.stop="settleAccount">
+				<view class="jiesuan-btn fcorfff" @click.stop="settleAccount">
 					去支付
 				</view>
 			</view>
 		</view>
-		
-		
-		<detailPopup ref="detailPopup"></detailPopup>
+
+
+		<detailPopup ref="detailPopup" @selectYhq="selectYhq"></detailPopup>
+		<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
 	</view>
 </template>
 
 <script>
 	import detailPopup from '@/pages/settleAccounts/detail-popup/detail-popup.vue'
+	import ssPaymentPassword from '@/components/sanshui-payment-password/index.vue'
+	import {
+		getRegionFreight,
+		getAddressPrice,
+		getUserExclusiveDiscount,
+		createOrder,
+		findUser
+	} from '@/Utils/physicalObject.js'
+	import {
+		getThirdPartyByDetail
+	} from '@/Utils/Api.js'
+	const app = getApp();
 	export default {
-		data(){
-			return{
-				noteValue:'这是备注',
-				goodsData:{
-					"images": ["https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg","https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg","https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg","https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg","https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg"],
-				},
-				isMoreThanOne:false,
+		data() {
+			return {
+				useScope: 9, //实物商品
+				imageUrl: app.globalData.imgUrl, //图片地址
+				noteValue: '这是备注',
+
+				isMoreThanOne: false, //是否超过一个商品
+				goodsList: [], //商品列表
+				haveAddress: false, //默认没有地址
+				addressDetail: null, //地址信息
+				postPrice: null, //运费信息
+
+				discountList: [], //优惠券信息
+				yhqId: 0, //优惠券id，
+				yhqPrice: 0, //优惠券抵的价格
+
+
+				jifenPrice: 0, //积分抵的价格
+				userInfo: null,
+				availIntegal: 0, //积分数量
+				availIntegalUse:0,//可使用的积分数量
+				percentage:100,//100积分兑换1块钱
+				isSelectJf: false, //是否选择积分抵扣
+				isShowjf:true,//是否显示积分
+				PaymentPassword: 0,
 			}
 		},
-		components:{
-			detailPopup
+		components: {
+			detailPopup,
+			ssPaymentPassword
 		},
-		methods:{
-			goAddress(){
+		computed: {
+			getNumberAll() {
+				if (this.goodsList.length > 0) {
+					let num = 0;
+					this.goodsList.map(item => {
+						num += Number(item.num);
+					})
+
+					return num;
+				} else {
+					return 0
+				}
+
+			},
+			//商品金额
+			priceAll() {
+
+				var str = 0;
+				for (var i = 0; i < this.goodsList.length; i++) {
+					str += this.goodsList[i].num * this.goodsList[i].price;
+				}
+				return str;
+			},
+			//商品原价金额
+			priceOrigin() {
+				var str = 0;
+				for (var i = 0; i < this.goodsList.length; i++) {
+					str += this.goodsList[i].num * this.goodsList[i].originalPrice;
+				}
+				return str;
+			},
+			//计算运费
+			postPriceAll() {
+				if (this.postPrice) {
+					if (this.priceAll >= this.postPrice.freePostPrice) {
+						return 0
+					} else {
+						return this.postPrice.freightPrice;
+					}
+				} else {
+					return 0;
+				}
+			},
+			//小计金额,不含积分
+			priceSettle() {
+				let priceAll = Number(this.priceAll); //商品金额
+				let priceOrigin = Number(this.priceOrigin); //商品原价
+				let freightPrice = Number(this.postPriceAll); //运费
+				let yhqPrice = Number(this.yhqPrice); //优惠券	
+				if (this.yhqId != 0) { //使用优惠券
+					priceAll = priceOrigin;
+				}else{
+					priceAll = priceAll;
+				}
+				// console.log("商品金额："+priceAll)
+				if (yhqPrice >= priceAll) {
+					priceAll = 0;
+				} else {
+					priceAll = priceAll - yhqPrice;
+				}
+				// console.log("商品金额-优惠券："+priceAll)
+			
+				//优惠券不能抵运费
+				priceAll = priceAll + freightPrice;
+				// console.log("商品金额-优惠券+运费："+priceAll)
+				if(priceAll == 0){
+					this.isShowjf = false;
+				}else{
+					this.isShowjf = true;
+				}
+
+				//percentage 100,100积分兑换1块钱
+				let price = parseFloat(this.availIntegal / this.percentage).toFixed(2);
+				//总积分扣得钱超出了小计金额
+				if(price >= priceAll){
+					this.availIntegalUse = priceAll*this.percentage;
+				}else {
+					//总积分扣得钱没有超过小计今额	
+					this.availIntegalUse = this.availIntegal;
+				}
+				
+				// console.log("全部积分："+this.availIntegal,"可用积分："+this.availIntegalUse)
+				
+				let jifenPrice = 0;
+				if(this.isSelectJf){
+					
+					jifenPrice = parseFloat(this.availIntegalUse / this.percentage).toFixed(2);
+				}else{
+					jifenPrice = 0;
+				}
+				
+				this.jifenPrice = jifenPrice;
+				// console.log("jifenPrice:"+jifenPrice)
+				if (jifenPrice >= priceAll) {
+					priceAll = 0;
+				} else {
+					priceAll = priceAll - jifenPrice;
+				}
+				// console.log("商品金额-优惠券+运费-积分："+priceAll)
+				return priceAll
+			},
+			
+			// 可以使用的优惠券张数
+			yhqUse() {
+				if (this.discountList.length == 0) {
+
+					return 0;
+				} else {
+					let num = 0;
+					this.discountList.map(item => {
+						if (item.discountType == 1) {
+							if (this.priceAll >= item.discountCondition) {
+								num += 1;
+							}
+						} else if (item.discountType == 2 || item.discountType == 3) { //3：折扣券，2：直抵20元
+							num += 1;
+						}
+					})
+
+					return num;
+
+
+				}
+			},	
+		},
+		
+		onLoad(options) {
+			this.goodsList = JSON.parse(options.goodsList);
+			console.log(this.goodsList,"this.goodsList")
+			if (this.goodsList.length > 1) {
+				this.isMoreThanOne = true;
+			}
+			this.getAddrPrice() //查询收货地址包邮金额和运费金额
+
+		},
+		onShow() {
+
+			this.getUserDiscount() //查询优惠券
+			this.findUser() //查询用户相关内容
+		},
+		methods: {
+			//根据区域查询包邮，运费价格
+			getRegiFreight(addressDetail) {
+				this.haveAddress = true;
+				this.addressDetail = addressDetail;
+				let params = {
+					regionId: addressDetail.regionId
+				}
+				getRegionFreight(params).then(res => {
+					if (res.return_code == '000000') {
+						this.postPrice = res.return_data
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+
+				})
+			},
+			//初始化查询地址
+			getAddrPrice() {
+				uni.showLoading({
+					title: '加载中',
+					mask: true,
+				});
+
+				getAddressPrice().then(res => {
+
+					if (res.return_code == '000000') {
+
+						if (res.return_data) {
+
+							uni.hideLoading();
+							// this.addressDetail =res.return_data.deliveryAddress; 
+							/*
+							address: "nclanfpqwnc"
+							consignee: "小明"
+							createTime: 1681788155000
+							ext1: null
+							ext2: null
+							ext3: null
+							id: 7
+							opId: null
+							opName: null
+							phone: "15983446565"
+							regionId: "110101"
+							regionName: "北京市,市辖区,东城区"
+							updateTime: 1681788174000
+							userId: 204040
+							whetherDefault: true
+							
+							*/
+							this.getRegiFreight(res.return_data.deliveryAddress)
+						}
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+
+
+				})
+			},
+			goAddress() {
 				uni.navigateTo({
-					url:"/pages/address/address"
+					url: "/pages/address/address?status=" + 1
 				})
 			},
-			
+			// 查询优惠券
+			getUserDiscount() {
+				let _this = this;
+				let params = {
+					useScope: _this.useScope
+				};
+				getUserExclusiveDiscount(params).then(res => {
+					if (res.return_code == '000000') {
+						if (res.return_data.length > 0) {
+							_this.discountList = res.return_data;
+
+							console.log(_this.discountList, "优惠券")
+						}
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
+			//优惠券弹射方法
+			selectYhq(yhq) {
+				this.yhqId = yhq;
+				if (this.yhqId == 0) {
+					this.yhqPrice = 0;
+				} else {
+					this.discountList.map(item => {
+						if (this.yhqId == item.id) {
+							// console.log(this.yhqId,item.id,)
+							if (item.discountType == 1) {
+								this.yhqPrice = item.discountPrice;
+							} else if (item.discountType == 2) { //直抵券
+								this.yhqPrice = item.discountPrice;
+							} else if (item.discountType == 3) { //折扣券
+								this.yhqPrice = this.priceOrigin * parseFloat(1 - item.discountPrice).toFixed(2);
+							}
+						}
+					})
+
+
+
+				}
+			},
+
+			cilikRadio() {
+				this.isSelectJf = !this.isSelectJf;
+			},
+
+			//查询用户相关内容
+			findUser() {
+
+				findUser().then(res => {
+					if (res.return_code == '000000') {
+						this.userInfo = res.return_data;
+						// this.availIntegal = this.userInfo.gold;	
+						if (this.userInfo.gold > 0) {
+							// 查询积分使用比例
+							this.getThirdPartyByDetail()
+						} else {
+							this.availIntegal = 0;
+						}
+
+						console.log(this.userInfo, "this.userInfo", "积分", this.availIntegal)
+
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+
+
+
+				})
+			},
+
+			//查询积分使用比例
+			//查询支付方式
+			getThirdPartyByDetail() {
+				// #ifdef H5
+				this.showType = 2;
+				// #endif
+				// #ifdef MP
+				this.showType = 1;
+				// #endif
+				let datas = {
+					platformId: this.showType,
+					"companyId": app.globalData.companyId,
+					productType: 10
+				}
+				getThirdPartyByDetail(datas).then(res => {
+					if (res.return_code == '000000') {
+						let jfPercent = parseFloat(res.return_data.integralDiscount / 100).toFixed(2);
+						//
+						// this.userInfo.gold=1000;
+						// jfPercent = 0.8;
+						//
+						this.availIntegal =Math.floor(parseFloat(this.userInfo.gold * jfPercent)) 
+				
+						console.log(this.availIntegal)
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				});
+			},
 			// 失去焦点
-			noteBlur(){
-				console.log(12)
+			noteBlur() {
+				// console.log(12)
 			},
-			noteInput(){
-				console.log(12)
+			noteInput() {
+				// console.log(12)
 			},
-			
+
+
+
+
 			//goods货品， freight运费,integral积分,coupon优惠券
-			showPopup(str){
-				
-				this.$refs.detailPopup.show(str);
+			showPopup(str) {
+				if (str == 'goods') {
+					this.$refs.detailPopup.show(str, this.goodsList);
+				} else if (str == 'freight') {
+					if (!this.postPrice) {
+						uni.showToast({
+							title: '请先选择地址',
+							duration: 1000,
+							icon: 'none'
+						});
+						return
+					}
+					let obj = JSON.parse(JSON.stringify(this.postPrice));
+					obj.totalPrice = this.priceAll
+					this.$refs.detailPopup.show(str, obj);
+				} else if (str == 'coupon') { //优惠券
+					let obj = {};
+					obj.discountList = this.discountList;
+					// obj.totalPrice = this.priceAll;
+					obj.totalPrice = this.priceOrigin;
+					this.$refs.detailPopup.show(str, obj);
+				} else if (str == 'integral') { //积分
+					this.$refs.detailPopup.show(str);
+				}
+
 			},
-			// 去支付按钮
-			settleAccount(){
+			// 去支付按钮,下单
+			settleAccount() {
+				if (!this.addressDetail) {
+					uni.showToast({
+						title: '请选择地址',
+						duration: 1000,
+						icon: 'none'
+					});
+					return
+				}
+
+				//小计金额为0时
+				if (this.priceSettle == 0) {
+					//没有设置支付密码
+					if (!this.userInfo.isSetPayPwd) {
+						uni.navigateTo({
+							url: '/pages/login/updatePas/updatePas'
+						})
+						return;
+					}
+					console.log(this.PaymentPassword,"this.PaymentPassword22222222222")
+					if (this.PaymentPassword ==  0) {
+						//确认设置的密码
+						this.$refs.paymentPassword.modalFun('show');
+
+						return;
+					}
+					
+					
+					
+				}
+				
+				this.createOrder();
+				
 				
+			},
+
+			createOrder() {
+				// 
 				// uni.navigateTo({
-				// 	url:"/pages/classify/order/pay"
+				// 	url: '/pages/classify/order/pay?obj=' + {}
 				// })
-			}
+				// return
+				// 
+				
+				
+				//处理商品信息
+				let childOrderList = [];
+				this.goodsList.map(item => {
+					let obj = {};
+					obj.goodsType = 11;
+					obj.goodsId = item.goodsId;
+					obj.skuId = item.sku;
+					obj.saleCount = item.num;
+					if (item.id) {
+						obj.shopCartId = item.id;
+					} else {
+						obj.shopCartId = ""
+					}
+					childOrderList.push(obj)
+				})
+				let _this = this;
+				
+				//处理优惠券
+				// let yhqId = 0;
+				// if (_this.yhqId == 0) {
+				// 	yhqId = null;
+				// }else{
+				// 	yhqId = _this.yhqId;
+				// }
+				let yhqId = 0;
+				_this.yhqId == 0?yhqId = null:yhqId = _this.yhqId;
+				
+				
+				//处理积分
+				// let jfNum = 0;
+				// if(_this.jifenPrice == 0){
+				// 	jfNum = 0;
+				// }else{
+				// 	jfNum = _this.availIntegalUse
+				// }
+				let jfNum = 0;
+				_this.jifenPrice == 0?(jfNum = 0):(jfNum = _this.availIntegalUse)
+				
+
+				let params = {
+					companyId: app.globalData.companyId,
+					remarks: _this.noteValue, //备注
+					memDiscountId: yhqId, //优惠券id_this.yhqId,没选优惠券时为null
+					deliveryAddressId: _this.addressDetail.id, //地址id
+					payGold:jfNum , //积分数量
+					payPwd: _this.PaymentPassword, //支付密码
+					childOrderList: childOrderList //购买的商品信息	
+				}
+
+				console.log(params, "params")
+
+				uni.showLoading({
+					title: '支付中...'
+				})
+				createOrder(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						console.log(res,"订单信息")
+						let obj = {
+							orderNo : res.return_data.orderNo,
+							createTime:res.return_data.createTime,
+							payPrice:res.return_data.payPrice
+							
+						}
+						obj = JSON.stringify(obj)
+						
+						console.log(_this.priceSettle,_this.availIntegalUse)
+						
+						if(_this.priceSettle ==0&&_this.availIntegalUse!=0){
+							uni.reLaunch({
+								url: "/pages/classify/order/paymentResult?id=" + res.return_data.orderNo
+							});
+							
+							return
+						}
+						
+						uni.navigateTo({
+							url: '/pages/classify/order/pay?obj=' + obj
+						})
+						return
+					} 
+				
+				   //支付密码错误
+					if(res.return_code == '102132'){
+						_this.PaymentPassword = 0;
+					}
+					
+					
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
+					
+				})
+			},
+			//密码支付完成
+			submitHandle(e) {
+				this.PaymentPassword = e.value;
+				console.log(e, "eeeeeee")
+				if (this.PaymentPassword == 0) {
+					uni.showToast({
+						title: '请勿手动关闭弹窗',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+				}
+				this.createOrder();
+
+			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.text-ov {
+		// text-overflow: ellipsis;
+		// white-space: nowrap;
+		// width: 100%;
+	}
+
+	// 地址
+	.select-address {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.border-bt {
+		border-bottom: 1px solid #f6f6f6;
+	}
+
+	.container-price {
+		padding: 10px;
+		font-size: 16px;
+	}
 
-// 地址
- .select-address{
-	 display: flex;
-	 justify-content: space-between;
-	 align-items: center;
- }
- 
- .border-bt{
-	 border-bottom: 1px solid #f6f6f6;
- }
- 
- .container-price{
-	 padding: 10px;
-	 font-size: 16px;
- }
- 
- // 
- .settleAccounts{
-	
-	 box-sizing: border-box;
-	 padding-bottom: 110px;
- }
- 
- //商品图片
- .po-ra{
-	 position: relative;
- }
- .settle-goods{
-	 width: auto; 
- }
- .settle-con{
- 		
- 		 display: flex;
- 		 justify-content: flex-start;
- 		 align-items: center;
- 		
- 		 .settle-img{
- 			  font-size: 0;
- 			 margin-left: 10px;
- 			 .st-img{
- 				 width: 82px;
- 				 height: 82px;
- 			 }
- 		 }
- 		 
-		 .settle-msg{
-			 flex: 1;
-			 padding: 0 10px;
-			 .settle-title{
-				 display: flex;
-				 justify-content: space-between;
-				 align-items: center;
-			 }
-		 }
- 		 
- 		 
- }
- .fix-soon{
-	 			 position: absolute;
-	 			 right: 0;
-				 top:0;
-	 			width: 82px ;
-	 			height: 82px;
-	 			line-height: 82px;
-	 			opacity: 0.8;
-	 			background-color: #ffffff;
-	 			text-align: center;
-	 }
- 
- //备注
- .note{
-	 width: auto;
- }
- 
- // 底部结算按钮
- .tool-contain{
-	 position: fixed;
-	 bottom: 0;
-	 left: 0;
-	 right: 0;
-	 z-index: 10;
- }
- 
-.tool-right{
- 	flex: 1;
- 	display: flex;
- 	justify-content: space-between;
-	padding: 10px;
- 	align-items: center;
-	
- 	.tool-jiesuan{
- 		
- 	}
- 	.jiesuan-btn{
- 		width: 200rpx;
- 		height:40px;
- 		line-height: 40px;
- 		text-align: center;
- 		border-radius: 20px;
- 		background: linear-gradient(to right,#FFCC1E,#FF8F19);
- 	}
- }
- // 底部地址确认
- .adressConfirm{
-	 height: 20px;
-	 padding: 10px;
-	 line-height: 20px;
-	 background-color:#FEFBDA;
- }
- 
- 
-</style>
\ No newline at end of file
+	// 
+	.settleAccounts {
+
+		box-sizing: border-box;
+		padding-bottom: 130px;
+	}
+
+	//商品图片
+	.po-ra {
+		position: relative;
+	}
+
+	.settle-goods {
+		width: auto;
+	}
+
+	.settle-con {
+
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+
+		.settle-img {
+			font-size: 0;
+			margin-left: 10px;
+
+			.st-img {
+				width: 82px;
+				height: 82px;
+			}
+		}
+
+		.settle-msg {
+			flex: 1;
+			padding: 0 10px;
+
+			.settle-title {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+			}
+		}
+
+
+	}
+
+	.fix-soon {
+		position: absolute;
+		right: 0;
+		top: 0;
+		width: 82px;
+		height: 82px;
+		line-height: 82px;
+		opacity: 0.8;
+		background-color: #ffffff;
+		text-align: center;
+	}
+
+	//备注
+	.note {
+		width: auto;
+	}
+
+	// 底部结算按钮
+	.tool-contain {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 10;
+	}
+
+	.tool-right {
+		flex: 1;
+		display: flex;
+		justify-content: space-between;
+		padding: 10px;
+		align-items: center;
+
+		.tool-jiesuan {}
+
+		.jiesuan-btn {
+			width: 200rpx;
+			height: 40px;
+			line-height: 40px;
+			text-align: center;
+			border-radius: 20px;
+			background: linear-gradient(to right, #FFCC1E, #FF8F19);
+		}
+	}
+
+	// 底部地址确认
+	.adressConfirm {
+		// height: 20px;
+		padding: 10px;
+		line-height: 20px;
+		background-color: #FEFBDA;
+	}
+</style>
diff --git a/pages/tabBar/classify/classify.vue b/pages/tabBar/classify/classify.vue
index 2b2e76d..2a5b4f5 100644
--- a/pages/tabBar/classify/classify.vue
+++ b/pages/tabBar/classify/classify.vue
@@ -130,6 +130,7 @@
 		},
 		onShow(){
 			
+			console.log("121212")
 				this.hackReset = false;
 				this.$nextTick(() => {
 					this.hackReset = true;
@@ -232,7 +233,7 @@
 					pageSize:_this.pageData.pageNum,
 					price:price,
 				}
-				console.log(params,"params")
+				// console.log(params,"params")
 				getListGoodsDetail(params).then(res=>{
 					if (res.return_code == '000000') {
 						if(res.return_data.list.length > 0){
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 5ac152b..d4fe546 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -103,77 +103,7 @@
 				
 				
 				<!-- start -->
-				<view class="row" v-for="(row,index) in orderList" :key="index"
-					@click="jumpDetails(row.orderNo,row.productType)">
-					<view class="width96 mart10 alijusstart">
-						<view class="width70">
-							<!-- edit -->
-							<view class="orderlabel" v-if="false">{{orderTyplist | msgFormat(row.productType)}}</view>
-							<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
-						</view>
-						<view class="width30 fotrt fcor666 font12">
-							{{typeText[row.orderStatus]}}
-						</view>
-					</view>
 				
-					<view class="width96  mart10">
-						<!-- <view class="width70 flleft fotlt ">
-							<view class="font16 fontwig6 fcor333 alijusstart">
-								<image mode="widthFix" src="../../../static/img/order2.png" v-if="row.productType == 4"
-									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-								<image mode="widthFix" src="../../../static/img/order3.png" v-if="row.productType == 3"
-									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-								<image mode="widthFix" src="../../../static/img/order4.png" v-if="row.productType == 6"
-									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-								<image mode="widthFix" src="../../../static/img/order5.png" v-if="row.productType == 5"
-									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-								<image mode="widthFix" src="../../../static/img/order6.png" v-if="row.productType == 9"
-									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-								<image mode="widthFix" src="../../../static/img/order8.png" v-if="row.productType == 7"
-									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-								<image mode="widthFix" src="../../../static/img/order7.png" v-if="row.productType == 1"
-									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-								<image mode="widthFix" src="../../../static/img/unioncard.png" v-if="row.productType == 8"
-									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-								<image mode="widthFix" src="../../../static/img/order9.png" v-if="row.productType == 2"
-									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-								<view class="width100 text1">{{row.title}}</view>
-							</view>
-						</view>
-						<view class="width30 flright fotrt fcor666 font15 fotrt">
-							<view class="font14 fcor333">
-								x1
-							</view>
-						</view> -->
-						<orderList :orderType="1"></orderList>
-					</view>
-					<view class="width96 mart10 font12 fcor999">
-						订单编号:{{row.orderNo}}
-					</view>
-					<view class="width96 height25 paddbotm10  alijusstart">
-						<view class="width60  fotlt ">
-							<view class="font12 text1 fcor999 mart5">
-								下单时间 : {{row.createTime | formatDate('-')}}
-							</view>
-						</view>
-						<view class="width40 fotrt fcor666 font15 fotrt alijusend">
-							<view class="font12 width25 fcor999">合计:</view>
-							<view class="fotlt text1 font18 fcor333 ">
-								￥{{row.payPrice}}
-							</view>
-						</view>
-					</view>
-					<view class="width96 mart10 marb5" style="border:1px dashed #f4f4f4;" v-if="(row.orderStatus==1)">
-					</view>
-					<view class="btns" v-if="(row.orderStatus==1)">
-						<block>
-							<view class="default" @click.stop="cancel(row.orderNo)">
-								取消订单
-							</view>
-							<view class="pay" @click.stop="toPayment(row)">立即支付</view>
-						</block>
-					</view>
-				</view>
 				
 				
 				<!-- end -->
@@ -349,6 +279,14 @@
 					})
 					return;
 				}
+				//实物类型
+				if(item == 12){
+					uni.navigateTo({
+						url: '/pages/classify/order/orderDetail?id='+e 
+					})
+					return;
+				}
+				
 				uni.navigateTo({
 					url: '../order_details/order_details?id=' + e
 				})
diff --git a/uni.scss b/uni.scss
index f0130cf..51d7941 100644
--- a/uni.scss
+++ b/uni.scss
@@ -962,7 +962,15 @@ $uni-font-size-paragraph:30upx;
 .border-b{
 	border-bottom: 1px solid #f6f6f6;
 }
+.border-t{
+	border-top: 1px solid #f6f6f6;
+}
 // 盒模型
 .border-box{
 	box-sizing: border-box;
 }
+
+//text
+.text-lt{
+	text-decoration: line-through;
+}
\ No newline at end of file