Merge pull request '提交优化' (#9) from Branch_ccc into master

Reviewed-on: #9

.env

@@ -3,11 +3,19 @@ SHOPRO_VERSION = v1.8.3
 
 # 后端接口 - 正式环境（通过 process.env.NODE_ENV 非 development）
 SHOPRO_BASE_URL = https://zysc.fjptzykj.com
-#SHOPRO_BASE_URL = http://192.168.1.20:6127
+#SHOPRO_BASE_URL = http://192.168.1.12:6127
+#SHOPRO_BASE_URL = http://124.222.208.27:6127
+#SHOPRO_BASE_URL = http://192.168.1.9:6127
+#SHOPRO_BASE_URL = http://192.168.1.8:6127
+#SHOPRO_BASE_URL = http://192.168.1.7:6127
 
 # 后端接口 - 测试环境（通过 process.env.NODE_ENV = development）
 SHOPRO_DEV_BASE_URL = https://zysc.fjptzykj.com
-#SHOPRO_DEV_BASE_URL = http://192.168.1.20:6127
+#SHOPRO_DEV_BASE_URL = http://192.168.1.12:6127
+#SHOPRO_DEV_BASE_URL = http://124.222.208.27:6127
+#SHOPRO_DEV_BASE_URL = http://192.168.1.9:6127
+#SHOPRO_DEV_BASE_URL = http://192.168.1.8:6127
+#SHOPRO_DEV_BASE_URL = http://192.168.1.7:6127
 
 # 后端接口前缀（一般不建议调整）
 SHOPRO_API_PATH = /app-api

pages.json

@@ -378,6 +378,18 @@
 						"group": "用户中心"
 					}
 				},
+				{
+					"path": "user_vip/list",
+					"style": {
+						"navigationBarTitleText": "会员页面"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "会员页面",
+						"group": "用户中心"
+					}
+				},
 				{
 					"path": "goods-collect",
 					"style": {
@@ -767,6 +779,28 @@
 						"title": "兑换记录",
 						"group": "营销活动"
 					}
+				},
+				{
+					"path": "point/exchange_success",
+					"style": {
+						"navigationBarTitleText": "兑换成功"
+					},
+					"meta": {
+						"sync": true,
+						"title": "兑换成功",
+						"group": "营销活动"
+					}
+				},
+				{
+					"path": "point/exchange_detail",
+					"style": {
+						"navigationBarTitleText": "兑换详情"
+					},
+					"meta": {
+						"sync": true,
+						"title": "兑换详情",
+						"group": "营销活动"
+					}
 				}
 			]
 		}

pages/activity/point/exchange_detail.vue

@@ -0,0 +1,404 @@
+<!-- 积分商城：商品列表  -->
+<template>
+	<s-layout title="兑换详情" navbar="normal" :leftWidth="0" :rightWidth="0">
+		<view class="main">
+			<!-- 收货地址 -->
+			<view class="t-address">
+				<view class="t">
+					<text class="l">{{ state.orderInfo.receiverName }}</text>
+					<text class="r">{{ state.orderInfo.receiverMobile }}</text>
+				</view>
+				<view class="b">
+					{{ state.orderInfo.receiverAreaName }} {{ state.orderInfo.receiverDetailAddress }}
+				</view>
+				<image
+					src="https://zysc.fjptzykj.com:3000/shangcheng/0f01dda22fb349c40c4659d73cb346a1423fee44c9d53eb07bdae1a1e11b5299.png"
+					class="img"></image>
+			</view>
+
+			<view class="c-goods">
+				<view class="t">
+					共{{state.orderInfo.productCount}}件商品
+				</view>
+
+				<view class="b-detail" v-for="(item,index) in state.orderInfo.items" :key="item.goods_id">
+					<image :src="item.picUrl" class="img" mode=""></image>
+					<view class="right">
+						<view class="t">
+							<view class="ss-line-2" style="    width: 88%;">
+								{{item.spuName}}
+							</view>
+							<text class="r">x{{item.count}}</text>
+						</view>
+						<view class="c">
+							{{item.properties.map((property) => property.valueName).join(' ')}}
+						</view>
+						<view class="b">
+							10积分（待对接接口）
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="b-goodsDetail">
+				<view class="ddxx">
+					<view class="l">
+						订单编号:
+					</view>
+					<view class="r">
+						{{ state.orderInfo.no }}
+						<view class="copy-btn" @click="onCopy">
+							复制
+						</view>
+					</view>
+
+				</view>
+				<view class="ddxx">
+					<view class="l">
+						订单状态:
+					</view>
+					<view class="r">
+						{{ formatOrderStatus(state.orderInfo) }}
+					</view>
+				</view>
+				<view class="ddxx">
+					<view class="l">
+						下单时间:
+					</view>
+					<view class="r">
+						{{ sheep.$helper.timeFormat(state.orderInfo.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+					</view>
+				</view>
+				<view class="ddxx">
+					<view class="l">
+						支付积分
+					</view>
+					<view class="r">
+						10（待接口对接）
+					</view>
+				</view>
+			</view>
+		</view>
+	</s-layout>
+</template>
+<script setup>
+	import sheep from '@/sheep';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	import {
+		reactive,
+		ref
+	} from 'vue';
+	import {
+		isEmpty
+	} from 'lodash-es';
+	import {
+		fen2yuan,
+		formatOrderStatus,
+		formatOrderStatusDescription,
+		handleOrderButtons,
+	} from '@/sheep/hooks/useGoods';
+	import OrderApi from '@/sheep/api/trade/order';
+	import DeliveryApi from '@/sheep/api/trade/delivery';
+	import PickUpVerify from '@/pages/order/pickUpVerify.vue';
+
+	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+	const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
+
+	const state = reactive({
+		orderInfo: {},
+		merchantTradeNo: '', // 商户订单号
+		comeinType: '', // 进入订单详情的来源类型
+	});
+
+	// ========== 门店自提（核销） ==========
+	const systemStore = ref({}); // 门店信息
+
+	// 复制
+	const onCopy = () => {
+		sheep.$helper.copyText(state.orderInfo.no);
+	};
+
+	// 去支付
+	function onPay(payOrderId) {
+		sheep.$router.go('/pages/pay/index', {
+			id: payOrderId,
+		});
+	}
+
+	// 查看商品
+	function onGoodsDetail(id) {
+		sheep.$router.go('/pages/goods/index', {
+			id,
+		});
+	}
+
+	// 取消订单
+	async function onCancel(orderId) {
+		uni.showModal({
+			title: '提示',
+			content: '确定要取消订单吗?',
+			success: async function(res) {
+				if (!res.confirm) {
+					return;
+				}
+				const {
+					code
+				} = await OrderApi.cancelOrder(orderId);
+				if (code === 0) {
+					await getOrderDetail(orderId);
+				}
+			},
+		});
+	}
+
+	// 查看物流
+	async function onExpress(id) {
+		sheep.$router.go('/pages/order/express/log', {
+			id,
+		});
+	}
+
+	// 确认收货 TODO 芋艿：待测试
+	async function onConfirm(orderId, ignore = false) {
+		// 需开启确认收货组件
+		// todo: 芋艿：待接入微信
+		// 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
+		// 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
+		let isOpenBusinessView = true;
+		if (
+			sheep.$platform.name === 'WechatMiniProgram' &&
+			!isEmpty(state.orderInfo.wechat_extra_data) &&
+			isOpenBusinessView &&
+			!ignore
+		) {
+			mpConfirm(orderId);
+			return;
+		}
+
+		// 正常的确认收货流程
+		const {
+			code
+		} = await OrderApi.receiveOrder(orderId);
+		if (code === 0) {
+			await getOrderDetail(orderId);
+		}
+	}
+
+	// #ifdef MP-WEIXIN
+	// 小程序确认收货组件
+	function mpConfirm(orderId) {
+		if (!wx.openBusinessView) {
+			sheep.$helper.toast(`请升级微信版本`);
+			return;
+		}
+		wx.openBusinessView({
+			businessType: 'weappOrderConfirm',
+			extraData: {
+				merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
+				transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
+			},
+			success(response) {
+				console.log('success:', response);
+				if (response.errMsg === 'openBusinessView:ok') {
+					if (response.extraData.status === 'success') {
+						onConfirm(orderId, true);
+					}
+				}
+			},
+			fail(error) {
+				console.log('error:', error);
+			},
+			complete(result) {
+				console.log('result:', result);
+			},
+		});
+	}
+
+	// #endif
+
+	// 评价
+	function onComment(id) {
+		sheep.$router.go('/pages/goods/comment/add', {
+			id,
+		});
+	}
+
+	const pickUpVerifyRef = ref();
+
+	async function getOrderDetail(id) {
+		// 对详情数据进行适配
+		let res;
+		if (state.comeinType === 'wechat') {
+			// TODO 芋艿：微信场景下
+			res = await OrderApi.getOrder(id, {
+				merchant_trade_no: state.merchantTradeNo,
+			});
+		} else {
+			res = await OrderApi.getOrder(id);
+		}
+		if (res.code === 0) {
+			state.orderInfo = res.data;
+			handleOrderButtons(state.orderInfo);
+			// 配送方式：门店自提
+			if (res.data.pickUpStoreId) {
+				const {
+					data
+				} = await DeliveryApi.getDeliveryPickUpStore(res.data.pickUpStoreId);
+				systemStore.value = data || {};
+			}
+			if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
+				pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
+			}
+		} else {
+			sheep.$router.back();
+		}
+	}
+
+	onLoad(async (options) => {
+		let id = 0;
+		if (options.id) {
+			id = options.id;
+		}
+		// TODO 芋艿：下面两个变量，后续接入
+		state.comeinType = options.comein_type;
+		if (state.comeinType === 'wechat') {
+			state.merchantTradeNo = options.merchant_trade_no;
+		}
+		await getOrderDetail(id);
+	});
+</script>
+
+<style lang="scss" scope>
+	.main {
+		.t-address {
+			margin: 9px 0;
+			padding: 15px 10px;
+			background: white;
+			padding-bottom: 0;
+
+			.t {
+				font-size: 30rpx;
+				color: black;
+				display: flex;
+				font-weight: 700;
+				margin-bottom: 5px;
+
+				.l {
+					margin-right: 10px;
+				}
+			}
+
+			.b {
+				font-size: 26rpx;
+				color: rgba(156, 143, 114);
+			}
+
+			.img {
+				width: 100%;
+				height: 2px;
+			}
+		}
+
+		.c-goods {
+			margin: 9px 0;
+			padding: 15px 10px;
+			background: white;
+
+			&>.t {
+				font-size: 30rpx;
+				border-bottom: 1px solid rgba(240, 240, 240);
+				padding-bottom: 15px;
+			}
+
+			.b-detail {
+				display: flex;
+				margin-top: 15px;
+
+				.img {
+					width: 78px;
+					height: 78px;
+					margin-right: 14px;
+				}
+
+				.right {
+					flex: 1;
+
+					.t {
+						font-size: 26rpx;
+						font-weight: 500;
+						display: flex;
+						justify-content: space-between;
+
+						.r {
+							color: rgba(134, 139, 151);
+						}
+					}
+
+					.c {
+						margin: 10px 0;
+						color: rgba(134, 139, 151);
+					}
+
+					.b {
+						color: rgba(254, 94, 51);
+					}
+				}
+			}
+		}
+
+		.b-goodsDetail {
+			margin: 9px 0;
+			padding: 7px 10px;
+			background: white;
+		}
+
+		.ddxx {
+			display: flex;
+			justify-content: space-between;
+			margin: 8px 0;
+
+			.l {
+				font-size: 15px;
+
+				.r {}
+			}
+
+			.r {
+				font-size: 14px;
+				color: rgba(102, 102, 102);
+				display: flex;
+				align-items: center;
+
+				.copy-btn {
+					width: 3.125rem;
+					line-height: 1.5625rem;
+					border-radius: 0.78125rem;
+					padding: 0;
+					background: #eeeeee;
+					font-size: 0.6875rem;
+					font-weight: 400;
+					color: #333333;
+					position: relative;
+					text-align: center;
+					margin-left: 10px;
+					&:after {
+						content: ' ';
+						width: 200%;
+						height: 200%;
+						position: absolute;
+						top: 0;
+						left: 0;
+						// border: 1px solid rgba(0, 0, 0, 0.2);
+						transform: scale(0.5);
+						transform-origin: 0 0;
+						box-sizing: border-box;
+						border-radius: 10px;
+					}
+				}
+			}
+
+		}
+	}
+</style>

pages/activity/point/exchange_list.vue

@@ -0,0 +1,218 @@
+<template>
+	<s-layout title="兑换记录" color="white" :bgStyle="{ color: '#fff' }" opacityBgUi=""
+		navbarbackgroundColor="rgba(193,145,81)">
+		<view class="container">
+			<view class="card" v-for="(item, index) in reservationList" :key="index">
+				<view class="top">
+					订单时间:
+					{{
+						sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd')
+					}}
+				</view>
+				<view class="left">
+					<image :src="item.picUrl" class="img"></image>
+				</view>
+				<view class="right">
+					<view class='t ss-line-2'>{{item.name}}</view>
+					<!-- <view class='c'>共<text class="c-t">{{item.count}}</text>件商品</view>
+					<view class='b'>来自:</view> -->
+					<view class="card-bottom">
+						<view class="card-left">
+							<!-- <image
+								src="https://zysc.fjptzykj.com:3000/shangcheng/d1dd98b6a37ea9ea90c49898024d3669a54ee2a48f028b671609937b6b1250af.png"
+								class="img" mode=""></image> -->
+							<!-- <text class="card-c">×</text> -->
+							<view class="card-r">-{{item.usePoint}} 积分</view>
+						</view>
+						<view class="r-cart" @click="sheep.$router.go('/pages/activity/point/exchange_detail', { id: '1' })">查看详情</view>
+					</view>
+				</view>
+
+				<view class="r-cart r-top" :class="item.status == 40 ? 'hui' : ''">{{item.label}}</view>
+			</view>
+
+		</view>
+	</s-layout>
+</template>
+
+<script>
+	import {
+		computed
+	} from 'vue';
+	import sheep from '@/sheep';
+	import request from '@/sheep/request';
+	import {
+		baseUrl,
+		apiPath
+	} from '@/sheep/config';
+	export default {
+		data() {
+			return {
+				memberId: null,
+				reservationList: [],
+				page: 1,
+				limit: 10,
+				totalPages: 1,
+				sheep
+			};
+		},
+		created() {
+			this.memberId = computed(() => sheep.$store('user').userInfo).value.id
+			this.getList();
+		},
+		methods: {
+			getList() {
+				request({
+					// url: `${baseUrl}${apiPath}/h5/reservation/list`,
+					url: `${baseUrl}${apiPath}/trade/order/getPointOrder`,
+					method: 'GET',
+					// params: {
+					// 	userId: this.memberId,
+					// },
+					custom: {
+						showLoading: false,
+					},
+				}).then((res) => {
+					this.reservationList = res.data
+					console.log('this.reservationList', this.reservationList)
+				});
+				// uni.request({
+				// 	url: `${baseUrl}${apiPath}/h5/reservation/list`, // 接口地址
+				// 	data: {
+				// 		userId:this.memberId,
+				// 	},
+				// 	success: (res) => {
+				// 		console.log(res.data);
+				// 		this.reservationList = res.data.rows
+				// 	},
+				// 	fail: (error) => {
+				// 		console.log(error)
+				// 	}
+				// })
+			},
+		}
+	};
+</script>
+
+
+<style scoped lang="scss">
+	.container {
+		width: 100%;
+
+		.card {
+			width: 86%;
+			padding: 7px 15px;
+			background: white;
+			margin: 10px auto;
+			border-radius: 13px;
+			display: flex;
+			flex-wrap: wrap;
+			position: relative;
+			box-shadow: 3px -2px 12px 7px rgba(0, 0, 0, 0.05);
+
+			.top {
+				width: 100%;
+				padding-bottom: 6px;
+				color: rgba(127, 128, 128);
+				font-size: 11px;
+			}
+
+			.r-cart {
+				// position:absolute;
+				// top:0;
+				// right:0;
+				padding: 2px 11px;
+				border-radius: 12px;
+				height: 20px;
+				line-height:20px;
+				background: rgba(193, 145, 81);
+				color: white;
+				font-size: 11px;
+				text-align: center;
+
+				&.hui {
+					background: rgba(223, 241, 244);
+					color: rgba(75, 79, 82);
+				}
+				
+			}
+			.r-top{
+				position:absolute;
+				top:0;
+				right:0;
+				background:rgba(242, 232, 218);
+				border-radius: 0px 12px 0px 12px;
+				color:rgba(163,109,45);
+			}
+			.left {
+				width: 70px;
+				height: 70px;
+				margin-right: 10px;
+				border-radius: 12px;
+
+				.img {
+					width: 100%;
+					height: 100%;
+					border-radius: 12px;
+				}
+			}
+
+			.right {
+				flex: 1;
+				position: relative;
+
+				.t {
+					font-size: 15px;
+					font-weight: 700;
+				}
+
+				.card-bottom {
+					position: absolute;
+					bottom: 0;
+				}
+
+				.c {
+					font-size: 14px;
+					margin: 5px 0;
+
+					.c-t {
+						color: #cccc08;
+					}
+				}
+
+				.b {
+					font-size: 14px;
+					color: #dbcccc;
+				}
+			}
+		}
+
+		.card-bottom {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+
+			.card-left {
+				width: 48%;
+				display: flex;
+				align-items: center;
+
+				.img {
+					width: 20px;
+					height: 20px;
+				}
+
+				.card-r {
+					color: rgba(162, 75, 72);
+					font-size: 16px;
+					font-weight: 700;
+				}
+			}
+
+			.card-right {
+				flex: 1;
+				text-align: right;
+			}
+		}
+	}
+</style>

pages/activity/point/exchange_success.vue

@@ -0,0 +1,164 @@
+<!-- 积分商城：商品列表  -->
+<template>
+  <s-layout title="兑换成功" navbar="normal" :leftWidth="0" :rightWidth="0">
+		<view class="main">
+			<image src="https://zysc.fjptzykj.com:3000/shangcheng/4fd1540f5e7c4545140fe1278fd6db65f18a3cd86bc866b24470b888bf6664fe.png" class="img" mode=""></image>
+			<view class="title">商品兑换成功</view>
+			<view class="fgx"></view>
+			<view class="ddxx">
+				<view class="l">
+					订单编号
+				</view>
+				<view class="r">
+					wx23556151561321321351213
+				</view>
+			</view>
+			<view class="ddxx">
+				<view class="l">
+					兑换时间
+				</view>
+				<view class="r">
+					2024-10-18 15:46:03
+				</view>
+			</view>
+			<view class="ddxx">
+				<view class="l">
+					兑换方式
+				</view>
+				<view class="r">
+					积分兑换
+				</view>
+			</view>
+			<view class="ddxx">
+				<view class="l">
+					支付方式
+				</view>
+				<view class="r">
+					10
+				</view>
+			</view>
+			<view class="fgx"></view>
+			
+			<view class="ck-detail">
+				查看详情
+			</view>
+			<view class="bk-home">
+				返回首页
+			</view>
+		</view>
+  </s-layout>
+</template>
+<script setup>
+  import sheep from '@/sheep';
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+  import { reactive, ref } from 'vue';
+  import PointApi from '@/sheep/api/promotion/point';
+  import SLayout from '@/sheep/components/s-layout/s-layout.vue';
+
+  // 计算页面高度
+  const { safeAreaInsets, safeArea } = sheep.$platform.device;
+  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+  const pageHeight =
+    (safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sheep.$platform.navbar - 350;
+
+  const sPointCardRef = ref();
+  // 查询活动列表
+  const activityPageParams = reactive({
+    pageNo: 1, // 页码
+    pageSize: 5, // 每页数量
+  });
+
+  const activityTotal = ref(0); // 活动总数
+  const activityCount = ref(0); // 已加载活动数量
+  const loadStatus = ref(''); // 页面加载状态
+  async function getActivityList() {
+    loadStatus.value = 'loading';
+    const { data } = await PointApi.getPointActivityPage(activityPageParams);
+    await sPointCardRef.value.concatActivity(data.list);
+    activityCount.value = sPointCardRef.value.getActivityCount();
+    activityTotal.value = data.total;
+
+    loadStatus.value = activityCount.value < activityTotal.value ? 'more' : 'noMore';
+  }
+
+  // 加载更多
+  function loadMore() {
+    if (state.loadStatus !== 'noMore') {
+      activityPageParams.pageNo += 1;
+      getActivityList();
+    }
+  }
+
+  // 上拉加载更多
+  onReachBottom(() => {
+    loadMore();
+  });
+  onLoad(() => {
+    getActivityList();
+  });
+</script>
+
+<style lang="scss" scope>
+	.main{
+		background:white;
+		width:85%;
+		padding:15px;
+		position:fixed;
+		top:50%;
+		left:50%;
+		transform:translate(-50%, -50%);
+		border-radius:12px;
+		.img{
+			width:80px;
+			height:80px;
+			display:block;
+			margin:0 auto;
+			margin-top: -52px;
+		}
+		.title{
+			text-align: center;
+			font-size:18px;
+			margin:15px 0;
+			font-weight: 700;
+		}
+		.ddxx{
+			display: flex;
+			justify-content: space-between;
+			margin:10px 0;
+			.l{
+				font-size: 17px;
+			}
+			.r{
+				font-size: 16px;
+				color:rbga(102,102,102);
+			}
+		}
+		.fgx{
+			margin: 20px 0;
+			height: 1px;
+			width: 100%;
+			background:rgba(239,239,239);
+		}
+		.ck-detail{
+			// background: rgba(254,92,45);
+			background: rgba(207,162,92);
+			padding: 10px 0;
+			color: white;
+			font-size: 19px;
+			text-align: center;
+			width: 100%;
+			margin-bottom: 15px;
+			border-radius:31px;
+		}
+		.bk-home{
+			border:1px solid rgba(207,162,92);
+			padding: 10px 0;
+			color: rgba(207,162,92);
+			font-size: 19px;
+			text-align: center;
+			width: 100%;
+			border-radius:31px;
+		}
+		
+	}
+</style>

pages/app/sign.vue

@@ -456,7 +456,8 @@
 			.confirm-btn {
 				width: 220rpx;
 				height: 70rpx;
-				background: linear-gradient(90deg, #ff6000, #fe832a);
+				// background: linear-gradient(90deg, #ff6000, #fe832a);
+				background: linear-gradient(90deg, #ff6000, #ff6000);
 				box-shadow: 0 0.2em 0.5em rgba(#ff6000, 0.4);
 				border-radius: 35rpx;
 				font-size: 28rpx;

pages/app/signList.vue

@@ -0,0 +1,185 @@
+<template>
+	<s-layout title="预约记录" :bgStyle="{ color: '#fff' }">
+        <view class="container">
+            <view class="cards">
+                <view class="card" v-for="(item, index) in reservationList" :key="index">
+                    sss
+                </view>
+            </view>
+        </view>
+    </s-layout>
+</template>
+
+<script>
+	import request from '@/sheep/request';
+	import { computed } from 'vue';
+	import sheep from '@/sheep';
+	import {
+		baseUrl,
+		apiPath
+	} from '@/sheep/config';
+	export default {
+		data() {
+			return {
+				memberId:null,
+				reservationList: [],
+				page: 1,
+				limit: 10,
+				totalPages: 1,
+			};
+		},
+		created() {
+			this.memberId=computed(() => sheep.$store('user').userInfo).value.id
+			this.getList();
+		},
+		methods: {
+			getList() {
+				request({
+					url: `${baseUrl}${apiPath}/h5/reservation/list`,
+					method: 'GET',
+					params:{
+						userId:this.memberId,
+					},
+					custom: {
+						showLoading: false,
+					},
+				}).then((res) => {
+					this.reservationList = res.data.list
+				});
+				// uni.request({
+				// 	url: `${baseUrl}${apiPath}/h5/reservation/list`, // 接口地址
+				// 	data: {
+				// 		userId:this.memberId,
+				// 	},
+				// 	success: (res) => {
+				// 		console.log(res.data);
+				// 		this.reservationList = res.data.rows
+				// 	},
+				// 	fail: (error) => {
+				// 		console.log(error)
+				// 	}
+				// })
+			},
+		}
+	};
+</script>
+
+
+<style scoped>
+	.address-container {
+	  display: flex;
+	  align-items: center;
+	}
+	.container {
+		display: flex;
+		flex-direction: column;
+		/* align-items: center; */
+		background-color: #f5f5f5;
+		padding: 10px;
+	}
+
+	.header {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.title {
+		font-size: 24px;
+		font-weight: bold;
+		color: #333;
+	}
+
+	.cards {
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-around;
+		margin-top: 0px;
+	}
+
+	.card {
+		/* width: calc(50% - 10px); */
+		width: 100%;
+		background-color: #fff;
+		border-radius: 10px;
+		box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+		margin-bottom: 20px;
+		padding: 10px;
+	}
+
+	.card-content {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.card-contentinfo {
+		margin-top: 20px;
+		text-align: center;
+		/* display: flex;
+  justify-content: space-between; */
+	}
+
+	.card-image {
+		width: 50px;
+		height: 50px;
+		border-radius: 25px;
+	}
+
+	.technician {
+		margin-left: 20%;
+	}
+
+	.hospital,
+	.technician,
+	.type{
+		margin-left: 20px;
+		font-size: 15px;
+		color: #161616;
+		font-weight: bold;
+	}
+	.status {
+		font-size: 15px;
+		color: #666;
+	}
+	.address{
+		margin: 20px 0px 0px 20px ;
+		font-size: 15px;
+		color: #666;
+		}
+	.health-list {
+		background-color: #FFFFFF;
+		height: 100%;
+		width: 98%;
+		margin: 5PX;
+		padding-left: 15px;
+		padding-top: 10px;
+		/* padding: 10px; */
+		border-radius: 12px;
+	}
+
+	.health_title {
+		padding: 5px;
+	}
+
+	.health_title_img {
+		float: left;
+		width: 40px;
+		height: 40px;
+	}
+
+	.health-title-title {
+		float: none;
+		font-size: 18px;
+		font-weight: bold;
+		margin-top: 10px;
+		margin-left: 10px;
+	}
+
+	.time {
+		/* margin-top: 20px; */
+		font-size: 15px;
+		color: #5e5e5e;
+	}
+</style>

pages/commission/components/account-info.vue

@@ -117,7 +117,7 @@
 		border-radius: 12rpx 12rpx 0 0;
 		z-index: 3;
 		position: relative;
-		background: url('https://zysc.fjptzykj.com:3000/shangcheng/02ee19a89858e3b1cf0de82867fb06f3ae7f57511130d0167205a97b99b796c7.png') no-repeat;
+		background: url('https://zysc.fjptzykj.com:3000/shangcheng/423af1ff70d4e80ca7bd4ede17b9fe63800aaffd2e4e8b5b7584ab5bf5884996.png') no-repeat;
 		background-size: cover;
 
 		
@@ -129,7 +129,7 @@
 				padding: 0 45rpx;
 
 				.new-btn {
-					background: rgba(254, 104, 73);
+					background: rgba(178, 102, 67);
 					border-radius: 22px;
 					padding: 8px 0;
 					font-size: 16px;

pages/commission/components/commission-info.vue

@@ -18,7 +18,7 @@
 	<view class="new-ljsy">
 		<view class="l dd">
 			<view class="l-img">
-				<image src="https://zysc.fjptzykj.com:3000/shangcheng/a2aba0242cd2b7ec54518e2ec11651fba3154b5dff9bcd6323cbfa22d771a970.png" class="img"></image>
+				<image src="https://zysc.fjptzykj.com:3000/shangcheng/7624fd0e447748a5f8f4532d89a416cf7f962644e588c99d7e8c8baeab7ee91f.png" class="img"></image>
 			</view>
 			<view class="l-text">
 				<view class="l-text-t">
@@ -33,7 +33,7 @@
 		</view>
 		<view class="l r" @click="sheep.$router.go('/pages/commission/team')">
 			<view class="l-img">
-				<image src="https://zysc.fjptzykj.com:3000/shangcheng/e940fb45cc53df01980b7069432d5101e104014fbb3cd24862d08c1ffba9df68.png" class="img"></image>
+				<image src="https://zysc.fjptzykj.com:3000/shangcheng/6575e409f7656efb2821b2159ca0a26916f83f037fc533f9f19aa141c412ee2c.png" class="img"></image>
 			</view>
 			<view class="l-text">
 				<view class="l-text-t">
@@ -95,7 +95,7 @@
 		display: flex;
 		justify-content: center;
 		.l {
-			background: rgba(254,244,237,1);
+			background: rgba(254,244,237);
 			// background:url('https://zysc.fjptzykj.com/admin-api/infra/file/25/get/8e878e15d22f68e0187a953aeba31b80423b7e3fafa8e4aa9f237477ac0fd519.png') rgba(254,244,237,1);
 			width:43%;
 			height:85px;
@@ -145,8 +145,9 @@
 		width: 100%;
 		height: 580rpx;
 		// margin: -88rpx 20rpx 0 20rpx;
-		// background: url('https://zysc.fjptzykj.com:3000/shangcheng/10c7d7a9afb36266f658e5f398922b835530cb350ef98cf90d4ef6f60ccc1bc1.png') no-repeat;
+		background: url('https://zysc.fjptzykj.com:3000/shangcheng/c4f941683d41701ac7f182824791ff43b5f7e70fb527b4d4d153416d6065c44f.png') no-repeat;
-		background: url('https://zysc.fjptzykj.com:3000/shangcheng/4bcaa2803c9cc953353d22db804b952b333e97d2a0d57266a00baf0c07379efa.png') no-repeat;
+		// background: url('https://zysc.fjptzykj.com:3000/shangcheng/4bcaa2803c9cc953353d22db804b952b333e97d2a0d57266a00baf0c07379efa.png') no-repeat;
+		// background:#ff3000;
 		background-size: 100% 100%;
 		display: flex;
 		flex-wrap: wrap;

pages/commission/promoter.vue

@@ -168,7 +168,6 @@
 
 <style lang="scss" scoped>
   .PromoterRank .redBg {
-    padding: 45rpx 0 30rpx 0;
   }
 
   .PromoterRank .header {
@@ -177,6 +176,7 @@
     width: 100%;
     height: 460rpx;
     background-size: 100% 100%;
+	padding-top:27px;
   }
 
   .PromoterRank .header .nav {
@@ -187,6 +187,7 @@
     font-size: 30rpx;
     color: #fff;
     margin: 0 auto;
+	
   }
 
   .PromoterRank .header .nav .item {

pages/commission/team.vue

@@ -1,11 +1,9 @@
 <!-- 页面 TODO 芋艿：该页面的实现代码需要优化，包括 js 和 css，以及相关的样式设计 -->
 <template>
-  <s-layout title="我的团队" :class="state.scrollTop ? 'team-wrap' : ''" navbar="inner">
+	<s-layout title="我的团队" :class="state.scrollTop ? 'team-wrap' : ''" navbar="inner" navbarbackgroundColor="rgba(255,48,0)">
 		<view class="promoter-list">
-      <view
+			<view class="promoterHeader bg-color"
-        class="promoterHeader bg-color"
+				style="backgroundcolor: #e93323 !important; height: 218rpx; color: #fff">
-        style="backgroundcolor: #e93323 !important; height: 218rpx; color: #fff"
-      >
 				<view class="headerCon acea-row row-between" style="padding: 28px 29px 0 29px">
 					<view>
 						<view class="name" style="color: #fff">推广人数</view>
@@ -22,7 +20,7 @@
 					<view class="iconfont icon-tuandui" />
 				</view>
 			</view>
-      <view style="padding: 0 30rpx">
+			<view style="background:#f6f6f6;">
 				<view class="nav acea-row row-around l1">
 					<view :class="state.level == 1 ? 'item on' : 'item'" @click="setType(1)">
 						一级({{ state.summary.firstBrokerageUserCount || 0 }})
@@ -31,42 +29,24 @@
 						二级({{ state.summary.secondBrokerageUserCount || 0 }})
 					</view>
 				</view>
-        <view
+				<view class="search acea-row row-between-wrapper"
-          class="search acea-row row-between-wrapper"
+					style="display: flex; height: 100rpx; align-items: center">
-          style="display: flex; height: 100rpx; align-items: center"
-        >
 					<view class="input">
-            <input
+						<input placeholder="点击搜索会员名称" v-model="state.nickname" confirm-type="search" name="search"
-              placeholder="点击搜索会员名称"
+							@confirm="submitForm" />
-              v-model="state.nickname"
-              confirm-type="search"
-              name="search"
-              @confirm="submitForm"
-            />
 					</view>
-          <image
+					<image src="/static/images/search.png" mode="" style="width: 60rpx; height: 64rpx"
-            src="/static/images/search.png"
+						@click="submitForm" />
-            mode=""
-            style="width: 60rpx; height: 64rpx"
-            @click="submitForm"
-          />
 				</view>
 				<view class="list">
 					<view class="sortNav acea-row row-middle" style="display: flex; align-items: center">
-            <view
+						<view class="sortItem" @click="setSort('userCount', 'asc')" v-if="sort === 'userCountDESC'">
-              class="sortItem"
-              @click="setSort('userCount', 'asc')"
-              v-if="sort === 'userCountDESC'"
-            >
 							团队排序
 							<!-- TODO 芋艿：看看怎么从项目里拿出去 -->
 							<image src="/static/images/sort1.png" />
 						</view>
-            <view
+						<view class="sortItem" @click="setSort('userCount', 'desc')"
-              class="sortItem"
+							v-else-if="sort === 'userCountASC'">
-              @click="setSort('userCount', 'desc')"
-              v-else-if="sort === 'userCountASC'"
-            >
 							团队排序
 							<image src="/static/images/sort3.png" />
 						</view>
@@ -78,11 +58,7 @@
 							金额排序
 							<image src="/static/images/sort1.png" />
 						</view>
-            <view
+						<view class="sortItem" @click="setSort('price', 'desc')" v-else-if="sort === 'priceASC'">
-              class="sortItem"
-              @click="setSort('price', 'desc')"
-              v-else-if="sort === 'priceASC'"
-            >
 							金额排序
 							<image src="/static/images/sort3.png" />
 						</view>
@@ -90,19 +66,12 @@
 							金额排序
 							<image src="/static/images/sort2.png" />
 						</view>
-            <view
+						<view class="sortItem" @click="setSort('orderCount', 'asc')" v-if="sort === 'orderCountDESC'">
-              class="sortItem"
-              @click="setSort('orderCount', 'asc')"
-              v-if="sort === 'orderCountDESC'"
-            >
 							订单排序
 							<image src="/static/images/sort1.png" />
 						</view>
-            <view
+						<view class="sortItem" @click="setSort('orderCount', 'desc')"
-              class="sortItem"
+							v-else-if="sort === 'orderCountASC'">
-              @click="setSort('orderCount', 'desc')"
-              v-else-if="sort === 'orderCountASC'"
-            >
 							订单排序
 							<image src="/static/images/sort3.png" />
 						</view>
@@ -113,10 +82,8 @@
 					</view>
 					<block v-for="(item, index) in state.pagination.list" :key="index">
 						<view class="item acea-row row-between-wrapper" style="display: flex">
-              <view
+							<view class="picTxt acea-row row-between-wrapper"
-                class="picTxt acea-row row-between-wrapper"
+								style="display: flex; align-items: center">
-                style="display: flex; align-items: center"
-              >
 								<view class="pictrue">
 									<image :src="item.avatar" />
 								</view>
@@ -128,31 +95,26 @@
 									</view>
 								</view>
 							</view>
-              <view
+							<view class="right" style="
-                class="right"
-                style="
                   justify-content: center;
                   flex-direction: column;
                   display: flex;
                   margin-left: auto;
-                "
+                ">
-              >
 								<view>
 									<text class="num font-color">{{ item.brokerageUserCount || 0 }} </text>人
 								</view>
 								<view>
-                  <text class="num">{{ item.orderCount || 0 }}</text
+									<text class="num">{{ item.orderCount || 0 }}</text>单
-                  >单</view
+								</view>
-                >
 								<view>
-                  <text class="num">{{ item.brokeragePrice || 0 }}</text
+									<text class="num">{{ item.brokeragePrice || 0 }}</text>元
-                  >元
 								</view>
 							</view>
 						</view>
 					</block>
 					<block v-if="state.pagination.list.length === 0">
-            <view style="text-align: center">暂无推广人数</view>
+						<view style="text-align: center;margin-top:20px;">暂无推广人数</view>
 					</block>
 				</view>
 			</view>
@@ -233,10 +195,19 @@
 
 <script setup>
 	import sheep from '@/sheep';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+	import {
-  import { computed, reactive, ref } from 'vue';
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive,
+		ref
+	} from 'vue';
 	import _ from 'lodash';
-  import { onPageScroll } from '@dcloudio/uni-app';
+	import {
+		onPageScroll
+	} from '@dcloudio/uni-app';
 	import BrokerageApi from '@/sheep/api/trade/brokerage';
 
 	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
@@ -279,7 +250,10 @@
 
 	async function getTeamList() {
 		state.loadStatus = 'loading';
-    let { code, data } = await BrokerageApi.getBrokerageUserChildSummaryPage({
+		let {
+			code,
+			data
+		} = await BrokerageApi.getBrokerageUserChildSummaryPage({
 			pageNo: state.pagination.pageNo,
 			pageSize: state.pagination.pageSize,
 			level: state.level,
@@ -312,7 +286,9 @@
 	onLoad(async () => {
 		await getTeamList();
 		// 概要数据
-    let { data } = await BrokerageApi.getBrokerageUserSummary();
+		let {
+			data
+		} = await BrokerageApi.getBrokerageUserSummary();
 		state.summary = data;
 	});
 
@@ -440,7 +416,11 @@
 			border-radius: 50%;
 		}
 	}
-
+	.promoter-list{
+		background:rgba(255,48,0);
+		margin-top:-3rem;
+		padding-top:30px;
+	}
 	.promoter-list .nav {
 		background-color: #fff;
 		height: 86rpx;

pages/coupon/list.vue

@@ -17,9 +17,10 @@
     <!-- 情况一：领劵中心 -->
     <template v-if="state.currentTab === 0">
       <view v-for="item in state.pagination.list" :key="item.id">
+		  <!-- @tap="sheep.$router.go('/pages/coupon/detail', { id: item.id })" -->
         <s-coupon-list
           :data="item"
-          @tap="sheep.$router.go('/pages/coupon/detail', { id: item.id })"
+          
         >
           <template #default>
             <button
@@ -37,17 +38,17 @@
     <!-- 情况二：我的优惠劵 -->
     <template v-else>
       <view v-for="item in state.pagination.list" :key="item.id">
+		  <!--           @tap="sheep.$router.go('/pages/coupon/detail', { couponId: item.id })" -->
         <s-coupon-list
           :data="item"
           type="user"
-          @tap="sheep.$router.go('/pages/coupon/detail', { couponId: item.id })"
         >
           <template #default>
             <button
               class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center"
               :class="item.status !== 1 ? 'disabled-btn' : ''"
               :disabled="item.status !== 1"
-              @click.stop="sheep.$router.go('/pages/coupon/detail', { couponId: item.id })"
+              @click.stop="sheep.$router.go('/pages/goods/list')"
             >
               {{ item.status === 1 ? '立即使用' : item.status === 2 ? '已使用' : '已过期' }}
             </button>

pages/goods/point.vue

@@ -32,7 +32,7 @@
           <view class="ss-flex ss-row-between ss-col-center ss-m-b-18">
             <view class="price-box ss-flex ss-col-bottom">
               <image
-                :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
+                :src="sheep.$url.static('https://zysc.fjptzykj.com:3000/shangcheng/b0c400b1b30a9ca45031093595e42533de267823285c702fed250061920debf0.png')"
                 class="point-img"
               ></image>
               <text class="point-text ss-m-r-16">
@@ -166,6 +166,7 @@
             count: sku.count,
           },
         ],
+		point: true,
       }),
     });
   }
@@ -291,6 +292,7 @@
         width: 36rpx;
         height: 36rpx;
         margin: 0 4rpx;
+		margin-right: 10px;
       }
 
       .point-text {

pages/goods/seckill.vue

@@ -605,9 +605,10 @@
 
 		// height: 41px;
 		padding-bottom: 4px;
+		padding-top: 10px;
 
 		.title-text {
-			padding: 14px 13px;
+			padding: 0 13px;
 		}
 	}
 

pages/index/index.vue

@@ -12,7 +12,7 @@
       onShareAppMessage
 	   @search="(e) => { console.log(e,'eeeeeeeeeeee') }"
 	   headerBtns='headerBtns'
-	   navbarbackgroundColor="rgba(248,83,42)"
+	   backgroundColor="rgba(248,83,42)"
 	   opacityBgUi='ll'
 	   :navBg="true"
     >

pages/order/confirm.vue

@@ -5,26 +5,14 @@
 
 		<!-- 商品信息 -->
 		<view class="order-card-box ss-m-b-14">
-      <s-goods-item
+			<s-goods-item v-for="item in state.orderInfo.items" :key="item.skuId" :img="item.picUrl"
-        v-for="item in state.orderInfo.items"
+				:title="item.spuName" :skuText="item.properties.map((property) => property.valueName).join(' ')"
-        :key="item.skuId"
+				:price="item.price" :num="item.count" marginBottom="10" />
-        :img="item.picUrl"
-        :title="item.spuName"
-        :skuText="item.properties.map((property) => property.valueName).join(' ')"
-        :price="item.price"
-        :num="item.count"
-        marginBottom="10"
-      />
 			<view class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
 				<view class="item-title">订单备注</view>
 				<view class="ss-flex ss-col-center">
-          <uni-easyinput
+					<uni-easyinput maxlength="20" placeholder="建议留言前先与商家沟通" v-model="state.orderPayload.remark"
-            maxlength="20"
+						:inputBorder="false" :clearable="false" />
-            placeholder="建议留言前先与商家沟通"
-            v-model="state.orderPayload.remark"
-            :inputBorder="false"
-            :clearable="false"
-          />
 				</view>
 			</view>
 		</view>
@@ -40,32 +28,25 @@
 						</text>
 					</view>
 				</view>
-        <view
+				<view v-if="state.orderPayload.pointActivityId" class="order-item ss-flex ss-col-center ss-row-between">
-          v-if="state.orderPayload.pointActivityId"
-          class="order-item ss-flex ss-col-center ss-row-between"
-        >
 					<view class="item-title">兑换积分</view>
 					<view class="ss-flex ss-col-center">
 						<image
 							src="https://zysc.fjptzykj.com:3000/shangcheng/b0c400b1b30a9ca45031093595e42533de267823285c702fed250061920debf0.png"
-              class="score-img"
+							class="score-img" />
-            />
 						<text class="item-value ss-m-r-24">
 							{{ state.orderInfo.usePoint }}
 						</text>
 					</view>
 				</view>
-        <view
+				<view class="order-item ss-flex ss-col-center ss-row-between"
-          class="order-item ss-flex ss-col-center ss-row-between"
+					v-if="state.orderInfo.type === 0 || state.orderPayload.pointActivityId">
-          v-if="state.orderInfo.type === 0 || state.orderPayload.pointActivityId"
-        >
 					<view class="item-title">积分抵扣</view>
 					<view class="ss-flex ss-col-center">
 						{{ state.pointStatus || state.orderPayload.pointActivityId ? '剩余积分' : '当前积分' }}
 						<image
 							src="https://zysc.fjptzykj.com:3000/shangcheng/b0c400b1b30a9ca45031093595e42533de267823285c702fed250061920debf0.png"
-              class="score-img"
+							class="score-img" />
-            />
 						<text class="item-value ss-m-r-24">
 							{{
                 state.pointStatus || state.orderPayload.pointActivityId
@@ -74,18 +55,13 @@
               }}
 						</text>
 						<checkbox-group @change="changeIntegral" v-if="!state.orderPayload.pointActivityId">
-              <checkbox
+							<checkbox :checked="state.pointStatus"
-                :checked="state.pointStatus"
+								:disabled="!state.orderInfo.totalPoint || state.orderInfo.totalPoint <= 0" />
-                :disabled="!state.orderInfo.totalPoint || state.orderInfo.totalPoint <= 0"
-              />
 						</checkbox-group>
 					</view>
 				</view>
 				<!-- 快递配置时，信息的展示 -->
-        <view
+				<view class="order-item ss-flex ss-col-center ss-row-between" v-if="addressState.deliveryType === 1">
-          class="order-item ss-flex ss-col-center ss-row-between"
-          v-if="addressState.deliveryType === 1"
-        >
 					<view class="item-title">运费</view>
 					<view class="ss-flex ss-col-center">
 						<text class="item-value ss-m-r-24" v-if="state.orderInfo.price.deliveryPrice > 0">
@@ -95,55 +71,32 @@
 					</view>
 				</view>
 				<!-- 门店自提时，需要填写姓名和手机号 -->
-        <view
+				<view class="order-item ss-flex ss-col-center ss-row-between" v-if="addressState.deliveryType === 2">
-          class="order-item ss-flex ss-col-center ss-row-between"
-          v-if="addressState.deliveryType === 2"
-        >
 					<view class="item-title">联系人</view>
 					<view class="ss-flex ss-col-center">
-            <uni-easyinput
+						<uni-easyinput maxlength="20" placeholder="请填写您的联系姓名" v-model="addressState.receiverName"
-              maxlength="20"
+							:inputBorder="false" :clearable="false" />
-              placeholder="请填写您的联系姓名"
-              v-model="addressState.receiverName"
-              :inputBorder="false"
-              :clearable="false"
-            />
 					</view>
 				</view>
-        <view
+				<view class="order-item ss-flex ss-col-center ss-row-between" v-if="addressState.deliveryType === 2">
-          class="order-item ss-flex ss-col-center ss-row-between"
-          v-if="addressState.deliveryType === 2"
-        >
 					<view class="item-title">联系电话</view>
 					<view class="ss-flex ss-col-center">
-            <uni-easyinput
+						<uni-easyinput maxlength="20" placeholder="请填写您的联系电话" v-model="addressState.receiverMobile"
-              maxlength="20"
+							:inputBorder="false" :clearable="false" />
-              placeholder="请填写您的联系电话"
-              v-model="addressState.receiverMobile"
-              :inputBorder="false"
-              :clearable="false"
-            />
 					</view>
 				</view>
 				<!-- 优惠劵：只有 type = 0 普通订单（非拼团、秒杀、砍价），才可以使用优惠劵 -->
-        <view
+				<view class="order-item ss-flex ss-col-center ss-row-between" v-if="state.orderInfo.type === 0">
-          class="order-item ss-flex ss-col-center ss-row-between"
-          v-if="state.orderInfo.type === 0"
-        >
 					<view class="item-title">优惠券</view>
 					<view class="ss-flex ss-col-center" @tap="state.showCoupon = true">
 						<text class="item-value text-red" v-if="state.orderPayload.couponId > 0">
 							-￥{{ fen2yuan(state.orderInfo.price.couponPrice) }}
 						</text>
-            <text
+						<text class="item-value" :class="
-              class="item-value"
-              :class="
                 state.couponInfo.filter((coupon) => coupon.match).length > 0
                   ? 'text-red'
                   : 'text-disabled'
-              "
+              " v-else>
-              v-else
-            >
 							{{
                 state.couponInfo.filter((coupon) => coupon.match).length > 0
                   ? state.couponInfo.filter((coupon) => coupon.match).length + ' 张可用'
@@ -153,10 +106,8 @@
 						<text class="_icon-forward item-icon" />
 					</view>
 				</view>
-        <view
+				<view class="order-item ss-flex ss-col-center ss-row-between"
-          class="order-item ss-flex ss-col-center ss-row-between"
+					v-if="state.orderInfo.price.discountPrice > 0">
-          v-if="state.orderInfo.price.discountPrice > 0"
-        >
 					<view class="item-title">活动优惠</view>
 					<view class="ss-flex ss-col-center" @tap="state.showDiscount = true">
 						<text class="item-value text-red">
@@ -165,10 +116,7 @@
 						<text class="_icon-forward item-icon" />
 					</view>
 				</view>
-        <view
+				<view class="order-item ss-flex ss-col-center ss-row-between" v-if="state.orderInfo.price.vipPrice > 0">
-          class="order-item ss-flex ss-col-center ss-row-between"
-          v-if="state.orderInfo.price.vipPrice > 0"
-        >
 					<view class="item-title">会员优惠</view>
 					<view class="ss-flex ss-col-center">
 						<text class="item-value text-red">
@@ -187,19 +135,11 @@
 		</view>
 
 		<!-- 选择优惠券弹框 -->
-    <s-coupon-select
+		<s-coupon-select v-model="state.couponInfo" :show="state.showCoupon" @confirm="onSelectCoupon"
-      v-model="state.couponInfo"
+			@close="state.showCoupon = false" />
-      :show="state.showCoupon"
-      @confirm="onSelectCoupon"
-      @close="state.showCoupon = false"
-    />
 
 		<!-- 满额折扣弹框 TODO @puhui999：【折扣】后续要把优惠信息打进去 -->
-    <s-discount-list
+		<s-discount-list v-model="state.orderInfo" :show="state.showDiscount" @close="state.showDiscount = false" />
-      v-model="state.orderInfo"
-      :show="state.showDiscount"
-      @close="state.showDiscount = false"
-    />
 
 		<!-- 底部 -->
 		<su-fixed bottom :opacity="false" bg="bg-white" placeholder :noFixed="false" :index="200">
@@ -209,10 +149,7 @@
 						￥{{ fen2yuan(state.orderInfo.price.payPrice) }}
 					</view>
 				</view>
-        <button
+				<button class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main" @tap="onConfirm">
-          class="ss-reset-button ui-BG-Main-Gradient ss-r-40 submit-btn ui-Shadow-Main"
-          @tap="onConfirm"
-        >
 					提交订单
 				</button>
 			</view>
@@ -221,13 +158,21 @@
 </template>
 
 <script setup>
-  import { reactive, ref, watch } from 'vue';
+	import {
-  import { onLoad } from '@dcloudio/uni-app';
+		reactive,
+		ref,
+		watch
+	} from 'vue';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
 	import AddressSelection from '@/pages/order/addressSelection.vue';
 	import sheep from '@/sheep';
 	import OrderApi from '@/sheep/api/trade/order';
 	import TradeConfigApi from '@/sheep/api/trade/config';
-  import { fen2yuan } from '@/sheep/hooks/useGoods';
+	import {
+		fen2yuan
+	} from '@/sheep/hooks/useGoods';
 
 	const state = reactive({
 		orderPayload: {},
@@ -296,7 +241,10 @@
 
 	// 创建订单&跳转
 	async function submitOrder() {
-    const { code, data } = await OrderApi.createOrder({
+		const {
+			code,
+			data
+		} = await OrderApi.createOrder({
 			items: state.orderPayload.items,
 			couponId: state.orderPayload.couponId,
 			remark: state.orderPayload.remark,
@@ -324,10 +272,14 @@
 			sheep.$router.redirect('/pages/pay/index', {
 				id: data.payOrderId,
 			});
-    } else {
+		} else if(!state.orderPayload.point) {
 			sheep.$router.redirect('/pages/order/detail', {
 				id: data.id,
 			});
+		}else{
+			sheep.$router.redirect('/pages/activity/point/exchange_detail', {
+				id: data.id,
+			});
 		}
 	}
 
@@ -335,7 +287,8 @@
 	async function getOrderInfo() {
 		// 计算价格
 		let parm = {};
-	if(addressState.value.deliveryType == 4){
+		console.log(state.orderPayload.pointActivityId, 'state.orderPayload.pointActivityId')
+		if (state.orderPayload.pointActivityId) {
 			parm = {
 				items: state.orderPayload.items,
 				couponId: state.orderPayload.couponId,
@@ -350,7 +303,7 @@
 				seckillActivityId: state.orderPayload.seckillActivityId,
 				pointActivityId: state.orderPayload.pointActivityId,
 			}
-	}else{
+		} else {
 			parm = {
 				items: state.orderPayload.items,
 				couponId: state.orderPayload.couponId,
@@ -367,7 +320,10 @@
 		}
 
 
-    const { data, code } = await OrderApi.settlementOrder(parm);
+		const {
+			data,
+			code
+		} = await OrderApi.settlementOrder(parm);
 		if (code !== 0) {
 			return;
 		}
@@ -387,7 +343,10 @@
 		state.orderPayload = JSON.parse(options.data);
 		await getOrderInfo();
 		// 获取交易配置
-    const { data, code } = await TradeConfigApi.getTradeConfig();
+		const {
+			data,
+			code
+		} = await TradeConfigApi.getTradeConfig();
 		if (code === 0) {
 			addressState.value.isPickUp = data.deliveryPickUpEnabled;
 		}

pages/reservation_record/reservation_record.vue

@@ -5,28 +5,29 @@
 				<view class="card" v-for="(item, index) in reservationList" :key="index">
 					<view class="card-content">
 						<text class="type">预约信息</text>
-						<text class="time">订单日期：{{ sheep.$helper.timeFormat(item.reAddTime, 'yyyy-mm-dd hh:MM:ss') }}</text>
+						<text class="time">订单日期：{{ sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd') }}</text>
 					</view>
-					<view style="height: 1px; background-color: #e8e8e8;margin:7px 0px 7px 0px"></view>
 					<view>
-						<text class="address">医生：{{ item.technicianName }}</text><br><br>
+						<text class="address">预约姓名：<text class="title">{{ item.technicianName }}</text></text>
-						<text class="address">医馆：{{ item.brandName }}</text><br><br>
+						<text class="address">预约电话：<text class="title">{{ item.memberphone }}</text></text>
-						<text class="address">医馆电话：{{ item.brandphone }}</text><br><br>
+						<text class="address">预约时间：<text
+								class="title">{{ sheep.$helper.timeFormat(item.reAddTime, 'yyyy-mm-dd') }}</text></text>
+						<text class="address">门店名称：<text class="title">{{ item.brandName }}</text> </text>
 						<div class="address-container">
-							<text class="address">医馆地址：{{ item.brandaddress }}</text><br><br>
+							<text class="address">门店地址：<text class="title">{{ item.brandaddress }}</text></text>
 						</div>
-						<text class="address">备注：{{ item.remark }}</text><br><br>
+						<text class="address">备注留言：<text class="title">{{ item.remark }}</text></text>
 					</view>
 					<view>
 						<text class="status"
-							style="float: right; border-radius: 10px; background-color: orangered; padding: 5px 10px; color: white;"
+							style="float: right; border-radius: 10px; background-color: rgba(0,149,243); padding: 5px 10px; color: white;"
 							v-if=" item.reStatus===0">待审核</text>
 						<text class="status"
 							style="float: right; border-radius: 10px; background-color: orangered; padding: 5px 10px; color: white;"
 							v-if=" item.reStatus===1">预约成功</text>
 						<text class="status"
 							style="float: right; border-radius: 10px; background-color: orangered; padding: 5px 10px; color: white;"
-							v-if=" item.reStatus===2">已完结</text><br><br>
+							v-if=" item.reStatus===2">已完结</text>
 					</view>
 				</view>
 			</view>
@@ -88,6 +89,7 @@
 				limit,
 				totalPages,
 				getList,
+				sheep
 			};
 		},
 	};
@@ -142,10 +144,12 @@
 	.card-content {
 		display: flex;
 		justify-content: space-between;
+		margin-bottom: 20px;
 
 		.type {
 			position: relative;
 			padding-left: 20px;
+			font-size: 16px;
 
 			&::before {
 				content: '';
@@ -154,17 +158,18 @@
 				left: 0;
 				width: 10px;
 				height: 100%;
-				background: url('https://zysc.fjptzykj.com:3000/shangcheng/7b5c7b96c46b782e8928ed9e53d19563823408b481b03ec75954d8266ec55f6b.png') no-repeat;
+				background: url('https://zysc.fjptzykj.com:3000/shangcheng/617bb18286a76a4c8bfc377bf69f7436c478252e419f04cdd9a6070dd352d00f.png') no-repeat;
 				background-size: 60%;
 			}
 		}
+		.time{
+			font-size: 15px;
+		}
 	}
 
 	.card-contentinfo {
 		margin-top: 20px;
 		text-align: center;
-		/* display: flex;
-  justify-content: space-between; */
 	}
 
 	.card-image {
@@ -192,9 +197,15 @@
 	}
 
 	.address {
-		margin: 20px 0px 0px 20px;
+		display: block;
+		margin-bottom: 10px;
 		font-size: 15px;
-		color: #666;
+		color: rgba(174, 174, 174);
+
+		.title {
+			font-size: 15px;
+			font-weight: 300;
+		}
 	}
 
 	.health-list {
@@ -228,7 +239,7 @@
 
 	.time {
 		/* margin-top: 20px; */
-		font-size: 15px;
+		font-size: 12px;
-		color: #5e5e5e;
+		color: #aeaeae;
 	}
 </style>

pages/user/user_vip/list.vue

@@ -0,0 +1,378 @@
+<!-- 会员信息 -->
+<template>
+	<s-layout navbar="inner" title="SVIP会员专享" :statusBar="true" :bgStyle="{ color: '#FE832A', backgroundColor:'white' }" navbarbackgroundColor="rgba(57,55,54)">
+		<view class='vip-main'>
+			<view class="vip-top">
+				<image
+					src="https://zysc.fjptzykj.com:3000/shangcheng/07cee74ec47ed41b33e277dffe9291a6cab8423d8f8539c34662a793842e6d27.png"
+					class="img"></image>
+				<view class="userInfo">
+					<view class="l">
+
+						<image :src="sheep.$url.cdn(userInfo.avatar)" mode="aspectFill" class="img"></image>
+						<view class="text">
+							<view class="t">{{ userInfo.nickname }}
+								<image src="" class="img"></image>
+							</view>
+							<view class="c">您与众悦e家商场的第101天</view>
+							<view class="b">开通即享会员权益</view>
+						</view>
+					</view>
+					<view class="r">
+						开通会员
+					</view>
+				</view>
+
+			</view>
+			<view class="vip-zxq">
+				<image
+					src="https://zysc.fjptzykj.com:3000/shangcheng/d865a7766bf5ccbfb76e97f3fd65bcfdc37a612fe94878b7a899adab869360f8.png"
+					class="img"></image>
+				<view class="list">
+					<view class="item" v-for="(item, index) in vipList2" :key="index">
+						<view class="new-nei">
+							<view class="l">
+								<image
+									:src="item.iconUrl"
+									class="l-img"></image>
+							</view>
+							<view class="r">
+								<view class="t">
+									{{item.benName}}
+								</view>
+								<view class="b">
+									{{item.intro}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="" style="clear: both;">
+
+				</view>
+			</view>
+
+			<view class="vip-kt">
+				<view class="top">
+					<text class="t1" v-if="userInfo.activate == 1">试用会员</text>
+					<text class="t1" v-if="userInfo.activate == 2">开通会员</text>
+					<text class="t2">有效期至</text>
+					<text class="t3">2024-10-24</text>
+				</view>
+				<scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll" scroll-left="120">
+					<view id="demo1" @click="vipFun(index,item.name)" class="scroll-view-item_H uni-bg-red" :class="valVip == index ? 'on' : ''" v-for="(item,index) in vipList" :key="index">
+						<view class="t">{{item.name}}</view>
+						<view class="c">￥<text class="tx">{{item.specialPrice}}</text></view>
+						<view class="b" v-if="index==0">试用1天</view>
+						<view class="b sc" v-else>￥{{item.originalPrice}}</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<view class="vip-text">
+				购买即视为同意《<text class="ts">会员用户协议</text>》
+			</view>
+			<view class="vip-btn" @click="beclick()" v-if="userInfo.activate != 1">
+				立即试用
+			</view>
+			<view class="vip-btn" @click="beclick()" v-else>
+				立即开通
+			</view>
+		</view>
+	</s-layout>
+</template>
+<script setup>
+	import {
+		computed,
+		reactive,
+		onBeforeMount,
+		onMounted,
+		ref
+	} from 'vue';
+	import request from '@/sheep/request';
+	import {
+		baseUrl,
+		apiPath
+	} from '@/sheep/config';
+	import sheep from '@/sheep';
+	 const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+	const userInfo = computed(() => sheep.$store('user').userInfo);
+	const vipList = ref([]);
+	const vipList2 = ref([]);
+	const valVip = ref([]);
+	const nameVip = ref([]);
+	// 定义方法
+	function getList() {
+		request({
+			url: `${baseUrl}${apiPath}/member/card/type/list`,
+			method: 'GET',
+			params: {
+			},
+			custom: {
+				showLoading: false,
+			},
+		}).then((res) => {
+			console.log(res,"sss")
+			vipList.value = res.data;
+		});
+	}
+	
+	// vipFun
+	let data = {
+			cardName:nameVip.value
+	}
+	function vipFun(index,name) {
+		valVip.value = index
+		data.cardName = name
+	}
+	
+	// beclick
+	function beclick() {
+		console.log(data.cardName,"nameVip.value")
+		request({
+			url: `${baseUrl}${apiPath}/pay/member/create`,
+			method: 'post',
+			data,
+			custom: {
+				showLoading: false,
+			},
+		}).then((res) => {
+			console.log(res,"-----------试用---------------")
+			if(res.code == 200){
+				sheep.$helper.toast('试用开通成功');
+				sheep.$router.go('/pages/index/user')
+			}else{
+				sheep.$helper.toast(res.msg);
+			}
+			
+		});
+	}
+	
+	// 定义方法2
+	function getList2() {
+		request({
+			url: `${baseUrl}${apiPath}/member/benefit/list`,
+			method: 'GET',
+			params: {
+			},
+			custom: {
+				showLoading: false,
+			},
+		}).then((res) => {
+			console.log(res,"sss")
+			vipList2.value = res.data;
+		});
+	}
+	// 使用 onMounted 生命周期钩子
+	onMounted(() => {
+		getList();
+		getList2();
+	});
+</script>
+<style lang="scss" scoped>
+	.vip-main {
+		margin-top: -3.75rem;
+
+		.vip-top {
+			width: 100%;
+			height: 200px;
+			// background: rgba(57, 55, 54);
+			position: relative;
+
+			.img {
+				width: 100%;
+				height: 100%;
+			}
+
+			.userInfo {
+				position: absolute;
+				bottom: 38px;
+				padding: 0 20px;
+				display: flex;
+				justify-content: space-between;
+				left: 50%;
+				transform: translateX(-50%);
+				width: 85%;
+				align-items: center;
+
+				.l {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.img {
+						width: 50px;
+						height: 50px;
+						border-radius: 23px;
+						margin-right: 10px;
+					}
+
+					.text {
+						.t {
+							font-size: 18px;
+							font-weight: 700;
+
+							.img {
+								width: 20px;
+								height: 20px;
+							}
+						}
+
+						.c {
+							color: rgba(208, 185, 156);
+							font-size: 13px;
+						}
+
+						.b {
+							color: rgba(201, 141, 99);
+							font-size: 13px;
+							margin-top: 7px;
+						}
+					}
+				}
+
+				.r {
+					color: #8a745c;
+					font-size: 15px;
+					padding: 5px 15px;
+					background: white;
+					border-radius: 15px;
+				}
+			}
+		}
+
+		.vip-zxq {
+			.img {
+				width: 77%;
+				height: 89px;
+				margin: 0 auto;
+				display: block;
+				margin-top: 20px;
+			}
+
+			.list {
+				padding: 0 10px;
+
+				.item {
+					width: 47%;
+					float: left;
+					padding: 5px;
+
+					.new-nei {
+						background: rgba(247, 247, 247);
+						padding: 15px 10px;
+						display: flex;
+						align-items: center;
+
+						.l {
+							display: flex;
+							align-items: center;
+
+							.l-img {
+								width: 50px;
+								height: 50px;
+								margin-right: 10px;
+							}
+						}
+
+						.r {
+							.t {}
+
+							.b {
+								font-size: 13px;
+								color: rgba(191, 147, 109);
+							}
+						}
+					}
+
+				}
+			}
+
+		}
+
+		.vip-kt {
+			padding: 10px 10px;
+
+			.top {
+				.t1 {
+					font-size: 17px;
+					font-weight: 700;
+					margin-right: 10px;
+				}
+
+				.t2 {
+					font-size: 15px;
+					margin-right: 10px;
+					color: rgba(121, 121, 121);
+				}
+
+				.t3 {
+					font-size: 13px;
+					color: rgba(174, 90, 42);
+				}
+			}
+			.scroll-view_H {
+				white-space: nowrap;
+				width: 100%;
+				.scroll-view-item_H {
+					width: 113px;
+					display: inline-block;
+					background-color: white;
+					border: 1px solid rgba(214,214,214);
+					margin-right:15px;
+					border-radius: 10px;
+					margin-top:15px;
+					padding:15px 0;
+					&.on{
+						background-color: rgba(254,247,236);
+						border: 1px solid rgba(252,194,130);
+					}
+					.t{
+						color:rgba(117,78,25);
+						font-weight: 700;
+						font-size:20px;
+						text-align: center;
+					}
+					.c{
+						color:rgba(117,78,25);
+						font-weight: 700;
+						font-size:15px;
+						text-align: center;
+						padding:10px 0;
+						.tx{
+							font-size:27px;
+						}
+					}
+					.b{
+						color:rgba(173,173,173);
+						font-size:16px;
+						text-align: center;
+						&.sc{
+							text-decoration: line-through;
+						}
+					}
+				}
+			}
+		}
+
+		.vip-text {
+			text-align: center;
+			color: rgba(157, 157, 157);
+			margin: 15px 0;
+
+			.ts {
+				color: rgba(174, 90, 42);
+			}
+		}
+
+		.vip-btn {
+			padding: 10px 0;
+			background: rgba(254, 220, 137);
+			text-align: center;
+			margin: 0 15px;
+			border-radius: 20px;
+			color: rgba(95, 53, 38);
+		}
+		
+	}
+</style>

pages/user/wallet/money.vue

@@ -69,7 +69,7 @@
             </view>
           </view>
           <text class="time">
-            {{ sheep.$helper.timeFormat(state.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+            {{ sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss') }}
           </text>
         </view>
       </view>

pages/user/wallet/score.vue

@@ -1,15 +1,12 @@
 <!-- 我的积分 -->
 <template>
 	<s-layout class="wallet-wrap" title="我的积分" navbar="inner">
-    <view
+		<view class="header-box ss-flex ss-flex-col ss-row-center ss-col-center" :style="[
-      class="header-box ss-flex ss-flex-col ss-row-center ss-col-center"
-      :style="[
 			{
 			  marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
 			  paddingTop: Number(statusBarHeight + 88) + 'rpx',
 			},
-      ]"
+		  ]">
-    >
 			<view class="header-bg">
 				<view class="bg" />
 			</view>
@@ -19,17 +16,48 @@
 				</view>
 				<text class="all-num">{{ userInfo.point || 0 }}</text>
 			</view>
+
+			<view class="new-point">
+				<view class="l">
+					<view class="b">1000</view>
+					<view class="c">累计积分（带对接接口）</view>
+				</view>
+				<view class="l">
+					<view class="b">1000</view>
+					<view class="c">累计消费（带对接接口）</view>
+				</view>
+				<view class="l">
+					<view class="b">0</view>
+					<view class="c">冻结积分</view>
+				</view>
+			</view>
+
+			<view class='new-tab'>
+				<view class="l l " :class="state.isShow == 1 ? 'on': ''" @click="state.isShow = 1">
+					<image
+						src="https://zysc.fjptzykj.com:3000/shangcheng/6fcdf0863d8665f2857ebfef5bb4a1d13df5d0ac8fa2517b16c3fa06f0b93a8a.png"
+						class="img2"></image>
+					<image
+						src="https://zysc.fjptzykj.com:3000/shangcheng/9e5801a7825e99274b7963f87c2044839640fe3b3e706c49238157449385cc87.png"
+						class="img"></image>
+					<text class="tx">分值明细</text>
+				</view>
+				<view class="l r" :class="state.isShow == 2 ? 'on': ''" @click="state.isShow = 2">
+					<image
+						src="https://zysc.fjptzykj.com:3000/shangcheng/0c9af735ebcd6a6b9c480b237c20331747cf69f8991150be10de4eef1f7c9173.png"
+						class="img2"></image>
+					<image
+						src="https://zysc.fjptzykj.com:3000/shangcheng/00bc0a57ca7f7a9ba79415b6f48a671669e7ed5f930e4b6e5096bcd8101d499e.png"
+						class="img"></image>
+					<text class="tx">分值提升</text>
+				</view>
+			</view>
 		</view>
 		<!-- tab -->
-    <su-sticky :customNavHeight="sys_navBar">
+		<!-- <su-sticky :customNavHeight="sys_navBar"> -->
 			<!-- 统计 -->
-      <view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
+			<view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between"  v-if="state.isShow == 1">
-        <uni-datetime-picker
+				<uni-datetime-picker v-model="state.date" type="daterange" @change="onChangeTime" :end="state.today">
-          v-model="state.date"
-          type="daterange"
-          @change="onChangeTime"
-          :end="state.today"
-        >
 					<button class="ss-reset-button date-btn">
 						<text>{{ dateFilterText }}</text>
 						<text class="cicon-drop-down ss-seldate-icon"></text>
@@ -42,26 +70,32 @@
 				<!--					<view>总支出￥{{ -state.pagination.expense }}</view>-->
 				<!--				</view>-->
 			</view>
-      <su-tabs
+			<!-- <su-tabs :list="tabMaps" @change="onChange" :scrollable="false" :current="state.currentTab"></su-tabs> -->
-        :list="tabMaps"
+		<!-- </su-sticky> -->
-        @change="onChange"
+		<!-- icon -->
-        :scrollable="false"
+		<view class="icon-img" v-if="state.isShow == 2">
-        :current="state.currentTab"
+			<view class="list" @click="sheep.$router.go('/pages/goods/list')">
-      ></su-tabs>
+				<image
-    </su-sticky>
+					src="https://zysc.fjptzykj.com:3000/shangcheng/90eef89176c26da9a605a7b22c4b0beea07d970fc5da7204effb51e970546112.png"
-
+					class="img"></image>
+				<view class="c">购买商品可获得积分奖励</view>
+				<view class="b">赚积分</view>
+			</view>
+			<view class="list" @click="sheep.$router.go('/pages/app/sign')">
+				<image
+					src="https://zysc.fjptzykj.com:3000/shangcheng/90eef89176c26da9a605a7b22c4b0beea07d970fc5da7204effb51e970546112.png"
+					class="img"></image>
+				<view class="c">每日签到可获得积分奖励</view>
+				<view class="b">赚积分</view>
+			</view>
+		</view>
 		<!-- list -->
-    <view class="list-box">
+		<view class="list-box" v-if="state.isShow == 1">
 			<view v-if="state.pagination.total > 0">
-        <view
+				<view class="list-item ss-flex ss-col-center ss-row-between" v-for="item in state.pagination.list"
-          class="list-item ss-flex ss-col-center ss-row-between"
+					:key="item.id">
-          v-for="item in state.pagination.list"
-          :key="item.id"
-        >
 					<view class="ss-flex-col">
-            <view class="name"
+						<view class="name">{{ item.title }}{{ item.description ? ' - ' + item.description : '' }}</view>
-              >{{ item.title }}{{ item.description ? ' - ' + item.description : '' }}</view
-            >
 						<view class="time">{{
               sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM:ss')
             }}</view>
@@ -73,25 +107,28 @@
 			<s-empty v-else text="暂无数据" icon="/static/data-empty.png" />
 		</view>
 
-    <uni-load-more
+		<uni-load-more v-if="state.pagination.total > 0 && state.isShow == 1" :status="state.loadStatus" :content-text="{
-      v-if="state.pagination.total > 0"
-      :status="state.loadStatus"
-      :content-text="{
         contentdown: '上拉加载更多',
-      }"
+      }" @tap="onLoadMore" />
-      @tap="onLoadMore"
-    />
 	</s-layout>
 </template>
 
 <script setup>
 	import sheep from '@/sheep';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+	import {
-  import { computed, reactive } from 'vue';
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive
+	} from 'vue';
 	import _ from 'lodash';
 	import dayjs from 'dayjs';
 	import PointApi from '@/sheep/api/member/point';
-  import { resetPagination } from '@/sheep/util';
+	import {
+		resetPagination
+	} from '@/sheep/util';
 
 	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
 	const userInfo = computed(() => sheep.$store('user').userInfo);
@@ -108,10 +145,10 @@
 		loadStatus: '',
 		date: [],
 		today: '',
+		isShow: 1
 	});
 
-  const tabMaps = [
+	const tabMaps = [{
-    {
 			name: '全部',
 			value: 'all',
 		},
@@ -135,7 +172,10 @@
 
 	async function getLogList() {
 		state.loadStatus = 'loading';
-    let { code, data } = await PointApi.getPointRecordPage({
+		let {
+			code,
+			data
+		} = await PointApi.getPointRecordPage({
 			pageNo: state.pagination.pageNo,
 			pageSize: state.pagination.pageSize,
 			addStatus: state.currentTab > 0 ? tabMaps[state.currentTab].value : undefined,
@@ -183,14 +223,132 @@
 </script>
 
 <style lang="scss" scoped>
+	.icon-img {
+		background-color: white;
+		padding-top: 20px;
+		display: grid;
+
+		.list {
+			display: flex;
+			width: 89%;
+			margin: 0 auto;
+			padding: 20px 12px;
+			justify-content: space-around;
+			align-items: center;
+			border-radius: 10px;
+			background: rgba(255, 251, 242);
+			margin-bottom: 20px;
+			font-size: 16px;
+			color: rgba(198, 179, 114);
+
+			.img {
+				width: 40px;
+				height: 60px;
+			}
+
+			.c {
+				font-size: 18px;
+				color: rgba(198, 179, 114);
+				width: 50%;
+				font-weight: 700;
+				line-height: 26px;
+			}
+
+			.b {
+				border: 1px solid rgba(183, 175, 128);
+				padding: 4px 18px;
+				border-radius: 15px;
+			}
+		}
+	}
+
 	.header-box {
 		width: 100%;
-    background: linear-gradient(180deg, var(--ui-BG-Main) 0%, var(--ui-BG-Main-gradient) 100%)
+		// background: linear-gradient(180deg, var(--ui-BG-Main) 0%, var(--ui-BG-Main-gradient) 100%)
-      no-repeat;
+		//   no-repeat;
+		background: rgb(193, 145, 81);
 		background-size: 750rpx 100%;
-    padding: 0 0 120rpx 0;
+		padding: 0 0 0 0;
 		box-sizing: border-box;
 
+		.new-tab {
+			width: 100%;
+			display: flex;
+			justify-content: center;
+			margin-top: 22px;
+
+			.l {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 45%;
+				padding: 13px 0;
+				background: rgba(247, 247, 247);
+				border-radius: 10px 0 0 0;
+				
+				.img2 {
+					display: none;
+				}
+
+				.img,
+				.img2 {
+					width: 25px;
+					height: 25px;
+					margin-right: 5px;
+				}
+
+				&.on {
+					background: white;
+
+					.img2 {
+						display: block;
+					}
+
+					.img {
+						display: none;
+					}
+
+					.tx {
+						color: #c19151;
+					}
+				}
+
+				.tx {
+					font-size: 18px;
+					font-weight: 700;
+				}
+			}
+
+			.r {
+				border-radius: 0 10px 0 0;
+			}
+		}
+
+		.new-point {
+			display: flex;
+			justify-content: space-around;
+			width: 100%;
+			margin-top: 20px;
+
+			.l {
+				&>view {
+					color: white;
+					text-align: center;
+				}
+
+				.b {
+					margin-bottom: 7px;
+					font-size: 40rpx;
+					font-weight: 700;
+				}
+
+				.c {
+					font-size: 25rpx;
+					font-weight: 700;
+				}
+			}
+		}
+
 		.score-box {
 			height: 100%;
 
@@ -218,6 +376,7 @@
 	.filter-box {
 		height: 114rpx;
 		background-color: $bg-page;
+		background: rgb(193, 145, 81);
 
 		.total-box {
 			font-size: 24rpx;

sheep/components/s-block-item/s-block-item.vue

@@ -66,9 +66,12 @@
 		<!-- 用户组件：用户卡片 -->
 		<s-user-card v-if="type === 'UserCard'" />
 		<view v-if="type === 'UserOrder'" class="new-huiy" @click="
-			  sheep.$router.go('/pages/user/user_vip/index')
+			  sheep.$router.go('/pages/user/user_vip/list')
 			">
-			<view class="new-button">立即开通</view>
+			<view class="new-button" v-if="userInfo.activate == 1">正在试用</view>
+			<view class="new-button" v-if="userInfo.activate == 2">开通</view>
+			<view class="new-button" v-if="userInfo.activate == 3">永久</view>
+			<view class="new-button" v-if="userInfo.activate == 0">立即开通</view>
 			<image class="seckill1" mode="aspectFit"
 				src="https://zysc.fjptzykj.com:3000/shangcheng/64776e2edc3c2f15295e7c3976ba301e08f9170f99a2e845d8f33bd65179b177.png" />
 		</view>
@@ -86,13 +89,15 @@
 	import {
 		ref,
 		reactive,
-		unref
+		unref,
+		computed
 	} from 'vue';
 	import AddressApi from '@/sheep/api/member/address';
 	const state = reactive({
 		model: [],
 	});
-
+// 用户信息
+	const userInfo = computed(() => sheep.$store('user').userInfo);
 	const ff = async (id) => {
 		let {
 			code,

sheep/components/s-groupon-block/s-groupon-block.vue

@@ -225,7 +225,6 @@
 
 	.new-class {
 		background: white;
-		border-radius: 13px;
 	}
 
 	:deep(.sm-goods-card) {

sheep/components/s-layout/s-layout.vue

@@ -1,44 +1,22 @@
 <template>
-  <view
+	<view class="page-app" :class="['theme-' + sys.mode, 'main-' + sys.theme, 'font-' + sys.fontSize]">
-    class="page-app"
-    :class="['theme-' + sys.mode, 'main-' + sys.theme, 'font-' + sys.fontSize]"
-  >
 		<view class="page-main" :style="[bgMain]">
 			<!-- 顶部导航栏-情况1：默认通用顶部导航栏 -->
-      <su-navbar
+			<su-navbar v-if="navbar === 'normal'" :title="title" statusBar :navbarbackgroundColor="navbarbackgroundColor" :color="color" :tools="tools"
-        v-if="navbar === 'normal'"
+				:opacityBgUi="opacityBgUi" @search="(e) => emits('search', e)" :defaultSearch="defaultSearch"
-        :title="title"
+				:headerBtns="headerBtns" :backgroundColor="backgroundColor" :navBg="navBg" />
-        statusBar
-        :color="color"
-        :tools="tools"
-        :opacityBgUi="opacityBgUi"
-        @search="(e) => emits('search', e)"
-        :defaultSearch="defaultSearch"
-		:headerBtns = "headerBtns" 
-		:backgroundColor="navbarbackgroundColor"
-		:navBg="navBg"
-      />
 
 			<!-- 顶部导航栏-情况2：装修组件导航栏-标准 -->
-      <s-custom-navbar
+			<s-custom-navbar v-else-if="navbar === 'custom' && navbarMode === 'normal'" :data="navbarStyle"
-        v-else-if="navbar === 'custom' && navbarMode === 'normal'"
+				:showLeftButton="showLeftButton" />
-        :data="navbarStyle"
-        :showLeftButton="showLeftButton"
-      />
 			<view class="page-body" :style="[bgBody]">
 				<!-- 顶部导航栏-情况3：沉浸式头部 -->
-        <su-inner-navbar v-if="navbar === 'inner'" :title="title" />
+				<su-inner-navbar v-if="navbar === 'inner'" :title="title"   :navbarbackgroundColor="navbarbackgroundColor" />
-        <view
+				<view v-if="navbar === 'inner'" :style="[{ paddingTop: sheep.$platform.navbar + 'px' }]"></view>
-          v-if="navbar === 'inner'"
-          :style="[{ paddingTop: sheep.$platform.navbar + 'px' }]"
-        ></view>
 
 				<!-- 顶部导航栏-情况4：装修组件导航栏-沉浸式 -->
-        <s-custom-navbar
+				<s-custom-navbar v-if="navbar === 'custom' && navbarMode === 'inner'" :data="navbarStyle"
-          v-if="navbar === 'custom' && navbarMode === 'inner'"
+					:showLeftButton="showLeftButton" />
-          :data="navbarStyle"
-          :showLeftButton="showLeftButton"
-        />
 
 				<!-- 页面内容插槽 -->
 				<slot />
@@ -63,15 +41,26 @@
 	/**
 	 * 模板组件 - 提供页面公共组件，属性，方法
 	 */
-  import { computed, reactive, ref } from 'vue';
+	import {
+		computed,
+		reactive,
+		ref
+	} from 'vue';
 	import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
+	import {
-  import { onShow } from '@dcloudio/uni-app';
+		isEmpty
+	} from 'lodash';
+	import {
+		onShow
+	} from '@dcloudio/uni-app';
 	// #ifdef MP-WEIXIN
-  import { onShareAppMessage } from '@dcloudio/uni-app';
+	import {
+		onShareAppMessage
+	} from '@dcloudio/uni-app';
 	// #endif
 
 	const props = defineProps({
+		
 		title: {
 			type: String,
 			default: '',
@@ -80,7 +69,11 @@
 			type: String,
 			default: '',
 		},
-	navbarbackgroundColor:{
+		navbarbackgroundColor: {
+			type: String,
+			default: '',
+		},
+		backgroundColor: {
 			type: String,
 			default: '',
 		},
@@ -159,7 +152,6 @@
 	const appStore = sheep.$store('app');
 	const modalStore = sheep.$store('modal');
 	const sys = computed(() => sysStore);
-
 	// 导航栏模式(因为有自定义导航栏 需要计算)
 	const navbarMode = computed(() => {
 		if (props.navbar === 'normal' || props.navbarStyle.styleType === 'normal') {

sheep/components/s-share-modal/canvas-poster/poster/user.js

@@ -23,37 +23,51 @@ const user = async (poster) => {
     {
       type: 'text',
       text: userInfo.nickname,
+      css: {
+        color: '#333',
+        fontSize: 17,
+        fontWeight: 700,
+        textAlign: 'center',
+        fontFamily: 'sans-serif',
+        position: 'fixed',
+        top: width * 1.33,
+        left: width / 2.2,
+      },
+    },
+	{
+	  type: 'text',
+	  text: '邀请您加入众悦e家',
 	  css: {
 	    color: '#333',
 	    fontSize: 14,
 	    textAlign: 'center',
 	    fontFamily: 'sans-serif',
 	    position: 'fixed',
-        top: width * 0.4,
+	    top: width * 1.41,
-        left: width / 2,
+	    left: width / 2.2,
-      },
-    },
-    {
-      type: 'image',
-      src: formatImageUrlProtocol(sheep.$url.cdn(userInfo.avatar)),
-      css: {
-        position: 'fixed',
-        left: width * 0.4,
-        top: width * 0.16,
-        width: width * 0.2,
-        height: width * 0.2,
 	  },
 	},
+    // {
+    //   type: 'image',
+    //   src: formatImageUrlProtocol(sheep.$url.cdn(userInfo.avatar)),
+    //   css: {
+    //     position: 'fixed',
+    //     left: width * 0.4,
+    //     top: width * 0.16,
+    //     width: width * 0.2,
+    //     height: width * 0.2,
+    //   },
+    // },
     // #ifndef MP-WEIXIN
     {
       type: 'qrcode',
       text: poster.shareInfo.link,
       css: {
         position: 'fixed',
-        left: width * 0.35,
+        left: width * 0.25,
-        top: width * 0.84,
+        top: width * 1.3,
-        width: width * 0.3,
+        width: width * 0.2,
-        height: width * 0.3,
+        height: width * 0.2,
       },
     },
     // #endif
@@ -63,10 +77,10 @@ const user = async (poster) => {
       src: wxa_qrcode,
       css: {
         position: 'fixed',
-        left: width * 0.35,
+        left: width * 0.22,
-        top: width * 0.84,
+        top: width * 1.3,
-        width: width * 0.3,
+        width: width * 0.2,
-        height: width * 0.3,
+        height: width * 0.2,
       },
     },
     // #endif

sheep/components/s-share-modal/s-share-modal.vue

@@ -43,7 +43,7 @@
           </button>
 
           <!-- 操作 ③：生成链接 -->
-          <button
+         <!-- <button
             v-if="shareConfig.methods.includes('link')"
             class="share-item share-btn ss-flex-col ss-col-center"
             @tap="onShareByCopyLink"
@@ -54,7 +54,7 @@
               mode=""
             />
             <text class="share-title">复制链接</text>
-          </button>
+          </button> -->
         </view>
         <view class="share-foot ss-flex ss-row-center ss-col-center" @tap="closeShareModal">
           取消

sheep/components/s-user-card/s-user-card.vue

@@ -21,9 +21,9 @@
 				</view>
 			</view>
 			<view class="right-box ss-m-r-52">
-				<button class="ss-reset-button" @tap="showShareModal">
+				<!-- <button class="ss-reset-button" @tap="showShareModal">
 					<text class="sicon-qrcode"></text>
-				</button>
+				</button> -->
 				<!-- <view class="qiandao" @click="sheep.$router.go('/pages/app/sign');">
 					签到
 				</view> -->

sheep/router/index.js

@@ -2,7 +2,6 @@ import $store from '@/sheep/store';
 import { showAuthModal, showShareModal } from '@/sheep/hooks/useModal';
 import { isNumber, isString, isEmpty, startsWith, isObject, isNil, clone } from 'lodash';
 import throttle from '@/sheep/helper/throttle';
-
 const _go = (
   path,
   params = {},

sheep/store/app.js

@@ -66,7 +66,7 @@ const app = defineStore({
           copyright: '全部开源，个人与企业可 100% 免费使用',
           copytime: 'Copyright© 2018-2024',
 
-          cdnurl: 'https://file.sheepjs.com', // 云存储域名
+          cdnurl: 'https://zysc.fjptzykj.com:3000', // 云存储域名
           filesystem: 'qcloud', // 云存储平台
         };
         this.platform = {
@@ -74,9 +74,9 @@ const app = defineStore({
             methods: ['poster', 'link'],
             linkAddress: 'http://127.0.0.1:3000', // TODO 芋艿：可以考虑改到 .env 那
             posterInfo: {
-              user_bg: '/static/img/shop/config/user-poster-bg.png',
+              user_bg: '/shangcheng/user-poster-bg.png',
-              goods_bg: '/static/img/shop/config/goods-poster-bg.png',
+              goods_bg: '/shangcheng/goods-poster-bg.png',
-              groupon_bg: '/static/img/shop/config/groupon-poster-bg.png',
+              groupon_bg: '/shangcheng/groupon-poster-bg.png',
             },
           },
           bind_mobile: 0,

sheep/ui/su-inner-navbar/su-inner-navbar.vue

@@ -1,26 +1,13 @@
 <template>
-  <su-fixed
+	<su-fixed :noFixed="props.noFixed" :alway="props.alway" :bgStyles="props.bgStyles" :val="0" :index="props.zIndex"
-    :noFixed="props.noFixed"
+		noNav :bg="props.bg" :ui="props.ui" :opacity="props.opacity" :placeholder="props.placeholder">
-    :alway="props.alway"
+		<su-status-bar :navbarbackgroundColor="navbarbackgroundColor" />
-    :bgStyles="props.bgStyles"
-    :val="0"
-    :index="props.zIndex"
-    noNav
-    :bg="props.bg"
-    :ui="props.ui"
-    :opacity="props.opacity"
-    :placeholder="props.placeholder"
-  >
-    <su-status-bar />
 		<!-- 
       :class="[{ 'border-bottom': !props.opacity && props.bg != 'bg-none' }]"
      -->
 		<view class="ui-navbar-box">
-      <view
+			<view class="ui-bar ss-p-x-20" :class="state.isDark ? 'text-white' : 'text-black'"
-        class="ui-bar ss-p-x-20"
+				:style="[{ height: sys_navBar - sys_statusBar + 'px' }]">
-        :class="state.isDark ? 'text-white' : 'text-black'"
-        :style="[{ height: sys_navBar - sys_statusBar + 'px' }]"
-      >
 				<view class="icon-box ss-flex">
 					<view class="icon-button icon-button-left ss-flex ss-row-center" @tap="onClickLeft">
 						<text class="sicon-back" v-if="hasHistory" />
@@ -62,10 +49,20 @@
 	 *
 	 */
 
-  import { computed, reactive, onBeforeMount, ref } from 'vue';
+	import {
+		computed,
+		reactive,
+		onBeforeMount,
+		ref
+	} from 'vue';
 	import sheep from '@/sheep';
-  import { onPageScroll } from '@dcloudio/uni-app';
+	import {
-  import { showMenuTools, closeMenuTools } from '@/sheep/hooks/useModal';
+		onPageScroll
+	} from '@dcloudio/uni-app';
+	import {
+		showMenuTools,
+		closeMenuTools
+	} from '@/sheep/hooks/useModal';
 
 	// 本地数据
 	const state = reactive({
@@ -79,6 +76,11 @@
 	const sys_navBar = sheep.$platform.navbar;
 
 	const props = defineProps({
+
+		navbarbackgroundColor: {
+			type: String,
+			default: '',
+		},
 		zIndex: {
 			type: Number,
 			default: 100,
@@ -127,7 +129,7 @@
 		},
 		bgStyles: {
 			type: Object,
-      default() {},
+			default () {},
 		},
 	});
 
@@ -151,6 +153,7 @@
 		}
 		emits('clickLeft');
 	}
+
 	function onClickRight() {
 		showMenuTools();
 	}
@@ -177,39 +180,49 @@
 		height: 56rpx;
 		margin-left: 8rpx;
 		border: 1px solid rgba(#fff, 0.4);
+
 		.line {
 			width: 2rpx;
 			height: 24rpx;
 			background: #e5e5e7;
 		}
+
 		.sicon-back {
 			font-size: 32rpx;
 		}
+
 		.sicon-home {
 			font-size: 32rpx;
 		}
+
 		.sicon-more {
 			font-size: 32rpx;
 		}
+
 		.icon-button {
 			width: 67rpx;
 			height: 56rpx;
+
 			&-left:hover {
 				background: rgba(0, 0, 0, 0.16);
 				border-radius: 30rpx 0px 0px 30rpx;
 			}
+
 			&-right:hover {
 				background: rgba(0, 0, 0, 0.16);
 				border-radius: 0px 30rpx 30rpx 0px;
 			}
 		}
 	}
+
 	.navbar-title {
 		font-size: 36rpx;
 	}
+
 	.tools-icon {
 		font-size: 40rpx;
 	}
+
 	.ui-navbar-box {
 		background-color: transparent;
 		width: 100%;
@@ -320,6 +333,7 @@
 					}
 
 					&.isFristPage {
+
 						.capsule-back,
 						&::after {
 							display: none;

sheep/ui/su-navbar/su-navbar.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="uni-navbar" :class="{ 'uni-dark': dark }">
 		<view :style="{
-          background: backgroundColor,
+          background: backgroundColor || navbarbackgroundColor,
         }" 
 		:class="{
         'uni-navbar--fixed': fixed,
@@ -10,7 +10,7 @@
         'uni-navbar--border': border,
       }" class="uni-navbar__content">
 			<view class="fixed-bg" :class="[opacity ? '' : opacityBgUi]"></view>
-			<su-status-bar v-if="statusBar" :navBg = "navBg" />
+			<su-status-bar v-if="statusBar" :navBg = "navBg"/>
 			<view :style="{
           color: themeColor,
           height: navbarHeight,
@@ -111,6 +111,10 @@
 
 	const emits = defineEmits(['clickLeft', 'clickRight', 'clickTitle', 'search']);
 	const props = defineProps({
+		navbarbackgroundColor:{
+			type: String,
+			default: '',
+		},
 		navBg: {
 			type: Boolean,
 			default: false,
@@ -202,7 +206,7 @@
 		defaultSearch: {
 			type: String,
 			default: '',
-		},
+		}
 	});
 
 	const capsuleStyle = computed(() => {

sheep/ui/su-status-bar/su-status-bar.vue

@@ -1,6 +1,6 @@
 <!-- 自定义状态栏 -->
 <template>
-	<view :style="{ height: statusBarHeight }" class="uni-status-bar" :class="navBg? 'ss' : ''">
+	<view :style="{ height: statusBarHeight,background: navbarbackgroundColor }" class="uni-status-bar" :class="navBg? 'ss' : ''" >
 		<slot />
 	</view>
 </template>
@@ -11,6 +11,10 @@
 		navBg: {
 			type: Boolean,
 			default: false,
+		},
+		navbarbackgroundColor:{
+			type: String,
+			default: '',
 		}
 	})
 	const statusBarHeight = sheep.$platform.device.statusBarHeight - 2 + 'px';