diff --git a/pages.json b/pages.json
index 607816b..1dbad33 100644
--- a/pages.json
+++ b/pages.json
@@ -231,6 +231,20 @@
 			"style": {
 				"navigationBarTitleText": "订单详情"
 			}
+		},
+		{
+			"path" : "pages/member/memberdetails",
+			"style" : 
+			{
+				"navigationBarTitleText" : "会员卡"
+			}
+		},
+		{
+			"path" : "pages/member/billDetails",
+			"style" : 
+			{
+				"navigationBarTitleText" : "账单明细"
+			}
 		}		
 	],
 	"globalStyle": {
diff --git a/pages/group_order/components/groupPrompt.vue b/pages/group_order/components/groupPrompt.vue
index ba5eb82..9632471 100644
--- a/pages/group_order/components/groupPrompt.vue
+++ b/pages/group_order/components/groupPrompt.vue
@@ -27,7 +27,7 @@
 			查看更多<u-icon name="arrow-down" color="#575B66" size="28"></u-icon>
 		</view>
 		<view class="More" v-else>
-			{{info.notice.usageRules}}
+			<u-parse :content="info.notice.usageRules"></u-parse>
 		</view>
 
 
diff --git a/pages/member/billDetails.vue b/pages/member/billDetails.vue
new file mode 100644
index 0000000..82e22d8
--- /dev/null
+++ b/pages/member/billDetails.vue
@@ -0,0 +1,150 @@
+<template>
+	<!-- 账单明细 -->
+	<view>
+		<view class="bild">
+			<view class="bildLeft">
+				<text>充值金额</text>
+				<view>12</view>
+			</view>
+			<view class="bildRight">
+				<text>剩余次数（次）</text>
+				<view>12</view>
+			</view>
+		</view>
+		<view class="navTop">
+			<view @click="clickEvent(1)">
+				充值
+				<view :class="[active==1?'xian':'']" style="left: 8rpx;"> </view>
+			</view>
+			<view @click="clickEvent(2)">
+				消费
+				<view :class="[active==2?'xian':'']" style="left: 8rpx;"> </view>
+			</view>
+		</view>
+		<view class="listStyle">
+			<!-- <image :src="require('')" style="width: 76rpx;height: 76rpx;float: left;" mode=""></image> -->
+			<view class="listrigth">
+				<view>尚美养储值卡</view>
+				<view>2023-04-21 10:32:44</view>
+			</view>
+			<view class="listrigth2">
+				<view>尚美养储值卡2</view>
+				<view>2023-04-21 10:32:44</view>
+			</view>
+		</view>
+		<view class="listStyle">
+			<!-- <image :src="require('./1.png')" style="width: 76rpx;height: 76rpx;float: left;" mode=""></image> -->
+			<view class="listrigth">
+				<view>尚美养储值卡</view>
+				<view>2023-04-21 10:32:44</view>
+			</view>
+			<view class="listrigth2">
+				<view>尚美养储值卡</view>
+				<view>2023-04-21 10:32:44</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				active: 1,
+				list: []
+			}
+		},
+		onLoad() {
+			this.getlist()
+		},
+		methods: {
+			getlist() {
+			
+			},
+			clickEvent(i) {
+				this.active = i
+			}
+		}
+	}
+</script>
+
+<style scoped lang="less">
+	.bild {
+		height: 488rpx;
+		background-image: url('https://czg-qr-order.oss-cn-beijing.aliyuncs.com/drder/czmxbg.png');
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+
+		.bildLeft,
+		.bildRight {
+			font-weight: 400;
+			font-size: 32rpx;
+
+			>view,
+			>text {
+				text-align: center;
+				color: rgba(255, 255, 255, 0.7);
+			}
+
+			>view {
+				margin-top: 34rpx;
+				font-weight: bold;
+			}
+		}
+	}
+
+	.navTop {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		color: #fff;
+		margin-top: -50rpx;
+		padding: 0 120rpx;
+
+		>view {
+			position: relative;
+
+			.xian {
+				width: 58rpx;
+				height: 6rpx;
+				background: #F1CB66;
+				border-radius: 2rpx 2rpx 2rpx 2rpx;
+				position: absolute;
+				bottom: -6rpx;
+			}
+		}
+
+	}
+
+	.listStyle {
+		padding: 28rpx;
+		width: 100%;
+
+		.listrigth,
+		.listrigth2 {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-left: 32rpx;
+		}
+
+		.listrigth {
+			>view {
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #333333;
+			}
+		}
+
+		.listrigth2 {
+			margin-top: 6rpx;
+
+			>view {
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #666666;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/member/index.vue b/pages/member/index.vue
index a815054..ca0f6c5 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -49,13 +49,13 @@
 			}
 		},
 		onLoad(e) {
-			console.log(e,'调试')
+			console.log(e,'调试2')
 			if (e.type == 'list') {//从列表进来的
 				this.paygetShopByMember(e.shopId_id)
 			}else{
 				this.paygetShopByMember(e.shopId_id)
 			}
-			this.paygetActive() //列表
+			this.paygetActive(e.shopId_id) //列表
 		},
 		methods: {
 			async paygetShopByMember(w) {
@@ -67,9 +67,9 @@
 				})
 				this.userInfo = res.data.list[0]
 			},
-			async paygetActive() {
+			async paygetActive(shopid) {
 				let res = await this.api.paygetActive({
-					shopId: uni.cache.get('shopUser'),
+					shopId:shopid,
 					page: 1,
 					pageSize: 10
 				})
diff --git a/pages/member/list.vue b/pages/member/list.vue
index 2756d75..e918ceb 100644
--- a/pages/member/list.vue
+++ b/pages/member/list.vue
@@ -79,7 +79,8 @@
 				}
 			},
 			eeInfo(item) {
-				uni.pro.navigateTo('member/index',{
+				console.log(item,'调试123123')
+				uni.pro.navigateTo('member/memberdetails',{
 					shopId_id:item.shopId,
 					type:'list'
 				})
diff --git a/pages/member/memberdetails.vue b/pages/member/memberdetails.vue
new file mode 100644
index 0000000..728112c
--- /dev/null
+++ b/pages/member/memberdetails.vue
@@ -0,0 +1,378 @@
+<template>
+	<!-- 会员详情 -->
+	<view class="content">
+		<view class="towcontentitem">
+			<view class="towcontentitemone flex-start">
+				<image class="towcontentitemoneimage" :src="userInfo.logo" mode="aspectFill"></image>
+				<view class="towcontentitemonetext flex-colum-start">
+					<text class="towcontentitemonetextone">{{userInfo.chainName || '暂无昵称'}}</text>
+				</view>
+			</view>
+			<view class="towcontentitemthere flex-start">
+				余额：<text class="towcontentitemtheretext">{{userInfo.amount || '0.00'}}</text>
+
+			</view>
+			<view class="towcontentitemtow flex-between">
+				<text class="towcontentitemtowetext">vip{{userInfo.code || '无'}}</text>
+			</view>
+			<view class="towcontentitevip">
+				vip{{userInfo.is_vip}}
+			</view>
+		</view>
+		<view class="memberdetailsStyle">
+			<text>会员详情</text>
+			<view @click="goUrl('member/billDetails')">
+				<text>账单明细</text>
+				<uni-icons type="right" style="color: #333;" size="20"></uni-icons>
+			</view>
+			<view @click="goUrl('member/index')">
+				<text>会员充值</text>
+				<uni-icons type="right" style="color: #333;" size="20"></uni-icons>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				info:null,
+				inputshow: 0,
+				memberlist: {},
+				listdata: [],
+				amount: '',
+				shopUser: {},
+				userInfo: {},
+				
+			}
+		},
+		onLoad(e) {
+			this.info = e
+			if (e.type == 'list') { //从列表进来的
+				this.paygetShopByMember(e.shopId_id)
+			} else {
+				this.paygetShopByMember(e.shopId_id)
+			}
+			
+			// this.paygetActive() //列表
+		},
+		onShow() {
+			this.paygetShopByMember(this.info.shopId_id)
+		},
+		methods: {
+			async paygetShopByMember(w) {
+				let res = await this.api.paygetShopByMember({
+					page: 1,
+					pageSize: 10,
+					userId: uni.cache.get('userInfo').id,
+					shopId: w
+				})
+				this.userInfo = res.data.list[0]
+			},
+			async paygetActive() {
+				let res = await this.api.paygetActive({
+					shopId: uni.cache.get('shopUser'),
+					page: 1,
+					pageSize: 10
+				})
+				try {
+					this.listdata = res.data.list
+					this.amount = res.data.list[0].minNum
+				} catch (e) {
+					//TODO handle the exception
+				}
+			},
+			async userbalancerechangesub() {
+				if (this.amount == null || this.amount == '') {
+					uni.showToast({
+						title: '金额不能为空',
+						icon: 'none'
+					});
+					return false;
+				}
+				let res = await this.api.paymemeberIn({
+					shopId: uni.cache.get('shopUser'), // 判断显示哪家的作品,
+					amount: this.amount // 判断显示哪家的作品,
+				})
+				if (res) {
+					// #ifdef MP-WEIXIN
+					uni.requestPayment({
+						provider: 'wxpay', //支付类型-固定值
+						partnerid: res.data.appId, // 微信支付商户号
+						timeStamp: res.data.timeStamp, // 时间戳（单位：秒）
+						nonceStr: res.data.nonceStr, // 随机字符串
+						package: res.data.package, // 固定值
+						signType: res.data.signType, //固定值
+						paySign: res.data.paySign, //签名
+						success: (res) => {
+							uni.showToast({
+								title: "支付成功"
+							})
+							setTimeout(res => {
+								uni.navigateBack()
+							}, 1000)
+						},
+						fail: (err) => {
+							uni.showToast({
+								icon: 'none',
+								title: '支付失败'
+							})
+							setTimeout(res => {
+								uni.hideLoading()
+							}, 1000)
+						}
+					});
+					// #endif	
+				}
+			},
+			clickinput(a, b) {
+				console.log(a, b)
+				this.inputshow = b
+				this.amount = a.minNum
+			},
+			goUrl(url){
+				uni.pro.navigateTo(url,this.info)
+			},
+			eeInfo(e) {
+				uni.pro.navigateTo('my/member/memberinfo', {
+					id: e,
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #F9F9F9;
+	}
+
+	.content {
+		padding: 0 28rpx;
+
+		.towcontentitem {
+			width: 100%;
+			position: relative;
+			padding: 32rpx;
+			border-radius: 12rpx;
+			background: linear-gradient(126deg, #FFFBF2 0%, #F2D093 100%);
+			border-radius: 12rpx 12rpx 12rpx 12rpx;
+
+			&::after {
+				position: absolute;
+				bottom: 0;
+				right: 68rpx;
+				content: '';
+				display: inline-block;
+				width: 240rpx;
+				height: 232rpx;
+				background: url(https://czg-qr-order.oss-cn-beijing.aliyuncs.com/member.png) no-repeat;
+				background-size: 100% 100%;
+			}
+
+			.towcontentitemimage {
+				top: 0;
+				left: 0;
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				border-radius: 12rpx;
+				z-index: 5;
+			}
+
+			.towcontentitemone {
+				width: 100%;
+				position: relative;
+				z-index: 9;
+
+				.towcontentitemoneimage {
+					width: 76rpx;
+					height: 76rpx;
+					border-radius: 50%;
+				}
+
+
+
+				.towcontentitemonetext {
+					height: 76rpx;
+					margin-left: 16rpx;
+
+					.towcontentitemonetextone {
+						font-family: Source Han Sans CN, Source Han Sans CN;
+						font-weight: 500;
+						font-size: 36rpx;
+						color: #333333;
+					}
+
+					.towcontentitemonetexttow {
+						font-size: 24rpx;
+						font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+						font-weight: 400;
+						color: #422A07;
+					}
+
+				}
+			}
+
+			.towcontentitemprogressa {
+				padding: 8rpx 44rpx;
+				z-index: 10;
+				position: relative;
+				margin-top: 54rpx;
+			}
+
+			.towcontentitemtow {
+				margin-top: 84rpx;
+				z-index: 10;
+				font-size: 24rpx;
+				font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+				font-weight: 400;
+				color: #422A07;
+			}
+
+			.towcontentitevip {
+				position: absolute;
+				right: 0;
+				top: 0;
+				width: 92rpx;
+				height: 40rpx;
+				font-size: 20rpx;
+				background: #F4C380;
+				border-radius: 0rpx 12rpx 0rpx 12rpx;
+				text-align: center;
+				line-height: 40rpx;
+				color: #fff;
+				font-family: Source Han Sans CN-Medium;
+				font-weight: Medium;
+
+			}
+
+			.towcontentitemthere {
+				margin-left: 92rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: Medium;
+				font-size: 24rpx;
+				color: #333333;
+
+				.towcontentitemtheretext {
+					font-family: Source Han Sans CN, Source Han Sans CN;
+					font-weight: bold;
+					font-size: 36rpx;
+					color: #333333;
+				}
+			}
+		}
+
+		.therecontent {
+			margin-top: 32rpx;
+			position: relative;
+			padding: 22rpx 32rpx;
+			width: 100%;
+			background: #FFFFFF;
+			border-radius: 8rpx;
+
+			input {
+				padding-left: 30rpx;
+				text-align: right;
+				font-size: 28rpx;
+				font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+				font-weight: 500;
+				color: #666666;
+			}
+		}
+
+		.therecontent::after {
+			position: absolute;
+			top: 50%;
+			left: 32rpx;
+			transform: translateY(-50%);
+			content: '￥';
+			display: inline-block;
+			width: 28rpx;
+			height: 40rpx;
+			font-size: 28rpx;
+			font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+			font-weight: 400;
+			color: #333333;
+		}
+
+		.fourcontent {
+			.fourcontentlnage {
+				width: 33.33%;
+
+				.fourcontentitem {
+					margin: 24rpx 10rpx;
+					padding: 16rpx 0;
+					text-align: center;
+					background: #FFFFFF;
+					border-radius: 8rpx;
+					border: 1rpx solid #333333;
+					font-size: 28rpx;
+					font-family: Roboto-Medium, Roboto;
+					font-weight: 500;
+					color: #333333;
+				}
+
+				.fourcontentitems {
+					margin: 24rpx 10rpx;
+					padding: 16rpx 0;
+					text-align: center;
+					border-radius: 8rpx;
+					background: #F1CB66;
+					border-radius: 8rpx 8rpx 8rpx 8rpx;
+					border: 2rpx solid #F1CB66;
+					font-size: 28rpx;
+					font-family: Roboto-Medium, Roboto;
+					font-weight: 500;
+					color: #FFFFFF;
+				}
+			}
+
+		}
+
+		.fivecontent {
+			position: relative;
+			bottom: 44rpx;
+			margin-top: 62rpx;
+			padding: 20rpx 0;
+			text-align: center;
+			width: 100%;
+			font-size: 36rpx;
+			font-family: PingFang SC-Bold, PingFang SC;
+			font-weight: bold;
+			color: #FFFFFF;
+			border-radius: 8rpx;
+			background: #F1CB66;
+		}
+
+		// 会员详情
+		.memberdetailsStyle {
+			margin-top: 32rpx;
+			border-radius: 24rpx 24rpx 24rpx 24rpx;
+			background-color: #fff;
+			padding: 32rpx;
+			height: 252rpx;
+			display: flex;
+			justify-content: space-between;
+			flex-direction: column;
+
+			>text {
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #333333;
+			}
+
+			>view {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #333333;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order/successful.vue b/pages/order/successful.vue
index 1409dc7..13ecc29 100644
--- a/pages/order/successful.vue
+++ b/pages/order/successful.vue
@@ -38,7 +38,7 @@
 					支付方式：
 				</view>
 				<view class="towcontentow_T">
-					微信支付
+					{{paytype==1?'微信支付':'余额支付'}}
 				</view>
 			</view>
 			<view class="towcontenthere flex-colum" v-if="orderinfo">
@@ -91,12 +91,15 @@
 				const hour = date.getHours(); // 获取小时
 				const minute = date.getMinutes(); // 获取分钟
 				const second = date.getSeconds(); // 获取秒数
-				const formattedDate = `${year}-${month}-${day} ${hour}:${minute}:${second}`; // 拼接成格式化后的日期字符串
+				const formattedDate =
+					`${year}-${month}-${day} ${hour<10? '0'+hour:hour}:${minute<10? '0'+minute:minute}:${second<10? '0'+second:second}`; // 拼接成格式化后的日期字符串
 				return formattedDate
 			}
 		},
+
 		data() {
 			return {
+				paytype: 1,
 				titlename: '支付详情',
 				orderId: "",
 				opacitys: false,
@@ -142,6 +145,8 @@
 			}
 		},
 		onLoad(e) {
+			console.log(e,'调试1')
+			this.paytype = e.radiovalue1
 			this.orderId = e.orderId
 			setTimeout(() => {
 				this.GetTop()
diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue
index c9d01b0..2acb8ec 100644
--- a/pages/order_detail/order_detail.vue
+++ b/pages/order_detail/order_detail.vue
@@ -255,7 +255,11 @@
 			})
 		},
 		methods: {
-		
+		fangdouevent() {
+			this.$u.debounce(() => {
+				this.showpopupclick()
+			}, 1000)
+		},
 			async getcoupon() {
 				let res = await this.api.userCoupon({
 					"orderNum": this.listinfo.amount,
@@ -395,7 +399,7 @@
 									uni.redirectTo({
 										url: '/pages/order/successful?orderId=' + this
 											.listinfoid + '&orderInfo=' + JSON.stringify(
-												this.orderInfo)
+												this.orderInfo) + '&payType' + this.radiovalue1
 									});
 								}, 1000)
 								// uni.redirectTo({
@@ -452,7 +456,7 @@
 								uni.redirectTo({
 									url: '/pages/order/successful?orderId=' + this
 										.listinfoid + '&orderInfo=' + JSON.stringify(
-											this.orderInfo)
+											this.orderInfo)+ '&radiovalue1=' + this.radiovalue1
 								});
 							}, 1000)
 
diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue
index 6906170..01923ef 100644
--- a/pages/product/placeOrder.vue
+++ b/pages/product/placeOrder.vue
@@ -49,7 +49,7 @@
 
 		</view>
 		<!-- 支付方式 -->
-		<view class="payType" >
+		<view class="payType">
 			<view class="">
 				支付方式
 			</view>
@@ -65,7 +65,8 @@
 							</text>
 						</view>
 					</u-radio>
-					<view style="margin: 22rpx 0;width: 100%;height: 2rpx;background-color: #E5E5E5;" v-if="info.isUseVip==1">					</view>
+					<view style="margin: 22rpx 0;width: 100%;height: 2rpx;background-color: #E5E5E5;"
+						v-if="info.isUseVip==1"> </view>
 					<u-radio activeColor="#ffd158" name="2" v-if="info.isUseVip==1">
 						<view class="dfs">
 							<image style="width:44rpx;height:44rpx"
@@ -76,7 +77,8 @@
 						</view>
 					</u-radio>
 				</u-radio-group>
-				<view style="font-weight: 400;font-size: 24rpx;color: #333333;margin-left: 60rpx;" v-if="info.isUseVip==1">
+				<view style="font-weight: 400;font-size: 24rpx;color: #333333;margin-left: 60rpx;"
+					v-if="info.isUseVip==1">
 					会员卡余额{{ amountVIP.amount}} <text
 						style="font-weight: 500;font-size: 28rpx;margin-left: 16rpx;color: #FF4C11;"
 						@click="goRecharge">去充值</text>
@@ -94,7 +96,7 @@
 			<view class="">
 				共{{Quantity}}件 已优惠￥{{calculateEvent(info.save) }}
 			</view>
-			<button class="btnStyle" @click="sumbitFroms">提交订单</button>
+			<button class="btnStyle" @click="fangdouevent">提交订单</button>
 		</view>
 		<payPassword ref="payPwd" @accountPayevent="accountPayevent" v-show="ispws"></payPassword>
 	</view>
@@ -108,8 +110,6 @@
 		},
 		onLoad(e) {
 			this.getInfo(e.id)
-			
-			
 			this.orderIds = e.id
 			this.amount = uni.cache.get('userInfo').amount
 			this.vipId = uni.cache.get('userInfo').id
@@ -136,7 +136,7 @@
 				})
 				if (res.code == 0) {
 					this.amountVIP = res.data
-					
+
 				}
 			},
 			// 余额支付
@@ -149,9 +149,9 @@
 				})
 				if (res.code == 0) {
 					let orderInfo = {
-						createdAt:this.listinfoid.createTime,
-						orderNo:this.listinfoid.orderNo,
-						orderAmount:this.calculateEvent(this.info.salePrice)
+						createdAt: this.listinfoid.createTime,
+						orderNo: this.listinfoid.orderNo,
+						orderAmount: this.calculateEvent(this.info.salePrice)
 					}
 					uni.showToast({
 						icon: 'none',
@@ -160,7 +160,7 @@
 							setTimeout(res => {
 								uni.redirectTo({
 									url: '/pages/order/successful?orderId=' + this
-										.listinfoid.id + '&orderInfo=' + JSON.stringify(orderInfo)
+										.listinfoid.id + '&orderInfo=' + JSON.stringify(orderInfo)+'&radiovalue1=' + this.radiovalue1
 								});
 							}, 1000)
 						}
@@ -173,16 +173,17 @@
 				}
 			},
 			calculateEvent(d) {
-				return (d * 1000 * this.Quantity)/1000
+				return (d * 1000 * this.Quantity) / 1000
 			},
 			goRecharge() {
 				uni.pro.navigateTo('/pages/member/index', {
 					shopId_id: this.info.shopId
 				})
 			},
-			// 防抖
-			sumbitFroms(){
-				uni.$u.throttle(this.sumbitFrom, 500)
+			fangdouevent() {
+				this.$u.debounce(() => {
+					this.sumbitFrom()
+				}, 1000)
 			},
 			async sumbitFrom() {
 				let payMoney = this.info.salePrice * this.Quantity
@@ -201,7 +202,7 @@
 						this.payEvent(res.data.id)
 					} else {
 						// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
-						let isVip =  uni.cache.get('userInfo').isPwd
+						let isVip = uni.cache.get('userInfo').isPwd
 						if (isVip == 0) {
 							uni.pro.navigateTo('/pages/user/repairpassword', {
 								shopId_id: uni.cache.get('shopUser')