diff --git a/App.vue b/App.vue
index b6ad7ea..96a6840 100644
--- a/App.vue
+++ b/App.vue
@@ -9,6 +9,15 @@
 		},
 		onShow: function() {
 			console.log('App Show')
+			wx.loadFontFace({
+				global: true,
+				family: 'YouSheBiaoTiHei',
+				source: 'url("https://naweigetetest2.hschool.com.cn/dyqc/YouSheBiaoTiHei.ttf")',
+				success: function(res) {
+					console.log('字体加载成功');
+					console.log(res);
+				}
+			})
 		},
 		onHide: function() {
 			console.log('App Hide')
@@ -62,10 +71,12 @@
 	.uni-input-input {
 		font-size: 35rpx;
 	}
-	@font-face {
-		font-family: 'YouSheBiaoTiHei';
-		src: url('https://naweigetetest2.hschool.com.cn/dyqc/biaotihei.ttf') format('truetype');
-	}
+	// #ifdef MP-WEIXIN
+	// @font-face {
+	// 	font-family: 'YouSheBiaoTiHei';
+	// 	src: url('https://naweigetetest2.hschool.com.cn/dyqc/YouSheBiaoTiHei.ttf') format('truetype');
+	// }
+	// #endif
 	.swiper_s{
 		.uni-swiper-dots{
 				bottom: 40rpx;
@@ -82,7 +93,7 @@
 		//微信小程序
 		// #ifdef MP-WEIXIN
 		.wx-swiper-dots{
-			bottom: 40rpx;
+			bottom: 50rpx;
 		}
 		.wx-swiper-dot{
 			background-color: #ffffff ;
diff --git a/components/my-tabbar.vue b/components/my-tabbar.vue
index e33d621..5d70538 100644
--- a/components/my-tabbar.vue
+++ b/components/my-tabbar.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page-total">
-		<view :class="isOverall?'tab-list_ip':'tab-list'">
-			<view class="list" v-for="(item,index) in TabBarList" @click="onTabBar(item,index)" :key="index">
+		<view :class="isOverall ? 'tab-list_ip' : 'tab-list' ">
+			<view class="list" v-for="(item,index) in TabBarList" @click="onTabBar(item,index)" :key="index" >
 				<image :src="item.acImg" mode="widthFix" v-show="tabBarShow === index"></image>
 				<image :src="item.img" mode="widthFix" v-show="tabBarShow != index" ></image>
 
@@ -25,7 +25,8 @@
 		},
 		data() {
 			return {
-				TabBarList: [{
+				TabBarList:[],
+				TabBarList1: [{
 						index: 0,
 						name: '首页',
 						img: '/static/index.png',
@@ -50,10 +51,31 @@
 						acImg: '/static/my1.png',
 					},
 
+				],
+				TabBarList2: [{
+						index: 0,
+						name: '首页',
+						img: '/static/index.png',
+						acImg: '/static/index1.png',
+					},
+					{
+						index: 1,
+						name: '消息',
+						img: '/static/activity.png',
+						acImg: '/static/activity1.png',
+					},
+					{
+						index: 3,
+						name: '我的',
+						img: '/static/my.png',
+						acImg: '/static/my1.png',
+					},
+
 				],
 				codeheight: 0,
 				isOverall: 0,
 				phoneModel: '',
+				initFb:''
 
 			};
 		},
@@ -66,6 +88,7 @@
 		},
 
 		mounted() {
+			this.getinit();
 			try {
 				const res = uni.getSystemInfoSync();
 				let that = this;
@@ -100,41 +123,81 @@
 
 		},
 		methods: {
-
+			getinit() {
+				uni.$u.http.get('/api/index/init', {}).then(res => {
+					if (res.code == 1) {
+						this.initFb = res.data.base_info.miniapp_activity_swtich;
+						if (res.data.base_info.miniapp_activity_swtich == 1) {
+							this.TabBarList = this.TabBarList1;
+						} else {
+							this.TabBarList = this.TabBarList2;
+						}
+					} 
+				}).catch(error => {
+					console.log(error);
+				});
+			},
 			/**
 			 * @param {Object} item
 			 * @param {Number} index
 			 */
 			onTabBar(item, index) {
 				this.$emit('tabBarShow', index);
-				console.log('index', index)
-				switch (index) {
-					case 0:
-						uni.switchTab({
-							url: '/pages/index/index'
-						})
-						break;
-					case 1:
-						uni.switchTab({
-							url: '/pages/center/index'
-						})
-						break;
-					case 2:
-						uni.switchTab({
-							url: '/pages/activity/index'
-						})
-						break;
-					case 3:
-						uni.switchTab({
-							url: '/pages/my/index'
-						})
-						break;
-					case 3:
-						uni.switchTab({
-							url: '/pages/activity/index'
-						})
-						break;
+				console.log('index', index);
+				if(this.initFb == 1){
+
+					switch (index) {
+						case 0:
+							uni.switchTab({
+								url: '/pages/index/index'
+							})
+							break;
+						case 1:
+							uni.switchTab({
+								url: '/pages/center/index'
+							})
+							break;
+						case 2:
+							uni.switchTab({
+								url: '/pages/activity/index'
+							})
+							break;
+						case 3:
+							uni.switchTab({
+								url: '/pages/my/index'
+							})
+							break;
+						default:
+							uni.switchTab({
+								url: '/pages/index/index'
+							})
+					}
+
+				}else{
+
+					switch (index) {
+						case 0:
+							uni.switchTab({
+								url: '/pages/index/index'
+							})
+							break;
+						case 1:
+							uni.switchTab({
+								url: '/pages/activity/index'
+							})
+							break;
+						case 2:
+							uni.switchTab({
+								url: '/pages/my/index'
+							})
+							break;
+						default:
+							uni.switchTab({
+								url: '/pages/index/index'
+							})
+					}
 				}
+				
 			},
 
 		}
diff --git a/components/qrcodeSwiper.vue b/components/qrcodeSwiper.vue
new file mode 100644
index 0000000..8005e25
--- /dev/null
+++ b/components/qrcodeSwiper.vue
@@ -0,0 +1,125 @@
+<template>
+    <view class="carousel-container">
+      <!-- 轮播主体 -->
+      <swiper 
+        class="swiper-box" 
+        :current="currentIndex" 
+        @change="onSwiperChange"
+        circular
+      >
+        <swiper-item v-for="(item, index) in images" :key="index" class="swiper-item">
+          <image :src="item" class="swiper-image" mode="aspectFill" />
+        </swiper-item>
+      </swiper>
+  
+      <!-- 控制按钮 -->
+      <view class="nav-buttons">
+        <view class="btn prev" @click="switchSlide(-1)">
+            <image style="width: 50rpx;height: 50rpx;" src="/static/detail/left.png"></image>
+        </view>
+        <view class="btn next" @click="switchSlide(1)">
+          <image style="width: 50rpx;height: 50rpx;" src="/static/detail/right.png"></image>
+        </view>
+      </view>
+  
+      <!-- 自定义指示器 -->
+      <!-- <view class="dots">
+        <text 
+          v-for="(dot, idx) in images.length" 
+          :key="idx" 
+          :class="['dot', { active: currentIndex === idx }]"
+        />
+      </view> -->
+    </view>
+  </template>
+  
+  <script>
+  export default {
+    props: {
+      images: { type: Array, default: () => [] } // 接收外部图片数组
+    },
+    data() {
+      return {
+        currentIndex: 0
+      };
+    },
+    methods: {
+      // 滑动切换回调
+      onSwiperChange(e) {
+        this.currentIndex = e.detail.current;
+      },
+      // 按钮切换逻辑
+      switchSlide(step) {
+        const total = this.images.length;
+        let newIndex = this.currentIndex + step;
+        
+        if (newIndex < 0) newIndex = total - 1;  // 循环向前
+        else if (newIndex >= total) newIndex = 0; // 循环向后
+        
+        this.currentIndex = newIndex;
+      }
+    }
+  };
+  </script>
+  <style lang="scss" scoped>
+  .carousel-container {
+    position: relative;
+    height: 400rpx;
+  }
+  
+  .swiper-box {
+    width: 100%;
+    height: 100%;
+  }
+  .swiper-item{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .swiper-image {
+    width: 200rpx;
+    height: 200rpx;
+    border-radius: 16rpx;
+  }
+  
+  .nav-buttons {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+  
+    .btn {
+      width: 60rpx;
+      height: 60rpx;
+      // border-radius: 50%;
+      // background: rgba(0,0,0,0.3);
+      color: white;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+  
+  .dots {
+    position: absolute;
+    bottom: 20rpx;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+  
+    .dot {
+      width: 12rpx;
+      height: 12rpx;
+      border-radius: 50%;
+      background: rgba(255,255,255,0.5);
+      margin: 0 8rpx;
+  
+      &.active {
+        background: #007AFF;
+        transform: scale(1.2);
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/packageA/activity/acList.vue b/packageA/activity/acList.vue
deleted file mode 100644
index 93a529e..0000000
--- a/packageA/activity/acList.vue
+++ /dev/null
@@ -1,1523 +0,0 @@
-<template>
-	<view class="box flex justify-start flex-column align-items" :class="'no-scroll'">
-		<view class="swiper">
-			<u-swiper :list="detail.images" indicator indicatorMode="line" height="450rpx" circular></u-swiper>
-		</view>
-		<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
-			<view class="first-box flex flex-start flex-column justify-start">
-				<span class="first-name">{{'' + detail.title}}</span>
-				<span class="line"></span>
-				<span class="huodong text-blue">活动介绍</span>
-				<view class="line-title">
-					<span class="title">活动时间:</span>
-					<span class="conter">{{'' + detail.start_time_text}} - {{detail.end_time_text}}</span>
-				</view>
-				<view class="line-title">
-					<span class="title">报名时间:</span>
-					<span class="conter">{{'' + detail.sign_start_time_text}} - {{detail.sign_end_time_text}}</span>
-				</view>
-				<view class="line-title">
-					<span class="title">报名费用:</span>
-					<span class="conter" style="color: #FF5F5F;">{{'' + detail.price + '元'}}</span>
-				</view>
-				<view class="line-title">
-					<span class="title">活动人数:</span>
-					<span class="conter">{{'' + detail.id == 16 ? 50 : detail.stock}}</span>
-				</view>
-				<!-- 	<view class="line-title">
-					<span class="title">可参与人数:</span>
-					<span class="conter">{{'' + detail.id == 16 ? 50 : detail.stock}}</span>
-				</view> -->
-				<view class="line-title">
-					<span class="title">已参加人数:</span>
-					<span class="conter">{{'' + detail.id == 16 ? 50 : detail.sale}}</span>
-				</view>
-				<view class="line-title">
-					<span class="title">活动项目:</span>
-					<span class="conter">{{'' + detail.item}}</span>
-				</view>
-				<view class="line-title flex align-items"
-					@click.stop="toMap(detail.latitude,detail.longitude,detail.address_detail)">
-					<span class="title">活动地址:</span>
-					<span class="conter flex align-items ">
-						<span class="white-space" style="max-width: 500rpx;">{{'' + detail.address_detail}}</span>
-						<image src="../../static/center/address.png" mode="" class="icon-size"></image>
-					</span>
-				</view>
-				<!-- <view class="flex justify-center flex-column align-items w-100" v-if="detail.status == 2">
-					<image :src="detail.codeimage" mode="" style="width: 376rpx; height: 376rpx;"></image>
-					<span style="margin: 34rpx 0;font-weight: 800;font-size: 38rpx;color: #343434;">核销二维码</span>
-				</view> -->
-				<!-- <view class="flex flex-column gj">
-					<scroll-view :scroll-top="scrollTop" scroll-y="true" class="flex flex-column align-items scroll">
-						<view v-for="(item,index) in detail.item_json" :key="index">
-							<span class="title">{{ item.formattedTime}}</span>
-							<span v-if="item.sign_num === item.limit_num" class="red">(已满)</span>
-							<span v-else class="lan">({{item.sign_num + '/' + item.limit_num}})</span>
-						</view>
-					</scroll-view>
-				</view> -->
-			</view>
-
-		</view>
-		<view class="header flex align-items w-100" style="justify-content: space-between;">
-			<span class="s-header flex justify-center align-items" v-for="(item,index) in headers" :key="index"
-				:class="{ selected: headerSelected(item.type) }"
-				@click="selectheader(item.type,item.auth_status,item.status)">{{item.text}}</span>
-		</view>
-		<span class="line bg-blue" style="background: #008CFF;"></span>
-		<view class="centerBox flex justify-start align-items flex-column" v-for="(item,index) in list" :key="index"
-			v-if="list.length > 0">
-			<view class="flex w-100 space-between hui align-items">
-				<span>订单号</span>
-				<span>{{item.order_no}}</span>
-			</view>
-
-			<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
-				<span>购买人</span>
-				<span style="color: #343434;">{{item.user.realname || item.user.nickname}}</span>
-			</view>
-			<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
-				<span>联系电话</span>
-				<span class="flex align-items" style="color: #71D0FF;" @click.stop="callPhone(orditemer.user.mobile)">
-					<span>{{item.user.mobile}}</span>
-					<image src="../../static/tel.png" mode="" style="width: 36rpx;height: 36rpx;"></image>
-				</span>
-			</view>
-
-			<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" v-if="item.paytime_text">
-				<span>购买时间</span>
-				<span>{{item.paytime_text}}</span>
-			</view>
-
-			<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
-				<span>订单状态</span>
-				<span class="status text-blue" v-if="item.auth_status == 0" style="font-size: 26rpx;">待审核</span>
-				<span class="status" v-if="item.auth_status == 1" style="font-size: 26rpx;color: #34DC12;">审核通过</span>
-				<span class="status" v-if="item.auth_status == 2" style="font-size: 26rpx;color: #FF0000;">审核失败</span>
-			</view>
-			<span class="box-line"></span>
-
-			<view class="flex w-100" style="justify-content: flex-end;margin-top: 24rpx;">
-				<!-- <span class="copy" style="margin-right: 10rpx;" @click.stop="copy(item.order_no)">复制消息</span> -->
-				<span class="refuse flex justify-center align-items" v-if="item.auth_status == 0 && item.status == 2"
-					@click="getOrder(item.id,1)">拒绝</span>
-				<span class="argee flex justify-center align-items" v-if="item.auth_status == 0 && item.status == 2"
-					@click="getOrder(item.id,2)">同意</span>
-				<span class="refuseNone flex justify-center align-items" v-if="item.status != 2">拒绝</span>
-				<span class="argeeNone flex justify-center align-items" v-if="item.status != 2">同意</span>
-
-			</view>
-		</view>
-		<view class="centerBox flex justify-start align-items flex-column" v-if="list.length == 0">
-			<u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png">
-			</u-empty>
-		</view>
-
-		<!-- 拒绝 -->
-		<u-popup :show="refuseShow" mode="center" :round="20" :zIndex="99999" :custom-style="popupStyle"
-			@close="refuseClose" @open="refuseOpen" :closeable="true">
-			<view class="center-box flex flex-column">
-				<span class="title text-blue">拒绝</span>
-				<span class="line"></span>
-				<view class="centerBox flex justify-start align-items flex-column">
-					<view class="flex w-100 space-between hui align-items">
-						<span>订单号</span>
-						<span style="color: #343434;">{{order.order_no}}</span>
-					</view>
-					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
-						<span>购买人</span>
-						<span style="color: #343434;">{{order.user.realname || order.user.nickname}}</span>
-					</view>
-					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
-						<span>联系电话</span>
-						<span class="flex align-items" style="color: #71D0FF;"
-							@click.stop="callPhone(order.user.mobile)">
-							<span>{{order.user.mobile}}</span>
-							<image src="../../static/tel.png" mode="" style="width: 36rpx;height: 36rpx;"></image>
-						</span>
-					</view>
-					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
-						<span>购买时间</span>
-						<span style="color: #343434;">{{order.paytime_text}}</span>
-					</view>
-
-					<view style="width: 630rpx;margin-top: 31rpx;">
-						<u--textarea v-model="reasonText" placeholder="请输入内容" count maxlength="150"
-							height='100'></u--textarea>
-					</view>
-					<view class="flex align-items btnList" style="justify-content: space-evenly;">
-						<span style="border-radius: 401rpx;border: 2rpx solid #008CFF;color: #008CFF;"
-							@click.stop="qx()">取消</span>
-						<span style="border-radius: 401rpx;background: #FF0000;color: #FFFFFF;"
-							@click.stop="next()">确认</span>
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<!-- 同意 -->
-		<u-popup :show="agreeShow" mode="center" :zIndex="99999" :round="20" :custom-style="popupStyle"
-			@close="agreeClose" @open="agreeOpen" :closeable="true">
-			<view class="center-box flex flex-column">
-				<span class="title text-blue">同意</span>
-				<span class="line"></span>
-				<view class="centerBox flex justify-start align-items flex-column">
-					<view class="flex w-100 space-between hui align-items">
-						<span>订单号</span>
-						<span>{{order.order_no}}</span>
-					</view>
-					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
-						<span>购买人</span>
-						<span style="color: #343434;">{{order.user.realname || order.user.nickname}}</span>
-					</view>
-					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
-						<span>联系电话</span>
-						<span class="flex align-items" style="color: #71D0FF;"
-							@click.stop="callPhone(order.user.mobile)">
-							<span>{{order.user.mobile}}</span>
-							<image src="../../static/tel.png" mode="" style="width: 36rpx;height: 36rpx;"></image>
-						</span>
-					</view>
-					<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
-						<span>购买时间</span>
-						<span>{{order.paytime_text}}</span>
-					</view>
-					<view class="flex align-items btnList" style="justify-content: space-evenly;">
-						<span style="border-radius: 401rpx;border: 2rpx solid #008CFF;color: #008CFF;"
-							@click.stop="TyQx()">取消</span>
-						<span class="bg-blue" style="border-radius: 401rpx;color: #FFFFFF;"
-							@click.stop="Tynext()">确认</span>
-					</view>
-				</view>
-
-			</view>
-		</u-popup>
-		<u-loadmore :status="loadStatus" />
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				id: '',
-				detail: '',
-				selected: '-3,2,3,5,6,9',
-				auth_status: '',
-				list: [],
-				popupStyle: {
-					width: '690rpx',
-					// height: '564rpx',
-					borderRadious: '20rpx',
-					margin: '0 auto', // 水平居中
-					display: 'flex',
-					justifyContent: 'center',
-					alignItems: 'center'
-				},
-				status:'-3,2,3,5,6,9',
-				classes_lib_id: '',
-				refuseShow: false,
-				agreeShow: false,
-				reasonText: '',
-				loadStatus: 'loading',
-				type: 0,
-				order: {},
-				headers: [{
-						status: '-3,2,3,5,6,9',
-						auth_status: '',
-						type: 0,
-						text: '全部'
-					},
-					{
-						status: '2',
-						auth_status: '0',
-						type: 1,
-						text: '待审核'
-					},
-					{
-						status: '-3,2,3,5,6,9',
-						auth_status: '1',
-						type: 2,
-						text: '已同意'
-					},
-
-					{
-						status: '-3,2,3,5,6,9',
-						auth_status: '2',
-						type: 3,
-						text: '已拒绝'
-					}
-				],
-			};
-		},
-		onLoad(options) {
-			this.userInfo = uni.getStorageSync("userInfo")
-			this.classes_lib_id = options.id
-			this.id = options.id
-			this.getDetail()
-			this.getList()
-		},
-		methods: {
-			refuseClose() {
-				this.refuseShow = false
-				this.reasonText = ''
-			},
-			refuseOpen() {
-				this.refuseShow = true
-			},
-			agreeClose() {
-				this.agreeShow = false
-			},
-			agreeOpen() {
-				this.agreeShow = true
-			},
-			// 取消
-			qx() {
-				this.refuseShow = false
-				this.reasonText = ''
-			},
-			TynextQx() {
-				this.agreeShow = fasle
-			},
-			Tynext() {
-				const that = this; // 保存当前上下文
-				uni.$u.http.post('/api/school.worker.activity.order/examine', {
-					order_no: this.order.order_no,
-					auth_status: '1'
-				}).then(res => {
-					console.log('Response:', res); // 打印响应数据
-					if (res.code === 1) { // 使用严格相等比较
-						uni.showToast({
-							title: '已同意',
-							icon: 'none',
-							duration: 2000
-						});
-						this.agreeShow = false;
-						that.page = 1;
-						that.list = [];
-						that.getList();
-					} else {
-						uni.showToast({
-							title: res.msg || '操作失败，请重试', // 防止 res.msg 为空
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					console.error('Error:', error); // 打印错误信息
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-			// 驳回退款
-			next() {
-			    const that = this; // 保存当前上下文
-			    uni.$u.http.post('/api/school.worker.activity.order/examine', {
-			        order_no: this.order.order_no,
-			        reason: this.reasonText,
-			        auth_status: '2'
-			    }).then(res => {
-			        console.log('Response:', res); // 打印响应数据
-			        if (res.code === 1) { // 使用严格相等比较
-			            this.refuseShow = false;
-			            this.reasonText = '';
-			            uni.showToast({
-			                title: '已拒绝',
-			                icon: 'none',
-			                duration: 2000
-			            });
-			            that.page = 1;
-			            that.list = [];
-			            that.getList();
-			        } else {
-			            uni.showToast({
-			                title: res.msg || '操作失败，请重试', // 防止 res.msg 为空
-			                icon: 'none',
-			                duration: 2000
-			            });
-			        }
-			    }).catch(error => {
-			        console.error('Error:', error); // 打印错误信息
-			        uni.showToast({
-			            title: '请求失败，请稍后再试',
-			            icon: 'none',
-			            duration: 2000
-			        });
-			    });
-			},
-			// 获取详情
-			getDetail() {
-				uni.$u.http.get('/api/school/activity/detail', {
-					params: {
-						id: this.id,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.detail = res.data.detail;
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					// 处理错误
-					console.error('获取详情失败:', error);
-				});
-			},
-			getOrder(id, type) {
-				uni.$u.http.get('/api/school.worker.activity.order/detail', {
-					params: {
-						id: id,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.order = res.data.detail;
-						if (type == 1) {
-							this.refuseShow = true
-						} else {
-							this.agreeShow = true
-						}
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					// 处理错误
-					console.error('获取详情失败:', error);
-				});
-			},
-
-			headerSelected(type) {
-				return this.type === type;
-			},
-			selectheader(type, auth_status,status) {
-				const that = this
-				that.type = type;
-				that.auth_status = auth_status;
-				that.status = status;
-				that.page = 1
-				that.list = []
-				that.getList()
-			},
-			getList() {
-				uni.$u.http.get('/api/school.worker.activity.order/order_list', {
-					params: {
-						keywords: this.keywords,
-						page: this.page,
-						limit: this.limit,
-						status: this.status,
-						auth_status: this.auth_status,
-						classes_lib_id: this.classes_lib_id
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.count = res.data.count
-						this.list = [...this.list, ...res.data.list];
-						if (this.list.length >= res.data.count) {
-							this.loadStatus = 'nomore';
-						} else {
-							this.loadStatus = 'loading';
-						}
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-						this.loadStatus = 'loading';
-					}
-				}).catch(error => {
-					console.error('请求失败', error);
-					this.loadStatus = 'loading';
-				});
-			},
-
-			// 导航
-			toMap(latitude, longitude, name) {
-				uni.openLocation({
-					latitude: parseFloat(latitude),
-					longitude: parseFloat(longitude),
-					name: name,
-					success: function() {
-						console.log('success');
-					}
-				});
-			},
-
-			callPhone(phone) {
-				uni.makePhoneCall({
-					phoneNumber: phone
-				})
-			},
-
-
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.w-100 {
-		width: 100%;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.flex-start {
-		align-items: flex-start;
-	}
-
-	.justify-center {
-		justify-content: center;
-	}
-
-	.align-items {
-		align-items: center;
-	}
-
-	.flex-column {
-		flex-flow: column;
-	}
-
-	.justify-start {
-		justify-content: start;
-	}
-
-	.space-between {
-		justify-content: space-between;
-	}
-
-	// .con-center {
-	// 	background: linear-gradient(to bottom,
-	// 			#F1F2F8 0%,
-	// 			#F1F2F8 10%,
-	// 			#FFFFFF 50%,
-	// 			#FFFFFF 95%);
-	// }
-
-	.swiper {
-		width: 100%;
-		height: 450rpx;
-	}
-
-	.box {
-		position: relative;
-		background: #F1F2F8;
-		// min-height: 100vh;
-	}
-
-	.first-box {
-		width: 690rpx;
-		background: #FFFFFF;
-		padding-left: 24rpx;
-		margin-top: 24rpx;
-		border-radius: 20rpx;
-
-		.huodong {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 26rpx;
-			margin: 23rpx 0;
-
-		}
-
-		.line-row {
-			width: 642rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			margin: 30rpx;
-		}
-
-		.center {
-			margin-left: 24rpx;
-
-			.title {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #343434;
-			}
-
-			.cen-tit {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-				margin-top: 39rpx;
-			}
-		}
-
-		.right {
-			.btn1 {
-				width: 138rpx;
-				height: 48rpx;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #FFFFFF;
-			}
-
-			.btn {
-				width: 138rpx;
-				height: 48rpx;
-				background: #D9D9D9;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #FFFFFF;
-			}
-
-			.price {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #FF5F5F;
-				margin-top: 39rpx;
-			}
-		}
-
-		.line-title {
-			margin-bottom: 18rpx;
-
-			.title {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-			}
-
-			.conter {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #7A7A7A;
-			}
-		}
-
-		.first-name {
-			width: 100%;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 34rpx;
-			color: #343434;
-			margin-top: 32rpx;
-		}
-
-		.first-money {
-			height: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 28rpx;
-			color: #FF2323;
-		}
-
-		.first-mine {
-			height: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-
-		}
-
-		.first-txt {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-			line-height: 32rpx;
-			margin: 0 6rpx;
-		}
-
-		.first-image {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-			margin: 16rpx 0 16rpx 0;
-		}
-	}
-
-	.second-box {
-		width: 90%;
-		margin-top: 42rpx;
-		// background: #FFFFFF;
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		padding-left: 24rpx;
-		position: relative;
-
-		.second-title {
-			// margin: 17rpx 35rpx 15rpx 0;
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
-
-		.second {
-			padding: 24rpx 23rpx 0 0rpx;
-			margin-top: 32rpx;
-
-			view {
-				width: 20%;
-				margin: 24rpx 0 0 0;
-			}
-
-			image {
-				width: 54rpx;
-				height: 54rpx;
-			}
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #7A7A7A;
-				text-align: center;
-				overflow: hidden;
-				white-space: nowrap;
-				width: 100%;
-			}
-
-		}
-
-		.number {
-			width: 108rpx;
-			color: #FF4949;
-			font-size: 42rpx;
-			font-weight: bold;
-			text-align: center;
-		}
-	}
-
-	.third {
-		margin-top: 24rpx;
-		width: 93%;
-
-		.third-header {
-			padding-bottom: 12rpx;
-			border-bottom: 2rpx solid #008CFF;
-		}
-
-		.third-box {
-			margin: 12rpx 0 0 24rpx;
-		}
-
-		.third-center {
-			margin-top: 28rpx;
-			width: 100%;
-			height: 242rpx;
-			overflow: hidden;
-			position: relative;
-		}
-
-		.scroll-container {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			animation: scroll 12s linear infinite;
-		}
-
-		@keyframes scroll {
-			0% {
-				transform: translateX(0);
-			}
-
-			100% {
-				transform: translateX(calc(-100% + 8 * 100px));
-				/* 8 * 100px 是假设每个项目的宽度为 100px */
-			}
-		}
-
-		.item {
-			display: flex;
-			width: 94%;
-			align-items: center;
-			justify-content: space-between;
-			padding: 22rpx 24rpx 24rpx 24rpx;
-			height: 32rpx;
-
-			/* 假设每条数据的高度为60rpx */
-		}
-
-		.item image {
-			margin-right: 10rpx;
-		}
-
-		.line-colum {
-			margin: 0 10rpx;
-			border-left: 1rpx solid #ccc;
-			height: 42rpx;
-		}
-
-		.item span {
-			margin-right: 10rpx;
-		}
-
-		@keyframes scroll {
-			0% {
-				transform: translateY(0);
-			}
-
-			100% {
-				transform: translateY(-240rpx);
-				/* 总高度为 4 * 60rpx = 240rpx */
-			}
-		}
-	}
-
-
-	.six {
-		margin-bottom: 106rpx;
-		width: 100%;
-		background: linear-gradient(to bottom, #F1F2F8 0%, #FFFFFF 1%, #FFFFFF 100%);
-		align-items: center;
-
-
-		.six-header {
-			width: 93%;
-			padding-top: 64rpx;
-			padding-bottom: 12rpx;
-			border-bottom: 2rpx solid #008CFF;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 42rpx;
-			color: #008CFF;
-			// background: linear-gradient(to bottom, #F1F2F8 0%, #ffffff 24%, #FFFFFF 100%);
-		}
-
-		.six-box {
-			width: 93%;
-			margin: 12rpx 0 0 24rpx;
-		}
-
-		.six-center {
-			width: 93%;
-			margin-top: 41rpx;
-
-
-			.s-header {
-				padding: 24rpx;
-				width: 642rpx;
-
-				span {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-				}
-			}
-
-			.s-footer {
-				padding: 24rpx;
-				width: 642rpx;
-
-				span {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-				}
-			}
-
-			.s-footer .h4 {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: bold;
-				font-size: 36rpx;
-				color: #656565;
-			}
-		}
-
-	}
-
-
-	.line {
-		width: 95%;
-		height: 1rpx;
-		background: #D9D9D9;
-		margin: 19rpx 0 19rpx 0;
-	}
-
-	.icon-size {
-		width: 36rpx;
-		height: 36rpx;
-	}
-
-
-	.footer {
-		width: 100%;
-		height: 166rpx;
-		background: #ffffff;
-		// box-shadow: 0rpx -2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
-		position: sticky;
-		z-index: 99;
-		/* 绝对定位 */
-		bottom: 0;
-		/* 定位在底部 */
-		left: 0;
-		/* 定位在左边 */
-
-		.footer-left {
-			position: absolute;
-			top: 24rpx;
-			left: 42rpx;
-			display: flex;
-
-			view {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				flex-flow: column;
-				// margin-right: 42rpx;
-
-				span {
-					text-align: center;
-				}
-			}
-
-			.feiyong {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #343434;
-
-				.price {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 34rpx;
-					color: #FF5F5F;
-				}
-			}
-
-			.tips {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-			}
-
-			image {
-				width: 50rpx;
-				height: 50rpx;
-			}
-		}
-
-		.footer-right {
-			position: absolute;
-			top: 27rpx;
-			right: 30rpx;
-			width: 250rpx;
-			height: 80rpx;
-			background: #D9D9D9;
-			border-radius: 401rpx 401rpx 401rpx 401rpx;
-
-			span {
-				font-family: Kingnamype Yuanmo SC, Kingnamype Yuanmo SC;
-				font-weight: 400;
-				font-size: 34rpx;
-				color: #FFFFFF;
-				letter-spacing: 6rpx;
-				text-align: center;
-				font-style: normal;
-				text-transform: none;
-			}
-		}
-
-		.footer-right1 {
-			position: absolute;
-			top: 27rpx;
-			right: 30rpx;
-			width: 250rpx;
-			height: 80rpx;
-			background: #008CFF;
-			border-radius: 401rpx 401rpx 401rpx 401rpx;
-
-			span {
-				font-family: Kingnamype Yuanmo SC, Kingnamype Yuanmo SC;
-				font-weight: 400;
-				font-size: 34rpx;
-				color: #FFFFFF;
-				letter-spacing: 6rpx;
-				text-align: center;
-				font-style: normal;
-				text-transform: none;
-			}
-		}
-	}
-
-
-	.share {
-		position: fixed;
-		color: #FFFFFF;
-		right: 0;
-		bottom: 190rpx;
-		background: linear-gradient(to bottom right, #FE726B, #FE956B);
-		padding: 10rpx 10rpx 10rpx 20rpx;
-		border-top-left-radius: 50px;
-		border-bottom-left-radius: 50px;
-		box-shadow: 0 0 20upx rgba(0, 0, 0, .09);
-	}
-
-	.cancel {
-		width: 100vw;
-		padding: 30rpx;
-		text-align: center;
-		background: #FFFFFF;
-		color: red;
-		font-weight: bold;
-		font-size: 30rpx;
-	}
-
-	.md-content {
-		display: flex;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		padding: 50rpx 0;
-		background-color: white;
-	}
-
-	.md-content-item {
-		margin: 0 70rpx;
-		position: relative;
-	}
-
-	.md-content-item image {
-		width: 100rpx;
-		height: 100rpx;
-	}
-
-	.md-content-item view {
-		margin-top: 15rpx;
-		font-size: 28rpx;
-	}
-
-	.sharebtn {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		opacity: 0;
-	}
-
-	.cu-modal {
-		position: fixed;
-		bottom: 166rpx;
-		left: 0;
-		z-index: 999999;
-	}
-
-	.gj {
-		.title {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 32rpx;
-			color: #4B4B4B;
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #4B4B4B;
-			}
-		}
-
-		.scroll {
-			width: 642rpx;
-			max-height: 340rpx;
-
-			view {
-				margin: 24rpx;
-				width: 600rpx;
-				height: 56rpx;
-				background: #E8E8E8;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-
-				.title {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #7A7A7A;
-				}
-
-				.red {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #FF5F5F;
-				}
-
-				.lan {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #008CFF;
-				}
-			}
-		}
-	}
-
-	::v-deep ::-webkit-scrollbar {
-		/*滚动条整体样式*/
-		width: 4px !important;
-		height: 1px !important;
-		overflow: auto !important;
-		background: #ccc !important;
-		-webkit-appearance: auto !important;
-		display: block;
-	}
-
-	::v-deep ::-webkit-scrollbar-thumb {
-		/*滚动条里面小方块*/
-		border-radius: 10px !important;
-		box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
-		background: #7b7979 !important;
-	}
-
-	::v-deep ::-webkit-scrollbar-track {
-		/*滚动条里面轨道*/
-		// box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
-		// border-radius: 10px !important;
-		background: #FFFFFF !important;
-	}
-
-	.Poster {
-		position: relative;
-		top: 21rpx;
-		left: 30rpx;
-		width: 690rpx;
-	}
-
-	.posterClose {
-		position: absolute;
-		right: 8rpx;
-		top: 8rpx;
-	}
-
-	.pos {
-		position: relative;
-	}
-
-
-
-	.no-scroll {
-		overflow: hidden;
-		height: 100vh;
-	}
-
-	.no-border-button {
-		background-color: transparent;
-		/* 去掉背景色 */
-		border: none;
-		/* 去掉边框 */
-		padding: 0;
-		/* 去掉内边距 */
-		margin: 0;
-		/* 去掉外边距 */
-		display: inline-flex;
-		/* 使按钮内容居中 */
-		align-items: center;
-		/* 垂直居中 */
-		justify-content: center;
-		/* 水平居中 */
-		flex-flow: column;
-		height: 110rpx;
-		line-height: inherit;
-
-		span {
-			text-align: center;
-			width: 48rpx;
-			height: 34rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #777777;
-		}
-	}
-
-	.popupBox {
-		// height: 365rpx;
-		margin-top: 22rpx;
-		width: 750rpx;
-
-		.pop-header {
-			width: 93%;
-			padding-top: 32rpx;
-			padding-bottom: 17rpx;
-
-			border-bottom: 2rpx solid #D9D9D9;
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				font-size: 20rpx;
-				color: #343434;
-			}
-		}
-
-		.popup {
-			display: flex;
-			align-items: self-start;
-			justify-content: center;
-			padding-top: 21rpx;
-
-			.popur-right {
-				align-items: self-start;
-				margin-left: 24rpx;
-				width: 418rpx;
-
-				.name {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 28rpx;
-					color: #343434;
-				}
-
-				.address {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-					margin: 16rpx 0 12rpx 0;
-					overflow: hidden;
-					/* 确保超出容器的文本被隐藏 */
-					white-space: nowrap;
-					/* 确保文本在一行内显示 */
-					text-overflow: ellipsis;
-					/* 使用省略号表示被截断的文本 */
-					width: 100%;
-				}
-
-				.date {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-				}
-
-				.time {
-					margin: 24rpx 0;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-				}
-
-				.line-row {
-					width: 418rpx;
-					height: 1rpx;
-					background: #008CFF;
-					border-radius: 0rpx 0rpx 0rpx 0rpx;
-				}
-
-				.price {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-					margin-top: 23rpx;
-					align-self: flex-end;
-
-					span {
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 800;
-						font-size: 36rpx;
-						color: #FF2323;
-						line-height: 32rpx;
-					}
-				}
-			}
-
-		}
-
-		.popup-footer {
-			margin-top: 42rpx;
-
-			span {
-				width: 642rpx;
-				height: 80rpx;
-				background: #008CFF;
-				border-radius: 401rpx 401rpx 401rpx 401rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #FFFFFF;
-				line-height: 32rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-
-
-		.line {
-			width: 642rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			box-shadow: 1rpx 1rpx 0rpx 0rpx rgba(102, 102, 102, 0.25);
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-
-		.times {
-			width: 93%;
-
-			.selectTime {
-				width: 288rpx;
-				height: 50rpx;
-				background: #FFFFFF;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				border: 1rpx solid #D9D9D9;
-				color: #4B4B4B;
-				font-family: 'PingFang SC', 'PingFang SC';
-				font-weight: 500;
-				font-size: 24rpx;
-				padding-left: 15rpx;
-				cursor: pointer;
-				margin: 24rpx 32rpx 0 0;
-				white-space: nowrap;
-				/* 防止文本换行 */
-				text-overflow: ellipsis;
-				/* 超出部分显示省略号 */
-				overflow: hidden;
-				/* 隐藏超出部分 */
-				text-align: left;
-				/* 文字靠左对齐 */
-				line-height: 50rpx;
-				/* 垂直居中对齐 */
-				box-sizing: border-box;
-				/* 确保 padding 和 border 不影响宽度和高度 */
-				display: inline-block;
-				/* 确保容器内文字正确对齐 */
-			}
-
-		}
-
-		.selectTime.selected {
-			width: 288rpx;
-			height: 50rpx;
-			border-radius: 12rpx 12rpx 12rpx 12rpx;
-			background: #008CFF;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			cursor: pointer;
-			margin: 24rpx 32rpx 0 0;
-
-		}
-	}
-
-	.header {
-		// height: 50rpx;
-		margin-top: 37rpx;
-		width: 690rpx;
-
-		.s-header {
-			// width: 104rpx;
-			width: 84rpx;
-			height: 26rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 400;
-			font-size: 28rpx;
-			color: #9E9E9E;
-		}
-
-		.s-header.selected {
-			// width: 104rpx;
-			padding: 10rpx 10rpx;
-			height: 50rpx;
-			background: #008CFF;
-			border-radius: 12rpx 12rpx 12rpx 12rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 28rpx;
-			color: #FFFFFF;
-			line-height: 26rpx;
-		}
-	}
-
-	.centerBox {
-		width: 642rpx;
-		padding: 24rpx 24rpx 32rpx 24rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx 20rpx 20rpx 20rpx;
-		margin-top: 24rpx;
-
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		font-size: 24rpx;
-		color: #7A7A7A;
-
-
-		.box-line {
-			width: 635rpx;
-			height: 1rpx;
-			background: #C0C0C0;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-			margin-top: 13rpx;
-		}
-
-		.status {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #008CFF;
-		}
-
-	}
-
-	.refuse {
-		width: 138rpx;
-		height: 48rpx;
-		border-radius: 12rpx 12rpx 12rpx 12rpx;
-		border: 2rpx solid #008CFF;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 800;
-		font-size: 24rpx;
-		color: #008CFF;
-		margin-right: 10rpx;
-	}
-
-	.refuseNone {
-		width: 138rpx;
-		height: 48rpx;
-		border-radius: 12rpx 12rpx 12rpx 12rpx;
-		border: 2rpx solid #D9D9D9;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 800;
-		font-size: 24rpx;
-		color: #D9D9D9;
-		margin-right: 10rpx;
-	}
-
-	.argee {
-		width: 138rpx;
-		height: 48rpx;
-		background: #008CFF;
-		border-radius: 12rpx 12rpx 12rpx 12rpx;
-		border: 2rpx solid #008CFF;
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 800;
-		font-size: 24rpx;
-		color: #FFFFFF;
-	}
-
-	.argeeNone {
-		width: 138rpx;
-		height: 48rpx;
-		background: #D9D9D9;
-		border-radius: 12rpx 12rpx 12rpx 12rpx;
-		font-family: PingFang SC, PingFang SC;
-		border: 2rpx solid #D9D9D9;
-		font-weight: 800;
-		font-size: 24rpx;
-		color: #FFFFFF;
-	}
-
-	.center-box {
-		width: 690rpx;
-
-		.title {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 42rpx;
-			padding: 30rpx;
-
-		}
-
-		.text {
-			padding: 0 30rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-		}
-
-		.jine {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 28rpx;
-			color: #343434;
-		}
-
-		.line {
-			width: 690rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-			margin: 11rpx 31rpx 0 0;
-		}
-
-		.price {
-			margin-top: 32rpx;
-			height: 53rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 62rpx;
-			color: #FF5F5F;
-			padding: 0 30rpx;
-			width: 630rpx;
-		}
-
-		.jine {
-			padding: 30rpx;
-		}
-
-		.red {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #FF5F5F;
-		}
-
-		input {
-			height: 53rpx;
-		}
-
-		.btnList {
-			padding: 30rpx 0;
-			width: 642rpx;
-
-			span {
-				width: 306rpx;
-				height: 80rpx;
-				border-radius: 401rpx 401rpx 401rpx 401rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-	}
-
-	.line-row {
-		width: 630rpx;
-		height: 1rpx;
-		background: #D9D9D9;
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
-		margin: 32rpx 0 38rpx 0;
-	}
-</style>
\ No newline at end of file
diff --git a/packageA/activity/activityDetaill.vue b/packageA/activity/activityDetaill.vue
deleted file mode 100644
index e125902..0000000
--- a/packageA/activity/activityDetaill.vue
+++ /dev/null
@@ -1,1376 +0,0 @@
-<template>
-	<view class="box flex justify-start flex-column align-items" :class="'no-scroll'">
-		<view class="swiper">
-			<u-swiper :list="detail.images" indicator indicatorMode="line" height="480rpx" circular></u-swiper>
-		</view>
-		<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
-			<view class="first-box flex flex-start flex-column justify-start">
-				<view class="flex align-items" style="width: 690rpx;">
-				<span class="Sign  flex justify-center align-items" style="color: #FFFFFF;background: #A4A4A4;"
-					v-if="detail.has_sign_expire == 1">已 结 束</span>
-				<span class="Sign  flex justify-center align-items"
-					style="color: #222222;background: #BEEE03;"
-					v-if="detail.has_sign_expire == 2">报 名</span>
-					<span class="first-name white-space-2">
-					{{'' + detail.title}}</span>
-				</view>
-				<!-- <span class="line"></span>
-				<span class="huodong text-blue">活动介绍</span> -->
-				<view class="line-title white-space" v-if="detail.feel != 1">
-				<view class="circle"> </view>
-					<span class="title">报名费用:</span>
-					<span class="conter " style="color: #FF5F5F;">{{'' + detail.price + '元'}}</span>
-				</view>
-				<view class="line-title white-space" v-if="detail.feel == 1">
-				<view class="circle"> </view>
-					<span class="title">报名费用:</span>
-					<span class="conter " style="color: #FF5F5F;">{{'' + '公益'}}</span>
-				</view>
-				<view class="line-title white-space">
-					<view class="circle"> </view>
-					<span class="title">活动人数:</span>
-					<span class="conter ">{{'' + detail.id == 16 ? 50 : detail.stock}}</span>
-				</view>
-				<view class="line-title white-space">
-					<view class="circle"> </view>
-					<span class="title">报名时间:</span>
-					<span class="conter ">{{'' + detail.sign_start_time_text}} - {{detail.sign_end_time_text}}</span>
-				</view>
-				<view class="line-title white-space">
-					<view class="circle"> </view>
-					<span class="title">活动时间:</span>
-					<span class="conter">{{'' + detail.start_time_text}} - {{detail.end_time_text}}</span>
-				</view>
-				<view class="line-title white-space flex align-items"
-					@click.stop="toMap(detail.latitude,detail.longitude,detail.address_detail)">
-					<view class="circle"> </view>
-					<span class="title">活动地址:</span>
-					<span class="conter flex align-items ">
-						<span class="white-space" style="width: 500rpx;">{{'' + detail.address_detail}}</span>
-						<image src="../../static/center/address.png" mode="" class="icon-size"></image>
-					</span>
-				</view>
-				
-				
-				
-			<!-- 	<view class="line-title">
-					<span class="title">可参与人数:</span>
-					<span class="conter">{{'' + detail.id == 16 ? 50 : detail.stock}}</span>
-				</view> -->
-				<!-- <view class="line-title white-space">
-					<view class="circle"> </view>
-					<span class="title">已参加人数:</span>
-					<span class="conter ">{{'' + detail.id == 16 ? 50 : detail.sale}}</span>
-				</view>
-				<view class="line-title white-space">
-					<view class="circle"> </view>
-					<span class="title">活动项目:</span>
-					<span class="conter ">{{'' + detail.item}}</span>
-				</view> -->
-				
-				<!-- <view class="flex justify-center flex-column align-items w-100" v-if="detail.status == 2">
-					<image :src="detail.codeimage" mode="" style="width: 376rpx; height: 376rpx;"></image>
-					<span style="margin: 34rpx 0;font-weight: 800;font-size: 38rpx;color: #343434;">核销二维码</span>
-				</view> -->
-				<!-- <view class="flex flex-column gj">
-					<scroll-view :scroll-top="scrollTop" scroll-y="true" class="flex flex-column align-items scroll">
-						<view v-for="(item,index) in detail.item_json" :key="index">
-							<span class="title">{{ item.formattedTime}}</span>
-							<span v-if="item.sign_num === item.limit_num" class="red">(已满)</span>
-							<span v-else class="lan">({{item.sign_num + '/' + item.limit_num}})</span>
-						</view>
-					</scroll-view>
-				</view> -->
-			</view>
-			<!-- <view class="first-box flex flex-column " style="width: 642rpx; padding: 30rpx 24rpx;"
-				v-if="detail.status == 1">
-				<view class="flex" style="justify-content: space-between; flex-wrap: wrap;"
-					v-for="(item, index) in skuList" :key="index" :class="{ selected: selectedIndex === index }"
-					@click="item.status != 2 && selectItem(index, item)">
-					<view class="flex">
-						<view class="left">
-							<image
-								:src="selectedIndex === index ? '../../static/my/selected.png' : '../../static/my/select.png'"
-								mode="" style="width: 42rpx; height: 42rpx;"></image>
-						</view>
-						<view class="center flex flex-column">
-							<span class="title white-space" style="width: 400rpx;">{{ item.name }}</span>
-							<view class="cen-tit">
-								<span>{{ item.limit_num }}人</span>
-								<span style="margin: 0 24rpx;">{{ item.age }}</span>
-								<span v-if="item.sex == 1">男</span>
-								<span v-if="item.sex == 0">女</span>
-								<span v-if="item.sex == 3">男女不限</span>
-							</view>
-						</view>
-					</view>
-					<view class="right flex flex-column align-items">
-						<span class="btn1 bg-blue flex align-items justify-center"
-							v-if="detail.has_sign_expire == 2">报名</span>
-						<span class="btn flex align-items justify-center" v-if="detail.has_sign_expire == 1">已结束</span>
-						<span class="price" v-if="item.feel == 2">{{ item.price }}元/人</span>
-						<span class="price" v-if="item.feel == 1">公益</span>
-					</view>
-					<span class="line-row"></span>
-				</view>
-			</view> -->
-		</view>
-		<!-- 课程详情 -->
-		<view class="six flex flex-column" style="justify-content: flex-start;">
-			<!-- <view class="six-header flex align-items space-between">
-				活动详情
-			</view> -->
-			<view class="six-top">
-				<view class="left flex align-items">
-					<span>活动详情</span>
-				</view>
-			</view>
-			<view class="six-center flex first-txt  flex-column">
-				<!-- <rich-text :nodes="detail.content" style="width: 100%;" :tagStyle="style"></rich-text> -->
-				<u-parse :content="detail.content" :tagStyle="style"></u-parse>
-				<!-- <view class="s-header flex justify-start flex-column">
-					<span>单门课程报名费用：499元/10小时，共5节课</span>
-					<span>上课时间：每周对应固定时间晚上19：00-21：00</span>
-					<span>上课人数：每门课程10人起</span>
-					<span>上课地点：</span>
-					<span>洛阳市老城区同化街1654号</span>
-				</view>
-				<image src="../../static/center/detail.png" mode="" style="width: 644rpx; height: 1054rpx;"></image> -->
-			</view>
-		</view>
-		<view class="footer flex align-items">
-			<view class="footer-left">
-				<button open-type="share" class="no-border-button" plain="true">
-					<view class="">
-						<image src="../../static/my/share.png" mode=""></image>
-						<span>分享</span>
-					</view>
-				</button>
-				<view class="flex flex-column" style=" margin-left: 32rpx;align-items: flex-start;">
-					<view class="feiyong flex" style="flex-flow: row;">
-						<span>报名费用:</span>
-						<span class="price" v-if="price != 0">{{'￥' + price}}</span>
-						<span class="price" v-if="price == 0">{{'公益'}}</span>
-					</view>
-					<span class="tips">报名成功后不能取消</span>
-				</view>
-			</view>
-			<!-- <view class="footer-right flex justify-center align-items" v-if="detail.has_expire == 1">
-				<span>已 结 束 </span>
-			</view>
-			<view class="footer-right1 flex justify-center align-items" v-if="detail.has_expire == 2" @click.stop="sign()">
-				<span>报 名</span>
-			</view> -->
-			<view class="footer-right flex justify-center align-items" v-if="detail.has_sign_expire == 1">
-				<span>已 结 束 </span>
-			</view>
-			<view class="footer-right1 flex justify-center align-items" v-if="detail.has_sign_expire == 2" @click.stop="sign()">
-				<span>报 名</span>
-			</view>
-		</view>
-		<!-- 购买弹窗 -->
-		<u-popup :show="buyShow" mode="center" :round="10" :zIndex="99999" :custom-style="popupStyle" @close="buyClose"
-			@open="buyOpen" safeAreaInsetBottom="false">
-			<view class="popupBox flex justify-start align-items flex-column">
-				<view class="pop-header flex align-items" style="justify-content: space-between;">
-					<!-- <image src="../../static/center/buy.png" mode="" style="width: 168rpx; height: 48rpx;">
-					</image> -->
-					确认订单
-				</view>
-				<view class="popup">
-					<image :src="detail.headimage" mode="" style="width: 200rpx; height: 140rpx;"></image>
-					<view class="popur-right flex flex-column">
-						<span class="name white-space">{{name}}</span>
-						<span class="address">地址:{{detail.address_detail}}</span>
-						<span class="date">开始时间:{{detail.start_time_text}}</span>
-						<span class="time">结束时间:{{detail.end_time_text}}</span>
-						<span class="line-row"></span>
-						<span class="price">
-							课程价格:
-							<span v-if="price != 0">￥{{price}}</span>
-							<span v-if="price == 0">公益</span>
-						</span>
-					</view>
-				</view>
-				<view class="popup-footer flex " @click="buy()">
-					<span v-if="detail.feel == 0">立 即 支 付</span>
-					<span v-if="detail.feel == 1">确 认 报 名</span>
-					<u-loading-icon :vertical="true" v-if="uloadingShow"></u-loading-icon>
-				</view>
-			</view>
-		</u-popup>
-
-
-
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				id: '',
-				detail: '',
-				selectedIndex: 0, // 默认选中第一个
-				listOrder_no: '',
-				price: '',
-				name:'',
-				order_no:'',
-				skuId:'',
-				uloadingShow:false,
-				buyShow:false,
-				PayPirce:'',
-				popupStyle: {
-					width: '100%',
-					height: '570rpx',
-					margin: '0 auto', // 水平居中
-					display: 'flex',
-					justifyContent: 'flex-start',
-					alignItems: 'center'
-				},
-				skuList:[]  //规格
-			};
-		},
-		onShareTimeline() {
-			return {
-				title: this.detail.title,//分享的标题
-				imageUrl: this.detail.headimage,//展示的图片，这里是本地路径的写法，也可以写http或https开头的图片路径
-				 query: `id=${this.id}`
-			}
-		},
-		onLoad(options) {
-			this.userInfo = uni.getStorageSync("userInfo")
-			this.id = options.id
-			this.getDetail()
-
-		},
-		methods: {
-			buyOpen() {
-				this.buyShow = true
-				this.type = 1
-			},
-			buyClose() {
-				this.type = 0
-				this.selectedTime = null
-				this.buyShow = false
-			},
-			// 购买弹窗
-			sign(){
-				this.buyShow = true
-			},
-			buy() {
-				this.uloadingShow = true
-				this.getMoney()
-			},
-			// 获取价格
-			getMoney() {
-				uni.$u.http.post('/api/school/activity.order/confirm', {
-					classes_activity_id: this.id,
-					order_no: this.order_no,
-					classes_activity_item_id: this.skuId,
-					is_compute: 1
-				}).then(res => {
-					if (res.code == 1) {
-						this.PayPirce = res.data.order_data.totalprice
-						this.order_no = res.data.order_no
-						this.create(this.order_no, this.PayPirce)
-					} else {
-						this.uloadingShow = false
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-						// _this.$api.toast(res.msg);
-					}
-					this.uloadingShow = false
-				}).catch(error => {
-			
-				});
-			},
-			// 创建订单
-			create(order_no, PayPirce) {
-				uni.$u.http.post('/api/school/activity.order/create', {
-					order_no: order_no,
-				}).then(res => {
-					
-					if (res.code == 1) {
-						if (PayPirce != 0) {
-							this.pament()
-						} else {
-							uni.showToast({
-								title: '创建成功',
-								icon: 'success',
-								duration: 2000,
-								complete: function() {
-									setTimeout(function() {
-										uni.redirectTo({
-											url: "/packageA/activity/exercise"
-										})
-									}, 2000);
-								}
-							});
-							this.uloadingShow = false
-							
-						}
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-						that.uloadingShow = false
-						
-						// _this.$api.toast(res.msg);
-					}
-				}).catch(error => {
-			
-				});
-			},
-			// 支付
-			pament() {
-				let that = this
-				that.uloadingShow = false
-				uni.$u.http.post('/api/school.activity.pay/payment', {
-					type: 'wechat',
-					order_no: that.order_no,
-					platform: 'miniapp'
-				}).then(res => {
-					if (res.code == 1) {
-						that.uloadingShow = false
-						wx.requestPayment({
-							timeStamp: res.data.paydata.timeStamp, //时间戳
-							nonceStr: res.data.paydata.nonceStr, //随机字符串
-							package: res.data.paydata.package, //prepay_id
-							signType: res.data.paydata.signType, //签名算法MD5
-							paySign: res.data.paydata.paySign, //签名
-							success(res) {
-								if (res.errMsg == "requestPayment:ok") {
-									that.order_no = ''
-									uni.redirectTo({
-										url: "/packageA/activity/exercise"
-									})
-									console.log('支付成功', res)
-								} else {
-									console.log('支付失败')
-								}
-							},
-							fail(res) {
-								that.uloadingShow = false
-								console.log('支付失败', res)
-							}
-						})
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-						// _this.$api.toast(res.msg);
-					}
-				}).catch(error => {
-			
-				});
-			},
-			selectItem(index, item) {
-				this.selectedIndex = index;
-				this.listOrder_no = item.order_no
-				this.price = item.price
-				this.skuId = item.id
-				this.name = item.name
-			},
-			// 获取详情
-			getDetail() {
-				uni.$u.http.get('/api/school/activity/detail', {
-					params: {
-						id: this.id,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.getSkuList()
-						this.detail = res.data.detail;
-						// 找到第一个 status 为 1 的 item 的下标
-					
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					// 处理错误
-					console.error('获取详情失败:', error);
-				});
-			},
-			// 规格
-			getSkuList() {
-				uni.$u.http.get('/api/school/activity/spec', {
-					params: {
-						id: this.id,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.skuList = res.data.spec
-						this.selectedIndex = this.skuList.findIndex(item => item.status == 1);
-						// 如果没有找到，赋值为 -1
-						if (this.selectedIndex == -1) {
-							this.selectedIndex = -1;
-						} else {
-							// 获取第一个 status 为 1 的 item 的 price
-							this.price = this.skuList[this.selectedIndex].price;
-							this.skuId = this.skuList[this.selectedIndex].id;
-							this.name = this.skuList[this.selectedIndex].name;
-						}
-						
-						// 如果没有找到 status 为 1 的 item，则使用 this.detail.price
-						if (this.selectedIndex == -1 && this.skuList) {
-							this.price = this.detail.price;
-							this.name = this.detail.title
-						}
-						console.log(this.name ,'this.name ')
-						console.log(this.price ,'this.price ')
-						console.log(this.skuId ,'this.skuId ')
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					// 处理错误
-					console.error('获取规格失败:', error);
-				});
-			},
-
-			// 导航
-			toMap(latitude, longitude, name) {
-				uni.openLocation({
-					latitude: parseFloat(latitude),
-					longitude: parseFloat(longitude),
-					name: name,
-					success: function() {
-						console.log('success');
-					}
-				});
-			},
-
-
-			callPhone(phone) {
-				uni.makePhoneCall({
-					phoneNumber: phone
-				})
-			},
-
-
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.w-100 {
-		width: 100%;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.flex-start {
-		align-items: flex-start;
-	}
-
-	.justify-center {
-		justify-content: center;
-	}
-
-	.align-items {
-		align-items: center;
-	}
-
-	.flex-column {
-		flex-flow: column;
-	}
-
-	.justify-start {
-		justify-content: start;
-	}
-
-
-	.con-center {
-		background: #FFFFFF;
-	}
-
-	.swiper {
-		width: 100%;
-		height: 480rpx;
-	}
-
-	.box {
-		position: relative;
-	}
-
-	.first-box {
-		width: 690rpx;
-		background: #FFFFFF;
-		padding-left: 24rpx;
-		margin-top: 24rpx;
-		border-radius: 20rpx;
-		.Sign {
-			width: 120rpx;
-			height: 40rpx;
-			border-radius: 4rpx 4rpx 4rpx 4rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 500;
-			font-size: 24rpx;
-			margin-right: 16rpx;
-		}
-
-		.huodong {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 26rpx;
-			margin: 23rpx 0;
-
-		}
-
-		.line-row {
-			width: 642rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			margin: 30rpx;
-		}
-
-		.center {
-			margin-left: 24rpx;
-
-			.title {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #343434;
-			}
-
-			.cen-tit {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-				margin-top: 39rpx;
-			}
-		}
-
-		.right {
-			.btn1 {
-				width: 138rpx;
-				height: 48rpx;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #FFFFFF;
-			}
-
-			.btn {
-				width: 138rpx;
-				height: 48rpx;
-				background: #D9D9D9;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #FFFFFF;
-			}
-
-			.price {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #FF5F5F;
-				margin-top: 39rpx;
-			}
-		}
-
-		.line-title {
-			margin-bottom: 18rpx;
-			display: flex;
-			align-items: center;
-			.circle{
-				width: 8rpx;
-				height: 8rpx;
-				background: #BEEE03;
-				border-radius: 8rpx;
-				margin-right: 14rpx;
-			}
-
-			.title {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-			}
-
-			.conter {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #7A7A7A;
-			}
-		}
-
-		.first-name {
-			width: 100%;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 34rpx;
-			color: #343434;
-			margin-top: 32rpx;
-		}
-
-		.first-money {
-			height: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 28rpx;
-			color: #FF2323;
-		}
-
-		.first-mine {
-			height: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-
-		}
-
-		.first-txt {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-			line-height: 32rpx;
-			margin: 0 6rpx;
-		}
-
-		.first-image {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-			margin: 16rpx 0 16rpx 0;
-		}
-	}
-
-	.second-box {
-		width: 90%;
-		margin-top: 42rpx;
-		// background: #FFFFFF;
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		padding-left: 24rpx;
-		position: relative;
-
-		.second-title {
-			// margin: 17rpx 35rpx 15rpx 0;
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
-
-		.second {
-			padding: 24rpx 23rpx 0 0rpx;
-			margin-top: 32rpx;
-
-			view {
-				width: 20%;
-				margin: 24rpx 0 0 0;
-			}
-
-			image {
-				width: 54rpx;
-				height: 54rpx;
-			}
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #7A7A7A;
-				text-align: center;
-				overflow: hidden;
-				white-space: nowrap;
-				width: 100%;
-			}
-
-		}
-
-		.number {
-			width: 108rpx;
-			color: #FF4949;
-			font-size: 42rpx;
-			font-weight: bold;
-			text-align: center;
-		}
-	}
-
-	.third {
-		margin-top: 24rpx;
-		width: 93%;
-
-		.third-header {
-			padding-bottom: 12rpx;
-			border-bottom: 2rpx solid #008CFF;
-		}
-
-		.third-box {
-			margin: 12rpx 0 0 24rpx;
-		}
-
-		.third-center {
-			margin-top: 28rpx;
-			width: 100%;
-			height: 242rpx;
-			overflow: hidden;
-			position: relative;
-		}
-
-		.scroll-container {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			animation: scroll 12s linear infinite;
-		}
-
-		@keyframes scroll {
-			0% {
-				transform: translateX(0);
-			}
-
-			100% {
-				transform: translateX(calc(-100% + 8 * 100px));
-				/* 8 * 100px 是假设每个项目的宽度为 100px */
-			}
-		}
-
-		.item {
-			display: flex;
-			width: 94%;
-			align-items: center;
-			justify-content: space-between;
-			padding: 22rpx 24rpx 24rpx 24rpx;
-			height: 32rpx;
-
-			/* 假设每条数据的高度为60rpx */
-		}
-
-		.item image {
-			margin-right: 10rpx;
-		}
-
-		.line-colum {
-			margin: 0 10rpx;
-			border-left: 1rpx solid #ccc;
-			height: 42rpx;
-		}
-
-		.item span {
-			margin-right: 10rpx;
-		}
-
-		@keyframes scroll {
-			0% {
-				transform: translateY(0);
-			}
-
-			100% {
-				transform: translateY(-240rpx);
-				/* 总高度为 4 * 60rpx = 240rpx */
-			}
-		}
-	}
-
-
-	.six {
-		margin-top: 64rpx;
-		margin-bottom: 106rpx;
-		width: 100%;
-		background: #FFFFFF;
-		align-items: center;
-
-
-		.six-top {
-			width: 690rpx;
-			.left {
-				background-image: url("/static/center/footer.png");
-				background-repeat: no-repeat;
-				background-position: left bottom;
-		
-				span {
-					width: 160rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: bold;
-					font-size: 40rpx;
-					color: #222222;
-					line-height: 47rpx;
-				}
-		
-			}
-		}
-
-		.six-box {
-			width: 93%;
-			margin: 12rpx 0 0 24rpx;
-		}
-
-		.six-center {
-			width: 93%;
-			margin-top: 41rpx;
-
-
-			.s-header {
-				padding: 24rpx;
-				width: 642rpx;
-
-				span {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-				}
-			}
-
-			.s-footer {
-				padding: 24rpx;
-				width: 642rpx;
-
-				span {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-				}
-			}
-
-			.s-footer .h4 {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: bold;
-				font-size: 36rpx;
-				color: #656565;
-			}
-		}
-
-	}
-
-
-	.line {
-		width: 95%;
-		height: 1rpx;
-		background: #D9D9D9;
-		margin: 19rpx 0 19rpx 0;
-	}
-
-	.icon-size {
-		width: 36rpx;
-		height: 36rpx;
-	}
-
-
-	.footer {
-		width: 100%;
-		height: 166rpx;
-		background: #ffffff;
-		// box-shadow: 0rpx -2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
-		position: sticky;
-		z-index: 99;
-		/* 绝对定位 */
-		bottom: 0;
-		/* 定位在底部 */
-		left: 0;
-		/* 定位在左边 */
-
-		.footer-left {
-			position: absolute;
-			top: 24rpx;
-			left: 42rpx;
-			display: flex;
-
-			view {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				flex-flow: column;
-				// margin-right: 42rpx;
-
-				span {
-					text-align: center;
-				}
-			}
-
-			.feiyong {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 22rpx;
-				color: #222222;
-
-				.price {
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: bold;
-					font-size: 28rpx;
-					color: #FF4810;
-				}
-			}
-
-			.tips {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 22rpx;
-				color: #A4A4A4;
-			}
-
-			image {
-				width: 50rpx;
-				height: 50rpx;
-			}
-		}
-
-		.footer-right {
-			position: absolute;
-			top: 27rpx;
-			right: 30rpx;
-			width: 296rpx;
-			height: 100rpx;
-			background: #A4A4A4;
-			border-radius: 200rpx 200rpx 200rpx 200rpx;
-			span {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #FFFFFF;
-			}
-		}
-
-		.footer-right1 {
-			position: absolute;
-			top: 27rpx;
-			right: 30rpx;
-			width: 296rpx;
-			height: 100rpx;
-			background: #222222;
-			border-radius: 200rpx 200rpx 200rpx 200rpx;
-
-			span {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #BEEE03;
-			}
-		}
-	}
-
-
-	.share {
-		position: fixed;
-		color: #FFFFFF;
-		right: 0;
-		bottom: 190rpx;
-		background: linear-gradient(to bottom right, #FE726B, #FE956B);
-		padding: 10rpx 10rpx 10rpx 20rpx;
-		border-top-left-radius: 50px;
-		border-bottom-left-radius: 50px;
-		box-shadow: 0 0 20upx rgba(0, 0, 0, .09);
-	}
-
-	.cancel {
-		width: 100vw;
-		padding: 30rpx;
-		text-align: center;
-		background: #FFFFFF;
-		color: red;
-		font-weight: bold;
-		font-size: 30rpx;
-	}
-
-	.md-content {
-		display: flex;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		padding: 50rpx 0;
-		background-color: white;
-	}
-
-	.md-content-item {
-		margin: 0 70rpx;
-		position: relative;
-	}
-
-	.md-content-item image {
-		width: 100rpx;
-		height: 100rpx;
-	}
-
-	.md-content-item view {
-		margin-top: 15rpx;
-		font-size: 28rpx;
-	}
-
-	.sharebtn {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		opacity: 0;
-	}
-
-	.cu-modal {
-		position: fixed;
-		bottom: 166rpx;
-		left: 0;
-		z-index: 999999;
-	}
-
-	.gj {
-		.title {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 32rpx;
-			color: #4B4B4B;
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #4B4B4B;
-			}
-		}
-
-		.scroll {
-			width: 642rpx;
-			max-height: 340rpx;
-
-			view {
-				margin: 24rpx;
-				width: 600rpx;
-				height: 56rpx;
-				background: #E8E8E8;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-
-				.title {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #7A7A7A;
-				}
-
-				.red {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #FF5F5F;
-				}
-
-				.lan {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #008CFF;
-				}
-			}
-		}
-	}
-
-	::v-deep ::-webkit-scrollbar {
-		/*滚动条整体样式*/
-		width: 4px !important;
-		height: 1px !important;
-		overflow: auto !important;
-		background: #ccc !important;
-		-webkit-appearance: auto !important;
-		display: block;
-	}
-
-	::v-deep ::-webkit-scrollbar-thumb {
-		/*滚动条里面小方块*/
-		border-radius: 10px !important;
-		box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
-		background: #7b7979 !important;
-	}
-
-	::v-deep ::-webkit-scrollbar-track {
-		/*滚动条里面轨道*/
-		// box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
-		// border-radius: 10px !important;
-		background: #FFFFFF !important;
-	}
-
-	.Poster {
-		position: relative;
-		top: 21rpx;
-		left: 30rpx;
-		width: 690rpx;
-	}
-
-	.posterClose {
-		position: absolute;
-		right: 8rpx;
-		top: 8rpx;
-	}
-
-	.pos {
-		position: relative;
-	}
-
-	.btnList {
-		width: 690rpx;
-		position: absolute;
-		bottom: 150rpx;
-		left: 30rpx;
-		display: flex;
-		justify-content: space-evenly;
-
-		span {
-			width: 250rpx;
-			height: 80rpx;
-			background: #FFFFFF;
-			border-radius: 401rpx 401rpx 401rpx 401rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 34rpx;
-			color: #008CFF;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.save {}
-	}
-
-	.no-scroll {
-		overflow: hidden;
-		height: 100vh;
-	}
-
-	.no-border-button {
-		background-color: transparent;
-		/* 去掉背景色 */
-		border: none;
-		/* 去掉边框 */
-		padding: 0;
-		/* 去掉内边距 */
-		margin: 0;
-		/* 去掉外边距 */
-		display: inline-flex;
-		/* 使按钮内容居中 */
-		align-items: center;
-		/* 垂直居中 */
-		justify-content: center;
-		/* 水平居中 */
-		flex-flow: column;
-		height: 110rpx;
-		line-height: inherit;
-
-		span {
-			width: 44rpx;
-			height: 34rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 22rpx;
-			color: #A4A4A4;
-		}
-	}
-	.popupBox {
-		// height: 365rpx;
-		margin-top: 22rpx;
-		width: 750rpx;
-	
-		.pop-header {
-			width: 93%;
-			padding-top: 32rpx;
-			padding-bottom: 17rpx;
-	
-			border-bottom: 2rpx solid #D9D9D9;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 42rpx;
-			color: #008CFF;
-	
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				font-size: 20rpx;
-				color: #343434;
-			}
-		}
-	
-		.popup {
-			display: flex;
-			align-items: self-start;
-			justify-content: center;
-			padding-top: 21rpx;
-	
-			.popur-right {
-				align-items: self-start;
-				margin-left: 24rpx;
-				width: 418rpx;
-	
-				.name {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 28rpx;
-					color: #343434;
-				}
-	
-				.address {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-					margin: 16rpx 0 12rpx 0;
-					overflow: hidden;
-					/* 确保超出容器的文本被隐藏 */
-					white-space: nowrap;
-					/* 确保文本在一行内显示 */
-					text-overflow: ellipsis;
-					/* 使用省略号表示被截断的文本 */
-					width: 100%;
-				}
-	
-				.date {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-				}
-	
-				.time {
-					margin: 24rpx 0;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-				}
-	
-				.line-row {
-					width: 418rpx;
-					height: 1rpx;
-					background: #008CFF;
-					border-radius: 0rpx 0rpx 0rpx 0rpx;
-				}
-	
-				.price {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-					margin-top: 23rpx;
-					align-self: flex-end;
-	
-					span {
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 800;
-						font-size: 36rpx;
-						color: #FF2323;
-						line-height: 32rpx;
-					}
-				}
-			}
-	
-		}
-	
-		.popup-footer {
-			margin-top: 42rpx;
-			span{
-				width: 642rpx;
-				height: 80rpx;
-				background: #008CFF;
-				border-radius: 401rpx 401rpx 401rpx 401rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #FFFFFF;
-				line-height: 32rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-	
-	
-		.line {
-			width: 642rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			box-shadow: 1rpx 1rpx 0rpx 0rpx rgba(102, 102, 102, 0.25);
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-	
-		.times {
-			width: 93%;
-	
-			.selectTime {
-				width: 288rpx;
-				height: 50rpx;
-				background: #FFFFFF;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				border: 1rpx solid #D9D9D9;
-				color: #4B4B4B;
-				font-family: 'PingFang SC', 'PingFang SC';
-				font-weight: 500;
-				font-size: 24rpx;
-				padding-left: 15rpx;
-				cursor: pointer;
-				margin: 24rpx 32rpx 0 0;
-				white-space: nowrap;
-				/* 防止文本换行 */
-				text-overflow: ellipsis;
-				/* 超出部分显示省略号 */
-				overflow: hidden;
-				/* 隐藏超出部分 */
-				text-align: left;
-				/* 文字靠左对齐 */
-				line-height: 50rpx;
-				/* 垂直居中对齐 */
-				box-sizing: border-box;
-				/* 确保 padding 和 border 不影响宽度和高度 */
-				display: inline-block;
-				/* 确保容器内文字正确对齐 */
-			}
-	
-		}
-	
-		.selectTime.selected {
-			width: 288rpx;
-			height: 50rpx;
-			border-radius: 12rpx 12rpx 12rpx 12rpx;
-			background: #008CFF;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			cursor: pointer;
-			margin: 24rpx 32rpx 0 0;
-	
-		}
-	}
-	.white-space-2 {
-	    display: -webkit-box; /* 将元素设置为弹性盒子 */
-	    -webkit-box-orient: vertical; /* 设置内容垂直排列 */
-	    -webkit-line-clamp: 2; /* 限制显示两行 */
-	    overflow: hidden; /* 超出部分隐藏 */
-	    text-overflow: ellipsis; /* 超出部分显示省略号 */
-	    white-space: normal; /* 允许换行 */
-	    width: 100%; /* 宽度占满父容器 */
-	}
-</style>
\ No newline at end of file
diff --git a/packageA/activity/exercise.vue b/packageA/activity/exercise.vue
deleted file mode 100644
index 1de399e..0000000
--- a/packageA/activity/exercise.vue
+++ /dev/null
@@ -1,471 +0,0 @@
-<template>
-	<view class="center-box">
-		<view class="box flex flex-column flex-start">
-			<view class="listBox flex flex-column flex-start">
-				<view class="list flex flex-column flex-start" v-for="(item,index) in list" :key="index"
-					@click="open(item.id)">
-					<image :src="item.detail.headimage" mode=""
-						style="width: 690rpx;height: 482rpx;border-radius: 10rpx;"></image>
-					<span class="title white-space">{{item.detail.title}}</span>
-					<view class="icon flex align-items">
-						<span class="white-space"
-							style="font-size: 24rpx;">{{'活动时间: ' + item.detail.start_time_text + '-' + item.detail.end_time_text}}</span>
-					</view>
-					<view class="icon flex align-items" style="margin-bottom: 8rpx;margin-top: 8rpx;width: 400rpx;">
-						<span class="white-space" style="font-size: 24rpx;color: #FF2323;">
-							<span style="color:#7A7A7A;" v-if="item.detail.feel == 1">活动费用:{{'' + '公益'}}</span>
-							<span style="color:#7A7A7A;" v-if="item.detail.feel == 2">活动费用:{{'￥'+ item.price}}</span>
-						</span>
-
-					</view>
-					<view class="icon flex align-items" style="margin-top: 0rpx;margin-bottom: 32rpx;">
-						<span class="status" v-if="item.status == -3" style="color: #FF0000;">已取消</span>
-						<span class="status text-blue" v-if="item.status == 0">待支付</span>
-						<span class="status text-blue" v-if="item.status == 2">待审核</span>
-						<span class="status text-blue" v-if="item.status == 3">已预约</span>
-						<span class="status" v-if="item.status == 4" style="color: #FF0000;">售后中</span>
-						<span class="status" v-if="item.status == 5" style="color: #FF0000;">退款中</span>
-						<span class="status" v-if="item.status == 6" style="color: #FF0000;">已退款</span>
-						<span class="status" v-if="item.status == 9" style="color: #34DC12;">已完成</span>
-					</view>
-					<span class="Sign bg-blue flex justify-center align-items" v-if="item.status == 3"
-						@click.stop="QR(item.id)">二 维 码</span>
-					<span class="hui bg-hui flex justify-center align-items" v-if="item.status != 3">二 维 码</span>
-				</view>
-
-			</view>
-		</view>
-		<u-popup :show="show" mode="center" :zIndex="99999" :custom-style="popupStyle" closeable="true" @close="qrClose"
-			@open="qrOpen">
-			<view class="popup flex flex-column align-items">
-				<view class="pop-center flex">
-					<!-- <view class="left">
-						<image :src="qrcode.detail.headimage" mode="" style="width: 280rpx;height: 200rpx;"></image>
-					</view> -->
-					<view class="right flex flex-column">
-						<span class="title white-space">{{qrcode.detail.title}}</span>
-						<span class="line-short"></span>
-						<span class="hui" style="margin-bottom: 20rpx;">活动时间:{{' ' + qrcode.detail.start_time_text}} -
-							{{qrcode.detail.end_time_text}}</span>
-						<span class="hui">报名时间:{{' ' + qrcode.detail.sign_start_time_text}} -
-							{{qrcode.detail.sign_end_time_text}}</span>
-						<span class="hui" style="margin: 20rpx 0;">活动地址:{{' ' + qrcode.detail.address_detail}}</span>
-						<view class="flex align-items">
-							<span class="hui">{{'审核状态:' + ' '}}</span>
-							<span class="status" v-if="qrcode.status == -3" style="color: #FF0000;">已取消</span>
-							<span class="status text-blue" v-if="qrcode.status == 0">待支付</span>
-							<span class="status text-blue" v-if="qrcode.status == 2">待审核</span>
-							<span class="status text-blue" v-if="qrcode.status == 3">已预约</span>
-							<span class="status" v-if="qrcode.status == 4" style="color: #FF0000;">售后中</span>
-							<span class="status" v-if="qrcode.status == 5" style="color: #FF0000;">退款中</span>
-							<span class="status" v-if="qrcode.status == 6" style="color: #FF0000;">已退款</span>
-							<span class="status" v-if="qrcode.status == 9" style="color: #34DC12;">已完成</span>
-						</view>
-
-					</view>
-				</view>
-				<image :src="qrcode.codeimage" mode="" style="width: 376rpx;height: 376rpx;"></image>
-				<span style="margin: 24rpx 0 64rpx 0;">核销二维码</span>
-			</view>
-		</u-popup>
-		<u-loadmore :status="loadStatus" />
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				page: 1,
-				limit: 10,
-				keywords: '',
-				list: [],
-				count: 0,
-				loadStatus: 'loading',
-				popupStyle: {
-					width: '690rpx',
-					margin: '0 auto', // 水平居中
-					display: 'flex',
-					justifyContent: 'center',
-					alignItems: 'center',
-					padding: '0',
-					borderRadius: '20rpx'
-				},
-				show: false,
-				qrcode: {}
-
-			};
-		},
-		onLoad() {
-			this.getList()
-		},
-		onReachBottom() {
-			if (this.list.length < this.count) {
-				this.page++;
-				this.getList();
-			}
-		},
-		methods: {
-			// 关闭弹窗
-			qrClose() {
-				this.show = false
-				// this.qrcode = ''
-			},
-			qrOpen() {
-				this.show = true
-			},
-			// 核销码
-			QR(id) {
-				uni.$u.http.get('/api/school.activity.order/detail', {
-					params: {
-						id: id
-					},
-				}).then(res => {
-					if (res.code == 1) {
-						this.qrcode = res.data.detail
-						this.show = true
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {});
-
-			},
-			getList() {
-				uni.$u.http.get('/api/school.activity.order/order_list', {
-					params: {
-						keywords: this.keywords,
-						page: this.page,
-						limit: this.limit,
-						status: '-3,0,2,3,4,5,6,9'
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.count = res.data.count
-						this.list = [...this.list, ...res.data.list];
-						if (this.list.length >= res.data.count) {
-							this.loadStatus = 'nomore';
-						} else {
-							this.loadStatus = 'loading';
-						}
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-			open(id) {
-				uni.navigateTo({
-					url: "/packageA/activity/exerciseDetaill?id=" + id
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.center-box {
-		width: 750rpx;
-		background: #F1F2F8;
-		min-height: 100vh;
-	}
-
-	.box {
-		width: 690rpx;
-		padding: 0 30rpx 0rpx 30rpx;
-		border-radius: 0px 0px 0px 0px;
-
-	}
-
-	.white-space {
-		overflow: hidden;
-		/* 确保超出容器的文本被隐藏 */
-		white-space: nowrap;
-		/* 确保文本在一行内显示 */
-		text-overflow: ellipsis;
-		/* 使用省略号表示被截断的文本 */
-		width: 100%;
-	}
-
-	.search {
-		margin-top: 27rpx;
-		width: 690rpx;
-		height: 64rpx;
-		background: #FFFFFF;
-		box-shadow: 2rpx 2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		border: 2rpx solid #008CFF;
-
-		.dashed {
-			image {
-				width: 52rpx;
-				height: 52rpx;
-			}
-		}
-
-		.line-search {
-			width: 2rpx;
-			height: 42rpx;
-			background: #008CFF;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-
-		.input {
-			// border: 4rpx solid #EAEAEA;
-			padding-left: 12rpx;
-			height: 100%;
-			width: 78%;
-		}
-
-		::v-deep .input-placeholder {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #C0C0C0;
-			line-height: 32rpx;
-			text-align: left;
-			font-style: normal;
-			text-transform: none;
-
-		}
-
-		.searchBtn {
-			width: 128rpx;
-			height: 64rpx;
-			background: #008CFF;
-			border-radius: 5rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #FFFFFF;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-	}
-
-	.white-space {
-		overflow: hidden;
-		/* 确保超出容器的文本被隐藏 */
-		white-space: nowrap;
-		/* 确保文本在一行内显示 */
-		text-overflow: ellipsis;
-		/* 使用省略号表示被截断的文本 */
-		width: 100%;
-	}
-
-	.w-100 {
-		width: 100%;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.justify-center {
-		justify-content: center;
-	}
-
-	.align-items {
-		align-items: center;
-	}
-
-	.flex-column {
-		flex-flow: column;
-	}
-
-	.justify-start {
-		justify-content: start;
-	}
-
-	.listBox {
-		width: 690rpx;
-		margin-top: 10rpx;
-
-		.list {
-			margin-top: 32rpx;
-			position: relative;
-			background: #FFFFFF;
-			border-radius: 10rpx;
-
-			.title {
-				width: 642rpx;
-				margin-top: 32rpx;
-				margin-left: 24rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 32rpx;
-				color: #343434;
-			}
-
-			.icon {
-				width: 580rpx;
-				margin-top: 24rpx;
-				margin-left: 24rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-			}
-
-			.Sign {
-				position: absolute;
-				bottom: 32rpx;
-				right: 54rpx;
-				width: 152rpx;
-				height: 56rpx;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 32rpx;
-				color: #FFFFFF;
-			}
-
-			.hui {
-				position: absolute;
-				bottom: 32rpx;
-				right: 54rpx;
-				width: 152rpx;
-				height: 56rpx;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 32rpx;
-				color: #FFFFFF;
-			}
-		}
-	}
-
-	.icon-size {
-		width: 32rpx;
-		height: 32rpx;
-		margin-right: 8rpx;
-	}
-
-	.status {
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		font-size: 26rpx;
-		color: #008CFF;
-	}
-
-	.popup {
-		.header {
-			margin-left: 24rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 42rpx;
-			color: #008CFF;
-			margin-top: 34rpx;
-			width: 690rpx;
-		}
-
-		.line-row {
-			width: 690rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			margin: 11rpx 0 31rpx 0;
-		}
-
-		.pop-center {
-			margin-top: 50rpx;
-			align-items: center;
-			width: 650rpx;
-
-			.left {
-				image {
-					border-radius: 12rpx;
-				}
-			}
-
-			.right {
-				// margin-left: 30rpx;
-
-				.title {
-					width: 650rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 42rpx;
-					color: #343434;
-				}
-
-				.line-short {
-					width: 642rpx;
-					height: 1rpx;
-					background: #D9D9D9;
-					border-radius: 0rpx 0rpx 0rpx 0rpx;
-					margin: 25rpx 0 25rpx 0;
-				}
-
-				.status {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 26rpx;
-				}
-
-				.hui {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-				}
-
-
-			}
-		}
-
-		.popList {
-			justify-content: space-between;
-			width: 600rpx;
-			margin-top: 32rpx;
-
-			.hei {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #343434;
-			}
-		}
-
-		.pop-btn {
-			width: 690rpx;
-			margin-top: 62rpx;
-			justify-content: space-around;
-
-			.Cancel {
-				width: 306rpx;
-				height: 80rpx;
-				border-radius: 401rpx 401rpx 401rpx 401rpx;
-				border: 2rpx solid #008CFF;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #008CFF;
-			}
-
-			.Confirm {
-				width: 306rpx;
-				height: 80rpx;
-				background: #008CFF;
-				border-radius: 401rpx 401rpx 401rpx 401rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #FFFFFF;
-			}
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/packageA/activity/exerciseDetaill.vue b/packageA/activity/exerciseDetaill.vue
deleted file mode 100644
index 5ace178..0000000
--- a/packageA/activity/exerciseDetaill.vue
+++ /dev/null
@@ -1,1085 +0,0 @@
-<template>
-	<view class="box flex justify-start flex-column align-items" :class="{ 'no-scroll': overlay }">
-		<view class="swiper">
-			<image :src="detail.detail.headimage" mode="" style="width: 750rpx;height: 450rpx;"></image>
-			<!-- <u-swiper :list="detail.detail.images" indicator indicatorMode="line" height="450rpx" circular></u-swiper> -->
-		</view>
-		<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
-			<view class="first-box flex flex-start flex-column justify-start">
-				<span class="first-name">{{'' + detail.detail.title}}</span>
-				<span class="line"></span>
-				<span class="huodong text-blue">活动介绍</span>
-				<view class="line-title">
-					<span class="title">活动时间:</span>
-					<span class="conter">{{'' + detail.detail.start_time_text}} - {{detail.detail.end_time_text}}</span>
-				</view>
-				<view class="line-title">
-					<span class="title">报名时间:</span>
-					<span class="conter">{{'' + detail.detail.sign_start_time_text}} - {{detail.detail.sign_end_time_text}}</span>
-				</view>
-				<view class="line-title">
-					<span class="title">报名费用:</span>
-					<span class="conter" style="color: #FF5F5F;" v-if="detail.detail.feel == 2">{{'' + detail.detail.price + '元'}}</span>
-					<span class="conter" style="color: #FF5F5F;" v-if="detail.detail.feel == 1">公益</span>
-				</view>
-				<view class="line-title">
-					<span class="title">活动人数:</span>
-					<span class="conter">{{'' + detail.detail.people_num}}</span>
-				</view>
-				<view class="line-title">
-					<span class="title">可参与人数:</span>
-					<span class="conter">{{'' + detail.detail.stock}}</span>
-				</view>
-				<view class="line-title">
-					<span class="title">已参加人数:</span>
-					<span class="conter">{{'' + detail.detail.sale}}</span>
-				</view>
-				<view class="line-title">
-					<span class="title">活动项目:</span>
-					<span class="conter">{{'' + detail.detail.item}}</span>
-				</view>
-				<view class="line-title flex align-items"
-					@click.stop="toMap(detail.detail.latitude,detail.detail.longitude,detail.detail.address_detail)">
-					<span class="title">活动地址:</span>
-					<span class="conter flex align-items ">
-						<span class="white-space" style="width: 500rpx;">{{'' + detail.detail.address_detail}}</span>
-						<image src="../../static/center/address.png" mode="" class="icon-size"></image>
-					</span>
-				</view>
-				<view class="line-title">
-					<span class="title">活动项目:</span>
-					<span class="status" v-if="detail.status == -3" style="color: #FF0000;">已取消</span>
-					<span class="status text-blue" v-if="detail.status == 0" >待支付</span>
-					<span class="status text-blue" v-if="detail.status == 2" >待审核</span>
-					<span class="status text-blue" v-if="detail.status == 3">已预约</span>
-					<span class="status" v-if="detail.status == 4" style="color: #FF0000;">售后中</span>
-					<span class="status" v-if="detail.status == 5" style="color: #FF0000;">退款中</span>
-					<span class="status" v-if="detail.status == 6" style="color: #FF0000;">已退款</span>
-					<span class="status" v-if="detail.status == 9" style="color: #34DC12;">已完成</span>
-				</view>
-				<view class="flex justify-center flex-column align-items w-100" v-if="detail.status == 3">
-					<image :src="detail.codeimage" mode="" style="width: 376rpx; height: 376rpx;"></image>
-					<span style="margin: 34rpx 0;font-weight: 800;font-size: 38rpx;color: #343434;">核销二维码</span>
-				</view>
-			</view>
-		</view>
-		<!-- 课程详情 -->
-		<view class="six flex flex-column" style="justify-content: flex-start;">
-			<view class="six-header flex align-items space-between">
-				<!-- <image src="../../static/center/kecheng.png" mode="" style="width: 168rpx; height: 48rpx;"></image> -->
-				活动详情
-			</view>
-			<view class="six-center flex first-txt  flex-column">
-				<!-- <rich-text :nodes="detail.content" style="width: 100%;" :tagStyle="style"></rich-text> -->
-				<u-parse :content="detail.detail.content" :tagStyle="style"></u-parse>
-				<!-- <view class="s-header flex justify-start flex-column">
-					<span>单门课程报名费用：499元/10小时，共5节课</span>
-					<span>上课时间：每周对应固定时间晚上19：00-21：00</span>
-					<span>上课人数：每门课程10人起</span>
-					<span>上课地点：</span>
-					<span>洛阳市老城区同化街1654号</span>
-				</view>
-				<image src="../../static/center/detail.png" mode="" style="width: 644rpx; height: 1054rpx;"></image> -->
-			</view>
-		</view>
-		<view class="footer flex align-items">
-			<view class="footer-left">
-				<view class="flex flex-column white-space" style="align-items: flex-start;">
-					<span class="feiyong white-space flex flex-start" style="flex-flow: row;">
-						{{detail.detail.item}}
-					</span>
-					<view class="flex align-items">
-						<span class="tips">{{detail.orderitem.limit_num}}人</span>
-						<span class="tips" style="margin: 0 24rpx;">{{detail.orderitem.age}}岁</span>
-						<span class="tips" v-if="detail.orderitem.sex == 3">男女不限</span>
-						<span class="tips" v-else>{{detail.orderitem.sex == 1 ? "男" : "女"}}</span>
-					</view>
-				</view>
-			</view>
-			<view class="footer-right flex justify-center align-items" v-if="detail.detail.feel == 1">
-				<span style="color: #FF5F5F;">公 益 </span>
-			</view>
-			<view class="footer-right flex justify-center flex-column align-items" v-if="detail.detail.feel == 2">
-				<span class="price">{{'￥' + detail.orderitem.price}}</span>
-				<span class="title">报名费用</span>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				id: '',
-				detail: '',
-				selectedIndex: 0, // 默认选中第一个
-				listOrder_no: '',
-				price: '',
-				order_no:'',
-				skuId:'',
-				uloadingShow:false,
-				buyShow:false,
-				PayPirce:'',
-				popupStyle: {
-					width: '100%',
-					height: '570rpx',
-					margin: '0 auto', // 水平居中
-					display: 'flex',
-					justifyContent: 'flex-start',
-					alignItems: 'center'
-				},
-				skuList:[]  //规格
-			};
-		},
-		onLoad(options) {
-			this.userInfo = uni.getStorageSync("userInfo")
-			this.id = options.id
-			this.getDetail()
-
-		},
-		methods: {
-		
-		
-			// 获取详情
-			getDetail() {
-				uni.$u.http.get('/api/school.activity.order/detail', {
-					params: {
-						id: this.id,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.detail = res.data.detail;
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					// 处理错误
-					console.error('获取详情失败:', error);
-				});
-			},
-		
-
-			// 导航
-			toMap(latitude, longitude, name) {
-				uni.openLocation({
-					latitude: parseFloat(latitude),
-					longitude: parseFloat(longitude),
-					name: name,
-					success: function() {
-						console.log('success');
-					}
-				});
-			},
-
-
-			callPhone(phone) {
-				uni.makePhoneCall({
-					phoneNumber: phone
-				})
-			},
-
-
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.w-100 {
-		width: 100%;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.flex-start {
-		align-items: flex-start;
-	}
-
-	.justify-center {
-		justify-content: center;
-	}
-
-	.align-items {
-		align-items: center;
-	}
-
-	.flex-column {
-		flex-flow: column;
-	}
-
-	.justify-start {
-		justify-content: start;
-	}
-
-
-	.con-center {
-		background: linear-gradient(to bottom,
-				#F1F2F8 0%,
-				#F1F2F8 10%,
-				#FFFFFF 50%,
-				#FFFFFF 95%);
-	}
-
-	.swiper {
-		width: 100%;
-		height: 450rpx;
-	}
-
-	.box {
-		position: relative;
-	}
-
-	.first-box {
-		width: 690rpx;
-		background: #FFFFFF;
-		padding-left: 24rpx;
-		margin-top: 24rpx;
-		border-radius: 20rpx;
-
-		.huodong {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 26rpx;
-			margin: 23rpx 0;
-
-		}
-
-		.line-row {
-			width: 642rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			margin: 30rpx;
-		}
-
-		.center {
-			margin-left: 24rpx;
-
-			.title {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #343434;
-			}
-
-			.cen-tit {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-				margin-top: 39rpx;
-			}
-		}
-
-		.right {
-			.btn1 {
-				width: 138rpx;
-				height: 48rpx;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 26rpx;
-				color: #FFFFFF;
-			}
-
-			.btn {
-				width: 138rpx;
-				height: 48rpx;
-				background: #D9D9D9;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 26rpx;
-				color: #FFFFFF;
-			}
-
-			.price {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #FF5F5F;
-				margin-top: 39rpx;
-			}
-		}
-
-		.line-title {
-			margin-bottom: 18rpx;
-
-			.title {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-			}
-
-			.conter {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-			}
-			.status{
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-			}
-		}
-
-		.first-name {
-			width: 100%;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 34rpx;
-			color: #343434;
-			margin-top: 32rpx;
-		}
-
-		.first-money {
-			height: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 28rpx;
-			color: #FF2323;
-		}
-
-		.first-mine {
-			height: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #7A7A7A;
-
-		}
-
-		.first-txt {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #7A7A7A;
-			line-height: 32rpx;
-			margin: 0 6rpx;
-		}
-
-		.first-image {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #7A7A7A;
-			margin: 16rpx 0 16rpx 0;
-		}
-	}
-
-	.second-box {
-		width: 90%;
-		margin-top: 42rpx;
-		// background: #FFFFFF;
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		padding-left: 24rpx;
-		position: relative;
-
-		.second-title {
-			// margin: 17rpx 35rpx 15rpx 0;
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
-
-		.second {
-			padding: 24rpx 23rpx 0 0rpx;
-			margin-top: 32rpx;
-
-			view {
-				width: 20%;
-				margin: 24rpx 0 0 0;
-			}
-
-			image {
-				width: 54rpx;
-				height: 54rpx;
-			}
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-				text-align: center;
-				overflow: hidden;
-				white-space: nowrap;
-				width: 100%;
-			}
-
-		}
-
-		.number {
-			width: 108rpx;
-			color: #FF4949;
-			font-size: 42rpx;
-			font-weight: bold;
-			text-align: center;
-		}
-	}
-
-	.third {
-		margin-top: 24rpx;
-		width: 93%;
-
-		.third-header {
-			padding-bottom: 12rpx;
-			border-bottom: 2rpx solid #008CFF;
-		}
-
-		.third-box {
-			margin: 12rpx 0 0 24rpx;
-		}
-
-		.third-center {
-			margin-top: 28rpx;
-			width: 100%;
-			height: 242rpx;
-			overflow: hidden;
-			position: relative;
-		}
-
-		.scroll-container {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			animation: scroll 12s linear infinite;
-		}
-
-		@keyframes scroll {
-			0% {
-				transform: translateX(0);
-			}
-
-			100% {
-				transform: translateX(calc(-100% + 8 * 100px));
-				/* 8 * 100px 是假设每个项目的宽度为 100px */
-			}
-		}
-
-		.item {
-			display: flex;
-			width: 94%;
-			align-items: center;
-			justify-content: space-between;
-			padding: 22rpx 24rpx 24rpx 24rpx;
-			height: 32rpx;
-
-			/* 假设每条数据的高度为60rpx */
-		}
-
-		.item image {
-			margin-right: 10rpx;
-		}
-
-		.line-colum {
-			margin: 0 10rpx;
-			border-left: 1rpx solid #ccc;
-			height: 42rpx;
-		}
-
-		.item span {
-			margin-right: 10rpx;
-		}
-
-		@keyframes scroll {
-			0% {
-				transform: translateY(0);
-			}
-
-			100% {
-				transform: translateY(-240rpx);
-				/* 总高度为 4 * 60rpx = 240rpx */
-			}
-		}
-	}
-
-
-	.six {
-		margin-bottom: 106rpx;
-		width: 100%;
-		background: linear-gradient(to bottom, #F1F2F8 0%, #FFFFFF 1%, #FFFFFF 100%);
-		align-items: center;
-
-
-		.six-header {
-			width: 93%;
-			padding-top: 64rpx;
-			padding-bottom: 12rpx;
-			border-bottom: 2rpx solid #008CFF;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 42rpx;
-			color: #008CFF;
-			// background: linear-gradient(to bottom, #F1F2F8 0%, #ffffff 24%, #FFFFFF 100%);
-		}
-
-		.six-box {
-			width: 93%;
-			margin: 12rpx 0 0 24rpx;
-		}
-
-		.six-center {
-			width: 93%;
-			margin-top: 41rpx;
-
-
-			.s-header {
-				padding: 24rpx;
-				width: 642rpx;
-
-				span {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 26rpx;
-					color: #7A7A7A;
-				}
-			}
-
-			.s-footer {
-				padding: 24rpx;
-				width: 642rpx;
-
-				span {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 26rpx;
-					color: #7A7A7A;
-				}
-			}
-
-			.s-footer .h4 {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: bold;
-				font-size: 36rpx;
-				color: #656565;
-			}
-		}
-
-	}
-
-
-	.line {
-		width: 95%;
-		height: 1rpx;
-		background: #D9D9D9;
-		margin: 19rpx 0 19rpx 0;
-	}
-
-	.icon-size {
-		width: 36rpx;
-		height: 36rpx;
-	}
-
-
-	.footer {
-		width: 100%;
-		height: 166rpx;
-		background: #ffffff;
-		// box-shadow: 0rpx -2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
-		position: sticky;
-		z-index: 99;
-		/* 绝对定位 */
-		bottom: 0;
-		/* 定位在底部 */
-		left: 0;
-		justify-content: space-evenly;
-		/* 定位在左边 */
-
-		.footer-left {
-			// position: absolute;
-			// top: 24rpx;
-			// left: 30rpx;
-			display: flex;
-			width: 60%;
-
-			view {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				// margin-right: 42rpx;
-
-				// span {
-				// 	text-align: center;
-				// }
-			}
-
-			.feiyong {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #343434;
-
-				.price {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 34rpx;
-					color: #FF5F5F;
-				}
-			}
-
-			.tips {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-			}
-
-			image {
-				width: 50rpx;
-				height: 50rpx;
-			}
-		}
-
-		.footer-right {
-			// position: absolute;
-			// top: 27rpx;
-			// right: 30rpx;
-
-			span {
-				font-family: Kingnamype Yuanmo SC, Kingnamype Yuanmo SC;
-				font-weight: 400;
-				font-size: 34rpx;
-				color: #FFFFFF;
-				letter-spacing: 6rpx;
-				text-align: center;
-				font-style: normal;
-				text-transform: none;
-			}
-			.price{
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #FF0000;
-			}
-			.title{
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #7A7A7A;
-			}
-		}
-
-		.footer-right1 {
-			position: absolute;
-			top: 27rpx;
-			right: 30rpx;
-			width: 250rpx;
-			height: 80rpx;
-			background: #008CFF;
-			border-radius: 401rpx 401rpx 401rpx 401rpx;
-
-			span {
-				font-family: Kingnamype Yuanmo SC, Kingnamype Yuanmo SC;
-				font-weight: 400;
-				font-size: 34rpx;
-				color: #FFFFFF;
-				letter-spacing: 6rpx;
-				text-align: center;
-				font-style: normal;
-				text-transform: none;
-			}
-		}
-	}
-
-
-	.share {
-		position: fixed;
-		color: #FFFFFF;
-		right: 0;
-		bottom: 190rpx;
-		background: linear-gradient(to bottom right, #FE726B, #FE956B);
-		padding: 10rpx 10rpx 10rpx 20rpx;
-		border-top-left-radius: 50px;
-		border-bottom-left-radius: 50px;
-		box-shadow: 0 0 20upx rgba(0, 0, 0, .09);
-	}
-
-	.cancel {
-		width: 100vw;
-		padding: 30rpx;
-		text-align: center;
-		background: #FFFFFF;
-		color: red;
-		font-weight: bold;
-		font-size: 30rpx;
-	}
-
-	.md-content {
-		display: flex;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		padding: 50rpx 0;
-		background-color: white;
-	}
-
-	.md-content-item {
-		margin: 0 70rpx;
-		position: relative;
-	}
-
-	.md-content-item image {
-		width: 100rpx;
-		height: 100rpx;
-	}
-
-	.md-content-item view {
-		margin-top: 15rpx;
-		font-size: 28rpx;
-	}
-
-	.sharebtn {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		opacity: 0;
-	}
-
-	.cu-modal {
-		position: fixed;
-		bottom: 166rpx;
-		left: 0;
-		z-index: 999999;
-	}
-
-	.gj {
-		.title {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 32rpx;
-			color: #4B4B4B;
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 26rpx;
-				color: #4B4B4B;
-			}
-		}
-
-		.scroll {
-			width: 642rpx;
-			max-height: 340rpx;
-
-			view {
-				margin: 24rpx;
-				width: 600rpx;
-				height: 56rpx;
-				background: #E8E8E8;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-
-				.title {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #7A7A7A;
-				}
-
-				.red {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #FF5F5F;
-				}
-
-				.lan {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #008CFF;
-				}
-			}
-		}
-	}
-
-	::v-deep ::-webkit-scrollbar {
-		/*滚动条整体样式*/
-		width: 4px !important;
-		height: 1px !important;
-		overflow: auto !important;
-		background: #ccc !important;
-		-webkit-appearance: auto !important;
-		display: block;
-	}
-
-	::v-deep ::-webkit-scrollbar-thumb {
-		/*滚动条里面小方块*/
-		border-radius: 10px !important;
-		box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
-		background: #7b7979 !important;
-	}
-
-	::v-deep ::-webkit-scrollbar-track {
-		/*滚动条里面轨道*/
-		// box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
-		// border-radius: 10px !important;
-		background: #FFFFFF !important;
-	}
-
-	.Poster {
-		position: relative;
-		top: 21rpx;
-		left: 30rpx;
-		width: 690rpx;
-	}
-
-	.posterClose {
-		position: absolute;
-		right: 8rpx;
-		top: 8rpx;
-	}
-
-	.pos {
-		position: relative;
-	}
-
-	.btnList {
-		width: 690rpx;
-		position: absolute;
-		bottom: 150rpx;
-		left: 30rpx;
-		display: flex;
-		justify-content: space-evenly;
-
-		span {
-			width: 250rpx;
-			height: 80rpx;
-			background: #FFFFFF;
-			border-radius: 401rpx 401rpx 401rpx 401rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 34rpx;
-			color: #008CFF;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.save {}
-	}
-
-	.no-scroll {
-		overflow: hidden;
-		height: 100vh;
-	}
-
-	.no-border-button {
-		background-color: transparent;
-		/* 去掉背景色 */
-		border: none;
-		/* 去掉边框 */
-		padding: 0;
-		/* 去掉内边距 */
-		margin: 0;
-		/* 去掉外边距 */
-		display: inline-flex;
-		/* 使按钮内容居中 */
-		align-items: center;
-		/* 垂直居中 */
-		justify-content: center;
-		/* 水平居中 */
-		flex-flow: column;
-		height: 110rpx;
-		line-height: inherit;
-
-		span {
-			text-align: center;
-			width: 48rpx;
-			height: 34rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #777777;
-		}
-	}
-	.popupBox {
-		// height: 365rpx;
-		margin-top: 22rpx;
-		width: 750rpx;
-	
-		.pop-header {
-			width: 93%;
-			padding-top: 32rpx;
-			padding-bottom: 17rpx;
-	
-			border-bottom: 2rpx solid #D9D9D9;
-	
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				font-size: 20rpx;
-				color: #343434;
-			}
-		}
-	
-		.popup {
-			display: flex;
-			align-items: self-start;
-			justify-content: center;
-			padding-top: 21rpx;
-	
-			.popur-right {
-				align-items: self-start;
-				margin-left: 24rpx;
-				width: 418rpx;
-	
-				.name {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 28rpx;
-					color: #343434;
-				}
-	
-				.address {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 26rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-					margin: 16rpx 0 12rpx 0;
-					overflow: hidden;
-					/* 确保超出容器的文本被隐藏 */
-					white-space: nowrap;
-					/* 确保文本在一行内显示 */
-					text-overflow: ellipsis;
-					/* 使用省略号表示被截断的文本 */
-					width: 100%;
-				}
-	
-				.date {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 26rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-				}
-	
-				.time {
-					margin: 24rpx 0;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 26rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-				}
-	
-				.line-row {
-					width: 418rpx;
-					height: 1rpx;
-					background: #008CFF;
-					border-radius: 0rpx 0rpx 0rpx 0rpx;
-				}
-	
-				.price {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 26rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-					margin-top: 23rpx;
-					align-self: flex-end;
-	
-					span {
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 800;
-						font-size: 36rpx;
-						color: #FF2323;
-						line-height: 32rpx;
-					}
-				}
-			}
-	
-		}
-	
-		.popup-footer {
-			margin-top: 42rpx;
-			span{
-				width: 642rpx;
-				height: 80rpx;
-				background: #008CFF;
-				border-radius: 401rpx 401rpx 401rpx 401rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #FFFFFF;
-				line-height: 32rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-	
-	
-		.line {
-			width: 642rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			box-shadow: 1rpx 1rpx 0rpx 0rpx rgba(102, 102, 102, 0.25);
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-	
-		.times {
-			width: 93%;
-	
-			.selectTime {
-				width: 288rpx;
-				height: 50rpx;
-				background: #FFFFFF;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				border: 1rpx solid #D9D9D9;
-				color: #4B4B4B;
-				font-family: 'PingFang SC', 'PingFang SC';
-				font-weight: 500;
-				font-size: 26rpx;
-				padding-left: 15rpx;
-				cursor: pointer;
-				margin: 24rpx 32rpx 0 0;
-				white-space: nowrap;
-				/* 防止文本换行 */
-				text-overflow: ellipsis;
-				/* 超出部分显示省略号 */
-				overflow: hidden;
-				/* 隐藏超出部分 */
-				text-align: left;
-				/* 文字靠左对齐 */
-				line-height: 50rpx;
-				/* 垂直居中对齐 */
-				box-sizing: border-box;
-				/* 确保 padding 和 border 不影响宽度和高度 */
-				display: inline-block;
-				/* 确保容器内文字正确对齐 */
-			}
-	
-		}
-	
-		.selectTime.selected {
-			width: 288rpx;
-			height: 50rpx;
-			border-radius: 12rpx 12rpx 12rpx 12rpx;
-			background: #008CFF;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 26rpx;
-			color: #FFFFFF;
-			cursor: pointer;
-			margin: 24rpx 32rpx 0 0;
-	
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/packageA/center/teacherClass.vue b/packageA/center/teacherClass.vue
deleted file mode 100644
index 447f908..0000000
--- a/packageA/center/teacherClass.vue
+++ /dev/null
@@ -1,509 +0,0 @@
-<template>
-	<view class="box flex justify-center align-items flex-column">
-		<view class="search flex  align-items">
-			<span class="dashed">
-				<image src="../../static/center/search.png" mode=""></image>
-			</span>
-			<span class="line-search"></span>
-			<input type="text" placeholder="搜索教师课程" v-model="keywords" class="input" placeholder-class="plasty" />
-			<span class="searchBtn" @click.stop="search()">搜索</span>
-		</view>
-		<view class="con-center flex flex-column justify-center align-items">
-			<view class="centerBox flex justify-start align-items flex-column" v-if="list.length != 0">
-				<view class="flex w-100 center flex-column" style="align-items: center;" v-for="(item,index) in list"
-					:key="index" @click.stop="openUrl('/pages/center/detail?id='+item.id)" >
-					<view class="flex" style="width: 690rpx;">
-						<image :src="item.headimage" mode="" style="width: 280rpx; height: 200rpx;border-radius: 12rpx;"></image>
-						<view class="flex flex-column rightBox">
-							<span class="name">{{item.title}}</span>
-							<!-- <span class="line-row"></span> -->
-							<span class="minge">{{'开始时间 ' + item.start_time_text}}</span>
-							<span class="minge">{{'结束时间 ' + item.end_time_text}}</span>
-							<span class="money" v-if="item.feel == 0">
-								<span>课程价格:</span>
-								{{'￥' + item.price}}</span>
-							<span class="charge" v-if="item.feel == 1" >
-								免费
-							</span>
-						</view>
-					</view>
-					<!-- <span class="error" v-if="item.auth_status == 2">审核失败:{{item.reason}}</span> -->
-					<span class="box-line"></span>
-				</view>
-			</view>
-			<view class="" v-else>
-				<u-empty
-				        mode="list"
-				        icon="http://cdn.uviewui.com/uview/empty/list.png"
-				>
-				</u-empty>
-			</view>
-		</view>
-		<u-loadmore :status="loadStatus" />
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				size: 13,
-				page: 1,
-				limit: 10,
-				loadStatus: 'loading',
-				list: [],
-				last_page:0,
-				keywords:''
-			};
-		},
-		// onLoad() {
-		// 	this.getList();
-		// },
-		onShow() {
-			this.page = 1
-			this.list = []
-			this.getList();
-		},
-		onReachBottom() {
-			if (this.page < this.last_page) {
-				this.page++;
-				this.getList();
-			}
-		},
-		methods: {
-			openUrl(url) {
-				uni.navigateTo({
-					url: url
-				})
-			},
-			search(){
-				this.resetLists()
-				this.getList()
-			},
-			resetLists(){
-				this.page = 1;
-				this.list = [];
-				this.loadStatus = 'loading'
-			},
-			// 获取课程列表
-			getList() {
-				// if (this.loadStatus === 'nomore') return;
-				uni.$u.http.get('/api/school/classes/classes_list', {
-					params: {
-						page: this.page,
-						limit: this.limit,
-						order: 'normal',
-						keywords:this.keywords,
-						teacher_id:this.id,
-						is_expire: 2
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						 this.last_page = res.data.list.last_page
-						this.list = [...this.list, ...res.data.list.data];
-						if (this.list.length >= res.data.list.total) {
-							this.loadStatus = 'nomore';
-						} else {
-							this.loadStatus = 'loading';
-						}
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-						this.loadStatus = 'loading';
-					}
-				}).catch(error => {
-					console.error('请求失败', error);
-					this.loadStatus = 'loading';
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.box {
-		background: linear-gradient(to bottom, #F1F2F8 0%, #FFFFFF 5%, #FFFFFF 100%);
-
-		.con-center {
-			width: 690rpx;
-			margin-top: 25rpx;
-
-			.centerBack {
-				position: fixed;
-				width: 100%;
-				height: 100%;
-				top: 25rpx;
-				left: 0;
-				z-index: -1;
-			}
-
-			.header {
-				height: 50rpx;
-				margin-top: 37rpx;
-
-				.s-header {
-					width: 104rpx;
-					height: 50rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #9E9E9E;
-					line-height: 26rpx;
-				}
-
-				.s-header.selected {
-					width: 104rpx;
-					height: 50rpx;
-					background: #008CFF;
-					border-radius: 12rpx 12rpx 12rpx 12rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 28rpx;
-					color: #FFFFFF;
-					line-height: 26rpx;
-				}
-			}
-		}
-
-	}
-
-	.w-100 {
-		width: 100%;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.flex-start {
-		align-items: flex-start;
-	}
-
-	.justify-center {
-		justify-content: center;
-	}
-
-	.align-items {
-		align-items: center;
-	}
-
-	.flex-column {
-		flex-flow: column;
-	}
-
-	.justify-start {
-		justify-content: start;
-	}
-
-	.line {
-		margin-top: 12rpx;
-		width: 690rpx;
-		height: 1rpx;
-		background: #008CFF;
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
-	}
-
-	.centerBox {
-		width: 690rpx;
-
-		.error {
-			width: 100%;
-			word-break: break-all;
-		}
-
-		.box-line {
-			width: 400rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-			margin-top: 52rpx;
-		}
-
-		.center {
-			margin: 32rpx 0 32rpx 0;
-		}
-
-		.rightBox {
-			margin-left: 24rpx;
-			width: 378rpx;
-
-			.line-row {
-				width: 382rpx;
-				height: 1rpx;
-				background: #D9D9D9;
-				box-shadow: 1rpx 1rpx 0rpx 0rpx rgba(102, 102, 102, 0.25);
-				margin: 14rpx 0 6rpx 0;
-			}
-
-			.name {
-				font-weight: 800;
-				font-size: 36rpx;
-				color: #343434;
-				margin-bottom: 24rpx;
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-				/* 设置行数 */
-				overflow: hidden;
-				text-overflow: ellipsis;
-				word-break: break-all;
-				/* 防止单词被截断 */
-			}
-
-			.minge {
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #7A7A7A;
-				margin-bottom: 14rpx;
-			}
-
-			.pass {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #34DC12;
-			}
-
-			.full {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #FF2323;
-			}
-
-
-			.money {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #FF2323;
-			
-				span {
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-				}
-			}
-
-			.Cancel {
-				width: 138rpx;
-				height: 48rpx;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				background: #008CFF;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #FFFFFF;
-				line-height: 32rpx;
-				letter-spacing: 4px;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				align-self: flex-end;
-			}
-
-			.make {
-				width: 138rpx;
-				height: 48rpx;
-				background: #008CFF;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #FFFFFF;
-				line-height: 32rpx;
-				letter-spacing: 4px;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				align-self: flex-end;
-				margin-left: 16rpx;
-			}
-
-			.QR {
-				width: 138rpx;
-				height: 48rpx;
-				background: #4974FF;
-				box-shadow: 2rpx 2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-				border-radius: 8rpx 8rpx 8rpx 8rpx;
-				font-weight: 400;
-				font-size: 26rpx;
-				color: #EAEAEA;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				align-self: flex-end;
-				margin-top: 50rpx;
-			}
-
-		}
-	}
-
-	.charge {
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 800;
-		font-size: 28rpx;
-		color: #FF2323;
-		line-height: 32rpx;
-	}
-
-	.search {
-		margin-top: 24rpx;
-		width: 690rpx;
-		height: 64rpx;
-		background: #FFFFFF;
-		box-shadow: 2rpx 2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		border: 2rpx solid #008CFF;
-
-		.dashed {
-			image {
-				width: 52rpx;
-				height: 52rpx;
-			}
-		}
-
-		.line-search {
-			width: 2rpx;
-			height: 42rpx;
-			background: #008CFF;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-
-		.input {
-			// border: 4rpx solid #EAEAEA;
-			padding-left: 12rpx;
-			height: 100%;
-			width: 100%;
-		}
-
-		::v-deep .input-placeholder {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #C0C0C0;
-			line-height: 32rpx;
-			text-align: left;
-			font-style: normal;
-			text-transform: none;
-
-		}
-		.searchBtn{
-			width: 128rpx;
-			height: 64rpx;
-			background: #008CFF;
-			border-radius: 5rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #FFFFFF;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-	}
-
-	.popup {
-		.header {
-			margin-left: 24rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 42rpx;
-			color: #008CFF;
-			margin-top: 34rpx;
-			width: 690rpx;
-		}
-
-		.line-row {
-			width: 690rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			margin: 11rpx 0 31rpx 0;
-		}
-
-		.pop-center {
-			.left {}
-
-			.right {
-				margin-left: 30rpx;
-
-				.title {
-					width: 340rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 34rpx;
-					color: #343434;
-				}
-
-
-			}
-		}
-
-		.line-short {
-			width: 400rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-		}
-
-		.popList {
-			justify-content: space-between;
-			width: 600rpx;
-			margin-top: 32rpx;
-
-			.hei {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #343434;
-			}
-		}
-
-		.pop-btn {
-			width: 690rpx;
-			margin-top: 62rpx;
-			justify-content: space-around;
-
-			.Cancel {
-				width: 306rpx;
-				height: 80rpx;
-				border-radius: 401rpx 401rpx 401rpx 401rpx;
-				border: 2rpx solid #008CFF;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #008CFF;
-			}
-
-			.Confirm {
-				width: 306rpx;
-				height: 80rpx;
-				background: #008CFF;
-				border-radius: 401rpx 401rpx 401rpx 401rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #FFFFFF;
-			}
-		}
-	}
-
-	.hui {
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		font-size: 24rpx;
-		color: #7A7A7A;
-	}
-
-	.white-space {
-		overflow: hidden;
-		/* 确保超出容器的文本被隐藏 */
-		white-space: nowrap;
-		/* 确保文本在一行内显示 */
-		text-overflow: ellipsis;
-		/* 使用省略号表示被截断的文本 */
-	}
-</style>
\ No newline at end of file
diff --git a/packageA/index/About.vue b/packageA/index/About.vue
deleted file mode 100644
index 8dc629c..0000000
--- a/packageA/index/About.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-	<view class="box">
-		<!-- <image src="https://testy.hschool.com.cn//uploads/20241128/50fba75792a2d6478eeedcd0e2373772.png" mode="widthFix"
-			class="backImg"></image> -->
-			<rich-text :nodes="Negotiate"></rich-text>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				Negotiate:''
-			};
-		},
-		onLoad() {
-			this.getAgreement()
-		},
-		methods:{
-			// 获取入驻协议文章
-			getAgreement() {
-				uni.$u.http.get('/api/index/agreement', {
-					params: {}
-				}).then(res => {
-					if (res.code == 1) {
-			
-						this.Negotiate = (res.data.about_us).replace(/\<img/gi,
-							'<img style="max-width:100%;height:auto" ');
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.box {
-		width: 750rpx;
-		overflow-y: auto;
-		/* 允许垂直滚动 */
-
-		.backImg {
-			width: 100%;
-			/* 图片宽度占满容器 */
-			height: auto;
-			/* 图片高度自适应 */
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/packageA/index/previousDetail.vue b/packageA/index/previousDetail.vue
deleted file mode 100644
index 815a45b..0000000
--- a/packageA/index/previousDetail.vue
+++ /dev/null
@@ -1,1227 +0,0 @@
-<template>
-	<view class="box flex justify-start flex-column align-items">
-		<view class="swiper">
-			<u-swiper :list="detail.images" indicator indicatorMode="line" height="450rpx" circular></u-swiper>
-		</view>
-		<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
-			<view class="first-box flex flex-start flex-column justify-start">
-				<span class="first-name">{{detail.title}}</span>
-				<view class="flex w-100  align-items" style="margin-top:28rpx;justify-content: space-between;">
-					<span class="first-money" v-if="detail.feel == 0" style="font-size: 28rpx;">￥{{detail.price}}<span
-							class="wangqi">(往期课程)</span></span>
-					<span class="first-money" v-if="detail.feel == 1">免费<span class="wangqi">(往期课程)</span></span>
-
-					<view class="flex align-items justify-center"
-						style="width: 30%;justify-content: flex-end;margin-right: 24rpx;">
-						<!-- <span
-							class="first-mine">{{ Number(detail.sign_num + detail.virtual_num)}}/{{detail.limit_num}}</span> -->
-							<span
-								class="first-mine">{{detail.limit_num}}/{{detail.limit_num}}</span>
-						<span class="first-txt">名额</span>
-						<image src="../../static/center/minge.png" mode="" class="icon-size"></image>
-					</view>
-				</view>
-				<span class="line"></span>
-				<span class="first-image flex align-items"
-					@click.stop="toMap(detail.latitude,detail.longitude,detail.address_detail)">
-					<image src="../../static/center/address.png" mode="" class="icon-size"></image>
-					{{detail.address_detail}}
-				</span>
-				<span class="first-image flex align-items" @click.stop="callPhone(detail.user.mobile)"
-					v-if="detail.user.mobile">
-					<image src="../../static/tel.png" mode="" class="icon-size"></image>
-					<!-- <span>{{detail.user.realname || detail.user.nickname || '未知'}}/{{detail.user.mobile || '未知'}}</span> -->
-					<span>{{mobile}}</span>
-				</span>
-				<span class="first-image flex align-items" @click.stop="callPhone(detail.user.mobile)">
-					<span>联系客服</span>
-				</span>
-				<span class="line"></span>
-				<view class="flex flex-column gj">
-					<span class="title">
-						<span style="font-size: 32rpx;">
-							共计{{formattedTimeList.length}}节
-						</span>
-						<span style="margin-left: 12rpx;">
-							({{formattedTime.formattedTime}})
-						</span>
-					</span>
-					<scroll-view :scroll-top="scrollTop" scroll-y="true" class="flex flex-column align-items scroll">
-						<span v-for="(item,index) in formattedTimeList" :key="index"> {{ item.formattedTime }}</span>
-					</scroll-view>
-				</view>
-				<!-- <span class="first-image flex align-items">
-					<image src="../../static/center/class.png" mode="" class="icon-size"></image>
-					<span>课时安排</span>
-					<image src="../../static/my/right.png" mode="" style="width: 24rpx;height: 24rpx;margin-left: 12rpx;"></image>
-				</span> -->
-			</view>
-			<!-- 课程详情 -->
-			<view class="six flex flex-column" style="justify-content: flex-start;">
-				<view class="six-header flex align-items space-between">
-					<image src="../../static/center/kecheng.png" mode="" style="width: 168rpx; height: 48rpx;"></image>
-				</view>
-				<view class="six-center flex first-txt  flex-column">
-					<!-- <rich-text :nodes="detail.content" style="width: 100%;" :tagStyle="style"></rich-text> -->
-					<u-parse :content="detail.content" :tagStyle="style"></u-parse>
-					<!-- <view class="s-header flex justify-start flex-column">
-						<span>单门课程报名费用：499元/10小时，共5节课</span>
-						<span>上课时间：每周对应固定时间晚上19：00-21：00</span>
-						<span>上课人数：每门课程10人起</span>
-						<span>上课地点：</span>
-						<span>洛阳市老城区同化街1654号</span>
-					</view>
-					<image src="../../static/center/detail.png" mode="" style="width: 644rpx; height: 1054rpx;"></image> -->
-				</view>
-			</view>
-
-			<!-- 课程须知 -->
-			<view class="six flex flex-column" style="justify-content: flex-start;background: white;">
-				<view class="six-header flex align-items space-between">
-					<image src="../../static/center/xuzhi.png" mode="" style="width: 168rpx; height: 48rpx;"></image>
-				</view>
-				<view class="six-center flex first-txt  flex-column">
-					<u-parse :content="detail.notice" :tagStyle="style"></u-parse>
-					<!-- <rich-text :nodes="detail.notice" style="width: 100%;" :tagStyle="style"></rich-text> -->
-
-				</view>
-			</view>
-			<view class="four flex justify-start align-items flex-column">
-				<view class="four-box flex justify-start align-items w-100" @click="toTeacher(detail.teacher.id)">
-					<view class="four-header flex align-items w-100" style="justify-content: space-between;">
-						<view class="flex align-items" style="justify-content: start; width: 70%;">
-							<image :src="detail.teacher.head_image" mode="" style="width: 100rpx; height: 125rpx;">
-							</image>
-							<span class="flex justify-center flex-column"
-								style="align-items: flex-start;margin-left: 18rpx;">
-								<span class="four-name">{{detail.teacher.name}}</span>
-								<span class="jigou">{{detail.shop.name}}</span>
-								<span class="flex align-items rate">
-									<u-rate :count="count" active-color="#FFBC2C" v-model="detail.teacher.teacher_star"
-										allowHalf="true" readonly></u-rate>
-									{{detail.teacher.teacher_star}}分
-								</span>
-
-							</span>
-						</view>
-						<view class="four-right flex flex-column align-items">
-							<image src="../../static/center/teacher.png" mode="" style="width: 168rpx; height: 48rpx;">
-							</image>
-							<span class="teacher-detail flex align-items">教师详情
-								<image src="../../static/center/right.png" mode="" style="width: 24rpx; height: 24rpx;">
-								</image>
-							</span>
-						</view>
-
-					</view>
-				</view>
-				<span class="line" style="width: 93%;"></span>
-				<span class="tt-detail flex ">
-					<span>教师简介:</span>
-					<!-- <span v-html="detail.teacher.content"></span> -->
-					<u-parse :content="detail.teacher.content"></u-parse>
-				</span>
-			</view>
-			<!-- 机构 -->
-			<view class="five flex align-items">
-				<view class="five-box flex ">
-					<view class="five-left flex align-items" style="justify-content: space-around;"
-						@click="toMeDetail()">
-						<image :src="detail.shop.logo" mode="" style="width: 78rpx; height: 78rpx;">
-						</image>
-						<span class="flex flex-column justify-center"
-							style="align-items: left; margin-left: 24rpx;width: 550rpx;">
-							<span class="five-name">{{detail.shop.name}}</span>
-							<span class="five-address white-space">{{detail.shop.address_detail}}</span>
-						</span>
-					</view>
-					<!-- <span class="five-right flex align-items" @click="toMeDetail()">
-						更多课程
-						<image src="../../static/center/right.png" mode="" style="width: 24rpx; height: 24rpx;"></image>
-					</span> -->
-				</view>
-			</view>
-
-		</view>
-
-		<view class="footer flex align-items" style="justify-content: space-between;">
-			<view class="footer-left">
-				<view @click="toIndex">
-					<image src="../../static/center/home.png" mode=""></image>
-					<span>首页</span>
-				</view>
-				<button open-type="share" class="no-border-button" plain="true">
-					<view class="">
-						<image src="../../static/center/share.png" mode=""></image>
-						<span>分享</span>
-					</view>
-				</button>
-				<view v-if="is_collect == 0" @click="Collect(1)">
-					<image src="../../static/center/Collect.png" mode=""></image>
-					<span>收藏</span>
-				</view>
-				<view v-if="is_collect != 0" @click="Collect(0)">
-					<image src="../../static/center/Collected.png" mode=""></image>
-					<span>已收藏</span>
-				</view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	// import indexBackgroundImage from "@/static/center/firstBack.png"
-	import dayjs from 'dayjs';
-	export default {
-
-		computed: {
-			formattedTimeList() {
-				return this.timeList.map(item => {
-					const startTime = dayjs.unix(item.start_time).format('YYYY-MM-DD HH:mm:ss');
-					const endTime = dayjs.unix(item.end_time).format('HH:mm:ss');
-					return {
-						formattedTime: `${startTime}~${endTime}`
-					};
-				});
-			},
-			formattedTime() {
-				const startTime = dayjs.unix(this.detail.start_time).format('YYYY-MM-DD');
-				const endTime = dayjs.unix(this.detail.end_time).format('YYYY-MM-DD');
-				return {
-					formattedTime: `${startTime}~${endTime}`
-				};
-			}
-		},
-		data() {
-			return {
-				style: {
-					// 字符串的形式
-					img: 'width: 100%',
-				},
-				show: false,
-				buyShow: false,
-				type: 0, // 0 支付 1 立即购买 2 预约  3确认时间
-				id: 1,
-				count: 5,
-				value: 5,
-				order_no: '',
-				PayPirce: 0,
-				notice: '',
-				detail: {},
-				people: {},
-				virtual_people: 0,
-				popupStyle: {
-					width: '100%',
-					// height: '564rpx',
-					margin: '0 auto', // 水平居中
-					display: 'flex',
-					justifyContent: 'center',
-					alignItems: 'center'
-				},
-				timeList: [],
-				selectedTime: null,
-				// indexBackgroundImage: indexBackgroundImage,
-				is_collect: 0,
-				orderId: "",
-				classes_lib_spec_id: '',
-				order_no2: '',
-				mobile:'',
-				is_show_model: false //是否显示分享模态窗
-
-			};
-		},
-		onShareTimeline() {
-			return {
-				title: this.detail.title,//分享的标题
-				imageUrl: this.detail.headimage,//展示的图片，这里是本地路径的写法，也可以写http或https开头的图片路径
-				 query: `id=${this.id}`
-			}
-		},
-		onLoad(options) {
-			this.id = options.id
-			this.getDetail()
-			this.getTime()
-		},
-
-		methods: {
-			// 时间转换函数
-			timeago(timestamp) {
-				const now = new Date().getTime(); // 当前时间（毫秒）
-				const diff = (now - timestamp * 1000) / 1000; // 时间差（秒）
-
-				if (diff < 60) {
-					return `${Math.floor(diff)}秒前`;
-				} else if (diff < 3600) {
-					return `${Math.floor(diff / 60)}分钟前`;
-				} else if (diff < 86400) {
-					return `${Math.floor(diff / 3600)}小时前`;
-				} else if (diff < 2592000) { // 30天
-					return `${Math.floor(diff / 86400)}天前`;
-				} else {
-					return `${Math.floor(diff / 2592000)}个月前`;
-				}
-			},
-
-			sharePoster() {
-				//获取带参数二维码并传递
-				this.is_show_model = false
-				this.$refs.poster.showCanvas()
-			},
-
-			// 获取课时规格
-			getTime() {
-				uni.$u.http.get('/api/school/classes/spec', {
-					params: {
-						id: this.id,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-
-						this.timeList = res.data.spec;
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-			// 获取详情
-			getDetail() {
-				uni.$u.http.get('/api/school/classes/detail', {
-					params: {
-						id: this.id,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.detail = res.data.detail
-						this.notice = res.data.detail.notice.replace(/<[^>]*>/g, '')
-						this.virtual_people = res.data.detail.views
-						if (res.data.detail.is_collect != 0) {
-							this.is_collect = 1
-						} else {
-							this.is_collect = 0
-						}
-						if (this.detail.user.realname) {
-							this.detail.user.realname = this.detail.user.realname.slice(0, 1) + 'XX';
-						}
-						this.mobile = this.detail.user.mobile.slice(0, 3) + 'XXXX' + this.detail.user
-							.mobile.slice(7);
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				}).catch(error => {});
-			},
-			// 教师详情
-			toTeacher(id) {
-				uni.navigateTo({
-					url: `/pages/center/teacherDetail?id=${id}`
-				})
-			},
-			// 导航
-			toMap(latitude, longitude, name) {
-				uni.openLocation({
-					latitude: parseFloat(latitude),
-					longitude: parseFloat(longitude),
-					name: name,
-					success: function() {
-						console.log('success');
-					}
-				});
-			},
-			// 机构详情
-			toMeDetail() {
-				const jigouId = this.detail.shop.id
-				uni.navigateTo({
-					url: "/pages/center/MechanismDetail?id=" + jigouId
-				})
-			},
-
-			// 返回首页
-			toIndex() {
-				uni.switchTab({
-					url: "/pages/index/index"
-				})
-			},
-			// 收藏和取消
-			Collect(number) {
-				uni.$u.http.post('/api/school/classes/collect', {
-					id: this.id,
-					is_collect: number
-				}).then(res => {
-					if (res.code == 1) {
-						this.is_collect = number
-						if (number == 0) {
-							uni.showToast({
-								title: '取消收藏',
-								icon: 'none',
-								duration: 2000
-							})
-						} else {
-							uni.showToast({
-								title: '收藏成功',
-								icon: 'none',
-								duration: 2000
-							})
-						}
-
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-						// _this.$api.toast(res.msg);
-					}
-				}).catch(error => {
-
-				});
-			},
-			callPhone(phone) {
-				uni.makePhoneCall({
-					phoneNumber: phone
-				})
-			},
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.w-100 {
-		width: 100%;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.flex-start {
-		align-items: flex-start;
-	}
-
-	.justify-center {
-		justify-content: center;
-	}
-
-	.align-items {
-		align-items: center;
-	}
-
-	.flex-column {
-		flex-flow: column;
-	}
-
-	.justify-start {
-		justify-content: start;
-	}
-
-	.white-space {
-		overflow: hidden;
-		/* 确保超出容器的文本被隐藏 */
-		white-space: nowrap;
-		/* 确保文本在一行内显示 */
-		text-overflow: ellipsis;
-		/* 使用省略号表示被截断的文本 */
-		width: 100%;
-	}
-
-	.con-center {
-		background: linear-gradient(to bottom,
-				#F1F2F8 0%,
-				#F1F2F8 10%,
-				#FFFFFF 50%,
-				#FFFFFF 95%);
-	}
-
-	.swiper {
-		width: 100%;
-		height: 450rpx;
-	}
-
-	.box {
-		position: relative;
-
-	}
-
-	.first-box {
-		width: 90%;
-		background: #FFFFFF;
-		padding-left: 24rpx;
-		margin-top: 24rpx;
-		border-radius: 20rpx;
-
-		.first-name {
-			width: 100%;
-			height: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 38rpx;
-			color: #343434;
-			margin-top: 32rpx;
-		}
-
-		.first-money {
-			height: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 36rpx;
-			color: #FF2323;
-			margin-bottom: 19rpx;
-		}
-
-		.first-mine {
-			height: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-
-		}
-
-		.first-txt {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-			line-height: 32rpx;
-			margin: 0 6rpx;
-		}
-
-		.first-image {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 26rpx;
-			color: #7A7A7A;
-			margin: 16rpx 0 16rpx 0;
-		}
-	}
-
-	.second-box {
-		width: 90%;
-		margin-top: 42rpx;
-		// background: #FFFFFF;
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		padding-left: 24rpx;
-		position: relative;
-
-		.second-title {
-			// margin: 17rpx 35rpx 15rpx 0;
-			position: absolute;
-			top: 0;
-			left: 0;
-		}
-
-		.second {
-			padding: 24rpx 23rpx 0 0rpx;
-			margin-top: 32rpx;
-
-			view {
-				width: 20%;
-				margin: 24rpx 0 0 0;
-			}
-
-			image {
-				width: 54rpx;
-				height: 54rpx;
-			}
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #7A7A7A;
-				text-align: center;
-				overflow: hidden;
-				white-space: nowrap;
-				width: 100%;
-			}
-
-		}
-
-		.number {
-			width: 108rpx;
-			color: #FF4949;
-			font-size: 42rpx;
-			font-weight: bold;
-			text-align: center;
-		}
-	}
-
-	.third {
-		margin-top: 24rpx;
-		width: 93%;
-
-		.third-header {
-			padding-bottom: 12rpx;
-			border-bottom: 2rpx solid #008CFF;
-		}
-
-		.third-box {
-			margin: 12rpx 0 0 24rpx;
-		}
-
-		.third-center {
-			margin-top: 28rpx;
-			width: 100%;
-			height: 242rpx;
-			overflow: hidden;
-			position: relative;
-		}
-
-		.scroll-container {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			animation: scroll 12s linear infinite;
-		}
-
-		@keyframes scroll {
-			0% {
-				transform: translateX(0);
-			}
-
-			100% {
-				transform: translateX(calc(-100% + 8 * 100px));
-				/* 8 * 100px 是假设每个项目的宽度为 100px */
-			}
-		}
-
-		.item {
-			display: flex;
-			width: 94%;
-			align-items: center;
-			justify-content: space-between;
-			padding: 22rpx 24rpx 24rpx 24rpx;
-			height: 32rpx;
-
-			/* 假设每条数据的高度为60rpx */
-		}
-
-		.item image {
-			margin-right: 10rpx;
-		}
-
-		.line-colum {
-			margin: 0 10rpx;
-			border-left: 1rpx solid #ccc;
-			height: 42rpx;
-		}
-
-		.item span {
-			margin-right: 10rpx;
-		}
-
-		@keyframes scroll {
-			0% {
-				transform: translateY(0);
-			}
-
-			100% {
-				transform: translateY(-240rpx);
-				/* 总高度为 4 * 60rpx = 240rpx */
-			}
-		}
-	}
-
-	.four {
-		margin-top: 42rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx 20rpx 20rpx 20rpx;
-		width: 93%;
-		// height: 338rpx;
-
-		.four-box {
-			.four-header {
-				padding: 32rpx 34rpx 15rpx 24rpx;
-
-				.four-name {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 36rpx;
-					color: #4974FF;
-				}
-
-				.jigou {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 24rpx;
-					color: #008CFF;
-					line-height: 26rpx;
-					margin: 8rpx 0 12rpx 0;
-				}
-
-				.rate {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 28rpx;
-					color: #FFBC2C;
-					line-height: 26rpx;
-				}
-
-				.teacher-detail {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 26rpx;
-					color: #008CFF;
-					line-height: 32rpx;
-				}
-			}
-
-			.four-right {
-				justify-content: space-between;
-				align-items: flex-end;
-				height: 115rpx;
-			}
-		}
-
-
-		.tt-detail {
-			width: 93%;
-			padding: 0rpx 24rpx 18rpx 24rpx;
-			justify-content: flex-start;
-			align-items: left;
-			flex-flow: column;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-
-			span {
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 4;
-				font-size: 32rpx;
-				/* 设置行数 */
-				overflow: hidden;
-				text-overflow: ellipsis;
-				line-height: 1.5em;
-				/* 根据需要调整行高 */
-				max-height: 6em;
-				/* 行高 * 行数 */
-			}
-		}
-
-	}
-
-	.five {
-		width: 93%;
-		height: 126rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx 20rpx 20rpx 20rpx;
-		margin-top: 24rpx;
-
-		.five-box {
-			padding: 24rpx;
-			width: 100%;
-			justify-content: space-between;
-			align-items: center;
-
-			.five-left {
-				.five-name {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: bold;
-					font-size: 36rpx;
-					color: #4974FF;
-				}
-
-				.five-address {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-				}
-
-			}
-
-			.five-right {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #7A7A7A;
-				width: 21%;
-			}
-		}
-
-	}
-
-	.six {
-		margin-bottom: 106rpx;
-		width: 100%;
-		background: linear-gradient(to bottom, #F1F2F8 0%, #FFFFFF 20%, #FFFFFF 80%, #FFFFFF 100%);
-		align-items: center;
-
-
-		.six-header {
-			width: 93%;
-			padding-top: 64rpx;
-			padding-bottom: 12rpx;
-			border-bottom: 2rpx solid #008CFF;
-			// background: linear-gradient(to bottom, #F1F2F8 0%, #ffffff 24%, #FFFFFF 100%);
-		}
-
-		.six-box {
-			width: 93%;
-			margin: 12rpx 0 0 24rpx;
-		}
-
-		.six-center {
-			width: 670rpx;
-			margin-top: 41rpx;
-
-
-			.s-header {
-				padding: 24rpx;
-				width: 642rpx;
-
-				span {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-				}
-			}
-
-			.s-footer {
-				padding: 24rpx;
-				width: 642rpx;
-
-				span {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-				}
-			}
-
-			.s-footer .h4 {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: bold;
-				font-size: 36rpx;
-				color: #656565;
-			}
-		}
-
-	}
-
-
-	.line {
-		width: 95%;
-		height: 1rpx;
-		background: #D9D9D9;
-		margin: 19rpx 0 19rpx 0;
-	}
-
-	.icon-size {
-		width: 36rpx;
-		height: 36rpx;
-	}
-
-
-	.footer {
-		width: 100%;
-		height: 166rpx;
-		background: #ffffff;
-		// box-shadow: 0rpx -2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
-		position: sticky;
-		z-index: 99;
-		/* 绝对定位 */
-		bottom: 0;
-		/* 定位在底部 */
-		left: 0;
-		/* 定位在左边 */
-
-		.footer-left {
-			position: absolute;
-			top: 24rpx;
-			left: 60rpx;
-			display: flex;
-
-			view {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				flex-flow: column;
-				// margin-right: 42rpx;
-				width: 100rpx;
-
-				span {
-					text-align: center;
-					width: 100rpx;
-					height: 34rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #777777;
-				}
-			}
-
-			image {
-				width: 50rpx;
-				height: 50rpx;
-			}
-		}
-
-		.footer-right {
-			position: absolute;
-			top: 27rpx;
-			right: 30rpx;
-			width: 250rpx;
-			height: 80rpx;
-			background: #008CFF;
-			border-radius: 401rpx 401rpx 401rpx 401rpx;
-
-			span {
-				font-family: Kingnamype Yuanmo SC, Kingnamype Yuanmo SC;
-				font-weight: 400;
-				font-size: 34rpx;
-				color: #FFFFFF;
-				letter-spacing: 6rpx;
-				text-align: center;
-				font-style: normal;
-				text-transform: none;
-			}
-		}
-	}
-
-
-
-	.popupBox {
-		// height: 365rpx;
-		margin-top: 22rpx;
-		width: 750rpx;
-
-		.pop-header {
-			width: 93%;
-			padding-top: 32rpx;
-			padding-bottom: 17rpx;
-
-			border-bottom: 2rpx solid #D9D9D9;
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				font-size: 20rpx;
-				color: #343434;
-			}
-		}
-
-		.popup {
-			display: flex;
-			align-items: self-start;
-			justify-content: center;
-			padding-top: 21rpx;
-
-			.popur-right {
-				align-items: self-start;
-				margin-left: 24rpx;
-				width: 418rpx;
-
-				.name {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 28rpx;
-					color: #343434;
-				}
-
-				.address {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-					margin: 16rpx 0 12rpx 0;
-					overflow: hidden;
-					/* 确保超出容器的文本被隐藏 */
-					white-space: nowrap;
-					/* 确保文本在一行内显示 */
-					text-overflow: ellipsis;
-					/* 使用省略号表示被截断的文本 */
-					width: 100%;
-				}
-
-				.date {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-				}
-
-				.time {
-					margin: 12rpx 0 73rpx 0;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-				}
-
-				.line-row {
-					width: 418rpx;
-					height: 1rpx;
-					background: #008CFF;
-					border-radius: 0rpx 0rpx 0rpx 0rpx;
-				}
-
-				.price {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-					margin-top: 23rpx;
-					align-self: flex-end;
-
-					span {
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 800;
-						font-size: 36rpx;
-						color: #FF2323;
-						line-height: 32rpx;
-					}
-				}
-			}
-
-		}
-
-		.popup-footer {
-			margin-top: 42rpx;
-		}
-
-
-		.line {
-			width: 642rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			box-shadow: 1rpx 1rpx 0rpx 0rpx rgba(102, 102, 102, 0.25);
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-
-		.times {
-			width: 93%;
-
-			.selectTime {
-				width: 288rpx;
-				height: 50rpx;
-				background: #FFFFFF;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				border: 1rpx solid #D9D9D9;
-				color: #4B4B4B;
-				font-family: 'PingFang SC', 'PingFang SC';
-				font-weight: 500;
-				font-size: 24rpx;
-				padding-left: 15rpx;
-				cursor: pointer;
-				margin: 24rpx 32rpx 0 0;
-				white-space: nowrap;
-				/* 防止文本换行 */
-				text-overflow: ellipsis;
-				/* 超出部分显示省略号 */
-				overflow: hidden;
-				/* 隐藏超出部分 */
-				text-align: left;
-				/* 文字靠左对齐 */
-				line-height: 50rpx;
-				/* 垂直居中对齐 */
-				box-sizing: border-box;
-				/* 确保 padding 和 border 不影响宽度和高度 */
-				display: inline-block;
-				/* 确保容器内文字正确对齐 */
-			}
-
-		}
-
-		.selectTime.selected {
-			width: 288rpx;
-			height: 50rpx;
-			border-radius: 12rpx 12rpx 12rpx 12rpx;
-			background: #008CFF;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			cursor: pointer;
-			margin: 24rpx 32rpx 0 0;
-
-		}
-	}
-
-	.share {
-		position: fixed;
-		color: #FFFFFF;
-		right: 0;
-		bottom: 190rpx;
-		background: linear-gradient(to bottom right, #FE726B, #FE956B);
-		padding: 10rpx 10rpx 10rpx 20rpx;
-		border-top-left-radius: 50px;
-		border-bottom-left-radius: 50px;
-		box-shadow: 0 0 20upx rgba(0, 0, 0, .09);
-	}
-
-	.cancel {
-		width: 100vw;
-		padding: 30rpx;
-		text-align: center;
-		background: #FFFFFF;
-		color: red;
-		font-weight: bold;
-		font-size: 30rpx;
-	}
-
-	.md-content {
-		display: flex;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		padding: 50rpx 0;
-		background-color: white;
-	}
-
-	.md-content-item {
-		margin: 0 70rpx;
-		position: relative;
-	}
-
-	.md-content-item image {
-		width: 100rpx;
-		height: 100rpx;
-	}
-
-	.md-content-item view {
-		margin-top: 15rpx;
-		font-size: 28rpx;
-	}
-
-	.sharebtn {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		opacity: 0;
-	}
-
-	.cu-modal {
-		position: fixed;
-		bottom: 166rpx;
-		left: 0;
-		z-index: 999999;
-	}
-
-	.gj {
-		.title {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 32rpx;
-			color: #4B4B4B;
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #4B4B4B;
-			}
-		}
-
-		.scroll {
-			width: 642rpx;
-			max-height: 340rpx;
-
-			span {
-				margin: 24rpx;
-				width: 600rpx;
-				height: 56rpx;
-				background: #E8E8E8;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 28rpx;
-				color: #7A7A7A;
-			}
-		}
-	}
-
-	::v-deep ::-webkit-scrollbar {
-		/*滚动条整体样式*/
-		width: 4px !important;
-		height: 1px !important;
-		overflow: auto !important;
-		background: #ccc !important;
-		-webkit-appearance: auto !important;
-		display: block;
-	}
-
-	::v-deep ::-webkit-scrollbar-thumb {
-		/*滚动条里面小方块*/
-		border-radius: 10px !important;
-		box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
-		background: #7b7979 !important;
-	}
-
-	::v-deep ::-webkit-scrollbar-track {
-		/*滚动条里面轨道*/
-		// box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
-		// border-radius: 10px !important;
-		background: #FFFFFF !important;
-	}
-
-	.no-border-button {
-		background-color: transparent;
-		/* 去掉背景色 */
-		border: none;
-		/* 去掉边框 */
-		padding: 0;
-		/* 去掉内边距 */
-		margin: 0;
-		/* 去掉外边距 */
-		display: inline-flex;
-		/* 使按钮内容居中 */
-		align-items: center;
-		/* 垂直居中 */
-		justify-content: center;
-		/* 水平居中 */
-		flex-flow: column;
-		height: 110rpx;
-		line-height: inherit;
-
-		span {
-			text-align: center;
-			width: 48rpx;
-			height: 34rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #777777;
-		}
-	}
-
-	::v-deep ._root {
-		padding: 0 10rpx;
-	}
-
-	.wangqi {
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 800;
-		font-size: 24rpx;
-		color: #343434;
-		margin-left: 12rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/packageA/my/cancelActivity copy.vue b/packageA/my/cancelActivity copy.vue
deleted file mode 100644
index cd73e86..0000000
--- a/packageA/my/cancelActivity copy.vue	
+++ /dev/null
@@ -1,421 +0,0 @@
-<template>
-	<view class="box flex flex-column flex-start align-items">
-		<view class="con-box flex flex-column flex-start align-items">
-			<view class="top flex ">
-				<image :src="detail.detail.headimage" mode=""
-					style="width: 280rpx;height: 200rpx;border-radius: 12rpx;"></image>
-				<view class="rightBox flex flex-column flex-start">
-					<span class="name">{{detail.detail.title}}</span>
-					<span class="minge">活动规格</span>
-					<span class="minge" style="font-weight: 800;">{{detail.orderitem.name}}</span>
-					<view class="flex align-items" style="width: 340rpx;">
-						<span class="minge">{{detail.orderitem.limit_num}}人</span>
-						<span class="minge">{{detail.orderitem.age}}岁</span>
-						<span class="minge" v-if="detail.orderitem.sex == 3">男女不限</span>
-						<span class="minge" v-else>{{detail.orderitem.sex == 1 ? "男" : "女"}}</span>
-					</view>
-					<!-- <span class="minge" v-if="detail.feel == 0">课程价格:
-						<span style="color: #FF2323;font-weight: 800;">{{'￥' + detail.price}}</span>
-					</span>
-					<span class="minge" v-if="detail.feel == 1">
-						<span style="color: #FF2323;font-weight: 800;">免费</span>
-					</span> -->
-				</view>
-			</view>
-			<span class="line"></span>
-			<view class="con-center flex flex-start flex-column align-items ">
-				<view class="top flex flex-start" style="padding: 0;">
-					<image :src="detail.user.avatar" mode=""
-						style="width: 120rpx;height: 120rpx;border-radius: 100%;margin-right: 18rpx;">
-					</image>
-					<view class="flex flex-column " style="width: 550rpx;">
-						<span class="name">{{detail.user.nickname}}</span>
-						<span class="minge"> {{'姓 名:' + detail.user.realname}}</span>
-						<span class="minge flex align-items white-space" @click="callPhone(detail.user.mobile)">
-							<span class="white-space">{{'联系电话:' + detail.user.mobile}}</span>
-							<image src="../../static/tel.png" mode="" style="width: 36rpx;height: 36rpx;"></image>
-						</span>
-						<span class="minge">{{'订 单 号:' + detail.order_no}}</span>
-						<span class="minge">{{'购买时间:' + detail.user.realname  || detail.user.nickname}}</span>
-						<span class="minge">{{'姓 名:' + detail.paytime_text}}</span>
-					</view>
-				</view>
-				<span class="line-row"></span>
-				<view class="center flex flex-column flex-start">
-					<span class="detail">活动介绍</span>
-					<span class="minge">{{'活动时间:' + detail.detail.start_time_text}} -
-						{{detail.detail.end_time_text}}</span>
-					<span class="minge">{{'报名时间:' + detail.detail.sign_start_time_text}} -
-						{{detail.detail.sign_end_time_text}}</span>
-					<span class="minge">
-						报名费用:
-						<span
-							class="price">{{ parseFloat(detail.orderitem.price) == 0 ? '公益' : detail.orderitem.price }}</span>
-					</span>
-					<span class="minge">{{'活动人数:' + detail.orderitem.limit_num}}</span>
-					<span class="minge flex align-items "
-						@click.stop="toMap(detail.detail.latitude,detail.detail.longitude,detail.detail.address_detail)">
-						<span class="white-space">{{'活动地址:' + detail.detail.address_detail}}</span>
-						<image src="../../static/center/address.png" mode=""
-							style="width: 36rpx;height: 36rpx; margin-left: 12rpx;"></image>
-					</span>
-				</view>
-
-
-
-			</view>
-		</view>
-		<view class="footer flex justify-center center align-items">
-			<span class="flex justify-center center align-items" @click.stop="submit">确认核销</span>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				detail: {},
-				order_id: '',
-				type: '',
-				vcode: '',
-			};
-		},
-		filters: {
-			formatDateTime(timestamp) {
-				if (!timestamp) return '';
-				const date = new Date(timestamp * 1000);
-				const year = date.getFullYear();
-				const month = String(date.getMonth() + 1).padStart(2, '0');
-				const day = String(date.getDate()).padStart(2, '0');
-				const hours = String(date.getHours()).padStart(2, '0');
-				const minutes = String(date.getMinutes()).padStart(2, '0');
-				const seconds = String(date.getSeconds()).padStart(2, '0');
-				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-			}
-		},
-		onLoad(option) {
-			console.log('option', option);
-			if (option.res) {
-				// 解码参数
-				const decodedRes = decodeURIComponent(option.res);
-				// 解析查询字符串为对象
-				const params = this.parseQueryString(decodedRes);
-				// 将解析后的参数赋值给组件的 data 属性
-				this.order_id = params.order_id;
-				this.type = params.type;
-				this.vcode = params.vcode;
-			}
-		},
-		onShow() {
-			this.page = 1
-			this.list = []
-			this.getDetail(this.order_id)
-		},
-
-		methods: {
-			submit() {
-				uni.$u.http.post('/api/school.worker.activity.order/verification', {
-					order_no: this.detail.order_no
-				}).then(res => {
-					if (res.code == 1) {
-						uni.showToast({
-							title: '核销完成',
-							icon: 'none',
-							duration: 2000,
-							complete: function() {
-								setTimeout(function() {
-									uni.navigateBack(1)
-								}, 2000);
-							}
-						})
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				}).catch(error => {});
-			},
-
-			parseQueryString(queryString) {
-				const params = {};
-				const pairs = queryString.split('&');
-				for (const pair of pairs) {
-					const [key, value] = pair.split('=');
-					params[key] = value;
-				}
-				return params;
-			},
-
-
-			getDetail(id) {
-				uni.$u.http.get('/api/school.worker.activity.order/detail', {
-					params: {
-						id: id,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.detail = res.data.detail
-
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000,
-							complete: function() {
-								setTimeout(function() {
-									uni.navigateBack(1)
-								}, 2000);
-							}
-						})
-					}
-				}).catch(error => {});
-			},
-			// 导航
-			toMap(latitude, longitude, name) {
-				uni.openLocation({
-					latitude: parseFloat(latitude),
-					longitude: parseFloat(longitude),
-					name: name,
-					success: function() {
-						console.log('success');
-					}
-				});
-			},
-
-
-			callPhone(phone) {
-				uni.makePhoneCall({
-					phoneNumber: phone
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.w-100 {
-		width: 100%;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.flex-start {
-		align-items: flex-start;
-	}
-
-	.justify-center {
-		justify-content: center;
-	}
-
-	.align-items {
-		align-items: center;
-	}
-
-	.white-space {
-		overflow: hidden;
-		/* 确保超出容器的文本被隐藏 */
-		white-space: nowrap;
-		/* 确保文本在一行内显示 */
-		text-overflow: ellipsis;
-		/* 使用省略号表示被截断的文本 */
-		width: 100%;
-	}
-
-	.flex-column {
-		flex-flow: column;
-	}
-
-	.justify-start {
-		justify-content: start;
-	}
-
-	.line {
-		margin-top: 12rpx;
-		width: 690rpx;
-		height: 1rpx;
-		background: #008CFF;
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
-	}
-
-	.space-between {
-		justify-content: space-between;
-	}
-
-	.hui {
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		font-size: 24rpx;
-		color: #7A7A7A;
-	}
-
-	.minge {
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		font-size: 24rpx;
-		color: #7A7A7A;
-		margin-top: 8rpx;
-		overflow: hidden;
-		/* 确保超出容器的文本被隐藏 */
-		white-space: nowrap;
-		/* 确保文本在一行内显示 */
-		text-overflow: ellipsis;
-		/* 使用省略号表示被截断的文本 */
-		width: 100%;
-	}
-
-	.box {
-		width: 750rpx;
-		background: #F1F2F8;
-		height: 100vh;
-
-		.con-box {
-			background: #FFFFFF;
-		}
-
-		.con-center {
-			width: 690rpx;
-			margin-bottom: 42rpx;
-
-			.name {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #181818;
-			}
-
-			.line-row {
-				width: 642rpx;
-				height: 1rpx;
-				background: #D9D9D9;
-				border-radius: 0rpx 0rpx 0rpx 0rpx;
-				margin: 33rpx 0 23rpx 0;
-			}
-
-
-			.center {
-				width: 642rpx;
-
-				.detail {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 26rpx;
-					color: #008CFF;
-					margin-bottom: 6rpx;
-				}
-
-				.price {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 26rpx;
-					color: #FF0000;
-				}
-
-				.minge {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 26rpx;
-					color: #7A7A7A;
-					margin-top: 18rpx;
-				}
-			}
-		}
-
-		.top {
-			width: 690rpx;
-			padding: 32rpx 30rpx;
-			background: #FFFFFF;
-
-			.rightBox {
-				margin-left: 32rpx;
-				width: 378rpx;
-
-				.line-row {
-					width: 382rpx;
-					height: 1rpx;
-					background: #D9D9D9;
-					box-shadow: 1rpx 1rpx 0rpx 0rpx rgba(102, 102, 102, 0.25);
-					margin: 14rpx 0 6rpx 0;
-				}
-
-				.price {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 24rpx;
-					color: #FF2323;
-				}
-
-				.name {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 34rpx;
-					color: #343434;
-					display: -webkit-box;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
-					/* 设置行数 */
-					overflow: hidden;
-					text-overflow: ellipsis;
-					word-break: break-all;
-					/* 防止单词被截断 */
-				}
-
-
-				.money {
-					font-weight: 800;
-					font-size: 24rpx;
-					color: #FF2323;
-
-					span {
-						font-weight: 500;
-						font-size: 24rpx;
-						color: #7A7A7A;
-					}
-				}
-			}
-		}
-
-		.centerBack {
-			position: fixed;
-			width: 100%;
-			height: 100%;
-			top: 25rpx;
-			left: 0;
-			z-index: -1;
-		}
-
-	}
-
-	.line {
-		width: 690rpx;
-		height: 1rpx;
-		background: #D9D9D9;
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
-		margin: 37rpx 0;
-	}
-
-	.footer {
-		width: 750rpx;
-		height: 122rpx;
-		position: fixed;
-		bottom: 0;
-		background: #FFFFFF;
-		box-shadow: 0rpx -6rpx 12rpx 0rpx rgba(111, 190, 255, 0.1);
-
-		span {
-			width: 642rpx;
-			height: 80rpx;
-			background: #008CFF;
-			border-radius: 401rpx 401rpx 401rpx 401rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 34rpx;
-			color: #FFFFFF;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue
index c82fdc4..5b440fb 100644
--- a/packageA/my/exercise.vue
+++ b/packageA/my/exercise.vue
@@ -11,7 +11,7 @@
 				</span>
 			</view>
 
-			<view style="min-height: 100vh;">
+			<view style="min-height: 100vh;margin-top: 80rpx;">
 
 				<view class="flex hdkuai flex-column" v-for="(item,index) in list" :key="index">
 				<view style="margin:0 30rpx;">
@@ -179,7 +179,7 @@
 				sortStyle: ['#ff557f', '#3f3f3f'],
 				headers: [
 					{
-						status: '',
+						status: '-3,0,2,3,4,5,6,7,9',
 						text: '全部'
 					},
 					{
@@ -221,7 +221,7 @@
 				this.selected = option.status
 				this.getList(option.status);
 			} else {
-				this.getList('0');
+				this.getList('-3,0,2,3,4,5,6,7,9');
 			}
 		},
 
@@ -413,6 +413,8 @@
 				// margin-top: 10rpx;
 				-webkit-overflow-scrolling: touch;
 				font-family: PingFang SC, PingFang SC;
+				position: fixed;
+    			top: 0;
 
 				.s-header {
 					display: flex;
@@ -425,6 +427,7 @@
 					color: #9E9E9E;
 					line-height: 26rpx;
 					flex: 0 0 auto;
+					position: relative;
 				}
 
 				.s-header.selected {
@@ -437,7 +440,8 @@
 					line-height: 28rpx;
 				}
 				.lines{
-					padding-top: 16rpx;
+					position: absolute;
+					bottom: 0;
 					width: 44rpx;
 				}
 				.lines.selected{
diff --git a/packageA/my/orderList copy.vue b/packageA/my/orderList copy.vue
deleted file mode 100644
index ae6c2b0..0000000
--- a/packageA/my/orderList copy.vue	
+++ /dev/null
@@ -1,718 +0,0 @@
-<template>
-	<view class="box flex justify-center align-items flex-column">
-		<view class="con-center flex flex-column justify-center align-items">
-			<view class="search flex  align-items" style="width: 99%;">
-				<span class="dashed flex align-items justify-center">
-					<image src="../../static/center/search.png" mode=""></image>
-				</span>
-				<span class="line-search"></span>
-				<input type="text" placeholder="搜索您的课程"  v-model="keywords"  class="input" placeholder-class="plasty" />
-				<span class="searchBtn" @click.stop="search()">搜索</span>
-			</view>
-			<view class="header flex align-items w-100" style="justify-content: space-between;">
-				<span class="s-header flex justify-center align-items" v-for="(item,index) in headers" :key="index"
-					:class="{ selected: headerSelected(item.status) }"
-					@click="selectheader(item.status)">{{item.text}}</span>
-			</view>
-			<span class="line"></span>
-			<!-- <view class="sort flex" style="width: 100%;padding: 20rpx 0;">
-					<JQ-orderBy @switchSort="switchSort" :size="size"></JQ-orderBy>
-			</view> -->
-			<view class="centerBox flex justify-start align-items flex-column">
-				<view class="flex w-100 center flex-column" style="align-items: center;" v-for="(item,index) in list"
-					:key="index">
-					<view class="flex w-100">
-						<image :src="item.detail.headimage" mode="" style="width: 280rpx; height: 200rpx;border-radius: 12rpx;"
-							@click="toDetail(item.shop_id,item.id,item.classes_lib_id,item.order_no)"></image>
-						<view class="flex flex-column rightBox">
-							<view class="flex flex-column" 
-								@click="toDetail(item.shop_id,item.id,item.classes_lib_id,item.order_no)">
-								<span class="name">{{item.detail.title}}</span>
-								<!-- <span class="line-row"></span> -->
-								<span class="minge" v-if="selected == 0">课程名额 {{ Number(item.detail.verification_num )}}
-									/
-									{{item.detail.limit_num}}</span>
-								<span class="minge" v-if="selected == 0">剩余时间:24:00:00</span>
-								<span class="minge"
-									v-if="selected == 3 || selected == 6 || selected == 9">{{'购买时间 ' + item.paytime_text.slice(0,10)}}</span>
-								<span class="minge" v-if="selected == 2">{{'预约时间 ' + item.make}}</span>
-								<span class="minge" v-if="selected == 3">{{'课时 ' + item.detail.use_num + "/" + item.detail.classes_num}}</span>
-								<span class="minge" v-if="selected == 9">{{'核销时间 ' +  item.finishtime_text.slice(0,10)}}</span>
-								<span class="minge" v-if="selected == -3">{{'取消时间 ' + item.canceltime}}</span>
-								<span class="minge" v-if="selected == 6">{{'退款时间 ' + item.refundtime}}</span>
-								<span class="money" v-if="item.payprice != 0">
-									<span>课程价格:</span>
-									{{'￥' + item.payprice}}</span>
-								<!-- <span class="charge" v-if="item.payprice == 0" >
-									免费
-								</span> -->
-								<span class="charge" v-if="item.payprice == 0" >
-									
-								</span>
-							</view>
-
-							<view class="flex align-items" style="justify-content: flex-end;margin-top: 12rpx;">
-								<span class="Cancel" v-if="selected == 0" @click="Cancel(item.order_no)">取消订单</span>
-								<span class="make" v-if="selected == 0"
-									@click="toPay(item.shop_id,item.id,item.classes_lib_id,item.order_no,1)">去付款</span>
-								<span class="Cancel" v-if="selected == 3 && item.detail.feel == 0" style="width: 100rpx;"
-									@click="service(item.id)">售后</span>
-									<span class="Cancel" v-if="selected == 3 && item.detail.feel == 1" style="width: 100rpx;"
-										@click="service(item.id)">取消</span>
-								<span class="Cancel" v-if="selected == 3" @click="QR(item.id)"
-									style="width: 100rpx; margin-left: 24rpx;">核销</span>
-								<span class="make" v-if="selected == 3"
-									@click="toMake(item.shop_id,item.id,item.classes_lib_id,2)"
-									style="width: 100rpx;">预约</span>
-								<span class="Cancel" v-if="selected == 9">已完成</span>
-							<!-- 	<span class="make" v-if="selected == 6 || selected == -3 ||  selected == 9"
-									@click="againBuy(item.classes_lib_id)">再次购买</span> -->
-									<!-- <span class="make" v-if="selected == 6 || selected == -3 ||  selected == 9"
-										@click.stop="toDetail(item.shop_id,item.id,item.classes_lib_id,item.order_no)">再次购买</span> -->
-								<!-- <span class="QR" v-if="selected == 2" >二维码</span> -->
-							</view>
-
-						</view>
-
-					</view>
-					<span class="box-line"></span>
-				</view>
-			</view>
-		</view>
-		<u-popup :show="show" mode="center" :zIndex="99999" :custom-style="popupStyle" closeable="true" @close="close"
-			@open="open">
-			<view class="popup flex flex-column align-items">
-				<view class="pop-center flex">
-					<view class="left">
-						<image :src="qrcode.detail.headimage" mode="" style="width: 280rpx;height: 200rpx;"></image>
-					</view>
-					<view class="right flex flex-column">
-						<span class="title white-space">{{qrcode.detail.title}}</span>
-						<span class="hui"
-							style="margin: 16rpx 0 6rpx 0;">课时:{{qrcode.detail.verification_num}}/{{qrcode.detail.limit_num}}</span>
-						<!-- <span class="hui">日期:{{qrcode.detail.classes_date_text}}</span> -->
-						<!-- <span class="hui" style="margin: 6rpx 0 6rpx 0;">时间:{{qrcode.detail.classes_time_text}}</span> -->
-						<span class="hui" v-if="qrcode && qrcode.detail" style="margin-top: 6rpx;">开始时间:{{ formatTimestamp(qrcode.detail.start_time) }}</span>
-						<span class="hui" v-if="qrcode && qrcode.detail" style="margin: 6rpx 0 6rpx 0;">结束时间:{{ formatTimestamp(qrcode.detail.end_time) }}</span>
-						<span class="hui">地址:{{qrcode.detail.address_detail}}</span>
-					</view>
-				</view>
-				<span class="line-short"></span>
-				<image :src="qrcode.codeimage" mode="" style="width: 376rpx;height: 376rpx;"></image>
-				<span style="margin: 24rpx 0 64rpx 0;">核销二维码</span>
-			</view>
-		</u-popup>
-		<u-loadmore :status="loadStatus" />
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				popupStyle: {
-					width: '690rpx',
-					margin: '0 auto', // 水平居中
-					display: 'flex',
-					justifyContent: 'center',
-					alignItems: 'center',
-					padding: '0',
-					borderRadius: '20rpx'
-				},
-				sortList: [{
-					text: '按照价格排序',
-					value: ['acs', 'desc'],
-				}, {
-					text: '按照编号排序',
-					value: ['acs', 'desc'],
-				}],
-				size: 13,
-				sortStyle: ['#ff557f', '#3f3f3f'],
-				headers: [{
-						status: '0',
-						text: '待付款'
-					},
-					{
-						status: '3',
-						text: '进行中'
-					},
-					{
-						status: '9',
-						text: '已完成'
-					},
-					{
-						status: '-3',
-						text: '已取消'
-					},
-					{
-						status: '6',
-						text: '已退款'
-					}
-				],
-				selected: '0',
-				page: 1,
-				limit: 10,
-				loadStatus: 'loading',
-				keywords: '',
-				list: [],
-				show: false,
-				qrcode: '',
-				count:0
-			};
-		},
-		onLoad(option) {
-			this.list = []
-			this.page = 1
-			if (option?.status) {
-				this.selected = option.status
-				this.getList(option.status);
-			} else {
-				this.getList('0');
-			}
-		},
-
-		onReachBottom() {
-			if (this.list.length < this.count) {
-				this.page++;
-				this.getList(this.selected);
-			}
-			
-		},
-		
-		methods: {
-			formatTimestamp(timestamp) {
-			  const date = new Date(timestamp * 1000); // 10位时间戳需要乘以1000
-			  const year = date.getFullYear();
-			  const month = String(date.getMonth() + 1).padStart(2, '0');
-			  const day = String(date.getDate()).padStart(2, '0');
-			  const hours = String(date.getHours()).padStart(2, '0');
-			  const minutes = String(date.getMinutes()).padStart(2, '0');
-			  const seconds = String(date.getSeconds()).padStart(2, '0');
-			  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-			},
-			// 关闭弹窗
-			close() {
-				this.show = false
-				// this.qrcode = ''
-			},
-			open() {
-				this.show = true
-			},
-			againBuy(id) {
-				uni.navigateTo({
-					url: "/pages/center/detail?id=" + id
-				})
-			},
-			// 取消支付
-			Cancel(order_no) {
-				console.log(order_no)
-				uni.$u.http.post('/api/school/order/cancel', {
-					order_no: order_no
-				}).then(res => {
-					if (res.code == 1) {
-						this.list = []
-						this.getList(0);
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {});
-			},
-			// 跳转预约
-			toMake(id, orderId, classes_lib_id, type) {
-				uni.navigateTo({
-					// url: "/pages/center/applyDetail?id=" + id + "&orderId=" + orderId + "&type=" + 2
-					url: "/pages/center/orderDetail?id=" + id + "&orderId=" + orderId + "&type=" + 2 +
-						"&classes_lib_id=" + classes_lib_id
-				})
-			},
-			toDetail(id, orderId, classes_lib_id, order_no) {
-				let type = null;
-				if (this.selected == 0) {
-					type = 1;
-				} else if (this.selected == 3) {
-					type = 2;
-				} else if (this.selected == 9) {
-					type = 9;
-				} else if (this.selected == -3) {
-					type = -3;
-				} else if (this.selected == 6) {
-					type = 6;
-				} else {
-					type = 0;
-				}
-				uni.navigateTo({
-					url: "/pages/center/orderDetail?id=" + id + "&orderId=" + orderId + "&order_no=" + order_no +
-						"&type=" + type + "&classes_lib_id=" + classes_lib_id
-				})
-			},
-			// 去支付
-			toPay(id, orderId, classes_lib_id, order_no, type) {
-				uni.navigateTo({
-					url: "/pages/center/orderDetail?id=" + id + "&orderId=" + orderId + "&order_no=" + order_no +
-						"&type=" + 1 + "&classes_lib_id=" + classes_lib_id
-				})
-			},
-			// 售后
-			service(id) {
-				uni.navigateTo({
-					url: "/pages/afterSales/index?id=" + id
-				})
-			},
-			// 核销码
-			QR(id) {
-				uni.$u.http.get('/api/school/order/detail', {
-					params: {
-						id: id
-					},
-				}).then(res => {
-					if (res.code == 1) {
-						this.qrcode = res.data.detail
-
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {});
-				this.show = true
-			},
-			switchSort(index, value) {
-				console.log(index, value);
-			},
-			// 搜索
-			search() {
-				const that = this
-				that.page = 1
-				that.list = []
-				this.getList(this.selected)
-			},
-			// 获取课程列表
-			getList(status) {
-				// if (this.loadStatus === 'nomore') return;
-				uni.$u.http.get('/api/school/order/order_list', {
-					params: {
-						keywords: this.keywords,
-						page: this.page,
-						limit: this.limit,
-						status: status,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.count = res.data.count
-						this.list = [...this.list, ...res.data.list];
-						if (this.list.length >= res.data.count) {
-							this.loadStatus = 'nomore';
-						} else {
-							this.loadStatus = 'loading';
-						}
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-						this.loadStatus = 'loading';
-					}
-				}).catch(error => {
-					console.error('请求失败', error);
-					this.loadStatus = 'loading';
-				});
-			},
-			selectheader(status) {
-				const that = this
-				that.selected = status;
-				console.log(status, '')
-				that.page = 1
-				that.list = []
-				that.getList(status)
-			},
-			headerSelected(status) {
-				return this.selected === status;
-			},
-
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.box {
-		background: linear-gradient(to bottom, #F1F2F8 0%, #FFFFFF 5%, #FFFFFF 100%);
-
-		.con-center {
-			width: 690rpx;
-			// margin-top: 25rpx;
-
-			.centerBack {
-				position: fixed;
-				width: 100%;
-				height: 100%;
-				top: 25rpx;
-				left: 0;
-				z-index: -1;
-			}
-
-			.header {
-				height: 50rpx;
-				margin-top: 37rpx;
-
-				.s-header {
-					width: 104rpx;
-					height: 50rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #9E9E9E;
-					line-height: 26rpx;
-				}
-
-				.s-header.selected {
-					width: 104rpx;
-					height: 50rpx;
-					background: #008CFF;
-					border-radius: 12rpx 12rpx 12rpx 12rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 28rpx;
-					color: #FFFFFF;
-					line-height: 26rpx;
-				}
-			}
-		}
-
-	}
-
-	.w-100 {
-		width: 100%;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.flex-start {
-		align-items: flex-start;
-	}
-
-	.justify-center {
-		justify-content: center;
-	}
-
-	.align-items {
-		align-items: center;
-	}
-
-	.flex-column {
-		flex-flow: column;
-	}
-
-	.justify-start {
-		justify-content: start;
-	}
-
-	.line {
-		margin-top: 12rpx;
-		width: 690rpx;
-		height: 1rpx;
-		background: #008CFF;
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
-	}
-
-	.centerBox {
-		width: 690rpx;
-
-		.box-line {
-			width: 400rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-			margin-top: 24rpx;
-		}
-
-		.center {
-			margin: 32rpx 0 32rpx 0;
-		}
-
-		.rightBox {
-			margin-left: 32rpx;
-			width: 50%;
-
-			.line-row {
-				width: 382rpx;
-				height: 1rpx;
-				background: #D9D9D9;
-				box-shadow: 1rpx 1rpx 0rpx 0rpx rgba(102, 102, 102, 0.25);
-				margin: 14rpx 0 6rpx 0;
-			}
-
-			.name {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #343434;
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-				/* 设置行数 */
-				overflow: hidden;
-				text-overflow: ellipsis;
-				word-break: break-all;
-				margin-bottom: 24rpx;
-				/* 防止单词被截断 */
-			}
-
-			.minge {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #7A7A7A;
-				margin-bottom: 8rpx;
-			}
-
-			.money {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #FF2323;
-
-				span {
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-				}
-			}
-
-			.Cancel {
-				width: 138rpx;
-				height: 48rpx;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				border: 2rpx solid #008CFF;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #008CFF;
-				line-height: 32rpx;
-				letter-spacing: 4px;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				align-self: flex-end;
-			}
-
-			.make {
-				width: 138rpx;
-				height: 48rpx;
-				background: #008CFF;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #FFFFFF;
-				line-height: 32rpx;
-				letter-spacing: 4px;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				align-self: flex-end;
-				margin-left: 24rpx;
-			}
-
-			.QR {
-				width: 138rpx;
-				height: 48rpx;
-				background: #4974FF;
-				box-shadow: 2rpx 2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-				border-radius: 8rpx 8rpx 8rpx 8rpx;
-				font-weight: 400;
-				font-size: 26rpx;
-				color: #EAEAEA;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				align-self: flex-end;
-				margin-top: 50rpx;
-			}
-
-		}
-	}
-
-	.charge {
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 800;
-		font-size: 28rpx;
-		color: #FF2323;
-		line-height: 32rpx;
-	}
-
-	.search {
-		margin-top: 24rpx;
-		width: 690rpx;
-		height: 64rpx;
-		background: #FFFFFF;
-		box-shadow: 2rpx 2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		border: 2rpx solid #008CFF;
-
-		.dashed {
-			image {
-				width: 52rpx;
-				height: 52rpx;
-			}
-		}
-
-		.line-search {
-			width: 2rpx;
-			height: 42rpx;
-			background: #008CFF;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-
-		.input {
-			// border: 4rpx solid #EAEAEA;
-			padding-left: 12rpx;
-			height: 100%;
-			width: 100%;
-		}
-
-		::v-deep .input-placeholder {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #C0C0C0;
-			line-height: 32rpx;
-			text-align: left;
-			font-style: normal;
-			text-transform: none;
-
-		}
-
-		.searchBtn {
-			width: 128rpx;
-			height: 64rpx;
-			background: #008CFF;
-			border-radius: 5rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #FFFFFF;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-	}
-
-	.popup {
-		.header {
-			margin-left: 24rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 42rpx;
-			color: #008CFF;
-			margin-top: 34rpx;
-			width: 690rpx;
-		}
-
-		.line-row {
-			width: 690rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			margin: 11rpx 0 31rpx 0;
-		}
-
-		.pop-center {
-			margin-top: 50rpx;
-			align-items: center;
-			width: 650rpx;
-
-			.left {
-				image {
-					border-radius: 12rpx;
-				}
-			}
-
-			.right {
-				margin-left: 30rpx;
-
-				.title {
-					width: 340rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 34rpx;
-					color: #343434;
-				}
-
-
-			}
-		}
-
-		.line-short {
-			width: 400rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			margin: 24rpx 0;
-		}
-
-		.popList {
-			justify-content: space-between;
-			width: 600rpx;
-			margin-top: 32rpx;
-
-			.hei {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #343434;
-			}
-		}
-
-		.pop-btn {
-			width: 690rpx;
-			margin-top: 62rpx;
-			justify-content: space-around;
-
-			.Cancel {
-				width: 306rpx;
-				height: 80rpx;
-				border-radius: 401rpx 401rpx 401rpx 401rpx;
-				border: 2rpx solid #008CFF;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #008CFF;
-			}
-
-			.Confirm {
-				width: 306rpx;
-				height: 80rpx;
-				background: #008CFF;
-				border-radius: 401rpx 401rpx 401rpx 401rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #FFFFFF;
-			}
-		}
-	}
-
-	.hui {
-		font-family: PingFang SC, PingFang SC;
-		font-weight: 500;
-		font-size: 24rpx;
-		color: #7A7A7A;
-	}
-
-	.white-space {
-		overflow: hidden;
-		/* 确保超出容器的文本被隐藏 */
-		white-space: nowrap;
-		/* 确保文本在一行内显示 */
-		text-overflow: ellipsis;
-		/* 使用省略号表示被截断的文本 */
-	}
-</style>
\ No newline at end of file
diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue
index b75b27e..1828229 100644
--- a/packageA/my/orderList.vue
+++ b/packageA/my/orderList.vue
@@ -1,6 +1,7 @@
 <template>
   <view class="box flex justify-center align-items flex-column">
     <view class="con-center flex flex-column justify-center align-items">
+
       <view class="tabs align-items">
         <span
           class="s-header flex flex-column"
@@ -129,9 +130,14 @@
               <span class="part flex justify-center align-items" v-if="item.auth_status != 2"  @click="detail(item.id)"> 详情 </span>
             </view>
           </view>
-          <view class="flex justify-center align-items" v-if="hotList.length == 0" style="margin-top: 150rpx;">
-            <span class="no-data">暂无数据</span>
-          </view>
+
+          <view class="flex flex-column flex-start align-items" v-if="hotList.length == 0" style="margin-top: 300rpx;">
+            <image src="/static/message/activen.png" mode="" style="width: 200rpx;height: 200rpx;">
+            </image>
+            <view style="margin-top: 50rpx;font-size: 36rpx;color: #323232;">暂无发布活动</view>
+            <view class="tofb" @click="tofb">前往发布</view>
+        </view>
+
         </view>
       </view>
     </view>
@@ -265,6 +271,11 @@ export default {
         url: "/pages/center/detailSys?id=" + id,
       });
     },
+    tofb() {	
+        uni.switchTab({
+          url: '/pages/center/index',
+        });
+			},
     //开始
     dateWeeks(e) {
       return dateWeek(e);
@@ -544,6 +555,9 @@ export default {
       overflow-x: auto;
       -webkit-overflow-scrolling: touch;
       font-family: PingFang SC, PingFang SC;
+      position: fixed;
+      top: 0;
+      z-index: 2;
 
       .s-header {
         display: flex;
@@ -556,6 +570,7 @@ export default {
         color: #9e9e9e;
         line-height: 26rpx;
         flex: 0 0 auto;
+        position: relative;
       }
 
       .s-header.selected {
@@ -568,7 +583,8 @@ export default {
         line-height: 28rpx;
       }
       .lines {
-        padding-top: 16rpx;
+        position: absolute;
+        bottom: 0;
         width: 44rpx;
       }
       .lines.selected {
@@ -579,6 +595,8 @@ export default {
 		width: 100%;
 		margin-left: 30rpx;
 		margin-top: 30rpx;
+    position: fixed;
+    top: 80rpx;
 		.span_s{
 			width: 134rpx;
 			height: 60rpx;
@@ -921,9 +939,9 @@ export default {
   /* 使用省略号表示被截断的文本 */
 }
 .hot {
-  //   margin-top: 30rpx;
-  margin-bottom: 70rpx;
-  min-height: 100vh;
+    margin-top: 80rpx;
+    margin-bottom: 70rpx;
+    min-height: 100vh;
 
   .hot-top {
     // padding-bottom: 12rpx;
@@ -1132,4 +1150,18 @@ export default {
   font-size: 42rpx;
   color: #323232;
 }
+.tofb{
+  margin-top: 50rpx;
+  width: 280rpx;
+  height: 70rpx;
+  background: #323232;
+  border-radius: 198rpx;
+  font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #BBFC5B;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>
diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue
index bb6b24a..05847ae 100644
--- a/packageA/my/pendinPayDetail.vue
+++ b/packageA/my/pendinPayDetail.vue
@@ -12,7 +12,7 @@
 							<span class="first-name">{{detail.title}}</span>
 						</view>				
 						<view class="first-image flex align-items" style="margin-top: 25rpx;">
-							<image :src="detailAny.user.avatar" mode="" style="width: 36rpx;height: 36rpx;"></image>
+							<image :src="detailAny.user.avatar" mode="" style="width: 36rpx;height: 36rpx;border-radius: 80rpx ;"></image>
 							<span style="color:#9C9C9C;">{{ detailAny.user.nickname }}</span>
 							<span style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
 						</view>
@@ -32,11 +32,11 @@
 				<span class="first-image flex align-items space-between"
 					style="width: 100%;"
 					@click.stop="toMap(detail.latitude, detail.longitude, detail.address_detail)">
-					<view>
+					<view class="flex">
 						<image src="/static/center/address.png" mode="" class="icon-size"></image>
 						<span>{{detail.address_detail}}</span>
 					</view>
-					<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;"></image>
+					<image src="/static/detail/daohang.png" class="icon-size" style="width: 48rpx; height: 48rpx;"></image>
 				</span>
 
 			</view>
@@ -50,21 +50,13 @@
 				</span>
 			</view>
 			<view class="third-center">
-				<!-- <u-swiper
-					:list="detail.ordercode"
-					previousMargin="30"
-					nextMargin="30"
-					keyName="miniurl"
-					circular
-					:autoplay="false"
-					radius="5"
-					bgColor="#ffffff"
-				></u-swiper> -->
-				<l-painter>
-					<l-painter-view css="margin-top: 24rpx;">
-						<l-painter-qrcode css="width: 200rpx; height: 200rpx;margin:0 auto" :text="qrcodesurl"></l-painter-qrcode>
+				<qrcode-swiper :images="['/static/index/about.png','/static/index/about.png','/static/index/about.png']"> </qrcode-swiper>
+				<l-painter v-for="qrcodesurl in detailAny.ordercode">
+					<l-painter-view css="margin-top: 20rpx;margin-bottom: 20rpx;">
+						<l-painter-qrcode css="width: 200rpx; height: 200rpx;margin:0 auto;" :text="qrcodesurl.miniurl"></l-painter-qrcode>
 					</l-painter-view>
 				</l-painter>
+				
 			</view>
 		</view>
 
@@ -97,11 +89,11 @@
 			</view>
 		</view>
 
+		<!-- v-if="detailAny.feel == 0" -->
+		<view class="footer flex align-items flex-column" style="justify-content: space-between;" > 
 
-		<view class="footer flex align-items flex-column" style="justify-content: space-between;">
-
-				<view class="footer-right flex justify-center align-items">
-					<span @click="pament()"> 申请售后 </span>
+				<view class="footer-right flex justify-center align-items" >
+					<span @click="service(detailAny.id)"> 申请售后 </span>
 				</view>		
 		</view>
 
@@ -219,10 +211,14 @@
 
 <script>
 	import dayjs from 'dayjs';
+	import qrcodeSwiper from "components/qrcodeSwiper.vue" // 引入 自己定义的tabBar组件
 	import {
 		dateWeek
 	} from '../../utils/dateFormat'
 	export default {
+		components: {
+			qrcodeSwiper
+		},
 		computed: {
 			// formattedTitle() {
 			// 	if (this.detail.title.length > 9) {
@@ -296,7 +292,7 @@
 				titleStyle: {
 					color: '#FFFFFF'
 				},
-				qrcodesurl:'' //二维码地址
+				// qrcodesurl:'' //二维码地址
 			};
 		},
 
@@ -483,7 +479,7 @@
 				}).then(res => {
 					if (res.code == 1) {
 						this.detail = res.data.detail.detail;
-						this.qrcodesurl = res.data.detail.ordercode[0].miniurl;
+						// this.qrcodesurl = res.data.detail.ordercode[0].miniurl;
 						this.detailAny = res.data.detail;
 					} else {
 						uni.showToast({
@@ -733,7 +729,12 @@
 					phoneNumber: phone
 				})
 			},
-
+			//申请售后
+			service(id) {
+				uni.navigateTo({
+					url: `/pages/afterSales/index?id=${id}`
+				})
+			},
 			// 取消选择
 			cancel() {
 				this.selectedTime = null
diff --git a/packageA/my/person-detail.vue b/packageA/my/person-detail.vue
index 206d3e5..0da8c4f 100644
--- a/packageA/my/person-detail.vue
+++ b/packageA/my/person-detail.vue
@@ -582,7 +582,7 @@
 				flex-direction: column;
 				align-items: center;
 				justify-content: center;
-
+				margin: 0 10rpx;
 				img {
 					width: 150rpx;
 					height: 150rpx;
diff --git a/pages.json b/pages.json
index 2b25112..138fd59 100644
--- a/pages.json
+++ b/pages.json
@@ -131,46 +131,17 @@
 			"style": {
 				"navigationBarTitleText": "隐私政策"
 			}
+		},
+		{
+			"path": "pages/activity/stationStemys",
+			"style": {
+				"navigationBarTitleText": "系统消息"
+			}
 		}
 	],
 	"subPackages": [{
 		"root": "packageA",
-		"pages": [{
-			"path": "activity/activityDetaill",
-			"style": {
-				"navigationBarTitleText": "活动详情"
-			}
-		},
-		{
-			"path": "activity/exercise",
-			"style": {
-				"navigationBarTitleText": "我的活动"
-			}
-		},
-		{
-			"path": "activity/acList",
-			"style": {
-				"navigationBarTitleText": "活动管理"
-			}
-		},
-		{
-			"path": "activity/exerciseDetaill",
-			"style": {
-				"navigationBarTitleText": "活动详情"
-			}
-		},
-		{
-			"path": "index/About",
-			"style": {
-				"navigationBarTitleText": "关于我们"
-			}
-		},
-		{
-			"path": "index/previousDetail",
-			"style": {
-				"navigationBarTitleText": "课程详情"
-			}
-		},
+		"pages": [
 		{
 			"path": "my/person-detail",
 			"style": {
@@ -247,7 +218,7 @@
 		{
 			"path": "my/stationDetail",
 			"style": {
-				"navigationBarTitleText": "消息通知"
+				"navigationBarTitleText": "消息详情"
 			}
 		},
 		{
@@ -314,12 +285,7 @@
 				"navigationBarTitleText": "订单管理"
 			}
 		},
-		{
-			"path": "center/teacherClass",
-			"style": {
-				"navigationBarTitleText": "全部课程"
-			}
-		},
+		
 		{
 			"path": "my/refund",
 			"style": {
diff --git a/pages/activity/index.vue b/pages/activity/index.vue
index 1287142..6980b21 100644
--- a/pages/activity/index.vue
+++ b/pages/activity/index.vue
@@ -1,131 +1,176 @@
 <template>
-	<view class="center-box">
-		<view class="box flex flex-column flex-start">
-			<!-- <view class="search flex  align-items" style="width: 99%;">
-				<span class="dashed">
-					<image src="../../static/center/search.png" mode=""></image>
-				</span>
-				<span class="line-search"></span>
-				<input type="text" placeholder="搜索活动" v-model="keywords" class="input" placeholder-class="plasty" />
-				<span class="searchBtn bg-blue" @click.stop="search()">搜索</span>
-			</view> -->
+	<view class="box flex flex-column align-items">
+		<view class="title_logo">
+			<image
+			src="/static/index/xiaoxilogo.png"
+			mode=""
+			style="width: 237rpx; height: 56rpx;"
+			></image>
+		</view>
+		<view class="box_center flex flex-column align-items">
+			<view class="top flex align-items justify-between" @click="toSystem">
+				<view class="flex align-items">
+					<image src="/static/index/xitongxiaoxi.png" mode="" style="width: 70rpx;height: 70rpx;margin-right: 20rpx;"></image>
+					<span class="xtxiaoxi">系统消息</span>
+				</view>
+				<view class="flex align-items">
+					<span class="xtNum">{{ numbers }}</span>
+					<image src="/static/detail/zidong.png" mode="" style="width: 20rpx;height: 20rpx;margin-left: 20rpx;" ></image>
+				</view>
+			</view>
+			<span class="lines"></span>
+			<view class="center flex flex-column">
+				<!-- <span class="hui" v-if="unread.length != 0">未读消息</span> -->
+				<!-- @click="detail(item.id,item.params)" -->
+				<view class="list flex flex-column" v-for="(item,index) in alllist" :key="index">
 
-			<u-navbar title="消息" :border="false" :placeholder="true" :autoBack="false" :is-back="false" :leftIcon="none">
-				<!-- <view class="" slot="center">
-					<u-search class="u-search" v-model="keywords" placeholder="请输入搜索内容" :showAction="false"
-						@change="search()"></u-search>
-				</view> -->
-			</u-navbar>
+					<view class="flex align-items left" v-if="item.params.images.length > 0">
+						<image :src="item.params.images[0]" mode="" style="width: 80rpx;height: 80rpx;border-radius: 8rpx;"></image>
+						<span class="white-space title1">{{ item.params.title }}</span>
+					</view>
 
-			<view class="flex flex-column flex-start align-items" style="margin-top: 300rpx;">
+					<view class="right flex flex-column">
+						<view class="flex align-items justify-between" style="margin-top: 30rpx;">
+							<span class="white-space title">{{item.title}}</span>
+							<span class="time">{{item.createtime_text}}</span>
+						</view>
+						<span class="white-space text">{{item.desc}}</span>
+					</view>
+
+					<!-- <span class="jiao">
+						<u-badge :isDot="true" type="success"></u-badge>
+					</span> -->
+				</view>
+			</view>
+			<!-- <u-loadmore :status="loadStatus" /> -->
+			<view class="flex flex-column flex-start align-items" v-if="alllist.length == 0" style="margin-top: 100rpx;">
 				<image src="/static/message/message.png" mode="" style="width: 256rpx;height: 240rpx;">
 				</image>
 				<view>暂无活动消息~</view>
 			</view>
-			<!-- <view class="listBox flex flex-column flex-start">
-				<view class="list flex flex-column flex-start" v-for="(item,index) in list" :key="index"
-					@click.stop="open(item.id)">
-					<image :src="item.headimage" mode="" style="width: 690rpx;height: 260rpx;border-radius: 10rpx;">
-					</image>
-					<view class="flex align-items" style="margin: 24rpx 0 0 32rpx;">
-						<span class="Sign  flex justify-center align-items" style="color: #FFFFFF;background: #A4A4A4;"
-							v-if="item.has_sign_expire == 1">已 结 束</span>
-						<span class="Sign  flex justify-center align-items"
-							style="color: #222222;background: #BEEE03;"
-							v-if="item.has_sign_expire == 2">报 名</span>
-						<span class="title white-space">{{item.title}}</span>
-					</view>
-
-					<view class="icon flex align-items">
-						<image src="../../static/index/address.png" mode="" class="icon-size"></image>
-						<span class="white-space">{{item.address_detail}}</span>
-					</view>
-					<view class="icon flex align-items" style="margin-bottom: 32rpx;margin-top: 14rpx;">
-						<image src="../../static/index/clock.png" mode="" class="icon-size"></image>
-						<span class="white-space">{{item.start_time_text}}</span>
-					</view>
-					<span class="Sign bg-hui flex justify-center align-items" v-if="item.has_sign_expire == 1">已 结 束</span>
-					<span class="Sign bg-blue flex justify-center align-items" v-if="item.has_sign_expire == 2">报 名</span>
-				</view>
-			</view> -->
-
-			<!-- <view class="footer flex justify-center align-items">
-				<u-loadmore :status="loadStatus" />
-			</view> -->
 		</view>
-		<tab-bar :tabBarShow="2"></tab-bar>
+		<tab-bar :tabBarShow="tabBarShow"></tab-bar>
 	</view>
 </template>
 
 <script>
+	import { mapActions } from 'vuex';
 	export default {
+		 ...mapActions(['number']),
 		data() {
 			return {
+				tabBarShow:null,
+				isFetching: false,
+				// selected: 'system,classes,order,activity',
+				selected: 'order',
+				alllist: [],// 活动订单所有消息
+				unread_number: '',
+				unread_system_number: '',
+				unread_activity_number: '',
+				keywords: '',
 				page: 1,
 				limit: 10,
-				keywords: '',
+				loadStatus: 'loading',
+				status: '',
+				mini_type: '',
+				type: '',
 				list: [],
-				count: 1,
-				loadStatus: 'nomore'
-
+				show: false,
+				id: '',
+				title: '标题'
 			};
 		},
-		// onLoad() {
-		// 	this.getList()
-		// },
 		onShow() {
-			this.page = 1
-			this.limit = 10
-			this.list = []
-			this.getList()
+			this.resetLists();
+			this.number()
+			this.getinit()
+			this.fetchMessages(this.selected);
 		},
-		onReachBottom() {
-			if (this.count) {
-
-				this.getList();
+		computed: {
+			numbers() {
+				return this.unread_system_number + this.unread_activity_number;
 			}
 		},
+		onReachBottom() {
+			this.page++;
+			this.fetchMessages(this.selected);
+		},
 		methods: {
-			// 搜索
-			search() {
-				this.page = 1
-				this.limit = 10
-				this.list = []
-				this.getList()
-			},
-			getList() {
-				uni.$u.http.get('/api/school/activity/activity_list', {
-					params: {
-						keywords: this.keywords,
-						page: this.page,
-						limit: this.limit,
-						is_expire: 0,
-						order: 'normal'
-					}
-				}).then(res => {
+			getinit() {
+				uni.$u.http.get('/api/index/init', {}).then(res => {
 					if (res.code == 1) {
-						console.log(res.data.list.data)
-						if (res.data.list.data.length > 0) {
-							this.count = res.data.list.data.length;
-							if (this.count) {
-								this.loadStatus = 'nomore';
-								this.page++;
-							} else {
-								this.loadStatus = 'loading';
-							}
-							this.list = [...this.list, ...res.data.list.data];
-
-							// this.count = this.list.length
-							// if (this.list.length >= res.data.count) {
-							// 	this.loadStatus = 'loading';
-							// } else {
-							// 	this.loadStatus = 'nomore';
-							// }
-
+						if (res.data.base_info.miniapp_activity_swtich == 1) {
+							this.tabBarShow = 2;
 						} else {
-							this.count = this.list.length
-							this.loadStatus = 'nomore';
+							this.tabBarShow = 1;
 						}
+					} 
+				}).catch(error => {
+					console.log(error);
+				});
+			},
+			// 获取时间
+			getFormattedDates() {
+				const today = new Date();
+				const startOfDay = new Date(today);
+				startOfDay.setHours(0, 0, 0, 0);
+
+				const endOfDay = new Date(today);
+				endOfDay.setHours(23, 59, 59, 999);
+
+				const yesterday = new Date(today);
+				yesterday.setDate(today.getDate() - 1);
+				const startOfYesterday = new Date(1970, 0, 1, 0, 0, 0, 0); // 1970/01/01 00:00:00
+				const endOfYesterday = new Date(yesterday);
+				endOfYesterday.setHours(23, 59, 59, 999);
+
+				const formatDate = (date) => {
+					const year = date.getFullYear();
+					const month = String(date.getMonth() + 1).padStart(2, '0');
+					const day = String(date.getDate()).padStart(2, '0');
+					const hours = String(date.getHours()).padStart(2, '0');
+					const minutes = String(date.getMinutes()).padStart(2, '0');
+					const seconds = String(date.getSeconds()).padStart(2, '0');
+
+					return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
+				};
+
+				return {
+					today: `${formatDate(startOfDay)}-${formatDate(endOfDay)}`,
+					yesterday: `${formatDate(startOfYesterday)}-${formatDate(endOfYesterday)}`
+				};
+			},
+			fetchMessages(status) {
+				// const dates = this.getFormattedDates();
+				this.getList(status, "alllist" ,'1,2','');
+
+				// this.getList(status, 'read', '2', dates.today);
+			},
+			toSystem(){
+				uni.navigateTo({
+					url:"/pages/activity/stationStemys"
+				})
+			},
+			// 消息详情
+			// detail(id,params){
+			// 	const message = JSON.parse(params);
+			// 	if (message.event == 'user_auth_need_after'){
+			// 		uni.navigateTo({
+			// 			url:"/packageA/my/settleIn?shop_id=" + message.shop_id + "&id=" + id
+			// 		})
+			// 	} else {
+			// 		uni.navigateTo({
+			// 			url:"/packageA/my/stationDetail?id=" + id
+			// 		})
+			// 	}
+			// },
+		
+			// 消息未读
+			number() {
+				uni.$u.http.get('/api/school/message/message_count').then(res => {
+					if (res.code == 1) {
+						this.unread_system_number = res.data.unread_system_number;
+						this.unread_activity_number = res.data.unread_activity_number;
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -133,135 +178,80 @@
 							duration: 2000
 						});
 					}
-				}).catch(error => {
-					let token = uni.getStorageSync('token')
-					if (token) {
-						uni.showToast({
-							title: `请在'我的'页面 右上角退出重新登陆`,
-							icon: 'none',
-							duration: 3000,
-							complete: function() {
-								setTimeout(function() {
-									uni.switchTab({
-										url: '/pages/my/index',
-									});
-								}, 3000);
-							}
-						});
+				}).catch(error => {});
+			},
+			// 一键已读
+			one() {
+				uni.$u.http.get('/api/school/message/batch', {
+					params: {
+						id: '*',
+						status: this.selected,
+						mini_type: '',
+						event: ''
+					}
+				}).then(res => {
+					if (res.code == 1) {
+						this.resetLists();
+						this.number();
+						this.fetchMessages('system,classes,order');
 					} else {
 						uni.showToast({
-							title: `请在'我的'页面 登陆后重试`,
+							title: res.msg,
 							icon: 'none',
-							duration: 3000,
-							complete: function() {
-								setTimeout(function() {
-									uni.switchTab({
-										url: '/pages/my/index',
-									});
-								}, 3000);
-							}
+							duration: 2000
 						});
 					}
+				}).catch(error => {});
+			},
+			// 获取消息列表
+			async getList(status,zt,type,time) {
+				uni.$u.http.get('/api/school/message/message_list', {
+					params: {
+						page: this.page,
+						limit: this.limit,
+						status: status,
+						// mini_type: '',
+						type: type,
+					},
+				}).then(res => {
+					if (res.code == 1) {
+						this.updateList(zt, res.data.list, res.data.count);
+						
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				}).catch(error => {});
+
 
-				});
 			},
-			open(id) {
-				uni.navigateTo({
-					url: "/packageA/activity/activityDetaill?id=" + id
-				})
+			// 更新列表
+			updateList(type, list, count) {
+				console.log(type, list, count)
+				const targetList = this[type];
+				this[type] = [...targetList, ...list];
+				console.log('this.loadStatus ',this.loadStatus )
+				this.loadStatus = targetList.length >= count ? 'nomore' : 'loading';
 			},
+			// 重置列表
+			resetLists() {
+				this.page = 1;
+				this.alllist = [];
+				this.loadStatus = 'loading'
+			}
 		}
-	}
+	};
 </script>
 
 <style lang="scss" scoped>
-	.center-box {
-		width: 750rpx;
-		background: #f7f7f7;
-		min-height: calc(100vh - 130rpx);
-	}
-
 	.box {
-		width: 690rpx;
-		padding: 0 30rpx 0rpx 30rpx;
-		border-radius: 0px 0px 0px 0px;
-	}
-
-	.white-space {
-		overflow: hidden;
-		/* 确保超出容器的文本被隐藏 */
-		white-space: nowrap;
-		/* 确保文本在一行内显示 */
-		text-overflow: ellipsis;
-		/* 使用省略号表示被截断的文本 */
-		width: 100%;
-	}
-
-	.search {
-		margin-top: 27rpx;
-		width: 690rpx;
-		height: 64rpx;
-		background: #FFFFFF;
-		box-shadow: 2rpx 2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		border: 2rpx solid #008CFF;
-
-		.dashed {
-			image {
-				width: 52rpx;
-				height: 52rpx;
-			}
-		}
-
-		.line-search {
-			width: 2rpx;
-			height: 42rpx;
-			background: #008CFF;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-
-		.input {
-			// border: 4rpx solid #EAEAEA;
-			padding-left: 12rpx;
-			height: 100%;
-			width: 78%;
-		}
-
-		::v-deep .input-placeholder {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #C0C0C0;
-			line-height: 32rpx;
-			text-align: left;
-			font-style: normal;
-			text-transform: none;
-
-		}
-
-		.searchBtn {
-			width: 128rpx;
-			height: 64rpx;
-			border-radius: 5rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #FFFFFF;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-	}
-
-	.white-space {
-		overflow: hidden;
-		/* 确保超出容器的文本被隐藏 */
-		white-space: nowrap;
-		/* 确保文本在一行内显示 */
-		text-overflow: ellipsis;
-		/* 使用省略号表示被截断的文本 */
-		width: 100%;
+		background-color: #F1F2F8;
+		background-image: url("https://naweigetetest2.hschool.com.cn/dyqc/bgx2.png");
+		background-size: 750rpx 797rpx;
+		background-repeat: no-repeat;
 	}
 
 	.w-100 {
@@ -272,9 +262,26 @@
 		display: flex;
 	}
 
+	.flex-start {
+		align-items: flex-start;
+	}
+
+	.white-space {
+		overflow: hidden;
+		/* 确保超出容器的文本被隐藏 */
+		white-space: nowrap;
+		/* 确保文本在一行内显示 */
+		text-overflow: ellipsis;
+		/* 使用省略号表示被截断的文本 */
+		width: 100%;
+	}
+
 	.justify-center {
 		justify-content: center;
 	}
+	.justify-between {
+		justify-content: space-between;
+	}
 
 	.align-items {
 		align-items: center;
@@ -287,64 +294,195 @@
 	.justify-start {
 		justify-content: start;
 	}
-
-	.listBox {
+	.title_logo{
 		width: 690rpx;
-		margin-top: 10rpx;
-
-		.list {
-			height: 456rpx;
-			margin-top: 32rpx;
-			position: relative;
-			background: #FFFFFF;
-			border-radius: 10rpx;
-
-			.title {
-				width: 522rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
+		margin-top: 110rpx;
+		display: flex;
+	}
+	.box_center{
+		margin-top: 30rpx;
+		width: 750rpx;
+		background: linear-gradient( 180deg, #FFFFFF 0%, #F7F7F7 23%);
+		// background: #F7F7F7;
+		min-height: 80vh;
+		border-radius: 44rpx;
+		.lines{
+			width: 690rpx;
+			height: 1rpx;
+			background: #F0F0F0;
+		}
+		.top{
+			width: 690rpx;
+			padding: 30rpx;
+			.xtxiaoxi{
+				font-family: PingFang SC, PingFang SC;
 				font-weight: bold;
 				font-size: 32rpx;
-				color: #000000;
+				color: #3D3D3D;
+				line-height: 45rpx;
+				text-align: left;
+				font-style: normal;
+				text-transform: none;
 			}
-
-			.icon {
-				width: 580rpx;
-				margin-top: 8rpx;
-				margin-left: 32rpx;
+			.xtNum{
+				width: 56rpx;
+				height: 32rpx;
+				line-height: 32rpx;
+				background: #FF4810;
+				border-radius: 84rpx;
+				font-weight: 400;
+				font-size: 22rpx;
+				color: #FFFFFF;
 				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
+				text-align: center;
+			}
+		}
+		.center {
+		width: 690rpx;
+		margin-bottom: 200rpx;
+		.list {
+			width: 690rpx;
+			background: #FFFFFF;
+			border-radius: 18rpx 18rpx 18rpx 18rpx;
+			margin-top: 30rpx;
+			position: relative;
+
+			.left {
+				font-size: 24rpx;
+				font-weight: bold;
+				margin-top: 40rpx;
+				margin-left: 30rpx;
+				.title1 {
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 800;
+					font-size: 34rpx;
+					color: #9C9C9C;
+					margin-left: 20rpx;
+					width: 460rpx;
+				}
 			}
 
-			.Sign {
-				width: 88rpx;
-				height: 40rpx;
-				border-radius: 4rpx 4rpx 4rpx 4rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 500;
-				font-size: 24rpx;
-				margin-right: 16rpx;
+			.right {
+				margin-left:30rpx;
+				margin-right: 30rpx;
+				.title {
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 600;
+					font-family: PingFang SC, PingFang SC;
+					font-size: 30rpx;
+					color: #202020;
+					line-height: 34rpx;
+					width: 360rpx;
+				}
+
+				.time {
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 500;
+					font-size: 24rpx;
+					color: #999999;
+					
+				}
+
+				.text {
+					margin-top: 20rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 500;
+					font-size: 26rpx;
+					color: #3D3D3D;	
+					margin-bottom: 40rpx;
+				}
 			}
+
+			// .jiao {
+			// 	position: absolute;
+			// 	left: 0;
+			// 	top: 0;
+			// }
+		}
+	}
+	}
+	.header {
+		width: 690rpx;
+		height: 50rpx;
+		margin-top: 30rpx;
+
+		.s-header {
+			width: 152rpx;
+			height: 50rpx;
+			border-radius: 12rpx 12rpx 12rpx 12rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #9E9E9E;
+			position: relative;
+
+			.numberPos {
+				// width: 45rpx;
+				// height: 50rpx;
+				position: absolute;
+				right: -10rpx;
+				top: -4px;
+			}
+		}
+
+		.s-header.selected {
+			width: 152rpx;
+			height: 50rpx;
+			background: #008CFF;
+			border-radius: 12rpx 12rpx 12rpx 12rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #FFFFFF;
+			line-height: 26rpx;
 		}
 	}
 
-	.icon-size {
-		width: 32rpx;
-		height: 32rpx;
-		margin-right: 8rpx;
-	}
-
-	.footer {
-		margin-bottom: 200rpx;
-	}
-
-	.slot-wrap {
+	.yidu {
+		border-top: #008CFF 1rpx solid;
+		width: 690rpx;
 		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		height: 66rpx;
+		margin-top: 18rpx;
+
+		.news {
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #9E9E9E;
+		}
+
+		.One {
+			width: 132rpx;
+			height: 40rpx;
+			border-radius: 12rpx 12rpx 12rpx 12rpx;
+			border: 1rpx solid #9E9E9E;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #9E9E9E;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+	}
+
+	
+
+	.hui {
+		width: 132rpx;
+		height: 40rpx;
+		background: #E7E7E7;
+		border-radius: 12rpx 12rpx 12rpx 12rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #9E9E9E;
+		margin: 24rpx 0;
+		display: flex;
+		justify-content: center;
 		align-items: center;
-		/* 如果您想让slot内容占满整个导航栏的宽度 */
-		/* flex: 1; */
-		/* 如果您想让slot内容与导航栏左右有空隙 */
-		/* padding: 0 30rpx; */
 	}
 </style>
\ No newline at end of file
diff --git a/pages/activity/stationStemys.vue b/pages/activity/stationStemys.vue
new file mode 100644
index 0000000..f3e0d3c
--- /dev/null
+++ b/pages/activity/stationStemys.vue
@@ -0,0 +1,144 @@
+<template>
+	<view class="box flex justify-center flex-column">
+		<view class="center flex flex-column flex-start" v-for="detail,index in list" :key="index">
+			<span class="title">{{detail.title}}</span>
+			<span class="span" style="margin-top: 20rpx;">
+				<!-- <u-parse :content="detail.desc" :selectable="true"></u-parse> -->
+			 	<rich-text :nodes="detail.desc" selectable user-select></rich-text>
+			</span>
+			<span  class="span" style="margin-top: 20rpx; color: #999999 ;">{{detail.createtime_text}}</span>
+			<span class="jiao">
+				<u-badge :isDot="true" type="error"></u-badge>
+			</span> 
+		</view>
+		<u-loadmore :status="loadStatus" />
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				page: 1,
+				limit: 10,
+				list:[],
+				loadStatus:'',
+				loadStatus: 'loading'
+			};
+		},
+		onLoad(option) {
+			console.log(option)
+			this.getDetail();
+			this.resetLists()
+		},
+		onReachBottom() {
+			this.page++;
+			this.getDetail();
+		},
+		methods: {
+			getDetail() {
+				uni.$u.http.get('/api/school/message/message_list', {
+					params: {
+						page: this.page,
+						limit: this.limit,
+						status: 'system,activity',
+						type: "1",
+					}
+				}).then(res => {
+					if (res.code == 1) {
+						this.list = [...res.data.list , ...this.list ]
+						this.loadStatus = this.list.length >= res.data.count ? 'nomore' : 'loading';
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				}).catch(error => {});
+			},
+			// 重置列表
+			resetLists() {
+				this.page = 1;
+				this.alllist = [];
+				this.loadStatus = 'loading'
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.box {
+		background: #F1F2F8;
+		width: 750rpx;
+		height: 100vh;
+		margin: 0 auto;
+	}
+
+	.w-100 {
+		width: 100%;
+	}
+
+	.flex {
+		display: flex;
+	}
+
+	.flex-start {
+		align-items: flex-start;
+	}
+
+	.white-space {
+		overflow: hidden;
+		/* 确保超出容器的文本被隐藏 */
+		white-space: nowrap;
+		/* 确保文本在一行内显示 */
+		text-overflow: ellipsis;
+		/* 使用省略号表示被截断的文本 */
+	}
+
+	.justify-center {
+		justify-content: center;
+	}
+
+	.align-items {
+		align-items: center;
+	}
+
+	.flex-column {
+		flex-flow: column;
+	}
+
+	.justify-start {
+		justify-content: start;
+	}
+
+	.center {
+		margin: 30rpx;
+		width: 690rpx;
+		height: 278rpx;
+		background: #FFFFFF;
+		border-radius: 20rpx 20rpx 20rpx 20rpx;
+		padding: 30rpx;
+		box-sizing: border-box;
+		position: relative;
+		.span {
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			font-size: 26rpx;
+			line-height: 36rpx;
+			color: #202020;
+		}
+
+		.title {
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 800;
+			font-size: 34rpx;
+			color: #202020 ;
+		}
+		.jiao {
+			position: absolute;
+			left: 0;
+			top: 0;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/afterSales/index.vue b/pages/afterSales/index.vue
index ec079bd..8a2e859 100644
--- a/pages/afterSales/index.vue
+++ b/pages/afterSales/index.vue
@@ -1,565 +1,400 @@
 <template>
-	<view style="background: #F1F2F8;min-height: 100vh;">
-		<view style="padding: 30rpx 30rpx 250rpx 30rpx;">
-			<view style="background-color: #ffffff;border-radius: 20rpx;padding:30rpx">
-				<view style="display: flex;align-self: center;align-items: start;">
-					<view style="width: 45%;">
-						<image :src="info.detail.headimage" style="width: 280rpx; height: 200rpx;" mode="aspectFill">
-						</image>
-					</view>
-					<view style="padding-left: 20rpx;">
-						<view style="font-size: 36rpx;font-weight: 600;">{{info.detail.title}}</view>
-						<view style="font-size: 26rpx;color: #7A7A7A;margin-top: 15rpx;">
-							<image src="/static/center/address.png"
-								style="width: 40rpx;height: 40rpx;vertical-align: middle;"></image>
-							<text style="vertical-align: middle;">{{info.detail.address}}</text>
+	<view class="detail_all">
+		<!-- <view class="nav">
+			<u-navbar :is-back="true" leftIconColor="#FFFFFF" :autoBack='true' title="" :bgColor="background"
+				:titleStyle='titleStyle'> </u-navbar>
+		</view> -->
+		<view class="box flex justify-start flex-column align-items" >
+		<!-- <view class="swiper">
+			<u-swiper :list="detail.images" indicator indicatorActiveColor="#323232" indicatorMode="dot" :indicator-style="{ bottom: '60rpx',zIndex: 999}"
+			 height="580rpx" circular></u-swiper>
+		</view> -->
+		
+		<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
+			
+
+			<view class="first-box flex flex-start flex-column justify-start">
+
+				<view class="flex flex-column">
+					<view class="flex">
+						<image v-if="detail.images" :src="detail.images[0]" mode="" style="width: 159rpx;height: 159rpx;border-radius: 18rpx;"></image>
+						<view class="flex align-items flex-column" style="margin-left: 20rpx;">
+							<span class="first-name white-space">{{detail.title}}</span>
+							<view class="rbot flex align-items">
+								<image src="/static/center/address.png" mode="" style="width: 32rpx;height: 32rpx;margin-right: 20rpx;"></image>
+								<span class="white-space">{{detail.address_detail}}</span>
+							</view>
 						</view>
 					</view>
 				</view>
-				<view style="height: 1px;width: 70%;background: #D9D9D9;margin: 45rpx auto;"></view>
-				<view v-if="infoRefund!=''" class="item-spacing"
-					style="display: flex; justify-content: space-between; font-size: 26rpx;">
-					<view style="color: #7A7A7A;">当前状态</view>
-					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts==1">机构处理中</view>
-					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts==4">待用户确认</view>
-				</view>
-				<view class="item-spacing" style="display: flex; justify-content: space-between; font-size: 26rpx;">
-					<view style="color: #7A7A7A;">课程机构</view>
-					<view style="color: #343434;">{{info.shop.name}}</view>
-				</view>
-				<view class="item-spacing" style="display: flex; justify-content: space-between; font-size: 26rpx;">
-					<view style="color: #7A7A7A;">讲师/电话</view>
-					<view style="color: #343434;" @click="callPhone(info.shop.tel)">
-						<text style="vertical-align: middle;">{{info.detail.teacher.name}}/{{info.shop.tel}}</text>
-						<image src="/static/tel.png" style="width: 40rpx;height: 40rpx;vertical-align: middle;"></image>
-					</view>
-				</view>
-				<view class="item-spacing" style="display: flex; justify-content: space-between; font-size: 26rpx;">
-					<view style="color: #7A7A7A;">订单号</view>
-					<view style="color: #343434;">{{info.order_no}}</view>
-				</view>
-				<view class="item-spacing" style="display: flex; justify-content: space-between; font-size: 26rpx;">
-					<view style="color: #7A7A7A;">购买时间</view>
-					<view style="color: #343434;">{{info.paytime_text}}</view>
-				</view>
-				<view class="item-spacing" style="display: flex; justify-content: space-between; font-size: 26rpx;">
-					<view style="color: #7A7A7A;">全部课时</view>
-					<view style="color: #343434;">{{info.detail.classes_num}}</view>
-				</view>
-				<view class="item-spacing" style="display: flex; justify-content: space-between; font-size: 26rpx;">
-					<view style="color: #7A7A7A;">已用课时</view>
-					<view style="color: #343434;">{{info.detail.use_num}}</view>
-				</view>
-				<view style="display: flex; justify-content: space-between; font-size: 26rpx;">
-					<view style="color: #7A7A7A;">购买价格</view>
-					<view style="color: #FF5F5F;">￥{{info.payprice}}</view>
-				</view>
-				<template v-if="infoRefund!=''&&infoRefund.service_stauts==4">
-					<view style="height: 1px;width: 100%;background: #D9D9D9;margin: 20rpx auto;"></view>
-					<view style="display: flex; justify-content: space-between; font-size: 26rpx;">
-						<view style="color: #7A7A7A;">商家退款金额</view>
-						<view style="color: #FF2323;font-size: 40rpx;font-weight: 600;">
-							￥{{infoRefund.auto_recommend_price}}</view>
-					</view>
-				</template>
+		
+				<span class="line"></span>
+				<span class="flex align-items" style="width: 100%;justify-content: space-between;">
+					<view class="tt1">选择退款原因</view>
+					<span class="row-right" @click="opentuikuan">
+						<input type="text" placeholder="请选择" class="input" disabled="true" v-model="reasons"
+							placeholder-class="plasty" />
+							<u-icon name="arrow-right" color="#323232"></u-icon>
+					</span>
+				</span>
+				<span class="line"></span>
+				<span class="flex align-items" style="width: 100%;justify-content: space-between;">
+					<view class="tt1">选择退款数量<span> (剩余{{detailAny.join_info.stock - detailAny.join_info.people_number}}张)</span></view>
+					<span class="flex align-items">
+						<image style="width: 42rpx;height: 42rpx;" src="/static/detail/jian.png" @click="removeMon"></image>
+						<span style="margin: 0 20rpx;">{{ nummoney }}</span>
+						<image style="width: 42rpx;height: 42rpx;" src="/static/detail/jia.png" @click="addMon"></image>
+					</span>
+				</span>
+				<span class="line"></span>
+				<span class="flex align-items" style="width: 100%;justify-content: space-between;">
+					<view class="tt1">支付金额</view>
+					<span style="color: #323232;font-weight: 900;">￥{{ detailAny.payprice  }}</span>
+				</span>
+				<span class="line"></span>
+				<span class="flex align-items" style="width: 100%;justify-content: space-between;margin-bottom: 40rpx;">
+					<view class="tt1">预计退款金额</view>
+					<span style="color: #FF4810;font-weight: 900;">￥{{ priceGem  }}</span>
+				</span>
+
 			</view>
-			<view v-if="infoRefund=='' && info.detail.feel == 0 "
-				style="background-color: #ffffff;border-radius: 20rpx;padding:30rpx;margin-top: 30rpx;">
-				<view class="flex align-items space-between" style="font-size: 26rpx;color: #7A7A7A;">
-					<view>
-						<text>退款原因</text>
-						<text style="color: #FF5F5F;">（必选)</text>
-					</view>
-					<view @click="refundShow=true">
-						<text style="vertical-align: middle;">选择原因</text>
-						<image src="/static/index/right.png"
-							style="width: 30rpx;height: 30rpx;vertical-align: middle;margin-left: 10rpx;">
-						</image>
-					</view>
-				</view>
-				<view v-if="myReason!=''">
-					<view style="height: 1px;width: 100%;background: #D9D9D9;margin: 20rpx auto;"></view>
-					<view style="font-size: 26rpx;">{{myReason}}</view>
-				</view>
-			</view>
-			<template v-if="infoRefund!=''">
-				<view style="background-color: #ffffff;border-radius: 20rpx;padding:30rpx;margin-top: 30rpx;">
-					<view class="flex align-items space-between" style="font-size: 26rpx;color: #7A7A7A;">
-						<view>
-							<text>退款原因</text>
-						</view>
-						<view style="font-size: 26rpx;">
-							{{infoRefund.reason}}
-						</view>
-					</view>
-				</view>
-				<!-- <view v-if="infoRefund.sales_type==1"
-					style="background-color: #ffffff;border-radius: 20rpx;padding:30rpx;margin-top: 30rpx;">
-					<view class="flex align-items space-between" style="font-size: 26rpx;color: #7A7A7A;">
-						<view>
-							<text>机构驳回退款原因</text>
-						</view>
-					</view>
-					<view style="height: 1px;width: 100%;background: #D9D9D9;margin: 20rpx auto;"></view>
-					<view style="font-size: 26rpx;">{{infoRefund.reject_reason}}</view>
-				</view>
-				<view v-if="infoRefund.sales_type==4"
-					style="background-color: #ffffff;border-radius: 20rpx;padding:30rpx;margin-top: 30rpx;">
-					<view class="flex align-items space-between" style="font-size: 26rpx;color: #7A7A7A;">
-						<view>
-							<text>用户驳回退款原因</text>
-						</view>
-					</view>
-					<view style="height: 1px;width: 100%;background: #D9D9D9;margin: 20rpx auto;"></view>
-					<view style="font-size: 26rpx;">{{infoRefund.reject_reason}}</view>
-					<view style="margin-top: 20rpx;">
-						<u-grid :border="false" @click="click" :col="3" align="center">
-							<u-grid-item v-for="(item,index) in infoRefund.reject_images">
-								<image :src="item" style="width: 200rpx;height: 200rpx;border-radius: 20rpx;"
-									mode="aspectFill">
-								</image>
-							</u-grid-item>
-						</u-grid>
-					</view>
-				</view>
-				<view v-if="infoRefund.sales_type==7"
-					style="background-color: #ffffff;border-radius: 20rpx;padding:30rpx;margin-top: 30rpx;">
-					<view class="flex align-items space-between" style="font-size: 26rpx;color: #7A7A7A;">
-						<view>
-							<text>平台驳回退款原因</text>
-						</view>
-					</view>
-					<view style="height: 1px;width: 100%;background: #D9D9D9;margin: 20rpx auto;"></view>
-					<view style="font-size: 26rpx;">{{infoRefund.reject_reason}}</view>
-				</view> -->
-			</template>
+
+
 		</view>
-		<view class="buttonClack">
-			<view class="flex align-items" style="text-align: center;justify-content: space-around;">
-				<view style="width: 100%;" v-if="info.status=='4'">
-					<view @click="cancelOrder"
-						style="margin: 0 auto;color: #ffffff;;background-color: #008CFF;width: 80%;height: 80rpx;border-radius: 80rpx;line-height: 80rpx;">
-						取 消</view>
-				</view>
-				<view style="width: 100%;" v-if="info.status=='3' && info.detail.feel == 0">
-					<view @click="submitAdd"
-						style="margin: 0 auto;background-color: #008CFF;color: #ffffff;width: 80%;height: 80rpx;border-radius: 80rpx;line-height: 80rpx;">
-						申 请 售 后</view>
-				</view>
-				<view style="width: 100%;" v-if="info.status=='3' && info.detail.feel == 1">
-					<view
-						style="margin: 0 auto;background-color:#b5b5b5;color: #ffffff;width: 80%;height: 80rpx;border-radius: 80rpx;line-height: 80rpx;font-size:30rpx;">
-						免费课程无法平台取消,请联系讲师手动取消
-					</view>
-				</view>
-				<!-- <template v-if="infoRefund.service_stauts==4">
-					<view>
-						<view @click="refuseShowOpen('no')"
-							style="border:2rpx solid #008CFF;color: #008CFF;;background-color: #ffffff;width: 300rpx;height: 80rpx;border-radius: 80rpx;line-height: 80rpx;">
-							不同意</view>
-					</view>
-					<view>
-						<view @click="refuseShowOpen('yes')"
-							style="color: #ffffff;;background-color: #008CFF;width: 300rpx;height: 80rpx;border-radius: 80rpx;line-height: 80rpx;">
-							同意</view>
-					</view>
-				</template> -->
+
+		<view class="third flex flex-column" style="justify-content: flex-start;" v-if="reasons == '其他'"> 
+			<view class="third-top flex align-items">
+				<span>退款说明</span>
+			</view>
+			<view class="flex align-items textarea_fb" >
+				<u--textarea v-model="ccontent"  maxlength="400" placeholder="请输入退款说明"
+				height="120" placeholder-class="bttop"></u--textarea>
 			</view>
 		</view>
-		<u-popup :show="refundShow" :round="10" :closeOnClickOverlay="true" @close="delShow">
-			<view style="padding: 30rpx 30rpx 0rpx 30rpx;">
-				<view>
-					<text style="font-size: 32rpx;">退款原因</text>
-					<text style="color: #FF5F5F;font-size: 24rpx;">（必选)</text>
+
+
+		
+		<view class="footer flex align-items" style="justify-content: space-between;">
+				<view class="footer-right flex justify-center align-items">
+					<span  @click="subumit()">确定</span>
 				</view>
-				<view style="height: 1px;width: 100%;background: #D9D9D9;margin: 20rpx auto;"></view>
-				<view>
-					<u-radio-group v-model="radioValue" placement="column" activeColor="#008CFF">
-						<u-radio v-for="(item,index) in radioList" :name="index" :label="item"
-							:customStyle="{marginBottom: '20rpx'}"></u-radio>
-					</u-radio-group>
-					<view>
-						<u--textarea v-model="otherText" placeholder="请填写退款原因" :maxlength="150" count></u--textarea>
+		</view>
+
+
+		<!-- 退款政策 -->
+		<u-popup @touchmove.native.stop.prevent  :show="tuikuan" :round="22" mode="bottom" @close="closetuikuan"
+			@open="opentuikuan" :custom-style="popupStyletk">
+			<view class="popup_tkall">
+				<view class="popup_tk"> 选择退款原因</view>
+				<scroll-view  scroll-y="true" class="popup-content">
+					<view class="popup-content-item flex align-items" 
+					v-for="(item,index) in activityInfo.refund_reason_data" 
+					:key="index" @click="selectItem(index,item)">
+						<view style="width: 540rpx;"> 
+							<span class="popup-content-item-title">{{ item }}</span>
+						</view>
+						<image v-if="currents === index" src="@/static/fabu/check.png" mode="widthFix" style="width: 44rpx;height: 44rpx;" />
+						<image v-else src="@/static/fabu/nocheck.png" mode="widthFix" style="width: 44rpx;height: 44rpx;" />
 					</view>
-				</view>
-				<view style="padding-top: 30rpx;">
-					<view @click="chickRadio"
-						style="text-align: center;margin: 0rpx auto; margin-bottom: 21rpx; background-color: #008CFF;color: #ffffff;width: 90%;height: 90rpx;border-radius: 90rpx;line-height: 90rpx;">
-						确 认</view>
-				</view>
+				
+				</scroll-view>
+				<view class="footer flex align-items" style="justify-content: space-between;">
+					<view class="footer-right flex justify-center align-items">
+						<span  @click="closetuikuan">确定</span>
+					</view>
+			</view>
 			</view>
 		</u-popup>
-		<!-- <u-popup :show="refuseShow" :round="10" mode="center" :customStyle="{width:'90%'}" :closeOnClickOverlay="false">
-			<view style="padding: 30rpx 30rpx 0rpx 30rpx;">
-				<view class="flex space-between align-items">
-					<view>
-						<text style="font-size: 40rpx;color: #008CFF;font-weight: 600;">详情</text>
-					</view>
-					<view @click="delShow">
-						<u-icon name="close" color="#008CFF" size="20px"></u-icon>
-					</view>
-				</view>
-				<view style="height: 1px;width: 100%;background: #D9D9D9;margin: 20rpx auto;"></view>
-				<view>
-					<view>
-						<u--textarea v-model="otherText" placeholder="请填写拒绝理由" :maxlength="150" count></u--textarea>
-					</view>
-				</view>
-				<view>
-					<view style="color: #7A7A7A;font-size: 24rpx;padding: 20rpx 0rpx;">图片补充(最多上传三张)</view>
-					<u-upload :fileList="fileList" @afterRead="afterRead" @delete="deletePic" multiple :maxCount="3"
-						:previewFullImage="true" width="180rpx" height="180rpx">
-						<image src="/static/index/upload.png" style="width: 180rpx;height: 180rpx;">
-					</u-upload>
-				</view>
-				<view class="flex align-items"
-					style="text-align: center;justify-content: space-around;padding-top: 30rpx;">
-					<view>
-						<view @click="refuseShow = false"
-							style="border:2rpx solid #008CFF;color: #008CFF;;background-color: #ffffff;width: 300rpx;height: 80rpx;border-radius: 80rpx;line-height: 80rpx;">
-							取 消</view>
-					</view>
-					<view>
-						<view @click="userConfirmation()"
-							style="color: #ffffff;;background-color: #008CFF;width: 300rpx;height: 80rpx;border-radius: 80rpx;line-height: 80rpx;">
-							确 认</view>
-					</view>
-				</view>
-			</view>
-		</u-popup> -->
+
+
+	</view>
 	</view>
 </template>
 
 <script>
+	import dayjs from 'dayjs';
+	import {
+		dateWeek,
+		dateWeekend
+	} from '../../utils/dateFormat'
 	export default {
+		computed: {
+			// formattedTitle() {
+			// 	if (this.detail.title.length > 9) {
+			// 		return this.detail.title.slice(0, 9) + '..';
+			// 	}
+			// 	return this.detail.title;
+			// },
+
+			fomartertime() {
+				return dayjs(this.detail.last_time*1000).format('YYYY-MM-DD HH:mm:ss');
+			},
+			formattedTime() {
+				const startTime = dateWeek(this.detail.start_time);
+				const endTime = dateWeekend(this.detail.end_time);
+				return {
+					formattedTime: `${startTime} - ${endTime}`
+				};
+			}
+		},
+
 		data() {
 			return {
-				refundShow: false,
-				radioValue: '',
-				//拒绝理由
-				otherText: '',
-				refuseShow: false,
-				fileList: [],
-				list: '',
-				id: 0,
-				info: {},
-				infoRefund: '',
-				myReason: '',
-				radioList: ['没有时间上课', '课程内容不符合预期', '位置不便', '其他课程时间冲突', '课程延期', '其他'],
-				classes_service_order_id: 0,
-				user_status: '',
+				popupStyletk: {
+					width: '710rpx',
+					padding: '24rpx 24rpx 42rpx 24rpx',
+					height: '700rpx',
+					margin: '0 auto', // 水平居中
+					display: 'flex',
+					justifyContent: 'start',
+					alignItems: 'center',
+					flexColumn: 'column'
+				},
+				style: {
+					// 字符串的形式
+					img: 'width: 100%'
+				},
+				nummoney:1,
+				ccontent:'',//退款说明
+				reasons:'', //退款原因
+				priceGem:null,
+				currents:0,
+				tuikuan:false,
+				activityInfo: {},
+				path: 'https://testy.hschool.com.cn//uploads/20241219/3406baf51fcc28c63c31ebcee5c9c75e.jpg',
+				uloadingShow: false,
+				show: false,
+				shows:false,
+				buyShow: false,
+				type: 0, // 0 支付 1 立即购买 2 预约  3确认时间
+				id: 1,
+				count: 5,
+				value: 5,
+				order_no: '',
+				PayPirce: 0,
+				detail: {},
+				detailAny:{},
+				people: {},
+				qrUrl: '',
+				is_collect: 0,
+
+
+				timeList: [],
+				selectedTime: null,
+				// indexBackgroundImage: indexBackgroundImage,
+				orderId: "",
+				classes_lib_spec_id: '',
+				order_no2: '',
+				mobile: '',
+				is_show_model: false, //是否显示分享模态窗
+				background: '#ffffff00',
+				titleStyle: {
+					color: '#FFFFFF'
+				},
 			};
-
 		},
-		onLoad(op) {
-			this.id = op.id;
-			this.getOrderInfo();
-			//classes_service_order_id
 
+
+
+		onLoad(options) {
+			this.id = options.id
+			this.getDetail()
 		},
+
 		methods: {
-			refuseShowOpen(status) {
-				var that = this;
-				this.user_status = status;
-				if (status = 'no') {
-					this.refuseShow = true;
-				} else {
-					uni.showModal({
-						title: '提示',
-						content: '确定要同意吗？',
-						success: function(res) {
-							if (res.confirm) {
-								that.userConfirmation();
-							}
-						}
-					});
-				}
+			//选择原因
+			selectItem(index,item) {
+				this.currents = index;
+				this.reasons = item;
 			},
-			//用户处理售后接口 
-			userConfirmation() {
-				uni.$u.http.post('/api/school.service_order/user_confirmation', {
-					order_no: this.classes_service_order_id,
-					status: this.user_status,
-					reject_reason: this.otherText,
-					reject_images: this.list,
-				}).then(res => {
-					console.log(res);
-					if (res.code == 1) {
-						uni.showToast({
-							title: '提交成功！',
-							icon: 'none',
-							duration: 2000
-						});
-						this.getOrderInfo();
-					}
-				}).catch(error => {
+			closetuikuan() {
+				this.tuikuan = false
+			},
+			opentuikuan(){
+				this.tuikuan = true;
+				this.reasons = '不想去了';
+			},
+			//确定
+			subumit(){
+				if (this.reasons == '') {
 					uni.showToast({
-						title: '请求失败，请稍后再试',
+						title: '请选择退款原因',
 						icon: 'none',
 						duration: 2000
-					});
-				});
-			},
-			//取消订单确认
-			cancelOrder() {
-				var that = this;
-				uni.showModal({
-					title: '提示',
-					content: '确定要撤销售后订单吗？',
-					success: function(res) {
-						if (res.confirm) {
-							that.cancelOrderDo();
-						}
-					}
-				});
-			},
-			//取消订单
-			cancelOrderDo() {
-				uni.$u.http.post('/api/school.service_order/cancel', {
-					order_no: this.classes_service_order_id,
-				}).then(res => {
-					console.log(res);
-					if (res.code == 1) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-						this.infoRefund = '';
-						this.getOrderInfo();
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-			//选择退款原因
-			chickRadio() {
-				var reason = "";
-				if (this.radioValue === '') {
-					uni.showToast({
-						title: '请选择原因！',
-						icon: 'none',
-						duration: 2000
-					});
+					})
 					return;
-				} else {
-					if (this.radioValue != 5) {
-						reason = this.radioList[this.radioValue];
-					} else {
-						reason = this.otherText;
-					}
 				}
-				this.refundShow = false;
-				this.myReason = reason;
-			},
-			//提交售后订单
-			submitAdd() {
-				console.log(this.radioValue);
-				var reason = "";
-				if (this.radioValue === '') {
+				if (this.nummoney > this.detailAny.join_info.people_number) {
 					uni.showToast({
-						title: '请选择原因！',
+						title: '退款数量不能已购买数量',
 						icon: 'none',
 						duration: 2000
-					});
+					})
 					return;
-				} else {
-					if (this.radioValue != 5) {
-						reason = this.radioList[this.radioValue];
-					} else {
-						reason = this.otherText;
-					}
 				}
-				uni.$u.http.post('/api/school.service_order/create', {
-					classes_order_id: this.id,
-					reason: reason,
-				}).then(res => {
-					console.log(res);
-					if (res.code == 1) {
-						// uni.showToast({
-						// 	title: res.msg,
-						// 	icon: 'none',
-						// 	duration: 2000
-						// });
-						// this.getOrderInfo();
+				
+				let reasons = ''
+				if(this.reasons == '其他'){
+					
+					if (this.ccontent == '') {
 						uni.showToast({
-							title: res.msg,
+							title: '请输入退款说明',
 							icon: 'none',
-							duration: 2000,
+							duration: 2000
 						})
-						setTimeout(function() {
-							uni.redirectTo({
-								url: "/pages/afterSales/info?id=" + res.data
-									.order_info.id
-							})
-						}, 2000);
+						return;
+					}
+					reasons = this.ccontent;
+				}else{
+					reasons = this.reasons;
+				}
+				
+				uni.$u.http.post('/api/school.newactivity.order/after_sales', {
+					order_no: this.order_no,
+					auth_reason: reasons,
+					num: this.nummoney,
+				}).then(res => {
+					if (res.code == 1) {
+						uni.showToast({
+							title: '申请成功',
+							icon: 'success',
+							duration: 2000,
+							complete: function() {
+								setTimeout(function() {
+									uni.redirectTo({
+										url: "/packageA/my/exercise?status=4,5,6,7"
+									})
+								}, 2000);
+							}
+						});	
+					}else{
+						uni.showToast({
+							title: res.msg,
+						})
+					}
+				})
+			},
+			addMon(){
+				if (this.nummoney < this.detailAny.join_info.people_number) {
+					this.nummoney++;
+					this.priceGem = Number(this.detail.price)*Number(this.nummoney)+".00";
+				}else{
+					uni.showToast({
+						title: '不能超过已购数量',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+
+				}
+			},
+			removeMon(){
+				if (this.nummoney > 1) {
+					this.nummoney--;
+					this.priceGem = Number(this.detail.price)*Number(this.nummoney)+".00";
+				}
+			},
+			// 获取订单详情
+			getDetail() {
+				uni.$u.http.get('/api/school.newactivity.order/detail', {
+					params: {
+						id: this.id,
+					}
+				}).then(res => {
+					if (res.code == 1) {
+						this.detail = res.data.detail.detail;
+						this.detailAny = res.data.detail;
+						this.order_no = res.data.detail.order_no;
+						this.priceGem = res.data.detail.payprice;
+						this.activityInfo = uni.getStorageSync('init_info')
 					} else {
 						uni.showToast({
 							title: res.msg,
 							icon: 'none',
 							duration: 2000
+						})
+					}
+				}).catch(error => {});
+			},
+
+
+			// 返回首页
+			toIndex() {
+				uni.switchTab({
+					url: "/pages/index/index"
+				})
+			},
+
+			//分享发布
+			sharePoster() { //分享图片给好友按钮的点击事件函数
+				let that = this
+				this.base64ToFilePath(this.path, (filePath) => {
+					console.log(filePath);
+					wx.showShareImageMenu({ //分享给朋友
+						path: filePath,
+						success: (res) => {
+							console.log("分享成功：", res);
+						},
+						fail: (err) => {
+							console.log("分享取消：", err);
+						},
+					})
+				})
+			},
+
+
+			base64ToFilePath(base64data, callback) {
+				const time = new Date().getTime();
+				const imgPath = `${wx.env.USER_DATA_PATH}/addFriends${time}share_qrcode.png`;
+				const imageData = base64data.replace(/^data:image\/\w+;base64,/, "");
+				const fileSystemManager = uni.getFileSystemManager();
+
+				fileSystemManager.writeFile({
+					filePath: imgPath,
+					data: imageData,
+					encoding: 'base64',
+					success: () => {
+						callback(imgPath);
+					},
+					fail: (err) => {
+						console.error('Write file failed:', err);
+						uni.showToast({
+							title: '写入文件失败',
+							icon: 'none'
 						});
 					}
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
 				});
 			},
-			//订单详情
-			getOrderInfo() {
-				uni.$u.http.get('/api/school/order/detail', {
-					params: {
-						id: this.id
-					}
-				}).then(res => {
-					this.info = res.data.detail;
-					// if (res.data.detail.classes_service_order_id != 0 && res.data.detail
-					// 	.classes_service_order_id != null && res.data.detail.classes_service_order_id != '') {
-					// 	 this.classes_service_order_id = res.data.detail.classes_service_order_id;
-					// 	this.getRefundInfo(res.data.detail.classes_service_order_id);
-					// }
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-			//售后详情
-			getRefundInfo(classes_service_order_id) {
-				uni.$u.http.get('/api/school.service_order/detail', {
-					params: {
-						id: classes_service_order_id
-					}
-				}).then(res => {
-					if (res.data.detail == null) {
-						this.infoRefund = '';
-					} else {
-						this.infoRefund = res.data.detail;
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-			delShow() {
-				this.refundShow = false;
-				this.refuseShow = false;
-			},
-			// 删除图片
-			// deletePic(event) {
-			// 	console.log(event);
-			// 	const {
-			// 		index
-			// 	} = event;
 
-			// 	if (index >= 0 && index < this.fileList.length) {
-			// 		this.fileList.splice(index, 1);
-			// 		this.list = this.fileList.map(item => item.url).join(',');
-			// 		// 确保对应的 list 字段是一个数组
-			// 		let list = this.list;
-			// 		if (!Array.isArray(list)) {
-			// 			console.warn(`list is not an array, skipping splice operation`);
-			// 		} else {
-			// 			list.splice(index, 1);
-			// 			console.log(`Updated list`, list);
-			// 		}
-			// 	} else {
-			// 		console.error('Invalid index');
-			// 	}
-			// },
-			// 新增图片
-			// async afterRead(event) {
-			// 	let lists = [].concat(event.file);
-			// 	let fileListLen = this.fileList.length;
-			// 	lists.map((item) => {
-			// 		this.fileList.push({
-			// 			...item,
-			// 			status: 'uploading',
-			// 			message: '上传中'
-			// 		});
-			// 	});
-			// 	for (let i = 0; i < lists.length; i++) {
-			// 		const result = await this.uploadFilePromise(lists[i].url);
-			// 		let item = this.fileList[fileListLen];
-			// 		this.fileList.splice(fileListLen, 1, Object.assign(item, {
-			// 			status: 'success',
-			// 			message: '',
-			// 			url: result
-			// 		}));
-			// 		fileListLen++;
-			// 		// 更新对应的list字段
-			// 		this.list = this.fileList.map(item => item.url).join(',');
-			// 	}
-			// },
-			//图片上传
-			// uploadFilePromise(url) {
-			// 	return new Promise((resolve, reject) => {
-			// 		let a = uni.uploadFile({
-			// 			url: 'https://testy.hschool.com.cn//api/common/upload', // 仅为示例，非真实的接口地址
-			// 			filePath: url,
-			// 			name: 'file',
-			// 			formData: {
-			// 				user: 'test'
-			// 			},
-			// 			header: {
-			// 				"token": uni.getStorageSync("token")
-			// 			},
-			// 			success: (res) => {
-			// 				resolve(JSON.parse(res.data).data.fullurl);
-			// 			},
-			// 			fail: (err) => {
-			// 				reject(err);
-			// 			}
-			// 		});
-			// 	});
-			// },
+
 			callPhone(phone) {
 				uni.makePhoneCall({
 					phoneNumber: phone
 				})
-			}
-		}
+			},
+
+			// 取消选择
+			cancel() {
+				this.selectedTime = null
+			},
+			selectTime(time) {
+				this.selectedTime = time;
+				this.classes_lib_spec_id = time.id
+
+			},
+			timeSelected(time) {
+				return this.selectedTime === time;
+			},
+			moveScroll() {},
+		},
 	}
 </script>
 
 <style lang="scss" scoped>
-	page {
-		background-color: #F1F2F8;
+	.detail_all{
+		background-color: #f7f7f7;
+		// height: 100vh;
 	}
-
-	.buttonClack {
-		padding-top: 20rpx;
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		height: 100rpx;
-		background-color: #ffffff;
-		padding-bottom: calc(env(safe-area-inset-bottom));
-		box-shadow: 0rpx -6rpx 12rpx 0rpx rgba(111, 190, 255, 0.1);
-	}
-
-	.item-spacing {
-		padding-bottom: 30rpx;
-	}
-
 	.w-100 {
 		width: 100%;
 	}
@@ -568,12 +403,12 @@
 		display: flex;
 	}
 
-	.justify-center {
-		justify-content: center;
+	.flex-start {
+		align-items: flex-start;
 	}
 
-	.space-between {
-		justify-content: space-between;
+	.justify-center {
+		justify-content: center;
 	}
 
 	.align-items {
@@ -588,7 +423,300 @@
 		justify-content: start;
 	}
 
-	.mar-top-30 {
-		margin-top: 30rpx;
+	.white-space {
+		overflow: hidden;
+		/* 确保超出容器的文本被隐藏 */
+		white-space: nowrap;
+		/* 确保文本在一行内显示 */
+		text-overflow: ellipsis;
+		/* 使用省略号表示被截断的文本 */
+		width: 100%;
+	}
+
+	.con-center {
+		background: white;
+		border-radius:0 0 44rpx 44rpx;
+		position: relative;
+	}
+	
+	
+
+	.space-between {
+		justify-content: space-between;
+	}
+
+	.swiper {
+		width: 100%;
+		height: 580rpx;
+	}
+
+	.box {
+		position: relative;
+	}
+
+	.topimgs_rmb{
+		position: absolute;
+		top: -168rpx;
+		right: 30rpx;
+		width: 201rpx;
+		height: 118rpx;
+		z-index: 0;
+	}
+	.topimgs{
+		position: absolute;
+		top: -120rpx;
+		width: 100%;
+		z-index: 0;
+	}
+	.top_texts{
+		position: absolute;
+		top: -156rpx;
+		right: 68rpx;
+		z-index: 3;
+		color: #ffffff;
+		.xiao{
+			margin-left: 4rpx;
+			font-size: 22rpx;
+			font-weight: 400;
+		}
+	}
+	.first-box {
+		width: 690rpx;
+		background: #FFFFFF;
+		// background: url('@/static/detail/conbg.png');
+		// padding-left: 24rpx;
+		margin-top: 20rpx;
+		border-radius: 20rpx;
+		// z-index: 1;
+		.sigh {
+			width: 88rpx;
+			height: 40rpx;
+			background: #BEEE03;
+			border-radius: 4rpx 4rpx 4rpx 4rpx;
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #222222;
+		}
+		.first-name{
+			width: 430rpx;
+			// height: 77rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #323232;
+			// margin-left: 16rpx;
+		}
+		.rbot{
+			width: 430rpx;
+			height: 52rpx;
+			font-size: 26rpx;
+			color: #323232;
+			margin-top: 60rpx;
+		}
+
+
+		.first-mine {
+			height: 32rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #7A7A7A;
+
+		}
+
+		.first-txt {
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #7A7A7A;
+			line-height: 32rpx;
+			margin: 0 6rpx;
+		}
+		.tt1{
+			font-size: 28rpx;
+			span{
+				padding-left: 15rpx;
+				font-size: 22rpx;
+				color: #9C9C9C;
+			}
+		}
+
+		.row-right {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+		}
+		::v-deep.plasty {
+			text-align: right;
+			font-family: PingFang SC, PingFang SC;
+			font-size: 28rpx;
+			color: #999999;
+		}
+		.input {
+			text-align: right;
+			color: #999999;
+			font-size: 28rpx;
+		}
+
+	}
+
+
+	.third {
+		width: 100%;
+		background: #ffffff;
+		margin-top:20rpx;
+		border-radius: 44rpx;
+		.third-top{
+			font-family: PingFang SC, PingFang SC;
+			font-weight: bold;
+			font-size: 36rpx;
+			color: #323232;
+			line-height: 50rpx;
+			margin-top: 30rpx;
+			margin-left:30rpx;
+			position: relative;
+			z-index: 10;
+		}
+		span{
+			position: relative;
+			.icons{
+				width: 37rpx;
+				height: 20rpx;
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				z-index: -1;
+			}
+		}
+		.textarea_fb{
+			margin:0 auto;
+			padding: 30rpx;
+			width: 642rpx;
+			::v-deep .u-textarea {
+				height: 100%;
+				padding: 0;
+				border: none;
+				font-size: 26rpx;
+				color: #9C9C9C;
+				background: #F7F7F7;
+				border-radius: 18rpx;
+			}
+			::v-deep .u-textarea__field{
+				padding: 30rpx;
+			}
+			::v-deep .bttop {
+				color: #999999 ;
+			}
+		}
+
+
+
+	}
+
+	.line {
+		width: 690rpx;
+		height: 1rpx;
+		background: #F0F0F0;
+		margin: 30rpx 0;
+	}
+
+
+
+
+	.footer {
+		width: 100%;
+		height: 200rpx;
+		background: #ffffff;
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		position: fixed;
+		z-index: 99;
+		/* 绝对定位 */
+		bottom: 0;
+		/* 定位在底部 */
+		left: 0;
+		/* 定位在左边 */
+
+
+		.footer-right {
+			position: absolute;
+			right: 30rpx;
+			width: 690rpx;
+			height: 92rpx;
+			background: #C1C1C1;
+			border-radius: 200rpx;
+
+			span {
+				width: 690rpx;
+				height: 92rpx;
+				line-height: 92rpx;
+				font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
+				font-weight: 400;
+				font-size: 36rpx;
+				color: #BBFC5B;
+				background: #323232;
+				border-radius: 200rpx;
+				text-align: center;
+			}
+		}
+	}
+
+
+	::v-deep ::-webkit-scrollbar {
+		/*滚动条整体样式*/
+		width: 4px !important;
+		height: 1px !important;
+		overflow: auto !important;
+		background: #ccc !important;
+		-webkit-appearance: auto !important;
+		display: block;
+	}
+
+	::v-deep ::-webkit-scrollbar-thumb {
+		/*滚动条里面小方块*/
+		border-radius: 10px !important;
+		box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
+		background: #7b7979 !important;
+	}
+
+	::v-deep ::-webkit-scrollbar-track {
+		/*滚动条里面轨道*/
+		// box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
+		// border-radius: 10px !important;
+		background: #FFFFFF !important;
+	}
+
+	.popup_tkall{
+		// height: 1100rpx;
+		
+		.popup_tk{
+			font-size: 42rpx;font-weight: 800;margin: 12rpx 0 24rpx 0;height: 120rpx;
+			text-align: center;
+		}
+		.popup-content{
+			height: 500rpx;
+			margin-bottom: 100rpx;
+			// overflow-y: auto;
+		}
+		.popup-content-item{
+			width: 690rpx;
+			padding: 30rpx;
+			box-sizing: border-box;
+			// background: #F7F7F7;
+			// border-radius: 18rpx;
+			// border: 5rpx solid #EAEAEA;
+			border-bottom:2rpx solid #EEEEEE ;
+			padding-bottom: 30rpx;
+			line-height: 50rpx;
+			font-family: PingFang SC, PingFang SC;
+			justify-content: space-between;
+			color: #3D3D3D;
+			
+			.popup-content-item-title{
+				font-weight: 500;
+				font-size: 28rpx;
+			}
+		}
+
 	}
 </style>
\ No newline at end of file
diff --git a/pages/afterSales/info.vue b/pages/afterSales/info.vue
index 4858b59..494411c 100644
--- a/pages/afterSales/info.vue
+++ b/pages/afterSales/info.vue
@@ -18,14 +18,14 @@
 					</view>
 				</view>
 				<view style="height: 1px;width: 70%;background: #D9D9D9;margin: 45rpx auto;"></view>
-				<view v-if="infoRefund!=''" class="item-spacing"
+				<view v-if=" infoRefund != '' " class="item-spacing"
 					style="display: flex; justify-content: space-between; font-size: 26rpx;">
 					<view style="color: #7A7A7A;">当前状态</view>
-					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts==1">机构处理中</view>
-					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts==4">待用户确认</view>
-					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts==7">结算中</view>
-					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts==10">已完成</view>
-					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts==-3">驳回</view>
+					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts== 1">机构处理中</view>
+					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts== 4">待用户确认</view>
+					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts== 7">结算中</view>
+					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts== 10">已完成</view>
+					<view style="color: #FF6D6D;" v-if="infoRefund.service_stauts== -3">驳回</view>
 				</view>
 				<view class="item-spacing" style="display: flex; justify-content: space-between; font-size: 26rpx;">
 					<view style="color: #7A7A7A;">课程机构</view>
diff --git a/pages/center/applyDetail.vue b/pages/center/applyDetail.vue
index ee6aa0c..fd6596d 100644
--- a/pages/center/applyDetail.vue
+++ b/pages/center/applyDetail.vue
@@ -19,22 +19,22 @@
 					<view class="flex">
 						<image v-if="detail.images" :src="detail.images[0]" mode="" style="width: 159rpx;height: 159rpx;border-radius: 18rpx;"></image>
 						<view class="flex align-items flex-column" style="margin-left: 20rpx;">
-							<span class="first-name">{{detail.title}}</span>
-							<view class="rbot">
-								<image src="/static/center/address.png" mode="" style="width: 32rpx;height: 32rpx;"></image>
-								<span>{{detail.address_detail}}</span>
+							<span class="first-name white-space">{{detail.title}}</span>
+							<view class="rbot flex align-items">
+								<image src="/static/center/address.png" mode="" style="width: 32rpx;height: 32rpx;margin-right: 20rpx;"></image>
+								<span class="white-space">{{detail.address_detail}}</span>
 							</view>
 						</view>
 					</view>
 				</view>
 		
 				<span class="line"></span>
-				<span class="flex align-items" style="width: 100%;margin-top: 20rpx;justify-content: space-between;">
+				<span class="flex align-items" style="width: 100%;justify-content: space-between;">
 					<view class="tt1">活动时间</view>
 					<span style="font-size: 14px;">{{formattedTime.formattedTime}}</span>
 				</span>
 				<span class="line"></span>
-				<span class="flex align-items" style="width: 100%;margin-top: 20rpx;justify-content: space-between;">
+				<span class="flex align-items" style="width: 100%;justify-content: space-between;">
 					<view class="tt1">数量<span> (剩余{{detail.join_info.stock - detail.join_info.people_number}}张)</span></view>
 					<span class="flex align-items">
 						<image style="width: 42rpx;height: 42rpx;" src="/static/detail/jian.png" @click="removeMon"></image>
@@ -43,12 +43,12 @@
 					</span>
 				</span>
 				<span class="line"></span>
-				<span class="flex align-items" style="width: 100%;margin-top: 20rpx;justify-content: space-between;">
+				<span class="flex align-items" style="width: 100%;justify-content: space-between;">
 					<view class="tt1">支付金额</view>
 					<span style="color: #FF4810;font-weight: 900;">￥{{ priceGem  }}</span>
 				</span>
 				<span class="line"></span>
-				<span class="flex align-items" style="width: 100%;margin-top: 20rpx;justify-content: space-between;margin-bottom: 50rpx;">
+				<span class="flex align-items" style="width: 100%;justify-content: space-between;margin-bottom: 40rpx;">
 					<view class="tt1">支付方式</view>
 					<span class="flex align-items">
 						<image style="width: 44rpx;height: 44rpx;" src="/static/detail/weixin.png"></image>
@@ -61,7 +61,7 @@
 
 		</view>
 
-		<view class="third flex flex-column" style="justify-content: flex-start;">
+		<view class="third flex flex-column" style="justify-content: flex-start;" v-if="priceGem > 0">
 			<view class="third-top flex align-items">
 				<span>退款政策
 					<image class="icons" src="/static/detail/xiangqing.png"></image>
@@ -81,11 +81,13 @@
 						<uni-td>0%</uni-td>
 						<uni-td>0</uni-td>
 					</uni-tr>
+
 					<uni-tr v-if="detail.refund_info.status == 5">
 						<uni-td>报名开始至{{ fomartertime }}</uni-td>
 						<uni-td>需协商</uni-td>
 						<uni-td>需协商</uni-td>
 					</uni-tr>
+
 				</uni-table>
 			</view>
 		</view>
@@ -295,7 +297,7 @@
 		},
 
 		onLoad(options) {
-			this.loginShow();
+			// this.loginShow();
 			this.userInfo = uni.getStorageSync("userInfo")
 			this.id = options.id
 			if (options.type == 2) {
@@ -305,7 +307,7 @@
 			if (options.type == 1) {
 				this.type = 1
 				this.order_no = options.order_no
-				this.pament()
+				this.create()
 			}
 			console.log(options.id)
 			this.getDetail()
@@ -630,7 +632,7 @@
 								complete: function() {
 									setTimeout(function() {
 										uni.redirectTo({
-											url: "/packageA/my/orderList?status=" + 3
+											url: "/packageA/my/exercise?status=" + "2,3"
 										})
 									}, 2000);
 								}
@@ -835,7 +837,7 @@
 		}
 		.first-name{
 			width: 430rpx;
-			height: 52rpx;
+			// height: 77rpx;
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 400;
 			font-size: 28rpx;
@@ -847,7 +849,7 @@
 			height: 52rpx;
 			font-size: 26rpx;
 			color: #323232;
-			margin-top: 20rpx;
+			margin-top: 60rpx;
 		}
 
 
@@ -997,7 +999,7 @@
 		width: 690rpx;
 		height: 1rpx;
 		background: #F0F0F0;
-		margin: 19rpx 0;
+		margin: 30rpx 0;
 	}
 
 	.icon-size {
diff --git a/pages/center/detail copy.vue b/pages/center/detail copy.vue
deleted file mode 100644
index 1836a9b..0000000
--- a/pages/center/detail copy.vue	
+++ /dev/null
@@ -1,1782 +0,0 @@
-<template>
-	<view class="box flex justify-start flex-column align-items" :class="{ 'no-scroll': overlay }">
-		<view class="swiper">
-			<u-swiper :list="detail.images" indicator indicatorMode="line" :indicator-style="{ bottom: '60rpx' }"
-				height="580rpx" circular></u-swiper>
-		</view>
-		<view class="nav">
-			<u-navbar :is-back="true" leftIconColor="#FFFFFF" :autoBack='true' title="课程详情" :bgColor="background"
-				:titleStyle='titleStyle'> </u-navbar>
-		</view>
-		<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
-			<view class="first-box flex flex-start flex-column justify-start">
-				<view class="flex align-items">
-					<span class="sigh flex justify-center align-items">报名中</span>
-					<span class="first-name">{{detail.title}}</span>
-				</view>
-
-				<!-- <view class="flex w-100  align-items" style="margin-top:28rpx;justify-content: space-between;">
-					<span class="first-money" v-if="detail.feel == 0">￥{{detail.price}}</span>
-					<span class="first-money" v-if="detail.feel == 1"></span>
-					<view class="flex align-items justify-center"
-						style="width: 30%;justify-content: flex-end;margin-right: 24rpx;">
-						<span
-							class="first-mine">{{ Number(detail.sign_num + detail.virtual_num)}}/{{detail.limit_num}}</span>
-						<span class="first-txt">名额</span>
-						<image src="../../static/center/minge.png" mode="" class="icon-size"></image>
-					</view>
-				</view> -->
-				<!-- <span class="line"></span> -->
-
-				<span class="first-image flex align-items" style="margin-top: 38rpx;">
-					<image src="../../static/center/authorize.png" mode="" class="icon-size"></image>
-					<span style="color: #FF4810;">{{'报名人数: ' +  Number(detail.sign_num + detail.virtual_num)}} /
-						{{detail.limit_num}}</span>
-				</span>
-
-				<span class="first-image flex align-items" style="margin: 16rpx 0;">
-					<image src="../../static/center/Alarm.png" mode="" class="icon-size"></image>
-					<span>{{formattedTime.formattedTime}} (共计{{formattedTimeList.length}}节)</span>
-				</span>
-
-				<span class="first-image flex align-items"
-					@click.stop="toMap(detail.latitude,detail.longitude,detail.address_detail)">
-					<image src="../../static/center/address.png" mode="" class="icon-size"></image>
-					<span>{{detail.address_detail}}</span>
-				</span>
-			</view>
-			<!-- 正在参与 -->
-			<view class="second-box flex align-items space-between">
-				<span class="number">{{virtual_people >= 10000 ? '9999+' : virtual_people}}人正在参与</span>
-				<view class="flex align-items">
-					<u-avatar-group :urls="people.unpaid_user_data" :extraValue="people.unpaid_user_data.length - 5"
-						keyName="head_image" size="24" gap="0.2"></u-avatar-group>
-					<span class="flex justify-center align-items">
-						<image src="/static/center/right_.png" mode="" style="width: 20rpx;height: 20rpx;"></image>
-					</span>
-				</view>
-			</view>
-			<!-- 报名成功 -->
-			<view class="third flex flex-column" style="justify-content: flex-start;">
-				<view class="third-center flex " style="justify-content: space-between;">
-					<view class="scroll-container ">
-						<view v-for="(item, index) in people.paid_user_data" :key="index" class="item">
-							<view class="flex align-items" style="justify-content: space-between;">
-								<image :src="item.head_image" mode="" style="width: 40rpx; height: 40rpx;">
-								</image>
-								<span
-									style="width: 72rpx; overflow: hidden; white-space: nowrap;">{{item.nickname}}</span>
-								<span class="line-colum"></span>
-								<span>报名成功</span>
-							</view>
-							<span>{{ item.createTime }}</span>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="four flex justify-start align-items flex-column">
-				<view class="four-top">
-					<view class="left flex align-items">
-						<span>授课教师</span>
-					</view>
-				</view>
-				<view class="four-box flex justify-start align-items w-100" @click="toTeacher(detail.teacher.id)">
-					<view class="four-header flex align-items w-100" style="justify-content: space-between;">
-						<view class="flex align-items" style="justify-content: start; width: 70%;">
-							<image :src="detail.teacher.head_image" mode=""
-								style="width: 96rpx; height: 96rpx;border-radius: 96rpx;">
-							</image>
-							<span class="flex justify-center flex-column"
-								style="align-items: flex-start;margin-left: 18rpx;">
-								<span class="four-name">{{detail.teacher.name}}</span>
-								<span class="jigou">{{detail.shop.name}}</span>
-								<!-- <span class="flex align-items rate">
-									<u-rate :count="count" active-color="#FFBC2C" v-model="detail.teacher.teacher_star"
-										allowHalf="true" readonly></u-rate>
-									{{detail.teacher.teacher_star}}分
-								</span> -->
-
-							</span>
-						</view>
-						<view class="four-right flex justify-center align-items">
-							详情
-						</view>
-					</view>
-				</view>
-				<span class="line" style="width: 93%;"></span>
-				<span class="tt-detail flex ">
-					<u-parse :content="detail.teacher.content"></u-parse>
-				</span>
-			</view>
-			<!-- 机构 -->
-			<view class="five flex align-items" style="justify-content: space-around;" @click="toMeDetail()">
-				<image :src="detail.shop.logo" mode="" style="width: 64rpx; height: 64rpx;border-radius: 64rpx;">
-					<span class="five-name">{{detail.shop.name}}</span>
-					<span class="five-address white-space">{{detail.shop.address_detail}}</span>
-					<image src="/static/center/blockRight.png" mode="" style="width: 28rpx; height: 28rpx;"></image>
-			</view>
-			<!-- 课程详情 -->
-			<view class="six flex flex-column" style="justify-content: flex-start;margin-top: 64rpx;">
-				<view class="six-top flex align-items space-between">
-					<view class="left flex align-items">
-						<span>课程详情</span>
-					</view>
-				</view>
-				<view class="six-center flex first-txt  flex-column" style="padding: 0rpx 30rpx;">
-					<u-parse :content="detail.content" :tagStyle="style"></u-parse>
-				</view>
-			</view>
-
-			<!-- 课程须知 -->
-			<view class="six flex flex-column" style="justify-content: flex-start;margin-bottom: 106rpx;">
-				<view class="six-top flex align-items space-between">
-					<view class="left flex align-items">
-						<span>课程须知</span>
-					</view>
-				</view>
-				<view class="six-center flex first-txt  flex-column">
-					<u-parse :content="detail.notice" :tagStyle="style"></u-parse>
-					<!-- <rich-text :nodes="detail.notice" style="width: 100%;" :tagStyle="style"></rich-text> -->
-				</view>
-			</view>
-			<view class="footer flex align-items" style="justify-content: space-between;">
-				<view class="footer-left">
-					<view @click="callPhone(detail.user.mobile)">
-						<image src="../../static/center/phone.png" mode=""></image>
-						<span>电话</span>
-					</view>
-					<view @click="overlayShow()">
-						<!-- <view @click="Share()"> -->
-						<image src="../../static/center/share.png" mode=""></image>
-						<span>分享</span>
-					</view>
-					<view v-if="is_collect == 0" @click="Collect(1)">
-						<image src="../../static/center/Collect.png" mode=""></image>
-						<span>收藏</span>
-					</view>
-					<view v-if="is_collect != 0" @click="Collect(0)">
-						<image src="../../static/center/Collected.png" mode=""></image>
-						<span>已收藏</span>
-					</view>
-				</view>
-				<view class="footer-right flex justify-center align-items">
-					<span v-if="type == 0 && detail.feel == 0" @click="sign()"> 购买 </span>
-					<span v-if="type == 0 && detail.feel == 1" @click="sign()"> 马上报名 </span>
-					<span v-if="type == 1 && detail.feel == 0" @click="buy()"> 立即支付 </span>
-					<span v-if="type == 1 && detail.feel == 1" @click="buy()"> 确认报名 </span>
-					<span v-if="type == 2" @click="open()"> 我要预约 </span>
-					<span v-if="type == 3" @click="confimTime()"> 确认时间 </span>
-					<!-- <image src="../../static/center/signUp.png" mode="" v-if="type == 0" @click="sign()"></image>
-				<image src="../../static/center/appointment.png" mode="" v-else-if="type == 1" @click="open()"></image>
-				<image src="../../static/center/Confirm.png" mode="" v-else="type == 2" @click="confimTime()"></image> -->
-				</view>
-			</view>
-		</view>
-
-		<!-- 课程时间 -->
-		<u-popup :show="show" mode="bottom" :round="10" :zIndex="99999" :custom-style="popupStyle" @close="close"
-			@open="open">
-			<view class="popupBox flex justify-start align-items flex-column">
-				<view class="pop-header flex align-items" style="justify-content: space-between;">
-					<image src="../../static/center/classTime.png" mode="" style="width: 252rpx; height: 48rpx;">
-					</image>
-					<span @click="cancel">取消选择</span>
-				</view>
-				<!-- <span class="line"></span> -->
-				<view class="times flex align-items justify-center" style="flex-wrap: wrap;">
-					<span class="selectTime flex justify-center align-items" v-for="(item,index) in timeList"
-						:key="index" :class="{ selected: timeSelected(item) }" @click="selectTime(item)">
-						{{item.name}}</span>
-				</view>
-			</view>
-
-		</u-popup>
-		<!-- 购买弹窗 -->
-		<u-popup :show="buyShow" mode="center" :round="10" :zIndex="99999" :custom-style="popupStyle" @close="buyClose"
-			@open="buyOpen" safeAreaInsetBottom="false" closeable="true">
-			<view class="popupBox flex justify-start align-items flex-column">
-				<view class="pop-header flex align-items flex-column flex-start">
-					<span class="name white-space">{{detail.title}}</span>
-					<span class="price">
-						<span v-if="detail.feel == 0">￥{{detail.price}}</span>
-						<span v-if="detail.feel == 1">公益</span>
-					</span>
-					<!-- <image src="../../static/center/buy.png" mode="" style="width: 168rpx; height: 48rpx;">
-					</image> -->
-				</view>
-				<view class="popup flex-column">
-					<span class="first-image flex align-items" style="margin: 16rpx 0;">
-						<image src="../../static/center/Alarm.png" mode="" class="icon-size"></image>
-						<span>{{formattedTime.formattedTime}} (共计{{formattedTimeList.length}}节)</span>
-					</span>
-					<span class="first-image flex align-items">
-						<image src="../../static/center/address.png" mode="" class="icon-size"></image>
-						<span>{{detail.address_detail}}</span>
-					</span>
-					<!-- <image :src="detail.headimage" mode="" style="width: 200rpx; height: 140rpx;"></image>
-					<view class="popur-right flex flex-column">
-						<span class="name white-space">{{detail.title}}</span>
-						<span class="address">地址:{{detail.address_detail}}</span>
-						<span class="date">开始时间:{{detail.start_time_text}}</span>
-						<span class="time">结束时间:{{detail.end_time_text}}</span>
-						<span class="line-row"></span>
-						<span class="price">
-							课程价格:
-							<span v-if="detail.feel == 0">￥{{detail.price}}</span>
-							<span v-if="detail.feel == 1">免费</span>
-						</span>
-					</view> -->
-				</view>
-				<view class="popup-footer flex " @click="buy()">
-					<span v-if="type == 1 && detail.feel == 0">立 即 支 付</span>
-					<span v-if="type == 1 && detail.feel == 1">确 认 报 名</span>
-					<!-- <image src="../../static/center/price.png" mode="" style="width: 642rpx;height: 80rpx;"></image> -->
-					<u-loading-icon :vertical="true" v-if="uloadingShow"></u-loading-icon>
-				</view>
-			</view>
-		</u-popup>
-
-		<u-overlay :show="overlay" class="pos">
-			<view class="btnList">
-				<span class="save" @click.stop="save()">保 存 海 报</span>
-				<!-- <span class="sharePoster"  @click.stop="sharePoster()">
-				分 享
-				</span> -->
-				<button open-type="share" class="no-border-button" plain="true">
-					<span>分 享 发 布</span>
-				</button>
-			</view>
-			<view class="Poster" style="z-index: 9999;height: 1230rpx;">
-				<span class="posterClose" @click.stop="overlay = false">
-					<image src="../../static/center/close.png" mode="" style="width: 64rpx;height: 64rpx;"></image>
-				</span>
-
-				<image :src="path" mode="widthFix" style="width: 690rpx;height: 1230rpx;"></image>
-				<l-painter isCanvasToTempFilePath ref="painter" @success="path = $event" hidden
-					css="width: 750rpx;height:1230rpx; padding-bottom: 40rpx; background-image: url('https://testy.hschool.com.cn//uploads/20241219/6f46474364fe7ae36295cb8d96854b52.png')">
-					<l-painter-image :src="userInfo.avatar"
-						css="margin-left: 40rpx; margin-top: 100rpx; width: 90rpx;  height: 90rpx; border-radius: 50%;" />
-					<l-painter-view css="margin-top: 100rpx; padding-left: 20rpx; display: inline-block">
-						<l-painter-text :text="userInfo.realname || userInfo.nickname"
-							css="display: block; padding-bottom: 10rpx; color: #181818; font-size: 34rpx; fontWeight: bold" />
-						<l-painter-text text="邀请您一起上课" css="color: #7A7A7A; font-size: 24rpx" />
-					</l-painter-view>
-					<l-painter-view
-						css="margin-left: 35rpx; margin-top: 24rpx; padding: 32rpx; box-sizing: border-box; background: #fff; border-radius: 16rpx; width: 690rpx; box-shadow: 0 20rpx 58rpx rgba(0,0,0,.15)">
-						<l-painter-image :src="detail.headimage"
-							css="object-fit: cover; object-position: 50% 50%; width: 626rpx; height: 448rpx; border-radius: 12rpx;" />
-
-						<l-painter-view css=" width: 626rpx;display: flex;alignItems: center;">
-							<l-painter-view>
-								<l-painter-view
-									css="margin-top: 32rpx; color: #FF0000; font-weight: bold; font-size: 28rpx; line-height: 1em;">
-									<l-painter-text text="￥" css="vertical-align: bottom;font-size: 42rpx"
-										v-if="detail.feel == 0" />
-									<l-painter-text :text="detail.price" css="vertical-align: bottom; font-size: 58rpx"
-										v-if="detail.feel == 0" />
-									<l-painter-text text="免费" css="vertical-align: bottom;font-size: 42rpx"
-										v-if="detail.feel == 1" />
-								</l-painter-view>
-								<l-painter-view css="margin-top: 24rpx;">
-									<l-painter-text :text="formattedTitle" css="color: #343434;font-size: 36rpx;" />
-								</l-painter-view>
-								<l-painter-text
-									css="line-clamp: 2; color: #333333; line-height: 1.8em; font-size: 26rpx;display: block; width: 380rpx; padding-right:32rpx; box-sizing: border-box"
-									:text="'讲师:' + detail.teacher.name"></l-painter-text>
-								<l-painter-text
-									css="line-clamp: 2; color: #333333; line-height: 1.8em; font-size: 26rpx;display: block;margin-bottom:30rpx; width: 380rpx; padding-right:32rpx; box-sizing: border-box"
-									:text="detail.address_detail"></l-painter-text>
-							</l-painter-view>
-							<l-painter-view css="margin-top: 24rpx;">
-								<l-painter-qrcode css="width: 200rpx; height: 200rpx;" :text="qrUrl"></l-painter-qrcode>
-							</l-painter-view>
-						</l-painter-view>
-
-					</l-painter-view>
-				</l-painter>
-			</view>
-		</u-overlay>
-
-	</view>
-</template>
-
-<script>
-	import dayjs from 'dayjs';
-	export default {
-		computed: {
-			formattedTitle() {
-				if (this.detail.title.length > 9) {
-					return this.detail.title.slice(0, 9) + '..';
-				}
-				return this.detail.title;
-			},
-			formattedTimeList() {
-				return this.timeList.map(item => {
-					const startTime = dayjs.unix(item.start_time).format('YYYY-MM-DD HH:mm:ss');
-					const endTime = dayjs.unix(item.end_time).format('HH:mm:ss');
-					return {
-						formattedTime: `${startTime}~${endTime}`,
-						limit_num: item.limit_num,
-						sign_num: item.sign_num
-					};
-				});
-			},
-			formattedTime() {
-				const startTime = dayjs.unix(this.detail.start_time).format('YYYY-MM-DD');
-				const endTime = dayjs.unix(this.detail.end_time).format('YYYY-MM-DD');
-				return {
-					formattedTime: `${startTime}~${endTime}`
-				};
-			}
-		},
-
-		data() {
-			return {
-				style: {
-					// 字符串的形式
-					img: 'width: 100%'
-
-				},
-				scrollTop: 0,
-				overlay: false,
-				userInfo: {},
-				path: 'https://testy.hschool.com.cn//uploads/20241219/3406baf51fcc28c63c31ebcee5c9c75e.jpg',
-				uloadingShow: false,
-				show: false,
-				buyShow: false,
-				type: 0, // 0 支付 1 立即购买 2 预约  3确认时间
-				id: 1,
-				count: 5,
-				value: 5,
-				order_no: '',
-				PayPirce: 0,
-				notice: '',
-				detail: {},
-				people: {},
-				qrUrl: '',
-				is_collect: 0,
-				virtual_people: 0,
-				popupStyle: {
-					width: '690rpx',
-					height: '716rpx',
-					margin: '0 auto', // 水平居中
-					display: 'flex',
-					justifyContent: 'flex-start',
-					alignItems: 'center'
-				},
-				timeList: [],
-				selectedTime: null,
-				// indexBackgroundImage: indexBackgroundImage,
-				orderId: "",
-				classes_lib_spec_id: '',
-				order_no2: '',
-				mobile: '',
-				is_show_model: false, //是否显示分享模态窗
-				background: '#ffffff00',
-				titleStyle: {
-					color: '#FFFFFF'
-				},
-			};
-		},
-
-		onShareTimeline() {
-			return {
-				title: this.detail.title, //分享的标题
-				imageUrl: this.detail.headimage, //展示的图片，这里是本地路径的写法，也可以写http或https开头的图片路径
-				query: `id=${this.id}`
-			}
-		},
-
-		onLoad(options) {
-			this.userInfo = uni.getStorageSync("userInfo")
-			this.id = options.id
-			// this.id = 1
-			if (options.type == 2) {
-				this.type = 2
-				this.orderId = options.orderId
-			}
-			if (options.type == 1) {
-				this.type = 1
-				this.order_no = options.order_no
-				this.pament()
-			}
-			console.log(options.id)
-			this.getDetail()
-			this.getPeople()
-			this.getTime()
-			this.getShare()
-		},
-
-		methods: {
-
-			overlayShow() {
-				const token = uni.getStorageSync('token')
-				if (token) {
-					this.overlay = true
-				} else {
-					uni.showToast({
-						title: '请登录',
-						icon: 'none',
-						duration: 2000,
-						complete: function() {
-							setTimeout(function() {
-								uni.switchTab({
-									url: '/pages/my/index',
-								});
-							}, 2000);
-						}
-					});
-				}
-			},
-			getShare() {
-				uni.$u.http.post('/api/wechat_util/link', {
-					path: 'pages/center/detail',
-					query: `id=${this.id}`,
-				}).then(res => {
-					if (res.code == 1) {
-						this.qrUrl = res.data.url_link
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-			// 时间转换函数
-			timeago(timestamp) {
-				const now = new Date().getTime(); // 当前时间（毫秒）
-				const diff = (now - timestamp * 1000) / 1000; // 时间差（秒）
-
-				if (diff < 60) {
-					return `${Math.floor(diff)}秒前`;
-				} else if (diff < 3600) {
-					return `${Math.floor(diff / 60)}分钟前`;
-				} else if (diff < 86400) {
-					return `${Math.floor(diff / 3600)}小时前`;
-				} else if (diff < 2592000) { // 30天
-					return `${Math.floor(diff / 86400)}天前`;
-				} else {
-					return `${Math.floor(diff / 2592000)}个月前`;
-				}
-			},
-
-			// sharePoster() {
-			// 	//获取带参数二维码并传递
-			// 	this.is_show_model = false
-			// 	this.$refs.poster.showCanvas()
-			// },
-
-			// 获取课时规格
-			getTime() {
-				uni.$u.http.get('/api/school/classes/spec', {
-					params: {
-						id: this.id,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-
-						this.timeList = res.data.spec;
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-			// 获取报名详情
-			getPeople() {
-				const that = this
-				uni.$u.http.get('/api/school/classes/people', {
-					params: {
-						id: that.id,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						that.processPeopleData(res.data).then(processedData => {
-							that.people = processedData;
-							console.log('that.people', that.people)
-						});
-
-					} else {
-						that.showErrorToast(res.msg);
-					}
-				}).catch(error => {
-					that.showErrorToast('请求失败，请稍后再试');
-
-				});
-			},
-			// 数据转换
-			processPeopleData(data) {
-				return new Promise((resolve) => {
-					const paidUserData = data.paid_user_data.map(item => {
-						item.createTime = this.timeago(item.time);
-						return item;
-					}).reverse();
-					const unpaidUserData = data.unpaid_user_data
-					const processedData = {
-						unpaid_user_data: unpaidUserData,
-						paid_user_data: paidUserData
-					}
-					resolve(processedData);
-				});
-			},
-			// 提示
-			showErrorToast(msg) {
-				uni.showToast({
-					title: msg,
-					icon: 'none',
-					duration: 2000
-				});
-			},
-			// 获取详情
-			getDetail() {
-				uni.$u.http.get('/api/school/classes/detail', {
-					params: {
-						id: this.id,
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.detail = res.data.detail
-						this.notice = res.data.detail.notice.replace(/<[^>]*>/g, '')
-						this.virtual_people = res.data.detail.views
-						if (res.data.detail.is_collect != 0) {
-							this.is_collect = 1
-						} else {
-							this.is_collect = 0
-						}
-						if (this.detail.user.realname) {
-							this.detail.user.realname = this.detail.user.realname.slice(0, 1) + 'XX';
-						}
-						this.mobile = this.detail.user.mobile.slice(0, 3) + 'XXXX' + this.detail.user.mobile.slice(
-							7);
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				}).catch(error => {});
-			},
-			// 报名  0 支付 1 立即购买 2 预约  3确认时间
-
-			sign() {
-				this.buyShow = true
-				this.type = 3
-				// uni.navigateTo({
-				// 	url: '/pages/CashierDesk/CashierDesk?id=' + this.id
-				// })
-
-			},
-			buy() {
-				this.uloadingShow = true
-				this.getMoney()
-			},
-			// 购买弹窗 type =  0 支付 1 立即购买 2 预约  3确认时间
-			buyOpen() {
-				this.buyShow = true
-				this.type = 1
-			},
-			// 预约弹窗 type = 2 0 支付 1 立即购买 2 预约  3确认时间
-			open() {
-				this.show = true
-				this.type = 3
-			},
-			// 确认时间  type = 0  0 支付 1 立即购买 2 预约  3确认时间
-			confimTime() {
-				uni.$u.http.post('/api/school/hour_order/confirm', {
-					classes_order_id: this.orderId,
-					classes_lib_spec_id: this.classes_lib_spec_id,
-					order_no: this.order_no2,
-					is_compute: 1
-				}).then(res => {
-					if (res.code == 1) {
-						this.order_no2 = res.data.order_no
-						this.timeCreat(res.data.order_no)
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-						this.type = 2
-						// _this.$api.toast(res.msg);
-					}
-				}).catch(error => {
-
-				});
-
-				this.show = false
-				this.type = 0
-			},
-			// 预约下单
-			timeCreat(order_no) {
-				uni.$u.http.post('/api/school/hour_order/create', {
-					order_no: order_no,
-				}).then(res => {
-					if (res.code == 1) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000,
-							complete: function() {
-								setTimeout(function() {
-									uni.reLaunch({
-										url: "/packageA/my/makeList?status=" + -1
-									})
-								}, 2000);
-							}
-
-						})
-
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-						this.type = 2
-						// _this.$api.toast(res.msg);
-					}
-				}).catch(error => {
-
-				});
-			},
-			// 教师详情
-			toTeacher(id) {
-				uni.navigateTo({
-					url: `/pages/center/teacherDetail?id=${id}`
-				})
-			},
-			// 导航
-			toMap(latitude, longitude, name) {
-				uni.openLocation({
-					latitude: parseFloat(latitude),
-					longitude: parseFloat(longitude),
-					name: name,
-					success: function() {
-						console.log('success');
-					}
-				});
-			},
-			// 机构详情
-			toMeDetail() {
-				uni.navigateTo({
-					url: "/pages/center/MechanismDetail?id=" + this.detail.shop.id
-				})
-			},
-
-			close() {
-				this.type = 0
-				this.selectedTime = null
-				this.show = false
-			},
-			buyClose() {
-				this.type = 0
-				this.selectedTime = null
-				this.buyShow = false
-			},
-			// 返回首页
-			toIndex() {
-				uni.switchTab({
-					url: "/pages/index/index"
-				})
-			},
-			// 保存海报
-			save() {
-				let base64 = this.path.replace(/^data:image\/\w+;base64,/, ""); //图片替换
-				let filePath = wx.env.USER_DATA_PATH + '/qrcode.png';
-				uni.getFileSystemManager().writeFile({
-					filePath: filePath, //创建一个临时文件名
-					data: base64, //写入的文本或二进制数据
-					encoding: 'base64', //写入当前文件的字符编码
-					success: (res) => {
-						uni.saveImageToPhotosAlbum({
-							filePath: filePath,
-							success: () => {
-								uni.showToast({
-									title: '保存成功',
-									icon: "none",
-									duration: 5000
-								})
-							},
-							fail: (err) => {
-								console.log(err);
-								uni.showToast({
-									title: '保存失败',
-									icon: "none",
-									duration: 5000
-								})
-							}
-						})
-					},
-					fail: (err) => {
-						console.log(err)
-					}
-				})
-			},
-			//分享发布
-			sharePoster() { //分享图片给好友按钮的点击事件函数
-				let that = this
-				this.base64ToFilePath(this.path, (filePath) => {
-					console.log(filePath);
-					wx.showShareImageMenu({ //分享给朋友
-						path: filePath,
-						success: (res) => {
-							console.log("分享成功：", res);
-						},
-						fail: (err) => {
-							console.log("分享取消：", err);
-						},
-					})
-				})
-			},
-
-
-			base64ToFilePath(base64data, callback) {
-				const time = new Date().getTime();
-				const imgPath = `${wx.env.USER_DATA_PATH}/addFriends${time}share_qrcode.png`;
-				const imageData = base64data.replace(/^data:image\/\w+;base64,/, "");
-				const fileSystemManager = uni.getFileSystemManager();
-
-				fileSystemManager.writeFile({
-					filePath: imgPath,
-					data: imageData,
-					encoding: 'base64',
-					success: () => {
-						callback(imgPath);
-					},
-					fail: (err) => {
-						console.error('Write file failed:', err);
-						uni.showToast({
-							title: '写入文件失败',
-							icon: 'none'
-						});
-					}
-				});
-			},
-
-			// 收藏和取消
-			Collect(number) {
-				uni.$u.http.post('/api/school/classes/collect', {
-					id: this.id,
-					is_collect: number
-				}).then(res => {
-					if (res.code == 1) {
-						this.is_collect = number
-						if (number == 0) {
-							uni.showToast({
-								title: '取消收藏',
-								icon: 'none',
-								duration: 2000
-							})
-						} else {
-							uni.showToast({
-								title: '收藏成功',
-								icon: 'none',
-								duration: 2000
-							})
-						}
-
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-						// _this.$api.toast(res.msg);
-					}
-				}).catch(error => {
-
-				});
-			},
-			callPhone(phone) {
-				uni.makePhoneCall({
-					phoneNumber: phone
-				})
-			},
-
-			// 取消选择
-			cancel() {
-				this.selectedTime = null
-			},
-			selectTime(time) {
-				this.selectedTime = time;
-				this.classes_lib_spec_id = time.id
-
-			},
-			timeSelected(time) {
-				return this.selectedTime === time;
-			},
-			moveScroll() {},
-			// 获取价格
-			getMoney() {
-				uni.$u.http.post('/api/school/order/confirm', {
-					classes_lib_id: this.id,
-					order_no: this.order_no,
-					is_compute: 1
-				}).then(res => {
-					if (res.code == 1) {
-						this.PayPirce = res.data.order_data.totalprice
-						this.order_no = res.data.order_no
-						this.create(this.order_no, this.PayPirce)
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-						// _this.$api.toast(res.msg);
-					}
-					this.uloadingShow = false
-				}).catch(error => {
-
-				});
-			},
-			// 创建订单
-			create(order_no, PayPirce) {
-				uni.$u.http.post('/api/school/order/create', {
-					order_no: order_no,
-				}).then(res => {
-					if (res.code == 1) {
-						if (PayPirce != 0) {
-							this.pament()
-						} else {
-							this.uloadingShow = false
-							uni.showToast({
-								title: '创建成功',
-								icon: 'success',
-								duration: 2000,
-								complete: function() {
-									setTimeout(function() {
-										uni.redirectTo({
-											url: "/packageA/my/orderList?status=" + 3
-										})
-									}, 2000);
-								}
-							});
-						}
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-						that.uloadingShow = false
-
-						// _this.$api.toast(res.msg);
-					}
-				}).catch(error => {
-
-				});
-			},
-			// 支付
-			pament() {
-				let that = this
-				that.uloadingShow = false
-				uni.$u.http.post('/api/school/pay/payment', {
-					type: 'wechat',
-					order_no: that.order_no,
-					platform: 'miniapp'
-				}).then(res => {
-					if (res.code == 1) {
-						wx.requestPayment({
-							timeStamp: res.data.paydata.timeStamp, //时间戳
-							nonceStr: res.data.paydata.nonceStr, //随机字符串
-							package: res.data.paydata.package, //prepay_id
-							signType: res.data.paydata.signType, //签名算法MD5
-							paySign: res.data.paydata.paySign, //签名
-							success(res) {
-								if (res.errMsg == "requestPayment:ok") {
-									that.order_no = ''
-									uni.redirectTo({
-										url: "/packageA/my/orderList?status=" + 3
-									})
-									console.log('支付成功', res)
-								} else {
-									that.uloadingShow = false
-									console.log('支付失败')
-								}
-							},
-							fail(res) {
-								that.uloadingShow = false
-								console.log('支付失败', res)
-							}
-						})
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-						// _this.$api.toast(res.msg);
-					}
-				}).catch(error => {
-
-				});
-			},
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.w-100 {
-		width: 100%;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.flex-start {
-		align-items: flex-start;
-	}
-
-	.justify-center {
-		justify-content: center;
-	}
-
-	.align-items {
-		align-items: center;
-	}
-
-	.flex-column {
-		flex-flow: column;
-	}
-
-	.justify-start {
-		justify-content: start;
-	}
-
-	.white-space {
-		overflow: hidden;
-		/* 确保超出容器的文本被隐藏 */
-		white-space: nowrap;
-		/* 确保文本在一行内显示 */
-		text-overflow: ellipsis;
-		/* 使用省略号表示被截断的文本 */
-		width: 100%;
-	}
-
-	.con-center {
-		background: white;
-		border-radius: 20rpx;
-		position: absolute;
-		top: 540rpx;
-	}
-
-	.space-between {
-		justify-content: space-between;
-	}
-
-	.swiper {
-		width: 100%;
-		height: 580rpx;
-	}
-
-	.box {
-		position: relative;
-	}
-
-	.first-box {
-		width: 690rpx;
-		background: #FFFFFF;
-		padding-left: 24rpx;
-		margin-top: 40rpx;
-		border-radius: 20rpx;
-
-		.sigh {
-			width: 88rpx;
-			height: 40rpx;
-			background: #BEEE03;
-			border-radius: 4rpx 4rpx 4rpx 4rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #222222;
-		}
-		.first-name{
-			width: 586rpx;
-			height: 52rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: bold;
-			font-size: 34rpx;
-			color: #222222;
-			margin-left: 16rpx;
-		}
-
-
-		.first-mine {
-			height: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-
-		}
-
-		.first-txt {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-			line-height: 32rpx;
-			margin: 0 6rpx;
-		}
-
-		.first-image {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-
-			span {
-				width: 650rpx;
-				height: 40rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 26rpx;
-				color: #222222;
-			}
-		}
-	}
-
-	.second-box {
-		width: 690rpx;
-		height: 64rpx;
-		background: #222222;
-		border-radius: 16rpx 16rpx 16rpx 16rpx;
-		margin: 48rpx 0 16rpx 0;
-
-
-		.number {
-			height: 40rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #FFFFFF;
-			margin-left: 32rpx;
-		}
-
-		view {
-			span {
-				width: 24rpx;
-				height: 24rpx;
-				background: rgba(255, 255, 255, 0.4);
-				border-radius: 24rpx;
-				margin: 0 22rpx 0 4rpx;
-			}
-		}
-
-	}
-
-	.third {
-		width: 690rpx;
-
-		.third-box {
-			margin: 12rpx 0 0 24rpx;
-		}
-
-		.third-center {
-			margin-top: 28rpx;
-			width: 100%;
-			height: 242rpx;
-			overflow: hidden;
-			position: relative;
-		}
-
-		.scroll-container {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			animation: scroll 12s linear infinite;
-		}
-
-		@keyframes scroll {
-			0% {
-				transform: translateX(0);
-			}
-
-			100% {
-				transform: translateX(calc(-100% + 8 * 100px));
-				/* 8 * 100px 是假设每个项目的宽度为 100px */
-			}
-		}
-
-		.item {
-			display: flex;
-			width: 94%;
-			align-items: center;
-			justify-content: space-between;
-			padding: 22rpx 24rpx 24rpx 24rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #222222;
-			height: 32rpx;
-
-			/* 假设每条数据的高度为60rpx */
-		}
-
-		.item image {
-			margin-right: 10rpx;
-		}
-
-		.line-colum {
-			margin: 0 10rpx;
-			border-left: 1rpx solid #ccc;
-			height: 42rpx;
-		}
-
-		.item span {
-			margin-right: 10rpx;
-		}
-
-		@keyframes scroll {
-			0% {
-				transform: translateY(0);
-			}
-
-			100% {
-				transform: translateY(-240rpx);
-				/* 总高度为 4 * 60rpx = 240rpx */
-			}
-		}
-	}
-
-	.four {
-		margin-top: 48rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx 20rpx 20rpx 20rpx;
-		width: 690rpx;
-
-		// height: 338rpx;
-		.four-top {
-			width: 100%;
-			margin: 0 0 48rpx 0;
-
-			.left {
-				background-image: url("/static/center/footer.png");
-				background-repeat: no-repeat;
-				background-position: left bottom;
-
-				span {
-					width: 128rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #222222;
-				}
-
-			}
-		}
-
-		.four-box {
-			.four-header {
-
-				.four-name {
-					height: 48rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: bold;
-					font-size: 32rpx;
-					color: #000000;
-				}
-
-				.jigou {
-					height: 42rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 28rpx;
-					color: #000000;
-					margin-top: 8rpx;
-				}
-
-				.rate {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 26rpx;
-					color: #FFBC2C;
-					line-height: 26rpx;
-				}
-
-			}
-
-			.four-right {
-				width: 116rpx;
-				height: 48rpx;
-				background: #222222;
-				border-radius: 200rpx 200rpx 200rpx 200rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 26rpx;
-				color: #BEEE03;
-			}
-		}
-
-
-		.tt-detail {
-			width: 690rpx;
-			// padding: 0rpx 24rpx 18rpx 24rpx;
-			justify-content: flex-start;
-			align-items: left;
-			flex-flow: column;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 24rpx;
-			color: #7A7A7A;
-
-			span {
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 4;
-				/* 设置行数 */
-				overflow: hidden;
-				text-overflow: ellipsis;
-				line-height: 1.5em;
-				/* 根据需要调整行高 */
-				max-height: 6em;
-				/* 行高 * 行数 */
-			}
-		}
-
-	}
-
-	.five {
-		width: 690rpx;
-		height: 96rpx;
-		background: linear-gradient(90deg, #FDF850 0%, #85EE9C 100%);
-		border-radius: 200rpx 200rpx 200rpx 200rpx;
-		margin-top: 30rpx;
-
-		.five-name {
-			width: 128rpx;
-			height: 48rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #000000;
-			margin: 0 32rpx 0 24rpx;
-		}
-
-		.five-address {
-			width: 182rpx;
-			height: 40rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 26rpx;
-			color: #000000;
-		}
-	}
-
-	.six {
-		margin-top: 64rpx;
-		width: 750rpx;
-		// background: linear-gradient(to bottom, #F1F2F8 0%, #FFFFFF 1%, #FFFFFF 100%);
-		align-items: center;
-
-
-		.six-top {
-			width: 690rpx;
-
-			.left {
-				background-image: url("/static/center/footer.png");
-				background-repeat: no-repeat;
-				background-position: left bottom;
-
-				span {
-					width: 160rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: bold;
-					font-size: 40rpx;
-					color: #222222;
-					line-height: 47rpx;
-				}
-
-			}
-		}
-
-		.six-box {
-			width: 690rpx;
-			margin: 12rpx 0 0 24rpx;
-		}
-
-		.six-center {
-			width: 670rpx;
-			margin-top: 41rpx;
-
-
-
-
-			.s-footer {
-				padding: 24rpx;
-				width: 642rpx;
-
-				span {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 24rpx;
-					color: #7A7A7A;
-				}
-			}
-
-			.s-footer .h4 {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: bold;
-				font-size: 36rpx;
-				color: #656565;
-			}
-		}
-
-	}
-
-
-	.line {
-		width: 95%;
-		height: 1rpx;
-		background: #D9D9D9;
-		margin: 19rpx 0 19rpx 0;
-	}
-
-	.icon-size {
-		width: 28rpx;
-		height: 28rpx;
-		margin-right: 12rpx;
-	}
-
-
-	.footer {
-		width: 100%;
-		height: 166rpx;
-		background: #ffffff;
-		// box-shadow: 0rpx -2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
-		position: sticky;
-		z-index: 99;
-		/* 绝对定位 */
-		bottom: 0;
-		/* 定位在底部 */
-		left: 0;
-		/* 定位在左边 */
-
-		.footer-left {
-			position: absolute;
-			left: 30rpx;
-			display: flex;
-
-			view {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				flex-flow: column;
-				margin-right: 40rpx;
-				width: 48rpx;
-
-				span {
-					text-align: center;
-					width: 48rpx;
-					height: 34rpx;
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 22rpx;
-					color: #A4A4A4;
-				}
-			}
-
-			image {
-				width: 48rpx;
-				height: 48rpx;
-			}
-		}
-
-		.footer-right {
-			position: absolute;
-			right: 30rpx;
-			width: 440rpx;
-			height: 100rpx;
-			background: #222222;
-			border-radius: 200rpx;
-
-			span {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #BEEE03;
-			}
-		}
-	}
-
-
-	.popupBox {
-		width: 690rpx;
-		height: 716rpx;
-
-		.pop-header {
-			width: 100%;
-			background-image: url("/static/center/bg.png");
-			background-repeat: no-repeat;
-			background-position: left bottom;
-			height: 265rpx;
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				font-size: 20rpx;
-				color: #343434;
-			}
-
-			.name {
-				width: 594rpx;
-				height: 66rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: bold;
-				font-size: 44rpx;
-				color: #222222;
-				margin-top: 80rpx;
-			}
-
-			.price {
-				width: 594rpx;
-				height: 66rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: bold;
-				font-size: 44rpx;
-				color: #FF4810;
-				margin-top: 16rpx;
-
-				span {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 36rpx;
-					color: #FF2323;
-					line-height: 32rpx;
-				}
-			}
-		}
-
-		.popup {
-			display: flex;
-			align-items: self-start;
-			justify-content: center;
-			width: 594rpx;
-		}
-
-		.popup-footer {
-			position: absolute;
-			left: 48rpx;
-			bottom: 48rpx;
-
-			span {
-				width: 594rpx;
-				height: 100rpx;
-				background: #222222;
-				border-radius: 200rpx 200rpx 200rpx 200rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #BEEE03;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-
-
-		.line {
-			width: 642rpx;
-			height: 1rpx;
-			background: #D9D9D9;
-			box-shadow: 1rpx 1rpx 0rpx 0rpx rgba(102, 102, 102, 0.25);
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-
-		.times {
-			width: 93%;
-
-			.selectTime {
-				width: 288rpx;
-				height: 50rpx;
-				background: #FFFFFF;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				border: 1rpx solid #D9D9D9;
-				color: #4B4B4B;
-				font-family: 'PingFang SC', 'PingFang SC';
-				font-weight: 500;
-				font-size: 24rpx;
-				padding-left: 15rpx;
-				cursor: pointer;
-				margin: 24rpx 32rpx 0 0;
-				white-space: nowrap;
-				/* 防止文本换行 */
-				text-overflow: ellipsis;
-				/* 超出部分显示省略号 */
-				overflow: hidden;
-				/* 隐藏超出部分 */
-				text-align: left;
-				/* 文字靠左对齐 */
-				line-height: 50rpx;
-				/* 垂直居中对齐 */
-				box-sizing: border-box;
-				/* 确保 padding 和 border 不影响宽度和高度 */
-				display: inline-block;
-				/* 确保容器内文字正确对齐 */
-			}
-
-		}
-
-		.selectTime.selected {
-			width: 288rpx;
-			height: 50rpx;
-			border-radius: 12rpx 12rpx 12rpx 12rpx;
-			background: #008CFF;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 24rpx;
-			color: #FFFFFF;
-			cursor: pointer;
-			margin: 24rpx 32rpx 0 0;
-
-		}
-	}
-
-	.share {
-		position: fixed;
-		color: #FFFFFF;
-		right: 0;
-		bottom: 190rpx;
-		background: linear-gradient(to bottom right, #FE726B, #FE956B);
-		padding: 10rpx 10rpx 10rpx 20rpx;
-		border-top-left-radius: 50px;
-		border-bottom-left-radius: 50px;
-		box-shadow: 0 0 20upx rgba(0, 0, 0, .09);
-	}
-
-	.cancel {
-		width: 100vw;
-		padding: 30rpx;
-		text-align: center;
-		background: #FFFFFF;
-		color: red;
-		font-weight: bold;
-		font-size: 30rpx;
-	}
-
-	.md-content {
-		display: flex;
-		flex-direction: row;
-		justify-content: center;
-		align-items: center;
-		padding: 50rpx 0;
-		background-color: white;
-	}
-
-	.md-content-item {
-		margin: 0 70rpx;
-		position: relative;
-	}
-
-	.md-content-item image {
-		width: 100rpx;
-		height: 100rpx;
-	}
-
-	.md-content-item view {
-		margin-top: 15rpx;
-		font-size: 28rpx;
-	}
-
-	.sharebtn {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		opacity: 0;
-	}
-
-	.cu-modal {
-		position: fixed;
-		bottom: 166rpx;
-		left: 0;
-		z-index: 999999;
-	}
-
-	.gj {
-		.title {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 32rpx;
-			color: #4B4B4B;
-
-			span {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 24rpx;
-				color: #4B4B4B;
-			}
-		}
-
-		.scroll {
-			width: 642rpx;
-			max-height: 340rpx;
-
-			view {
-				margin: 24rpx;
-				width: 600rpx;
-				height: 56rpx;
-				background: #E8E8E8;
-				border-radius: 12rpx 12rpx 12rpx 12rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-
-				.title {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #7A7A7A;
-				}
-
-				.red {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #FF5F5F;
-				}
-
-				.lan {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 28rpx;
-					color: #008CFF;
-				}
-			}
-		}
-	}
-
-	::v-deep ::-webkit-scrollbar {
-		/*滚动条整体样式*/
-		width: 4px !important;
-		height: 1px !important;
-		overflow: auto !important;
-		background: #ccc !important;
-		-webkit-appearance: auto !important;
-		display: block;
-	}
-
-	::v-deep ::-webkit-scrollbar-thumb {
-		/*滚动条里面小方块*/
-		border-radius: 10px !important;
-		box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
-		background: #7b7979 !important;
-	}
-
-	::v-deep ::-webkit-scrollbar-track {
-		/*滚动条里面轨道*/
-		// box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
-		// border-radius: 10px !important;
-		background: #FFFFFF !important;
-	}
-
-	.Poster {
-		position: relative;
-		top: 21rpx;
-		left: 30rpx;
-		width: 690rpx;
-	}
-
-	.posterClose {
-		position: absolute;
-		right: 8rpx;
-		top: 8rpx;
-	}
-
-	.pos {
-		position: relative;
-	}
-
-	.btnList {
-		width: 690rpx;
-		position: absolute;
-		bottom: 150rpx;
-		left: 30rpx;
-		display: flex;
-		justify-content: space-evenly;
-
-		span {
-			width: 250rpx;
-			height: 80rpx;
-			background: #FFFFFF;
-			border-radius: 401rpx 401rpx 401rpx 401rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 34rpx;
-			color: #008CFF;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-		.save {}
-	}
-
-	.no-scroll {
-		overflow: hidden;
-		height: 100vh;
-	}
-
-	::v-deep ._root {
-		padding: 0 10rpx;
-	}
-
-	.no-border-button {
-		background-color: transparent;
-		/* 去掉背景色 */
-		border: none;
-		/* 去掉边框 */
-		padding: 0;
-		/* 去掉内边距 */
-		margin: 0;
-		/* 去掉外边距 */
-		display: inline-flex;
-		/* 使按钮内容居中 */
-		align-items: center;
-		/* 垂直居中 */
-		justify-content: center;
-		/* 水平居中 */
-		flex-flow: column;
-		height: 80rpx;
-		line-height: inherit;
-
-		span {
-			width: 250rpx;
-			height: 80rpx;
-			background: #FFFFFF;
-			border-radius: 401rpx 401rpx 401rpx 401rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			font-size: 34rpx;
-			color: #008CFF;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/center/detail.vue b/pages/center/detail.vue
index 0dfe059..787a94c 100644
--- a/pages/center/detail.vue
+++ b/pages/center/detail.vue
@@ -7,7 +7,7 @@
 		<view class="box flex justify-start flex-column align-items" :class="overlay ? 'no-scroll' : ''">
 		<view class="swiper">
 			<u-swiper :list="detail.images" indicator indicatorActiveColor="#323232" indicatorMode="dot" :indicator-style="{ bottom: '60rpx',zIndex: 999}"
-			 height="580rpx" circular></u-swiper>
+			 :height="height_sw" circular></u-swiper>
 		</view>
 		
 		<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
@@ -56,11 +56,11 @@
 				<view class="second-box flex align-items space-between">
 					<view class="flex align-items">
 						<u-avatar-group :urls="detail.join_info.users" 
-							keyName="avatar" size="24" gap="0.3" :maxCount="3"></u-avatar-group>
+							keyName="avatar" size="30" gap="0.3" :maxCount="3"></u-avatar-group>
 							<image
 								src="/static/index/dian.png"
 								:class="detail.join_info.users.length > 0 ? '' :'smalld'"
-								style="width: 60rpx;height: 60rpx;z-index: 1;"
+								style="width: 60rpx;height: 60rpx;margin-left:-20rpx;z-index: 1;"
 							></image>
 					</view>
 					<span class="number">{{detail.join_info.people_number}}/{{detail.join_info.stock >= 10000 ? '9999+' : detail.join_info.stock}}
@@ -119,7 +119,7 @@
 				</view>
 				<view class="footer-right flex justify-center align-items">
 					<span v-if="type == 0 && detail.feel == 0" @click="sign()"> 支付并参加 </span>
-					<span v-if="type == 0 && detail.feel == 1" @click="signs()"> 免费参加 </span>
+					<span v-if="type == 0 && detail.feel == 1" @click="sign()"> 免费参加 </span>
 					<!-- <span v-if="type == 1 && detail.feel == 0" @click="buy()"> 立即支付 </span>
 					<span v-if="type == 1 && detail.feel == 1" @click="buy()"> 确认报名 </span>
 					<span v-if="type == 2" @click="open()"> 我要预约 </span>
@@ -298,6 +298,7 @@
 
 		data() {
 			return {
+				height_sw:'580rpx',
 				style: {
 					// 字符串的形式
 					img: 'width: 100%'
@@ -549,13 +550,6 @@
 					url: '/pages/center/applyDetail?id=' + this.id
 				})
 
-			},
-			//免费报名
-			signs() {
-				uni.navigateTo({
-					url: '/pages/center/applyDetail?id=' + this.id+"&type=1"
-				})
-
 			},
 
 			buy() {
@@ -1608,10 +1602,10 @@
 		.wx-slider-handle{
 			background: url('@/static/detail/qiu.png') !important;
 			border-radius: 0;
-			background-size: 28rpx 28rpx !important;
+			background-size: 30rpx 30rpx !important;
 			width: 28rpx;
 			height: 28rpx;
-			top: 18rpx;
+			top: 14rpx;
 			margin-left: -14rpx !important;
 		}
 		.wx-slider-value{
diff --git a/pages/center/index.vue b/pages/center/index.vue
index c447281..3375b0a 100644
--- a/pages/center/index.vue
+++ b/pages/center/index.vue
@@ -9,7 +9,7 @@
 			></image>
 		</view>
 
-		<view class="box flex flex-column align-items" @click="tofb">
+		<view class="box flex flex-column align-items">
 			<view class="first flex flex-column align-items justify-start">
 				<view class="row flex align-items" style="margin-top: 25rpx;">
 					<span >
@@ -27,7 +27,7 @@
 				<span class="line-row" style="margin-top: 0;"></span> 
 
 				<!-- 图片 -->
-				<view class="row flex flex-column" style="margin-top: 42rpx;">
+				<view class="shenfen row flex flex-column" style="margin-top: 42rpx;">
 					<u-upload :fileList="fileList1" @afterRead="afterRead" :previewFullImage="true" @delete="deletePic"
 						@oversize="oversize" name="1" multiple :maxSize="1*1024*1024" :maxCount="5">
 						<view class="pic_view">
@@ -94,9 +94,9 @@
 					<span class="label flex align-items ">
 						<span style="color: #3D3D3D;">*</span>退款政策
 					</span>
-					<!-- @click="tuikuan = true" -->
-					<span class="row-right" >
-						<input type="text" placeholder="请选择退款政策" class="input" disabled="true" v-model="form.refund_id"
+					<!--  -->
+					<span class="row-right" @click="tuikuan = true">
+						<input type="text" placeholder="请选择退款政策" class="input" disabled="true" v-model="form.refund_idn"
 							placeholder-class="plasty_c" />
 							<u-icon name="arrow-right" color="#323232"></u-icon>
 					</span>
@@ -160,13 +160,18 @@
 			<view class="popup_tkall">
 				<view class="popup_tk"> 选择退款政策</view>
 				<view class="closetk" @click="closetuikuan">取消</view>
-				<view class="confirmtk">确认</view>
-				<view class="popup-content">
-					<view class="popup-content-item" v-for="(item,index) in refund_list" :key="index" @click="selectItem(index,item)">
-						<span class="popup-content-item-title">{{ item.title }}</span>
-						<span v-html="item.desc" class="popup-content-item-content"></span>
+				<view class="confirmtk"@click="closetuikuan">确认</view>
+				<scroll-view  scroll-y="true" class="popup-content">
+					<view class="popup-content-item flex align-items" :class="[{ active: currents === index }]" v-for="(item,index) in refund_list" :key="index" @click="selectItem(index,item)">
+						<view style="width: 540rpx;"> 
+							<span class="popup-content-item-title">{{ item.title }}</span>
+							<span v-html="item.desc" class="popup-content-item-content" style="margin-top: 20rpx;"></span>
+						</view>
+						<image v-if="currents === index" src="@/static/fabu/check.png" mode="widthFix" style="width: 44rpx;height: 44rpx;" />
+						<image v-else src="@/static/fabu/nocheck.png" mode="widthFix" style="width: 44rpx;height: 44rpx;" />
 					</view>
-				</view>
+				
+				</scroll-view>
 			</view>
 		</u-popup>
 
@@ -261,8 +266,8 @@
 				birthShow1: false, // 报名日期弹窗
 				value: false,
 				scrollTop: 0,
-				minDate: dayjs(new Date()).unix()*1000,
-				minDate1: dayjs(new Date()).unix()*1000,
+				minDate: dayjs().add(2, 'hour').valueOf(),
+				minDate1: dayjs().add(4, 'hour').valueOf(),
 				old: {
 					scrollTop: 0
 				},
@@ -282,7 +287,8 @@
 					// 活动分类名字
 					cate_idsName:"",
 					content: '',
-					refund_id:'随时退',
+					refund_id:'',
+					refund_idn:'',
 					price:1,
 					stock:'',
 					sign_time:'',
@@ -321,7 +327,7 @@
 					flexColumn: 'column'
 				},
 				current:0,
-
+				currents:0,
 				institutionList: [],
 				images: '',
 				fileList1: [], // 用于存储第一个上传组件的文件列表
@@ -335,7 +341,7 @@
 			};
 		},
 		onLoad() {
-			this.tofb();
+			// this.tofb();
 			// this.searchStatus()
 			this.getAgreement()
 			this.getBqList();
@@ -349,7 +355,8 @@
 				// 活动分类名字
 				cate_idsName:"",
 				content: '',
-				refund_id:'随时退',
+				refund_id:'',
+				refund_idn:'',
 				price:1,
 				stock:'',
 				sign_time:'',
@@ -377,26 +384,32 @@
 			}
 		},
 		methods: {
-			//登录及发布
-			tofb() {	
-				const token = uni.getStorageSync('token')
-				if (token) {
-					return true;
-				} else {
-					uni.showToast({
-						title: '请登录',
-						icon: 'none',
-						duration: 2000,
-						complete: function() {
-							setTimeout(function() {
-								uni.switchTab({
-									url: '/pages/my/index',
-								});
-							}, 2000);
-						}
-					});
-				}
+			//选择政策
+			selectItem(index,item) {
+				this.currents = index;
+				this.form.refund_id = item.id;
+				this.form.refund_idn = item.title;
 			},
+			//登录及发布
+			// tofb() {	
+			// 	const token = uni.getStorageSync('token')
+			// 	if (token) {
+			// 		return true;
+			// 	} else {
+			// 		uni.showToast({
+			// 			title: '请登录',
+			// 			icon: 'none',
+			// 			duration: 2000,
+			// 			complete: function() {
+			// 				setTimeout(function() {
+			// 					uni.switchTab({
+			// 						url: '/pages/my/index',
+			// 					});
+			// 				}, 2000);
+			// 			}
+			// 		});
+			// 	}
+			// },
 			// 获取本地最近使用
 			getitembq(){
 				if (uni.getStorageSync("zjlist") != "") {
@@ -587,7 +600,9 @@
 				this.show = true
 			},
 			opentuikuan(){
-				this.tuikuan = true
+				this.tuikuan = true;
+				this.form.refund_id = 1;
+				this.form.refund_idn = '随时退';
 			},
 			change() {
 				this.agree = true
@@ -960,9 +975,9 @@
 		
 	// }
 	.title_logo{
-		width: 100%;
-		margin-top: 100rpx;
-		margin-left: 40rpx;
+		width: 690rpx;
+		margin-top: 110rpx;
+		display: flex;
 	}
 	.backImg {
 		// background: linear-gradient(to bottom, #F1F2F8 0%, #F1F2F8 50%, #FFFFFF 100%);
@@ -1136,17 +1151,10 @@
 		}
 	}
 
-	
-	
-
-	.ji ::v-deep .u-upload .u-upload__wrap__preview__image {
-		width: 690rpx !important;
-		height: 450rpx !important;
-	}
 
 	.shenfen ::v-deep .u-upload .u-upload__wrap__preview__image {
-		width: 690rpx !important;
-		height: 450rpx !important;
+		width: 196rpx !important;
+		height: 196rpx !important;
 	}
 
 	.bottom {
@@ -1338,18 +1346,38 @@
 		}
 		.popup-content{
 			height: 900rpx;
-			overflow-y: auto;
+			// overflow-y: auto;
 		}
 		.popup-content-item{
 			width: 690rpx;
 			padding: 30rpx;
 			box-sizing: border-box;
 			background: #F7F7F7;
-			border-radius: 18rpx 18rpx 18rpx 18rpx;
-			border: 2rpx solid #EAEAEA;
+			border-radius: 18rpx;
+			border: 5rpx solid #EAEAEA;
 			margin-bottom: 30rpx;
-			:active{
+			font-family: PingFang SC, PingFang SC;
+			justify-content: space-between;
+			color: #3D3D3D;
+			&.active{
+				background: #FAFFF3;
+				border: 5rpx solid;
 				border-image: linear-gradient(270deg, rgba(251, 246, 109, 1), rgba(156, 234, 162, 1)) 2 2;
+				border-radius: 18rpx;
+				clip-path: inset(0px round 16rpx);
+			}
+			.popup-content-item-title{
+				font-weight: bold;
+				font-size: 36rpx;
+			}
+			.popup-content-item-content{
+				font-weight: 400;
+				font-size: 26rpx;
+				line-height: 45rpx;
+				::v-deep rich-text{
+					margin-top: 20rpx;
+					display: flex;
+				}
 			}
 		}
 
diff --git a/pages/center/index1.vue b/pages/center/index1.vue
deleted file mode 100644
index f8f57ee..0000000
--- a/pages/center/index1.vue
+++ /dev/null
@@ -1,905 +0,0 @@
-<template>
-	<view class="center-box">
-		<view class="box flex justify-center align-items flex-column">
-			<view class="search flex  align-items" style="width: 99%;">
-				<u-navbar :title="navbarTitle" :border="false" :placeholder="true" :autoBack="false" :is-back="false" :leftIcon="none">
-					<view class="" slot="center">
-						<u-search class="u-search" v-model="keywords" placeholder="请输入搜索内容" :showAction="false"
-							 @change="search()"></u-search>
-					</view>
-				</u-navbar>
-			</view>
-			
-			
-
-			<!-- 推荐课程 -->
-			<view class="hot flex flex-column" :style="{ marginTop: capsuleHeight()}">
-				<view class="hot-top flex align-items ">
-					<image src="/static/index/Subtract.png" mode=""
-						style="width: 16rpx; height: 22rpx;margin: 0 8rpx 0 32rpx;"></image>
-					<span>优质课程陪您成长~</span>
-				</view>
-				<view class="content flex align-items" style="background: none;overflow-y: hidden;">
-					<view class=" ovr flex  align-items" style="align-items: self-start;" v-for="(item,index) in Tjlist"
-						:key="index">
-						<view class="hot-center justify-start flex  flex-column" style="align-items: flex-start;"
-							@click="detail(item.id)">
-							<image :src="item.headimage" mode=""
-								style="width: 308rpx; height: 168rpx;border-radius: 20rpx;"></image>
-							<span class="jita white-space">{{item.title}}</span>
-							<span class="price" v-if="item.feel == 0">￥{{item.price}}</span>
-							<span class="price" v-if="item.feel == 1">公益</span>
-							<view class="mingePos flex justify-center align-items">
-								<image src="/static/index/fire.png" mode=""
-									style="width: 22rpx;height: 24rpx;margin: 0 8rpx 0 12rpx;">
-								</image>
-								<span class="minge">{{ Number(item.sign_num + item.virtual_num)}} /
-									{{item.limit_num}}</span>
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- <view class="" v-else>
-					<u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png">
-					</u-empty>
-				</view> -->
-			</view>
-
-			<!-- 标签 -->
-			<view class="tabs">
-				<view v-for="(tab, index) in list" :key="index" :class="['tab-item', { active: current === index }]"
-					@click="handleClick(index)">
-					{{ tab.name }}
-				</view>
-			</view>
-			<!-- 课程 -->
-			<view class="totalClass flex flex-column">
-				<!-- <view class="total-top flex align-items space-between">
-					<image src="../../static/center/TotalClass.png" mode="" style="width: 168rpx;height: 48rpx;">
-					</image>
-				</view> -->
-				<!-- <view v-if="LoadingShow" class="flex justify-center align-items" style="height: 300rpx;">
-					加载中...
-				</view> -->
-				<view class="totalBox flex align-items flex-column">
-					<view class="flex align-items flex-column w-100 bbb" v-for="(item,index) in hotList" :key="index"
-						@click="detail(item.id)">
-						<view class="top flex align-items" style="justify-content: space-around;margin-top: 24rpx;">
-							<view class="left">
-								<image :src="item.headimage" mode=""
-									style="width: 240rpx; height: 196rpx;border-radius: 12rpx 12rpx 12rpx 12rpx;">
-								</image>
-							</view>
-							<view class="right flex flex-column " style="align-items: self-start;">
-								<span class="title white-space">{{item.title}}</span>
-								<view class=" row flex flex align-items">
-									<span
-										v-for="(items,index1) in item.classes_type_name"
-										class="remen flex justify-center align-items">{{items}}</span>
-									<span
-										style="background: #FFF1ED;color: #FF4810;margin-left:8rpx; max-width: 170rpx;"
-										class="remen flex justify-center align-items">
-										<span class="white-space">{{item.shop.name}}</span>
-									</span>
-								</view>
-								<view class="flex flex-column pos">
-									<view class=" time flex align-items white-space">
-										<image src="../../static/index/clock.png" mode=""
-											style="width: 24rpx;height: 24rpx;"></image>
-										<span class="white-space" style="margin-left: 8rpx;">{{item.start_time_text}}
-										</span>
-									</view>
-									<view class="address flex align-items white-space">
-										<image src="../../static/index/address.png" mode=""
-											style="width: 24rpx;height: 24rpx;"></image>
-										<span class="white-space"
-											style="margin-left: 8rpx; width: 220rpx;">{{item.address_detail}}</span>
-									</view>
-									<span class=" ab flex align-items" v-if="item.feel == 0" style="">
-										<span class="m">￥</span>
-										<span class="money">{{item.price}}</span>
-									</span>
-									<span class="ab no flex align-items" v-if="item.feel == 1">公益</span>
-								</view>
-							</view>
-						</view>
-						<span style="width: 626rpx;height: 2rpx;background: #EEEEEE;margin: 32rpx 0 0 0;"></span>
-						<view class="bottom flex align-items">
-							<view class="flex align-items">
-								<span class="flex align-items" style="width: 200rpx;">
-									<u-avatar-group :urls="item.unpaid_user_data"
-										:extraValue="item.unpaid_user_data.length - 5" keyName="head_image" size="24"
-										gap="0.4"></u-avatar-group>
-								</span>
-								<view class="number flex align-items">
-									{{'已报名: ' +  Number(item.sign_num + item.virtual_num)}}/{{item.limit_num}}
-								</view>
-							</view>
-							<span class="part flex justify-center align-items">
-								报名参加
-							</span>
-						</view>
-					</view>
-				</view>
-				<!-- <view class="" v-else>
-					<u-empty mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png">
-					</u-empty>
-				</view> -->
-				<view class="more flex flex-column align-items">
-					<span class="line-lone"></span>
-					<span class="line-erect"></span>
-				</view>
-			</view>
-
-			<view class="footer flex">
-				<u-loadmore :status="loadStatus" />
-			</view>
-		</view>
-		<tab-bar :tabBarShow="1"></tab-bar>
-	</view>
-</template>
-
-<script>
-	// import FilterMenu from "./myFilterMenu/index.vue"
-	// import {menuOption} from "@/common/menuOptions.js"
-	// import {
-	// 	updateStaticData
-	// } from '@/common/data.js';
-	export default {
-		// components: {
-		// 			FilterMenu
-		// 		},
-		data() {
-			return {
-				value1: 1,
-				options1: [{
-						label: '默认排序',
-						value: 1,
-					},
-					{
-						label: '距离优先',
-						value: 2,
-					},
-					{
-						label: '价格优先',
-						value: 3,
-					}
-				],
-				selectedLabel: '选项1',
-				selectedValue: 1,
-				searchValue: '',
-				value: 0,
-				range: [{
-						value: 0,
-						text: "篮球"
-					},
-					{
-						value: 1,
-						text: "足球"
-					},
-					{
-						value: 2,
-						text: "游泳"
-					},
-				],
-
-
-
-				list: [{
-						name: '全部课程'
-					},
-					{
-						name: '文化艺术'
-					},
-					{
-						name: '职业发展'
-					},
-					{
-						name: '社会融入'
-					},
-					{
-						name: '形势政策'
-					},
-				],
-				current: 0,
-				menuOption: {},
-				unread_number: '',
-				listQuery: {
-					priceStart: '',
-					priceEnd: ''
-				},
-				LoadingShow: true,
-				page: 1,
-				limit: 10,
-				tjShow: true,
-				keywords: '',
-				hotList: [],
-				Tjlist: [],
-				staticData: [],
-				loadStatus: 'loading',
-				district: '', //县区
-				classes_label_ids: '', //热门
-				classes_cate_ids: '', //标签
-				classes_type: '14,15,16,17', //类型
-				last_page: 0
-
-			}
-		},
-
-		onLoad() {
-			uni.hideTabBar()
-		},
-		onShow() {
-			this.resetLists()
-			// this.fetchAndUpdateStaticData()
-			this.getTjlList()
-			this.getTotalList()
-		},
-		onReachBottom() {
-			if (this.page < this.last_page) {
-				this.page++;
-				this.getTotalList();
-			}
-
-		},
-
-		methods: {
-			handleDropdownChange(value) {
-				const selectedItem = this.menuList.find(item => item.value === value);
-				if (selectedItem) {
-					this.selectedLabel = selectedItem.label;
-					this.selectedValue = selectedItem.value;
-				}
-			},
-			// 获取胶囊高度
-			capsuleHeight() {
-				console.log(uni.getMenuButtonBoundingClientRect())
-				if (uni?.getMenuButtonBoundingClientRect()) {
-					return `${uni.getMenuButtonBoundingClientRect().height + uni.getMenuButtonBoundingClientRect().top + 26}rpx`;
-				} else {
-					return `180rpx`;
-				}
-			},
-			handleClick(index) {
-				this.current = index;
-				if (index == 0) {
-					this.classes_type = "14,15,16,17"
-				} else if (index == 1) {
-					this.classes_type = '15'
-				} else if (index == 2) {
-					this.classes_type = '16'
-				} else if (index == 3) {
-					this.classes_type = '17'
-				} else if (index == 3) {
-					this.classes_type = '14'
-				}
-				this.hotList = []
-				this.getTotalList()
-			},
-			handleSearch(value) {
-				this.keywords = value
-				this.search()
-			},
-
-			// 重置列表
-			resetLists() {
-				this.page = 1;
-				this.hotList = []
-				this.loadStatus = 'loading'
-			},
-			// 搜索
-			search() {
-				if (this.keywords == '') {
-					this.tjShow = true
-				} else {
-					this.tjShow = false
-				}
-				this.resetLists()
-				this.getTotalList()
-			},
-			// 获取报名详情
-			getPeople(id) {
-				return uni.$u.http.get('/api/school/classes/people', {
-					params: {
-						id: id,
-						have_real: 1
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						return res.data.unpaid_user_data;
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-						throw new Error(res.msg); // 抛出错误以便 catch 捕获
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-					throw error; // 抛出错误以便 catch 捕获
-				});
-			},
-			// 全部课程
-			getTotalList() {
-				uni.$u.http.get('/api/school/classes/classes_list', {
-					params: {
-						page: this.page,
-						limit: this.limit,
-						order: 'normal',
-						has_shop: 1,
-						is_expire: 2,
-						keywords: this.keywords,
-						district: this.district, //县区
-						// classes_label_ids: this.classes_label_ids, //热门
-						// classes_cate_ids: this.classes_cate_ids, //标签
-						classes_type: this.classes_type //类型
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						// setTimeout(() => {
-						// 	this.LoadingShow = false; // 数据加载完成，关闭loading
-						// }, 100); // 模拟2秒的加载时间
-						this.last_page = res.data.list.last_page
-						const dataLiat = [...this.hotList, ...res.data.list.data]
-
-						const promises = dataLiat.map(item => {
-							return this.getPeople(item.id).then(peopleData => {
-								item.unpaid_user_data = peopleData;
-							}).catch(error => {
-								console.error(`Failed to get people data for id ${item.id}:`,
-									error);
-							});
-						});
-						// 等待所有异步操作完成
-						Promise.all(promises).then(() => {
-							this.hotList = dataLiat;
-						}).catch(error => {
-							console.error('Error in fetching people data:', error);
-						});
-						this.loadStatus = this.hotList.length >= res.data.list.total ? 'nomore' :
-							'loading';
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-						this.loadStatus = 'nomore';
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-					this.loadStatus = 'nomore';
-				});
-			},
-			// 获取推荐课程
-			getTjlList() {
-				uni.$u.http.get('/api/school/classes/classes_list', {
-					params: {
-						page: 1,
-						limit: 10,
-						order: 'recommend',
-						is_expire: 2
-					}
-				}).then(res => {
-					if (res.code == 1) {
-						this.Tjlist = res.data.list.data
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {
-					uni.showToast({
-						title: '请求失败，请稍后再试',
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-			resethandle(index) {
-				this.listQuery = {}
-			},
-
-			jump() {
-				uni.navigateTo({
-					url: '/pages/center/list',
-					success: res => {},
-					fail: () => {},
-					complete: () => {}
-				});
-			},
-			detail(id) {
-				uni.navigateTo({
-					url: "/pages/center/detail?id=" + id
-				})
-			},
-			onClickMenuIndex(props) {
-				console.log('onClickMenuIndex', props)
-			},
-			//关闭
-			onClose(e) {
-				console.log('onClose', e)
-			},
-			onOpen() {
-				console.log('onOpen')
-			},
-			//确认搜索
-			onSearch(e) {
-				console.log('onSearch', e)
-			},
-			handleConfirm(data) {
-				console.log('确认选择的数据:', data);
-				this.classes_cate_ids = data.classes_cate_ids.join(',')
-				this.classes_label_ids = data.classes_label_ids.join(',')
-				this.district = data.district.join(',')
-				this.classes_type = data.classes_type.join(',')
-				this.resetLists()
-				this.getTotalList()
-				// 进一步处理 selectedData
-				// 例如，发送到服务器或更新本地状态
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.center-box {
-		width: 750rpx;
-		min-height: 100vh;
-		background: #F2F2F2;
-	}
-
-	.box {
-		width: 690rpx;
-		padding: 0 30rpx 0rpx 30rpx;
-		border-radius: 0px 0px 0px 0px;
-
-	}
-
-	.white-space {
-		overflow: hidden;
-		/* 确保超出容器的文本被隐藏 */
-		white-space: nowrap;
-		/* 确保文本在一行内显示 */
-		text-overflow: ellipsis;
-		/* 使用省略号表示被截断的文本 */
-		width: 100%;
-	}
-
-	.search {
-		margin-top: 27rpx;
-		width: 690rpx;
-		height: 64rpx;
-		background: #FFFFFF;
-		// box-shadow: 2rpx 2rpx 0rpx 0rpx rgba(0, 0, 0, 0.4);
-		// border-radius: 8rpx 8rpx 8rpx 8rpx;
-		// border: 2rpx solid #008CFF;
-
-		.dashed {
-			image {
-				width: 52rpx;
-				height: 52rpx;
-			}
-		}
-
-		.line-search {
-			width: 2rpx;
-			height: 42rpx;
-			background: #008CFF;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-
-		.input {
-			// border: 4rpx solid #EAEAEA;
-			padding-left: 12rpx;
-			height: 100%;
-			width: 78%;
-		}
-
-		::v-deep .input-placeholder {
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #C0C0C0;
-			line-height: 32rpx;
-			text-align: left;
-			font-style: normal;
-			text-transform: none;
-
-		}
-
-		.searchBtn {
-			width: 128rpx;
-			height: 64rpx;
-			background: #008CFF;
-			border-radius: 5rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 32rpx;
-			color: #FFFFFF;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-
-	}
-
-	.w-100 {
-		width: 100%;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.justify-center {
-		justify-content: center;
-	}
-
-	.align-items {
-		align-items: center;
-	}
-
-	.flex-column {
-		flex-flow: column;
-	}
-
-	.justify-start {
-		justify-content: start;
-	}
-
-	.hot {
-		width: 100%;
-	}
-
-	.totalClass {
-		width: 100%;
-
-		.total-top {
-			padding-bottom: 12rpx;
-			border-bottom: 2rpx solid #008CFF;
-		}
-
-	}
-
-	.totalBox {
-		// height: 462rpx;
-		// overflow-x: auto;
-		/* 允许横向滚动 */
-		// white-space: nowrap;
-
-
-		width: 690rpx;
-
-		.bbb {
-			background: #FFFFFF;
-			margin-top: 24rpx;
-			border-radius: 20rpx;
-		}
-
-		.right {
-			margin-left: 24rpx;
-			width: 338rpx;
-
-			.title {
-				width: 338rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 34rpx;
-				color: #343434;
-			}
-
-			.row {
-				margin: 10rpx 0 26rpx 0;
-
-				.remen {
-					// width: 136rpx;
-					height: 40rpx;
-					background: #EBFAF5;
-					border-radius: 4rpx 4rpx 4rpx 4rpx;
-
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 24rpx;
-					color: #14BC84;
-					line-height: 28rpx;
-					padding: 2rpx 8rpx;
-				}
-
-				.line-colum {
-					width: 1rpx;
-					height: 32rpx;
-					background: #7A7A7A;
-					margin: 0 13rpx;
-				}
-
-				.name {
-					width: 110rpx;
-					height: 32rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 500;
-					font-size: 26rpx;
-					color: #7A7A7A;
-					line-height: 32rpx;
-					margin-left: 12rpx;
-				}
-			}
-
-			.line-row {
-				width: 338rpx;
-				height: 1rpx;
-				background: #E4E4E4;
-			}
-
-			.jigou {
-				width: 312rpx;
-				// height: 32rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #7A7A7A;
-				margin: 4rpx 0 14rpx 0;
-			}
-
-			.time {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 26rpx;
-				color: #A4A4A4;
-				line-height: 30rpx;
-			}
-
-			.address {
-
-				width: 350rpx;
-				height: 40rpx;
-				margin-top: 8rpx;
-
-				span {
-					font-family: Source Han Sans CN, Source Han Sans CN;
-					font-weight: 400;
-					font-size: 26rpx;
-					color: #A4A4A4;
-					line-height: 30rpx;
-				}
-			}
-		}
-
-		.bottom {
-			margin: 32rpx 0 32rpx 0;
-			width: 626rpx;
-
-			.number {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 500;
-				font-size: 26rpx;
-				color: #222222;
-				line-height: 30rpx;
-				width: 242rpx;
-				margin-left: 42rpx;
-			}
-
-			.text {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 26rpx;
-				color: #7A7A7A;
-			}
-
-			.money {
-				width: 150rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 800;
-				font-size: 36rpx;
-				color: #FF2323;
-				justify-content: flex-end;
-			}
-
-		}
-
-
-		.ovr {
-			width: 312rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			margin-top: 18rpx;
-			margin-right: 24rpx;
-		}
-	}
-
-	.more {
-		margin-top: 62rpx;
-
-		.line-lone {
-			width: 260rpx;
-			height: 1rpx;
-			background: #008CFF;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-
-		.line-erect {
-			margin-top: 16rpx;
-			width: 80rpx;
-			height: 1rpx;
-			background: #008CFF;
-			border-radius: 0rpx 0rpx 0rpx 0rpx;
-		}
-	}
-
-	.hot {
-
-		.hot-top {
-			width: 278rpx;
-			height: 44rpx;
-			background: linear-gradient(90deg, #FDF850 0%, #85EE9C 100%);
-			border-radius: 200rpx 200rpx 200rpx 200rpx;
-
-			span {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #000000;
-			}
-		}
-
-		.ovr {
-			width: 308rpx;
-			height: 304rpx;
-			background: #FFFFFF;
-			border-radius: 16rpx 16rpx 16rpx 16rpx;
-			margin-right: 30rpx;
-		}
-
-		.content {
-			margin-top: 30rpx;
-		}
-
-		.jita {
-			width: 244rpx;
-			height: 44rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 30rpx;
-			color: #000000;
-			margin: 24rpx 32rpx 8rpx 32rpx;
-		}
-
-		.price {
-			width: 212rpx;
-			height: 36rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: 400;
-			font-size: 24rpx;
-			color: #FF4810;
-			margin-left: 32rpx;
-		}
-
-		.hot-center {
-			position: relative;
-		}
-
-		.mingePos {
-			min-width: 118rpx;
-			height: 40rpx;
-			background: rgba(0, 0, 0, 0.7);
-			border-radius: 8rpx 8rpx 8rpx 8rpx;
-			position: absolute;
-			top: 40%;
-			right: 3%;
-			display: flex;
-			align-items: center;
-
-			span {
-				font-family: Source Han Sans CN, Source Han Sans CN;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #FFFFFF;
-			}
-		}
-
-	}
-
-
-	.footer {
-		margin: 120rpx 0 40rpx 0;
-		font-weight: 500;
-		font-size: 24rpx;
-		color: #BCBCBC;
-		line-height: 32rpx;
-	}
-
-	.u-search {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
-
-	.tabs {
-		display: flex;
-		overflow-x: auto;
-		margin-top: 64rpx;
-		-webkit-overflow-scrolling: touch;
-		/* 优化滚动效果 */
-	}
-
-	.tab-item {
-		flex: 0 0 auto;
-		text-align: center;
-		margin-right: 40rpx;
-		position: relative;
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: 400;
-		font-size: 30rpx;
-		color: #222222;
-	}
-
-	.tab-item.active {
-		background-image: url("/static/center/footer.png");
-		background-repeat: no-repeat;
-		background-position: bottom;
-
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #222222;
-	}
-
-	.pos {
-		position: relative;
-
-		.ab {
-			position: absolute;
-			right: 0%;
-			bottom: 0%;
-		}
-
-		.m {
-			width: 28rpx;
-			height: 42rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: bold;
-			font-size: 28rpx;
-			color: #FF4810;
-		}
-
-		.money {
-			width: 68rpx;
-			font-family: D-DIN-PRO, D-DIN-PRO;
-			font-weight: bold;
-			font-size: 36rpx;
-			color: #FF4810;
-		}
-
-		.no {
-			width: 64rpx;
-			height: 48rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN;
-			font-weight: bold;
-			font-size: 32rpx;
-			color: #FF4810;
-			line-height: 38rpx;
-		}
-	}
-
-	.part {
-		width: 176rpx;
-		height: 64rpx;
-		background: #BEEE03;
-		border-radius: 200rpx;
-		font-family: Source Han Sans CN, Source Han Sans CN;
-		font-weight: bold;
-		font-size: 28rpx;
-		color: #222222;
-		line-height: 33rpx;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 225819b..4c65456 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -93,7 +93,7 @@
                   <view class="time flex align-items white-space">
                     <span class="time_tex" v-if="item.status == 2">{{ '报名中' }}</span>
                     <!-- <span class="time_tex time_texs" v-if="item.status == 4">{{ '进行中' }}</span> -->
-                    <span style="margin:0 20rpx;">{{ dateWeeks(item.start_time) }}</span>|
+                    <span style="margin:0 20rpx;">{{ dateWeeks(item.start_time) }}</span><span style="width: 1rpx;height: 22rpx;background: #323232;"></span>
                     <span class="white-space" style="margin-left: 20rpx;width: 260rpx;">{{ item.address_detail }}</span>
                   </view>
 
@@ -358,6 +358,10 @@ export default {
         .then((res) => {
           if (res.code == 1) {
 						this.bqList = res.data.list;
+            //初始化默认标签
+            if (this.list.length < 3) {
+              this.list = [...this.list, ...res.data.list.slice(0,3)];
+            }
           } else {
             uni.showToast({
               title: res.msg,
@@ -616,15 +620,7 @@ export default {
       margin-top: 10rpx;
       margin-bottom: 30rpx;
       position: relative;
-       .u-search{
-        background: rgba($color: #FFFFFF, $alpha: 0.6);
-        ::v-deep .u-search__content{
-          background: rgba($color: #FFFFFF, $alpha: 0.6);
-        }
-        ::v-deep .u-search__content__input{
-          background: rgba($color: #FFFFFF, $alpha: 0.6);
-        }
-      }
+
       .searchBtn{
         position:absolute;
         width: 133rpx;
@@ -740,7 +736,6 @@ export default {
         font-weight: 400;
         font-size: 26rpx;
         color: #323232 ;
-        line-height: 30rpx;
         
           .time_tex{
             width: 116rpx;
@@ -753,6 +748,7 @@ export default {
             display: flex;
             justify-content: center;
             align-items: center;
+            line-height: 30rpx;
           }
           .time_texs{
             background: #FF4810;
@@ -991,3 +987,20 @@ export default {
 
 	}
 </style>
+<style lang="scss">
+.serch_top {
+      .u-search{
+        
+        ::v-deep .u-search__content{
+          background: rgba($color: #FFFFFF, $alpha: 0.6) !important;
+        }
+        ::v-deep .u-search__content__input{
+          background-color: rgba($color: #FFFFFF, $alpha: 0.6) !important;
+        }
+        ::v-deep .u-icon__img{
+          width: 36rpx !important;
+          height: 36rpx !important;
+        }
+      }
+    }
+</style>
\ No newline at end of file
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 703ee34..6c18910 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -3,17 +3,18 @@
 		<view class="box flex justify-start align-items flex-column">
 			<view class="con-center flex flex-start flex-column">
 				<view class="header flex align-items">
-					<view class="hea-left flex align-items" >
+					<view class="hea-left flex align-items">
 						<image :src="avatar" mode="" class="avatar" @click="clickTop(1)"></image>
 						<view class="first-header flex justify-center align-items">
 							<view class="flex flex-column" @click="clickTop(1)">
 								<span style="margin-bottom: 20rpx;">
-									{{userName}}
+									{{ userName }}
 								</span>
 								<span style="color: #909090; font-size: 24rpx;">带着热爱，在搭子圈里撒野~</span>
 							</view>
 							<image src="../../static/shezhi.png" mode=""
-								style="width: 50rpx; height: 50rpx;position: absolute;right: 0;" @click="clickTop(2)"></image>
+								style="width: 50rpx; height: 50rpx;position: absolute;right: 0;" @click="clickTop(2)">
+							</image>
 						</view>
 					</view>
 					<!-- <view class="hea-right flex flex-column align-items" @click="out()" v-if="token">
@@ -21,25 +22,25 @@
 						<span>退出登录</span>
 					</view> -->
 				</view>
-				
+
 				<view class="top_box flex">
 					<view class="flex align-items justify-start" @click="toMycy">
-						<image src="/static/my/wcyd.png" mode=""></image>	
+						<image src="/static/my/wcyd.png" mode=""></image>
 						<span class="flex flex-column align-items">
 							<span class="p1">我参与的</span>
-							<span class="p2">{{actives}}个活动</span>
-						</span>	
+							<span class="p2">{{ actives }}个活动</span>
+						</span>
 					</view>
 					<view class="top_box_right flex align-items justify-start" @click="toMyfb">
-						<image src="/static/my/wdfb.png" mode=""></image>	
+						<image src="/static/my/wdfb.png" mode=""></image>
 						<span class="flex flex-column align-items justify-start">
 							<span class="p1">我发布的</span>
-							<span class="p2">{{pushActives}}个活动</span>
-						</span>		
+							<span class="p2">{{ pushActives }}个活动</span>
+						</span>
 					</view>
 				</view>
 
-				
+
 
 				<!-- <view class="first flex  flex-column flex-start justify-center" style="margin-top: 42rpx;">
 					<view class="centerBox flex justify-start align-items" style="margin-left: 60rpx;">
@@ -51,124 +52,122 @@
 						</view>
 					</view>
 				</view> -->
-				
-				<view class="first service flex justify-center align-items"
-					@click="callPhone(init.mobile)">
+
+				<!-- 提现 -->
+				<!-- <view class="first mymoney flex flex-column" @click="callPhone(init.mobile)">
+					<view class="flex">
+						<view class="flex flex-column myyue">
+							<span style="font-size: 26rpx;">当前余额</span>
+							<view class="flex align-items" style="margin-top: 20rpx;">
+								<span style="font-size: 40rpx;margin-right: 20rpx;">00.00</span>
+								<image src="/static/my/qjt.png" mode="" style="width: 28rpx; height: 28rpx;"></image>
+							</view>
+						</view>
+						<view>							
+							<image class="tixian" src="/static/my/tixian.png" mode=""></image>
+							<span class="tixianwz">提现</span>
+						</view>
+					</view>
+					<view class="flex align-items botmoney">
+						<span>待入账 ￥6658.00</span>
+						<span class="shu"></span>
+						<span>累计收益 ￥6658.00</span>
+					</view>
+				</view> -->
+
+				<!-- 成为主理人 -->
+				<!-- @click="callPhone(init.mobile)" -->
+				<view class="first service flex justify-center align-items" >
 				</view>
 
+
+
 				<view class="flex justify-center align-items" style="margin-top: 50rpx;width: 100%;">
-					<image src="/static/my/hotac.png" mode="" style="width: 327rpx; height: 38rpx;">
+					<image src="https://naweigetetest2.hschool.com.cn/dyqc/hotac.png" mode="" style="width: 327rpx; height: 38rpx;">
 					</image>
 				</view>
-				
-				 <!-- 热门活动 -->
-				 <view class="hot flex flex-column">
-        <view class="content flex align-items flex-column">
-          <view
-				class="flex flex-column w-100 bbb"
-				v-for="(item, index) in hotList"
-				:key="index"
-				@click="detail(item.id)"
-			>
-            <view
-              class="flex "
-              style="margin-top: 30rpx"
-            >
-              <view
-                class="right flex flex-column"
-                style="align-items: self-start"
-              >
-                <span class="title white-space">{{ item.title }}</span>
-                <span class="first-image flex align-items" style="margin-top: 20rpx;width: 100%;">
-                  <image :src="item.user.avatar" style="width: 36rpx;height: 36rpx;"></image>
-                  <span style="color: #9C9C9C;margin-left: 10rpx;">{{ item.user.nickname }}</span>
-				  <view class="white-space" style="width: 60%;">
-					<span style="color:#0CA013;margin-left: 20rpx;" v-for="items_t in item.classes_cate">#{{ items_t }}</span>
-				  </view>
-                  
-                </span>
 
-                <view class="flex flex-column"  style="margin-top: 20rpx;">
-                  <view class="time flex align-items white-space">
-                    <span class="time_tex" v-if="item.status == 2">{{ '报名中' }}</span>
-                    <span style="margin:0 20rpx;"
-                      >{{ dateWeeks(item.sign_start_time) }}
-                    </span>|<span class="white-space" 
-                      style="margin-left: 20rpx;width: 260rpx;"
-                      >{{ item.address_detail }}</span
-                    >
-                  </view>
+				<!-- 热门活动 -->
+				<view class="hot flex flex-column">
+					<view class="content flex align-items flex-column">
+						<view class="flex flex-column w-100 bbb" v-for="(item, index) in hotList" :key="index"
+							@click="detail(item.id)">
+							<view class="flex " style="margin-top: 30rpx">
+								<view class="right flex flex-column" style="align-items: self-start">
+									<span class="title white-space">{{ item.title }}</span>
+									<span class="first-image flex align-items" style="margin-top: 20rpx;width: 100%;">
+										<image :src="item.user.avatar" style="width: 36rpx;height: 36rpx;"></image>
+										<span style="color: #9C9C9C;margin-left: 10rpx;">{{ item.user.nickname }}</span>
+										<view class="white-space" style="width: 60%;">
+											<span style="color:#0CA013;margin-left: 20rpx;"
+												v-for="items_t in item.classes_cate">#{{ items_t }}</span>
+										</view>
 
-                </view>
+									</span>
 
-                <view class="flex align-items" style="margin-top: 20rpx;">
-					<image class="imgs_con" v-for="(items_img,index) in item.images.slice(0,3)" :key="index" :src="items_img"></image>
-                </view>
-              </view>
-            </view>
-            <view class="bottom flex align-items">
-              <view class="flex align-items toptext">
-                <span class="flex align-items">
-                  <u-avatar-group
-                    :urls="item.join_info.users"
-                    keyName="avatar"
-                    size="30"
-					maxCount="5"
-                    gap="0.4"
-                  ></u-avatar-group>
-				  <image
-                    :class="item.join_info.users.length > 0 ? '' :'smalld'"
-                    src="/static/index/dian.png"
-                    style="width: 60rpx;height: 60rpx;margin-left:-20rpx;z-index: 1;"
-                  ></image>
-                </span>
-                <view class="number flex align-items" >
-					{{  Number(item.join_info.people_number)+"人已上车" }}
-                </view>
-              </view>
-              <span v-if="item.status == 5" class="part1 flex justify-center align-items">
-                已结束
-              </span>
-              <span v-else class="part flex justify-center align-items">
-                上车
-              </span>
-            </view>
-          </view>
-        </view>
-      </view>
+									<view class="flex flex-column" style="margin-top: 20rpx;">
+										<view class="time flex align-items white-space">
+											<span class="time_tex" v-if="item.status == 2">{{ '报名中' }}</span>
+											<span style="margin:0 20rpx;">{{ dateWeeks(item.start_time) }}</span>
+											<span style="width: 1rpx;height: 22rpx;background: #323232;"></span>
+											<span class="white-space"
+												style="margin-left: 20rpx;width: 260rpx;">{{ item.address_detail
+												}}</span>
+										</view>
+
+									</view>
+
+									<view class="flex align-items" style="margin-top: 20rpx;">
+										<image class="imgs_con" v-for="(items_img, index) in item.images.slice(0, 3)"
+											:key="index" :src="items_img"></image>
+									</view>
+								</view>
+							</view>
+							<view class="bottom flex align-items">
+								<view class="flex align-items toptext">
+									<span class="flex align-items">
+										<u-avatar-group :urls="item.join_info.users" keyName="avatar" size="30"
+											maxCount="5" gap="0.4"></u-avatar-group>
+										<image :class="item.join_info.users.length > 0 ? '' : 'smalld'"
+											src="/static/index/dian.png"
+											style="width: 60rpx;height: 60rpx;margin-left:-20rpx;z-index: 1;"></image>
+									</span>
+									<view class="number flex align-items">
+										{{ Number(item.join_info.people_number) + "人已上车" }}
+									</view>
+								</view>
+								<span v-if="item.status == 5" class="part1 flex justify-center align-items">
+									已结束
+								</span>
+								<span v-else class="part flex justify-center align-items">
+									上车
+								</span>
+							</view>
+						</view>
+					</view>
+				</view>
 
 
 			</view>
 
-				
+
 
 			<!-- 授权登录 -->
-			<u-popup :show="showPopup" mode="center" round="20" :customStyle="{'width':'690rpx','height':'630rpx'}" :closeable="true"
-				@close="close">
+			<u-popup :show="showPopup" mode="center" round="20" :customStyle="{ 'width': '640rpx', 'height': '630rpx'}"
+				:closeable="true" @close="close">
 				<!-- 隐私协议 -->
-				 <lsl-protocol-popup 
-				        title="用户协议和隐私政策提示" 
-				        predesc="感谢您使用洛阳青年夜校。为保护您的个人信息安全，在您洛阳青年夜校的服务前，请务必仔细阅读" 
-				        subdesc='以了解详细内容。如您同意，请点击“同意并继续”并开始使用我们的服务。' 
-				        top_img='https://xxx.xxx.com/images/home/zcts@2x.png' 
-				        color="#C9935C" 
-						hideTabBar="true"
-				        :onNeed='false' 
-				        @agree="getList" 
-				        :other="other" 
-				        :title_style="'padding-top:60rpx;'" 
-				        open_type='agreePrivacyAuthorization'>
-				    </lsl-protocol-popup>
+				<lsl-protocol-popup title="用户协议和隐私政策提示" predesc="感谢您使用洛阳青年夜校。为保护您的个人信息安全，在您洛阳青年夜校的服务前，请务必仔细阅读"
+					subdesc='以了解详细内容。如您同意，请点击“同意并继续”并开始使用我们的服务。' 
+					top_img='https://naweigetetest2.hschool.com.cn/dyqc/dyqclogo.png'
+					color="#C9935C" hideTabBar="true" :onNeed='false' @agree="getList" :other="other"
+					:title_style="'padding-top:60rpx;'" open_type='agreePrivacyAuthorization'>
+				</lsl-protocol-popup>
 				<view class="popup">
 					<img src="https://naweigetetest2.hschool.com.cn/dyqc/shou1.png" alt="" />
 					<text id="txt2">为您授权登陆，授权成功后可参加多种户外活动</text>
 					<button class="texbut" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-						<u-icon
-							label="授权登录"
-							labelColor="#fff"
-							size="28"
-							name="/static/wechat1.png"
-						></u-icon>
+						授权登录
+						<!-- <u-icon label="" labelColor="#fff" size="28" name="/static/wechat1.png"></u-icon> -->
 					</button>
 				</view>
 			</u-popup>
@@ -176,311 +175,458 @@
 			<u-toast ref="uToast"></u-toast>
 		</view>
 
-		<tab-bar :tabBarShow="3"></tab-bar>
+		<tab-bar :tabBarShow="tabBarShow"></tab-bar>
 	</view>
 
 </template>
 
 <script>
-	import {
-		mapActions
-	} from 'vuex';
-	import {
-		dateWeek
-	} from '../../utils/dateFormat'
-	export default {
-		...mapActions(['number']),
-		data() {
-			return {
-				topHeight: '',
-				hotList: [],
-				showPopup: false,
-				userName: '请登录',
-				actives: 0,
-				pushActives: 0,
-				show: false,
-				avatar: '',
-				agree: false,
-				other: [{
-						tit: '《用户协议》',
-						type: 'page', // doc自行下载打开文档 page跳转页面
-						content: '/pages/Negotiate/agreement', // 文档地址/页面跳转地址
-					},
-					{
-						tit: '《隐私政策》',
-						type: 'page', // doc自行下载打开文档 page跳转页面
-						content: '/pages/Negotiate/privacy', // 文档地址/页面跳转地址
-					},
-				],
-				protocolArr: ["<隐私协议>"],
-				userinfo: {},
-				shop_id:'',
-				openidInfo: null,
-				token: '',
-				src: '',
-				openid_code: '',
-				code: '',
-				unread_number: '',
-				init:{},
-				timer: null, // 定时器
-				list: [{
-						image: '../../static/my/class.png',
-						text: '我的课程',
-						url: '/packageA/my/orderList'
-					},
-					{
-						image: '../../static/my/make.png',
-						text: '预约课程',
-						url: '/packageA/my/makeList'
-					},
-					{
-						image: '../../static/my/start.png',
-						text: '收藏课程',
-						url: '/packageA/my/Collect'
-					},
-					{
-						image: '../../static/my/afterSales.png',
-						text: '售后订单',
-						url: '/pages/afterSales/list'
-					},
-					{
-						image: '../../static/my/Course.png',
-						text: '课程表',
-						url: '/packageA/my/timetable',
-					},
-					{
-						image: '../../static/my/Feedback.png',
-						text: '课程反馈',
-						url: '/packageA/my/Feedback',
-					},
-					{
-						image: '../../static/my/station.png',
-						text: '消息通知',
-						url: '/packageA/my/station'
-					},
-					// {
-					// 	image: '../../static/my/orderList.png',
-					// 	text: '订单管理',
-					// 	url: '/packageA/my/orderList'
-					// },
-					{
-						image: '../../static/my/Personal.png',
-						text: '修改信息',
-						url: "/packageA/my/person-detail"
-
-					},
-					{
-						image: '../../static/my/exercise.png',
-						text: '我的活动',
-						url: "/packageA/activity/exercise"
-					},
-					{
-						image: '../../static/my/Help.png',
-						text: '帮助',
-						url: "/packageA/my/help"
-					},
-
-				],
-				list2: [{
-						image: '../../static/my/Platform.png',
-						text: '申请入驻',
-						url: "/pages/index/Apply",
-						auth_status: 1
-					},
-					{
-						image: '../../static/my/Check.png',
-						text: '报名审核',
-						url: "/packageA/my/classCheck",
-						auth_status: 0
-					},
-					{
-						image: '../../static/my/Manage.png',
-						text: '课程管理',
-						auth_status: 0,
-						url: '/packageA/my/management',
-					},
-					{
-						image: '../../static/my/activity.png',
-						text: '活动管理',
-						auth_status: 0,
-						url: '/packageA/my/ac-management',
-					},
-					{
-						image: '../../static/my/verification.png',
-						text: '核销课程',
-						url: '/packageA/my/cancel',
-						auth_status: 0
-					},
-					{
-						image: '../../static/my/cancal.png',
-						text: '核销活动',
-						url: '/packageA/my/cancelActivity',
-						auth_status: 0
-					},
-					// {
-					// 	image: '../../static/my/list.png',
-					// 	text: '订单管理',
-					// 	auth_status: 0
-					// },
-					// {
-					// 	image: '../../static/my/phone.png',
-					// 	text: '学员管理',
-					// 	auth_status: 0
-					// },
-					{
-						image: '../../static/my/organization.png',
-						text: '我的机构',
-						auth_status: 0,
-						url: '/pages/center/MechanismDetail',
-					},
-					{
-						image: '../../static/my/addClass.png',
-						text: '创建课程',
-						auth_status: 0,
-						url: '/packageA/my/addManagement',
-					}
-				]
-			};
-		},
-		// watch: {
-		// 	showPopup: {
-		// 		handler(newVal, oldVal) {
-		// 			if (newVal == true) {
-		// 				uni.hideTabBar()
-		// 			} else {
-		// 				uni.showTabBar()
-		// 			}
-		// 		},
-		// 		immediate: true,
-		// 		deep: true
-		// 	},
-		// },
-		// onLoad() {
-		// 	this.token = uni.getStorageSync('token')
-		// 	const userinfo = uni.getStorageSync('userInfo')
-		// 	const niName = uni.getStorageSync('niName')
-		// 	if (niName) {
-		// 		this.userName = niName
-		// 	} else {
-		// 		this.userName = userinfo.name
-		// 	}
-		// 	this.avatar = uni.getStorageSync('avatar');
-		// 	let openidInfo = uni.getStorageSync('openidInfo')
-		// 	let _this = this;
-		// 	if (!openidInfo) {
-		// 		_this.miniLogin();
-		// 	}
-		// },
-		onLoad() {
-			uni.hideTabBar()
-		},
-
-		onShow() {
-			this.getStatus()
-			this.token = uni.getStorageSync('token');
-			if (this.token) {
-				this.getUserInfo();
-			}
-			this.unread_number = this.number
-			const userinfo = uni.getStorageSync('userInfo')
-			const activityInfo = uni.getStorageSync('activityInfo')
-			const niName = uni.getStorageSync('niName')
-			if (niName) {
-				console.log(1,'niName',niName)
-				this.userName = niName
-			} else {
-				console.log(2)
-				this.userName = userinfo.name
-			}
-			this.actives = activityInfo.join_num;
-			this.pushActives = activityInfo.release_num;
-
-			this.avatar = uni.getStorageSync('userInfo').avatar || '../../static/moren.png';
-			let openidInfo = uni.getStorageSync('openidInfo');
-
-			let _this = this;
-			if (!openidInfo) {
-				_this.miniLogin();
-			}
-			this.number();
-			this.getinit();
-			this.getHotList();
-			
-		},
-		created() {
-			const systemInfo = uni.getSystemInfoSync();
-			const statusBarHeightPx = systemInfo.statusBarHeight;
-			const windowWidthPx = systemInfo.windowWidth;
-			// 将 statusBarHeight 从 px 转换为 rpx
-			const statusBarHeightRpx = statusBarHeightPx * (750 / windowWidthPx);
-
-			this.topHeight = statusBarHeightRpx;
-
-
-		},
-		beforeDestroy() {
-			this.stopTimer();
-		},
-		mounted() {
-			this.startTimer();
-		},
-		methods: {
-			dateWeeks(e){
-				return dateWeek(e);
-			}, 
-			// 获取热门课程
-			getHotList() {
-      uni.$u.http
-         .get("/api/school.new_activity/activity_list", {
-          params: {
-            page: 1,
-            limit: 3,
-            order: "hot",
-            status: "2", //5已结束
-			auth_status: 1,
-          },
-        })
-        .then((res) => {
-          if (res.code == 1) {
-            const list = res.data.list.data || []; 
-            this.hotList = list;    
-          } else {
-            uni.showToast({
-              title: res.msg,
-              icon: "none",
-              duration: 2000,
-            });
-          }
-        })
-        .catch((error) => {
-          uni.showToast({
-            title: "请求失败，请稍后再试",
-            icon: "none",
-            duration: 2000,
-          });
-        });
-    },
-			// 跳转详情
-			detail(id) {
-				uni.navigateTo({
-					url: "/pages/center/detail?id=" + id,
-				});
+import {
+	mapActions
+} from 'vuex';
+import {
+	dateWeek
+} from '../../utils/dateFormat'
+export default {
+	...mapActions(['number']),
+	data() {
+		return {
+			tabBarShow:null,
+			topHeight: '',
+			hotList: [],
+			showPopup: false,
+			userName: '请登录',
+			actives: 0,
+			pushActives: 0,
+			show: false,
+			avatar: '',
+			agree: false,
+			other: [{
+				tit: '《用户协议》',
+				type: 'page', // doc自行下载打开文档 page跳转页面
+				content: '/pages/Negotiate/agreement', // 文档地址/页面跳转地址
 			},
-			callPhone(phone) {
-				console.log(phone)
-				uni.showToast({
-					title: '开发中，暂未开放',
-					icon: 'none'
-				});
-				// uni.makePhoneCall({
-				// 	phoneNumber: phone
-				// })
+			{
+				tit: '《隐私政策》',
+				type: 'page', // doc自行下载打开文档 page跳转页面
+				content: '/pages/Negotiate/privacy', // 文档地址/页面跳转地址
 			},
-			getinit() {
-				uni.$u.http.get('/api/index/init', {}).then(res => {
+			],
+			protocolArr: ["<隐私协议>"],
+			userinfo: {},
+			shop_id: '',
+			openidInfo: null,
+			token: '',
+			src: '',
+			openid_code: '',
+			code: '',
+			unread_number: '',
+			init: {},
+			timer: null, // 定时器
+			list: [{
+				image: '../../static/my/class.png',
+				text: '我的课程',
+				url: '/packageA/my/orderList'
+			},
+			{
+				image: '../../static/my/make.png',
+				text: '预约课程',
+				url: '/packageA/my/makeList'
+			},
+			{
+				image: '../../static/my/start.png',
+				text: '收藏课程',
+				url: '/packageA/my/Collect'
+			},
+			{
+				image: '../../static/my/afterSales.png',
+				text: '售后订单',
+				url: '/pages/afterSales/list'
+			},
+			{
+				image: '../../static/my/Course.png',
+				text: '课程表',
+				url: '/packageA/my/timetable',
+			},
+			{
+				image: '../../static/my/Feedback.png',
+				text: '课程反馈',
+				url: '/packageA/my/Feedback',
+			},
+			{
+				image: '../../static/my/station.png',
+				text: '消息通知',
+				url: '/packageA/my/station'
+			},
+			// {
+			// 	image: '../../static/my/orderList.png',
+			// 	text: '订单管理',
+			// 	url: '/packageA/my/orderList'
+			// },
+			{
+				image: '../../static/my/Personal.png',
+				text: '修改信息',
+				url: "/packageA/my/person-detail"
+
+			},
+			{
+				image: '../../static/my/exercise.png',
+				text: '我的活动',
+				url: "/packageA/activity/exercise"
+			},
+			{
+				image: '../../static/my/Help.png',
+				text: '帮助',
+				url: "/packageA/my/help"
+			},
+
+			],
+			list2: [{
+				image: '../../static/my/Platform.png',
+				text: '申请入驻',
+				url: "/pages/index/Apply",
+				auth_status: 1
+			},
+			{
+				image: '../../static/my/Check.png',
+				text: '报名审核',
+				url: "/packageA/my/classCheck",
+				auth_status: 0
+			},
+			{
+				image: '../../static/my/Manage.png',
+				text: '课程管理',
+				auth_status: 0,
+				url: '/packageA/my/management',
+			},
+			{
+				image: '../../static/my/activity.png',
+				text: '活动管理',
+				auth_status: 0,
+				url: '/packageA/my/ac-management',
+			},
+			{
+				image: '../../static/my/verification.png',
+				text: '核销课程',
+				url: '/packageA/my/cancel',
+				auth_status: 0
+			},
+			{
+				image: '../../static/my/cancal.png',
+				text: '核销活动',
+				url: '/packageA/my/cancelActivity',
+				auth_status: 0
+			},
+			// {
+			// 	image: '../../static/my/list.png',
+			// 	text: '订单管理',
+			// 	auth_status: 0
+			// },
+			// {
+			// 	image: '../../static/my/phone.png',
+			// 	text: '学员管理',
+			// 	auth_status: 0
+			// },
+			{
+				image: '../../static/my/organization.png',
+				text: '我的机构',
+				auth_status: 0,
+				url: '/pages/center/MechanismDetail',
+			},
+			{
+				image: '../../static/my/addClass.png',
+				text: '创建课程',
+				auth_status: 0,
+				url: '/packageA/my/addManagement',
+			}
+			]
+		};
+	},
+	// watch: {
+	// 	showPopup: {
+	// 		handler(newVal, oldVal) {
+	// 			if (newVal == true) {
+	// 				uni.hideTabBar()
+	// 			} else {
+	// 				uni.showTabBar()
+	// 			}
+	// 		},
+	// 		immediate: true,
+	// 		deep: true
+	// 	},
+	// },
+	// onLoad() {
+	// 	this.token = uni.getStorageSync('token')
+	// 	const userinfo = uni.getStorageSync('userInfo')
+	// 	const niName = uni.getStorageSync('niName')
+	// 	if (niName) {
+	// 		this.userName = niName
+	// 	} else {
+	// 		this.userName = userinfo.name
+	// 	}
+	// 	this.avatar = uni.getStorageSync('avatar');
+	// 	let openidInfo = uni.getStorageSync('openidInfo')
+	// 	let _this = this;
+	// 	if (!openidInfo) {
+	// 		_this.miniLogin();
+	// 	}
+	// },
+	onLoad() {
+		uni.hideTabBar()
+	},
+
+	onShow() {
+		this.getStatus()
+		this.token = uni.getStorageSync('token');
+		if (this.token) {
+			this.getUserInfo();
+		}
+		this.unread_number = this.number
+		const userinfo = uni.getStorageSync('userInfo')
+		const activityInfo = uni.getStorageSync('activityInfo')
+		const niName = uni.getStorageSync('niName')
+		if (niName) {
+			console.log(1, 'niName', niName)
+			this.userName = niName
+		} else {
+			console.log(2)
+			this.userName = userinfo.name
+		}
+		this.actives = activityInfo.join_num;
+		this.pushActives = activityInfo.release_num;
+
+		this.avatar = uni.getStorageSync('userInfo').avatar || '../../static/moren.png';
+		let openidInfo = uni.getStorageSync('openidInfo');
+
+		let _this = this;
+		if (!openidInfo) {
+			_this.miniLogin();
+		}
+		this.number();
+		this.getinit();
+		this.getHotList();
+
+	},
+	created() {
+		const systemInfo = uni.getSystemInfoSync();
+		const statusBarHeightPx = systemInfo.statusBarHeight;
+		const windowWidthPx = systemInfo.windowWidth;
+		// 将 statusBarHeight 从 px 转换为 rpx
+		const statusBarHeightRpx = statusBarHeightPx * (750 / windowWidthPx);
+
+		this.topHeight = statusBarHeightRpx;
+
+
+	},
+	beforeDestroy() {
+		this.stopTimer();
+	},
+	mounted() {
+		this.startTimer();
+	},
+	methods: {
+		dateWeeks(e) {
+			return dateWeek(e);
+		},
+		// 获取热门课程
+		getHotList() {
+			uni.$u.http
+				.get("/api/school.new_activity/activity_list", {
+					params: {
+						page: 1,
+						limit: 1,
+						order: "hot",
+						status: "2", //5已结束
+						auth_status: 1,
+					},
+				})
+				.then((res) => {
 					if (res.code == 1) {
-						this.init = res.data.customer_service
-						uni.setStorageSync('init',res.data.customer_service)
+						const list = res.data.list.data || [];
+						this.hotList = list;
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: "none",
+							duration: 2000,
+						});
+					}
+				})
+				.catch((error) => {
+					uni.showToast({
+						title: "请求失败，请稍后再试",
+						icon: "none",
+						duration: 2000,
+					});
+				});
+		},
+		// 跳转详情
+		detail(id) {
+			uni.navigateTo({
+				url: "/pages/center/detail?id=" + id,
+			});
+		},
+		callPhone(phone) {
+			console.log(phone)
+			uni.showToast({
+				title: '开发中，暂未开放',
+				icon: 'none'
+			});
+			// uni.makePhoneCall({
+			// 	phoneNumber: phone
+			// })
+		},
+		getinit() {
+			uni.$u.http.get('/api/index/init', {}).then(res => {
+				if (res.code == 1) {
+					this.init = res.data.customer_service;
+					if( res.data.base_info.miniapp_activity_swtich == 1){
+						this.tabBarShow = 3;
+					}else{
+						this.tabBarShow = 2;
+					}
+					uni.setStorageSync('init', res.data.customer_service)
+					uni.setStorageSync('init_info', res.data.activity_info)
+				} else {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none',
+						duration: 2000
+					});
+				}
+			}).catch(error => {
+				uni.showToast({
+					title: '请求失败，请稍后再试',
+					icon: 'none',
+					duration: 2000
+				});
+			});
+		},
+		// 查看自己的状态
+		getStatus() {
+			uni.$u.http.get('/api/school/shop/auth_info', {}).then(res => {
+				console.log(this.list2.length, 'this.list2.length')
+				if (res.code == 1) {
+					let have_auth = false;
+					let have_shop = false;
+
+					if (res.data.verification_auth.verification) {
+						have_auth = true;
+					}
+
+					if (res.data.auth_status == 1 && res.data.shop_id) {
+						have_shop = true;
+					}
+
+					if (have_auth) {
+						for (let i = 1; i < this.list2.length; i++) {
+							this.list2[i].auth_status = 1;
+						}
+						this.list2[this.list2.length - 1].auth_status = 0;
+						this.list2[this.list2.length - 2].auth_status = 0;
+					}
+					if (have_shop) {
+						this.list2[0].auth_status = 0;
+						for (let i = 1; i < this.list2.length; i++) {
+							this.list2[i].auth_status = 1;
+						}
+						this.shop_id = res.data.shop_id
+						uni.setStorageSync('shop_id', res.data.shop_id)
+						uni.setStorageSync('apply_info', res.data.apply_info)
+						this.list2[this.list2.length - 2].url = `/pages/center/MechanismDetail?id=${res.data.shop_id}`;
+					}
+
+				}
+			}).catch(error => {
+				uni.showToast({
+					title: res.msg,
+					icon: 'none',
+					duration: 2000
+				})
+			})
+		},
+		toMycy() {
+			// if (!this.token) {
+			// 	this.miniLogin()
+			// 	this.showPopup = true
+			// } else {
+			uni.navigateTo({
+				url: "/packageA/my/exercise?status=-3,0,2,3,4,5,6,7,9",
+			})
+			// }
+		},
+		toMyfb() {
+			// if (!this.token) {
+			// 	this.miniLogin()
+			// 	this.showPopup = true
+			// } else {
+			uni.navigateTo({
+				url: "/packageA/my/orderList",
+			})
+			// }
+		},
+
+
+		// 退出登录
+		out() {
+			let _this = this;
+			uni.clearStorageSync()
+			uni.reLaunch({
+				url: '/pages/my/index'
+			})
+			// uni.$u.http.post('/api/user/logout', {}).then(res => {
+			// 	if (res.code == 1) {
+			// 		uni.reLaunch({
+			// 			url: '/pages/my/index'
+			// 		})
+			// 	}
+			// }).catch(error => {
+			// 	uni.showToast({
+			// 		title: res.msg,
+			// 		icon: 'none',
+			// 		duration: 2000
+			// 	})
+			// })
+		},
+		to(url) {
+			console.log(url)
+			uni.navigateTo({
+				url: url
+			});
+		},
+		jump(url, type) {
+			console.log(url)
+			if (url == '/packageA/my/cancel') {
+				uni.scanCode({
+					success: (res) => {
+						console.log('扫码结果：' + res.result);
+						uni.navigateTo({
+							url: url + '?res=' + encodeURIComponent(res.result)
+						});
+					},
+					fail: (err) => {
+						console.error('扫码失败：' + err);
+						uni.showToast({
+							title: '扫码已取消',
+							icon: 'none'
+						});
+					}
+				});
+			} else if (url == '/packageA/my/addManagement') {
+				uni.$u.http.get('/api/school/shop/auth_info',).then(res => {
+					if (res.code == 1) {
+						if (res.data.check_full) {
+							uni.navigateTo({
+								url: "/packageA/my/addManagement?shop_id=" + this.shop_id
+							})
+						} else {
+							uni.showToast({
+								title: '必要展示信息未完善，请先在机构完善展示信息',
+								icon: 'none',
+								duration: 2000
+							});
+						}
+
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -489,907 +635,830 @@
 						});
 					}
 				}).catch(error => {
+					console.error('请求失败', error);
+				});
+			} else if (url == '/packageA/my/cancelActivity') {
+				uni.scanCode({
+					success: (res) => {
+						console.log('扫码结果：' + res.result);
+						uni.navigateTo({
+							url: url + '?res=' + encodeURIComponent(res.result)
+						});
+					},
+					fail: (err) => {
+						console.error('扫码失败：' + err);
+						uni.showToast({
+							title: '扫码已取消',
+							icon: 'none'
+						});
+					}
+				});
+			} else {
+				uni.navigateTo({
+					url: url
+				});
+			}
+		},
+		close() {
+			this.showPopup = false
+		},
+
+		//小程序静默登录
+		miniLogin() {
+			let _this = this;
+			uni.login({
+				provider: 'weixin',
+				success: function (res) {
+					console.log('res.code', res.code)
+					_this.getOpenidByCode(res.code)
+					_this.code = res.code
+					uni.setStorageSync('code', res.code)
+				},
+				fail: function (error) {
+					console.log('authError', error);
+				}
+			})
+		},
+		//根据code获取openid
+		getOpenidByCode(code) {
+			let _this = this;
+			uni.$u.http.post('/api/user/getOpenid ', {
+				code: code,
+			}).then(res => {
+				if (res.code == 1) {
+					_this.openidInfo = res.data;
+					uni.setStorageSync('openidInfo', res.data)
+					// _this.$api.setCache('openidInfo', res.data);
+				}
+			}).catch(error => {
+				console.log('获取openid失败：', error);
+			})
+		},
+		// 获取手机号
+		getPhoneNumber(e) {
+			var _this = this;
+			_this.miniLogin()
+			console.log('e.detail', e.detail)
+			if (!e.detail.iv) {
+				uni.showToast({
+					title: '授权失败，请重新授权',
+					icon: 'none',
+					duration: 2000
+				})
+				_this.miniLogin();
+				// this.$api.toast('授权失败，请重新点击授权');
+				return false;
+			}
+
+			// if (e.detail.errMsg !== "getPhoneNumber:ok") {
+			// 	uni.showToast({
+			// 		title: '授权失败，请重新点击授权',
+			// 		icon: 'none',
+			// 		duration: 2000
+			// 	})
+			// 	_this.miniLogin();
+			// 	return false;
+			// }
+			var openidInfo = uni.getStorageSync('openidInfo');
+			if (!openidInfo) {
+				_this.miniLogin();
+				uni.showToast({
+					title: '未获取到信息，请重新点击授权',
+					icon: 'none',
+					duration: 2000
+				})
+				// this.$api.toast('未获取到信息，请重新点击授权');
+				return false;
+			}
+			_this.decodeMobile({
+				encryptedData: e.detail.encryptedData,
+				iv: e.detail.iv,
+				sessionKey: openidInfo.session_key,
+			}, openidInfo);
+		},
+		//解析手机号
+		decodeMobile(data, openidInfo) {
+			var _this = this;
+			uni.$u.http.post('/api/user/decodeData', {
+				encryptedData: data.encryptedData,
+				iv: data.iv,
+				sessionKey: data.sessionKey,
+			}).then(res => {
+				console.log('res', res)
+				if (res.code == 1) {
+					_this.userRegister(res.data.phoneNumber, openidInfo.openid);
+				} else {
 					uni.showToast({
-						title: '请求失败，请稍后再试',
+						title: res.msg || '解析手机号失败',
 						icon: 'none',
 						duration: 2000
-					});
-				});
-			},
-			// 查看自己的状态
-			getStatus() {
-				uni.$u.http.get('/api/school/shop/auth_info', {}).then(res => {
-					console.log(this.list2.length,'this.list2.length')
-					if (res.code == 1) {
-						let have_auth = false;
-						let have_shop = false;
-						
-						if(res.data.verification_auth.verification){
-							have_auth = true;
-						}
-						
-						if(res.data.auth_status == 1 && res.data.shop_id){
-							have_shop = true;
-						}
-						
-						if(have_auth){
-							for (let i = 1; i < this.list2.length; i++) {
-							    this.list2[i].auth_status = 1;
-							}
-							 this.list2[this.list2.length - 1].auth_status = 0;
-							 this.list2[this.list2.length - 2].auth_status = 0;
-						}
-						if(have_shop){
-							 this.list2[0].auth_status = 0;
-							 for (let i = 1; i < this.list2.length; i++) {
-							     this.list2[i].auth_status = 1;
-							 }
-							 this.shop_id = res.data.shop_id
-							 uni.setStorageSync('shop_id',res.data.shop_id)
-							 uni.setStorageSync('apply_info',res.data.apply_info)
-							  this.list2[this.list2.length - 2].url = `/pages/center/MechanismDetail?id=${res.data.shop_id}`;
-						}
+					})
+					// _this.$api.toast(res.msg || '解析手机号失败')
+				}
 
-					}
-				}).catch(error => {
+			}).catch(error => {
+
+			});
+		},
+		//用户注册
+		userRegister(mobile, openid) {
+			var _this = this;
+			console.log(uni.getStorageInfoSync("code"))
+			uni.$u.http.post('/api/user/registerLogin', {
+				mobile: mobile,
+				openid: openid,
+				code: _this.code,
+				apptype: 'miniapp',
+				platform: 'wechat'
+			}).then(res => {
+				if (res.code == 1) {
+					uni.setStorageSync('token', res.data.token)
+					_this.getUserInfo()
+					this.token = res.data.token
+					uni.showToast({
+						title: '登陆成功',
+						icon: 'none',
+						duration: 2000
+					})
+					// _this.$api.setCache('token', res.data.token);
+				} else {
 					uni.showToast({
 						title: res.msg,
 						icon: 'none',
 						duration: 2000
 					})
-				})
-			},
-			toMycy(){
-				// if (!this.token) {
-				// 	this.miniLogin()
-				// 	this.showPopup = true
-				// } else {
-					uni.navigateTo({
-						url: "/packageA/my/exercise",
-					})
-				// }
-			},
-			toMyfb(){
-				// if (!this.token) {
-				// 	this.miniLogin()
-				// 	this.showPopup = true
-				// } else {
-					uni.navigateTo({
-						url: "/packageA/my/orderList",
-					})
-				// }
-			},
+					uni.clearStorageSync()
+					_this.miniLogin()
+					// _this.$api.toast(res.msg);
+				}
+			}).catch(error => {
+				console.log('error', error);
+				// 		_this.$api.modal('温馨提示', error.data.msg, function() {
 
+				// 		}, false);
+			});
 
-			// 退出登录
-			out() {
-				let _this = this;
-				uni.clearStorageSync()
-				uni.reLaunch({
-					url: '/pages/my/index'
-				})
-				// uni.$u.http.post('/api/user/logout', {}).then(res => {
-				// 	if (res.code == 1) {
-				// 		uni.reLaunch({
-				// 			url: '/pages/my/index'
-				// 		})
-				// 	}
-				// }).catch(error => {
-				// 	uni.showToast({
-				// 		title: res.msg,
-				// 		icon: 'none',
-				// 		duration: 2000
-				// 	})
-				// })
-			},
-			to(url) {
-				console.log(url)
-				uni.navigateTo({
-					url: url
-				});
-			},
-			jump(url, type) {
-				console.log(url)
-				if (url == '/packageA/my/cancel') {
-					uni.scanCode({
-						success: (res) => {
-							console.log('扫码结果：' + res.result);
-							uni.navigateTo({
-								url: url + '?res=' + encodeURIComponent(res.result)
-							});
-						},
-						fail: (err) => {
-							console.error('扫码失败：' + err);
-							uni.showToast({
-								title: '扫码已取消',
-								icon: 'none'
-							});
-						}
-					});
-				} else if (url == '/packageA/my/addManagement') {
-					uni.$u.http.get('/api/school/shop/auth_info', ).then(res => {
-						if (res.code == 1) {
-							if (res.data.check_full){
-								uni.navigateTo({
-									url: "/packageA/my/addManagement?shop_id=" + this.shop_id
-								})
-							} else{
-								uni.showToast({
-									title: '必要展示信息未完善，请先在机构完善展示信息',
-									icon: 'none',
-									duration: 2000
-								});
-							}
-							
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 2000
-							});
-						}
-					}).catch(error => {
-						console.error('请求失败', error);
-					});
-				} else if (url == '/packageA/my/cancelActivity') {
-					uni.scanCode({
-						success: (res) => {
-							console.log('扫码结果：' + res.result);
-							uni.navigateTo({
-								url: url + '?res=' + encodeURIComponent(res.result)
-							});
-						},
-						fail: (err) => {
-							console.error('扫码失败：' + err);
-							uni.showToast({
-								title: '扫码已取消',
-								icon: 'none'
-							});
-						}
-					});
+		},
+		// 获取个人信息
+		getUserInfo() {
+			uni.$u.http.get('/api/user/index', {}).then(res => {
+				if (res.code == 1) {
+					uni.setStorageSync('userInfo', res.data.user_info)
+					uni.setStorageSync('settleInfo', res.data.settle_info)
+					uni.setStorageSync('activityInfo', res.data.activity_info)
+
+					this.showPopup = false
+					this.userName = res.data.user_info.nickname;
+					this.avatar = res.data.user_info.avatar;
+					this.actives = res.data.activity_info.join_num;
+					this.pushActives = res.data.activity_info.release_num;
+
+					uni.setStorageSync("niName", res.data.user_info.nickname)
+					this.userinfo = res.data.user_info
+					this.token = res.data.user_info.token
 				} else {
-					uni.navigateTo({
-						url: url
-					});
-				}
-			},
-			close() {
-				this.showPopup = false
-			},
-
-			//小程序静默登录
-			miniLogin() {
-				let _this = this;
-				uni.login({
-					provider: 'weixin',
-					success: function(res) {
-						console.log('res.code',res.code)
-						_this.getOpenidByCode(res.code)
-						_this.code = res.code
-						uni.setStorageSync('code', res.code)
-					},
-					fail: function(error) {
-						console.log('authError', error);
-					}
-				})
-			},
-			//根据code获取openid
-			getOpenidByCode(code) {
-				let _this = this;
-				uni.$u.http.post('/api/user/getOpenid ', {
-					code: code,
-				}).then(res => {
-					if (res.code == 1) {
-						_this.openidInfo = res.data;
-						uni.setStorageSync('openidInfo', res.data)
-						// _this.$api.setCache('openidInfo', res.data);
-					}
-				}).catch(error => {
-					console.log('获取openid失败：', error);
-				})
-			},
-			// 获取手机号
-			getPhoneNumber(e) {
-				var _this = this;
-				_this.miniLogin()
-				console.log('e.detail', e.detail)
-				if (!e.detail.iv) {
-					uni.showToast({
-						title: '授权失败，请重新授权',
-						icon: 'none',
-						duration: 2000
-					})
-					_this.miniLogin();
-					// this.$api.toast('授权失败，请重新点击授权');
-					return false;
-				}
-
-				// if (e.detail.errMsg !== "getPhoneNumber:ok") {
-				// 	uni.showToast({
-				// 		title: '授权失败，请重新点击授权',
-				// 		icon: 'none',
-				// 		duration: 2000
-				// 	})
-				// 	_this.miniLogin();
-				// 	return false;
-				// }
-				var openidInfo = uni.getStorageSync('openidInfo');
-				if (!openidInfo) {
-					_this.miniLogin();
-					uni.showToast({
-						title: '未获取到信息，请重新点击授权',
-						icon: 'none',
-						duration: 2000
-					})
-					// this.$api.toast('未获取到信息，请重新点击授权');
-					return false;
-				}
-				_this.decodeMobile({
-					encryptedData: e.detail.encryptedData,
-					iv: e.detail.iv,
-					sessionKey: openidInfo.session_key,
-				}, openidInfo);
-			},
-			//解析手机号
-			decodeMobile(data, openidInfo) {
-				var _this = this;
-				uni.$u.http.post('/api/user/decodeData', {
-					encryptedData: data.encryptedData,
-					iv: data.iv,
-					sessionKey: data.sessionKey,
-				}).then(res => {
-					console.log('res', res)
-					if (res.code == 1) {
-						_this.userRegister(res.data.phoneNumber, openidInfo.openid);
-					} else {
-						uni.showToast({
-							title: res.msg || '解析手机号失败',
-							icon: 'none',
-							duration: 2000
-						})
-						// _this.$api.toast(res.msg || '解析手机号失败')
-					}
-
-				}).catch(error => {
-
-				});
-			},
-			//用户注册
-			userRegister(mobile, openid) {
-				var _this = this;
-				console.log(uni.getStorageInfoSync("code"))
-				uni.$u.http.post('/api/user/registerLogin', {
-					mobile: mobile,
-					openid: openid,
-					code: _this.code,
-					apptype: 'miniapp',
-					platform: 'wechat'
-				}).then(res => {
-					if (res.code == 1) {
-						uni.setStorageSync('token', res.data.token)
-						_this.getUserInfo()
-						this.token = res.data.token
-						uni.showToast({
-							title: '登陆成功',
-							icon: 'none',
-							duration: 2000
-						})
-						// _this.$api.setCache('token', res.data.token);
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-						uni.clearStorageSync()
-						_this.miniLogin()
-						// _this.$api.toast(res.msg);
-					}
-				}).catch(error => {
-					console.log('error', error);
-					// 		_this.$api.modal('温馨提示', error.data.msg, function() {
-
-					// 		}, false);
-				});
-
-			},
-			// 获取个人信息
-			getUserInfo() {
-				uni.$u.http.get('/api/user/index', {}).then(res => {
-					if (res.code == 1) {
-						uni.setStorageSync('userInfo', res.data.user_info)
-						uni.setStorageSync('settleInfo', res.data.settle_info)
-						uni.setStorageSync('activityInfo', res.data.activity_info)
-						
-						this.showPopup = false
-						this.userName = res.data.user_info.nickname;
-						this.avatar = res.data.user_info.avatar;
-						this.actives = res.data.activity_info.join_num;
-						this.pushActives = res.data.activity_info.release_num;
-
-						uni.setStorageSync("niName", res.data.user_info.nickname)
-						this.userinfo = res.data.user_info
-						this.token = res.data.user_info.token
-					} else {
-						this.showPopup = false
-						uni.showToast({
-							title: '登陆失败',
-							icon: 'error',
-							duration: 2000
-						})
-					}
-
-				}).catch(error => {
-					console.log('error', error);
 					this.showPopup = false
 					uni.showToast({
 						title: '登陆失败',
 						icon: 'error',
 						duration: 2000
 					})
+				}
+
+			}).catch(error => {
+				console.log('error', error);
+				this.showPopup = false
+				uni.showToast({
+					title: '登陆失败',
+					icon: 'error',
+					duration: 2000
 				})
-			},
-			// getPhoneNumber(e) {
-			// 	var that = this
-			// 	if (e.detail.errMsg == 'getPhoneNumber:ok') {
-			// 		wx.login({
-			// 			success: function(res) {
-			// 				uni.$u.http.post('/Loginye/wx_getcode', {
-			// 					code: e.detail.code,
-			// 					openid_code: res.code
-			// 				}).then(res => {
-			// 					if (res.code == 0) {
-			// 						uni.setStorageSync('token', res.data)
-			// 						uni.setStorageSync('userInfo', res.userinfo)
-			// 						uni.setStorageSync('avatar', res.userinfo.head_img)
-			// 						that.userName = res.userinfo.name
-			// 						that.token = res.data
-			// 						that.src = res.userinfo.head_img
-			// 						that.showPopup = false
-			// 						console.log(that, "sdad")
-			// 						that.$refs.uToast.show({
-			// 							type: 'success',
-			// 							message: '授权成功'
-			// 						})
-			// 					}
-			// 				}).catch(err => {
-			// 					console.log(err);
-			// 				})
-			// 			}
-			// 		})
+			})
+		},
+		// getPhoneNumber(e) {
+		// 	var that = this
+		// 	if (e.detail.errMsg == 'getPhoneNumber:ok') {
+		// 		wx.login({
+		// 			success: function(res) {
+		// 				uni.$u.http.post('/Loginye/wx_getcode', {
+		// 					code: e.detail.code,
+		// 					openid_code: res.code
+		// 				}).then(res => {
+		// 					if (res.code == 0) {
+		// 						uni.setStorageSync('token', res.data)
+		// 						uni.setStorageSync('userInfo', res.userinfo)
+		// 						uni.setStorageSync('avatar', res.userinfo.head_img)
+		// 						that.userName = res.userinfo.name
+		// 						that.token = res.data
+		// 						that.src = res.userinfo.head_img
+		// 						that.showPopup = false
+		// 						console.log(that, "sdad")
+		// 						that.$refs.uToast.show({
+		// 							type: 'success',
+		// 							message: '授权成功'
+		// 						})
+		// 					}
+		// 				}).catch(err => {
+		// 					console.log(err);
+		// 				})
+		// 			}
+		// 		})
 
-			// 	} else {
-			// 		this.$refs.uToast.show({
-			// 			type: 'error',
-			// 			message: '授权失败,请重试'
-			// 		})
-			// 		this.showPopup = false
-			// 	}
-			// },
+		// 	} else {
+		// 		this.$refs.uToast.show({
+		// 			type: 'error',
+		// 			message: '授权失败,请重试'
+		// 		})
+		// 		this.showPopup = false
+		// 	}
+		// },
 
 
-			clickTop(val) {
-				// uni.navigateTo({
-				// 	url: '/packageA/my/person-detail'
-				// })
-				// console.log(this.token)
-				if (!this.token) {
-					this.miniLogin()
-					this.showPopup = true
+		clickTop(val) {
+			// uni.navigateTo({
+			// 	url: '/packageA/my/person-detail'
+			// })
+			// console.log(this.token)
+			if (!this.token) {
+				this.miniLogin()
+				this.showPopup = true
+			} else {
+				uni.navigateTo({
+					url: "/packageA/my/person-detail?type=" + val,
+				})
+			}
+		},
+		checkTokenAndRequest() {
+			if (uni.getStorageSync('token')) {
+				this.number();
+			}
+		},
+		// 定时器
+		startTimer() {
+			if (!this.timer) { // 确保定时器只启动一次
+				this.timer = setInterval(() => {
+					this.checkTokenAndRequest();
+				}, 10000); // 每隔 10 秒执行一次
+			}
+		},
+		stopTimer() {
+			if (this.timer) {
+				clearInterval(this.timer);
+				this.timer = null;
+			}
+		},
+		// 未读消息
+		number() {
+			let that = this
+			uni.$u.http.get('/api/school/message/message_count', {
+				params: {},
+			}).then(res => {
+				if (res.code == 1) {
+					that.$store.commit('setNumber', res.data.unread_number);
+					that.unread_number = res.data.unread_number
+					uni.setStorageSync('unread_number', res.data.unread_number)
 				} else {
-					uni.navigateTo({
-						url: "/packageA/my/person-detail?type="+val,
-					})
+					uni.showToast({
+						title: res.msg,
+						icon: 'none',
+						duration: 2000
+					});
 				}
-			},
-			checkTokenAndRequest() {
-				if (uni.getStorageSync('token')) {
-					this.number();
-				}
-			},
-			// 定时器
-			startTimer() {
-				if (!this.timer) { // 确保定时器只启动一次
-					this.timer = setInterval(() => {
-						this.checkTokenAndRequest();
-					}, 10000); // 每隔 10 秒执行一次
-				}
-			},
-			stopTimer() {
-				if (this.timer) {
-					clearInterval(this.timer);
-					this.timer = null;
-				}
-			},
-			// 未读消息
-			number() {
-				let that = this
-				uni.$u.http.get('/api/school/message/message_count', {
-					params: {},
-				}).then(res => {
-					if (res.code == 1) {
-						that.$store.commit('setNumber', res.data.unread_number);
-						that.unread_number = res.data.unread_number
-						uni.setStorageSync('unread_number', res.data.unread_number)
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				}).catch(error => {});
-			},
+			}).catch(error => { });
+		},
 
-		}
 	}
+}
 </script>
 
 <style lang="scss" scoped>
-	.myBox {
-		width: 750rpx;
-		min-height: 100vh;
-		background-color: #F1F2F8;
-		background-image: url("https://naweigetetest2.hschool.com.cn/dyqc/bgx2.png");
-		background-size: 750rpx 797rpx;
-		background-repeat: no-repeat;
-	}
+.myBox {
+	width: 750rpx;
+	min-height: 100vh;
+	background-color: #F1F2F8;
+	background-image: url("https://naweigetetest2.hschool.com.cn/dyqc/bgx2.png");
+	background-size: 750rpx 797rpx;
+	background-repeat: no-repeat;
+}
 
-	.box {
-		border-radius: 8rpx 8rpx 8rpx 8rpx;
-		// padding-top: env(safe-area-inset-top);
-		padding-top: 200rpx;
+.box {
+	border-radius: 8rpx 8rpx 8rpx 8rpx;
+	// padding-top: env(safe-area-inset-top);
+	padding-top: 200rpx;
 
-		/* 顶部安全距离 */
-		.backImg {
-			position: fixed;
-			width: 100%;
-			height: 100%;
-			top: 0;
-			left: 0;
-			z-index: -1;
-		}
-	}
-
-	.w-100 {
+	/* 顶部安全距离 */
+	.backImg {
+		position: fixed;
 		width: 100%;
+		height: 100%;
+		top: 0;
+		left: 0;
+		z-index: -1;
 	}
+}
 
-	.flex {
-		display: flex;
-	}
+.w-100 {
+	width: 100%;
+}
 
-	.flex-start {
-		align-items: flex-start;
-	}
+.flex {
+	display: flex;
+}
 
-	.justify-center {
-		justify-content: center;
-	}
+.flex-start {
+	align-items: flex-start;
+}
 
-	.align-items {
-		align-items: center;
-	}
+.justify-center {
+	justify-content: center;
+}
 
-	.flex-column {
-		flex-flow: column;
-	}
+.align-items {
+	align-items: center;
+}
 
-	.justify-start {
-		justify-content: start;
-	}
+.flex-column {
+	flex-flow: column;
+}
+
+.justify-start {
+	justify-content: start;
+}
 
 
-	.con-center {
-		margin-bottom: 100rpx;
+.con-center {
+	margin-bottom: 100rpx;
 
-		.header {
-			width: 690rpx;
-			justify-content: space-between;
-
-			.hea-left {
-				width: 100%;
-				position: relative;
-				.avatar {
-					width: 140rpx;
-					height: 140rpx;
-					border-radius: 50%;
-				}
-
-				
-
-				.first-header {
-					margin-left: 18rpx;
-
-					span {
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 800;
-						font-size: 34rpx;
-						color: #181818;
-						// line-height: 26rpx;
-					}
-				}
-
-				.line {
-					width: 320rpx;
-					height: 1rpx;
-					background: #BABDC7;
-					border-radius: 0rpx 0rpx 0rpx 0rpx;
-					margin: 19rpx 0 7rpx 0;
-				}
-
-				.red {
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 800;
-					font-size: 26rpx;
-					color: #FF4949;
-					line-height: 32rpx;
-				}
-			}
-
-			.hea-right {
-				// width: 20%;
-			}
-
-			.line {}
-
-		}
-	}
-
-	.top_box{
+	.header {
 		width: 690rpx;
-		margin-top: 32rpx;
-		view{
-			background: #FFFFFF;
-			border-radius: 18rpx;
-			width: 330rpx;
-			padding: 20rpx 0;
-			image{
-				width: 70rpx;
-				height: 70rpx;
-				margin-left: 30rpx;
-			}
-			span{
-				margin-left: 20rpx;
-			}
-			.p1{
-				width: 100%;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: bold;
-				font-size: 30rpx;
-				color: #323232;
-			}
-			.p2{
-				width: 100%;
-				margin-top: 10rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				font-size: 24rpx;
-				color: #9C9C9C;
-			}
-		}
-		.top_box_right{
-			margin-left:30rpx ;
-		}
-	}
-
-	.first {
-		width: 690rpx;
-		padding-bottom: 32rpx;
-		margin-top: 52rpx;
-		background: #FFFFFF;
-		border-radius: 24rpx 24rpx 24rpx 24rpx;
-
-		.centerBox {
-			flex-wrap: wrap;
-
-			view {
-				width: 120rpx;
-				margin: 42rpx 90rpx 0 0;
-				position: relative;
-
-				.numberPos {
-					position: absolute;
-					right: 0%;
-					top: 0;
-				}
-
-				.text {
-					font-weight: 500;
-					font-size: 30rpx;
-					color: #181818;
-				}
-			}
-		}
-	}
-
-	.popup {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		padding-left: 73rpx;
-		padding-right: 73rpx;
-
-		img {
-			position: absolute;
-			left: -40rpx;
-			width: 750rpx;
-			height: 1140rpx;
-			top: -460rpx;
-
-		}
-
-
-		#txt2 {
-			text-align: center;
-			margin-top: 340rpx;
-			font-size: 28rpx;
-			color: #525252;
-			margin-bottom: 90rpx;
-			position: relative;
-			font-weight: 500;
-		}
-		.texbut{
-			width: 317rpx;
-			height: 90rpx;
-			border-radius: 45rpx;
-			background: #323232;
-			font-size: 34rpx;
-			color: #fff;
-			font-weight: bold;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-	}
-
-	.jifen {
-		width: 690rpx;
-		height: 86rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx 20rpx 20rpx 20rpx;
-		margin-top: 41rpx;
 		justify-content: space-between;
 
-		.left {
-			margin-left: 32rpx;
+		.hea-left {
+			width: 100%;
+			position: relative;
 
-			.title {
-				width: 104rpx;
-				height: 32rpx;
+			.avatar {
+				width: 140rpx;
+				height: 140rpx;
+				border-radius: 50%;
+			}
+
+
+
+			.first-header {
+				margin-left: 18rpx;
+
+				span {
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 800;
+					font-size: 34rpx;
+					color: #181818;
+					// line-height: 26rpx;
+				}
+			}
+
+			.line {
+				width: 320rpx;
+				height: 1rpx;
+				background: #BABDC7;
+				border-radius: 0rpx 0rpx 0rpx 0rpx;
+				margin: 19rpx 0 7rpx 0;
+			}
+
+			.red {
 				font-family: PingFang SC, PingFang SC;
 				font-weight: 800;
 				font-size: 26rpx;
-				color: #181818;
-				line-height: 32rpx;
-				margin: 0 12rpx 0 6rpx;
-			}
-
-			.scoring {
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 42rpx;
-				color: #FFB134;
+				color: #FF4949;
 				line-height: 32rpx;
 			}
 		}
 
-		.right {
-			margin-right: 32rpx;
+		.hea-right {
+			// width: 20%;
+		}
+
+		.line {}
+
+	}
+}
+
+.top_box {
+	width: 690rpx;
+	margin-top: 32rpx;
+
+	view {
+		background: #FFFFFF;
+		border-radius: 18rpx;
+		width: 330rpx;
+		padding: 20rpx 0;
+
+		image {
+			width: 70rpx;
+			height: 70rpx;
+			margin-left: 30rpx;
+		}
+
+		span {
+			margin-left: 20rpx;
+		}
+
+		.p1 {
+			width: 100%;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: bold;
+			font-size: 30rpx;
+			color: #323232;
+		}
+
+		.p2 {
+			width: 100%;
+			margin-top: 10rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #9C9C9C;
+		}
+	}
+
+	.top_box_right {
+		margin-left: 30rpx;
+	}
+}
+
+.first {
+	width: 690rpx;
+	padding-bottom: 32rpx;
+	margin-top: 52rpx;
+	background: #FFFFFF;
+	border-radius: 24rpx 24rpx 24rpx 24rpx;
+
+	.centerBox {
+		flex-wrap: wrap;
+
+		view {
+			width: 120rpx;
+			margin: 42rpx 90rpx 0 0;
+			position: relative;
+
+			.numberPos {
+				position: absolute;
+				right: 0%;
+				top: 0;
+			}
+
+			.text {
+				font-weight: 500;
+				font-size: 30rpx;
+				color: #181818;
+			}
+		}
+	}
+}
+
+.popup {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding-left: 73rpx;
+	padding-right: 73rpx;
+
+	img {
+		position: absolute;
+		left: -30rpx;
+		width: 690rpx;
+		height: 1130rpx;
+		top: -460rpx;
+	}
+
+
+	#txt2 {
+		text-align: center;
+		margin-top: 280rpx;
+		font-size: 28rpx;
+		color: #525252;
+		margin-bottom: 90rpx;
+		position: relative;
+		font-weight: 500;
+	}
+
+	.texbut {
+		width: 317rpx;
+		height: 90rpx;
+		border-radius: 45rpx;
+		background: #323232;
+		font-size: 34rpx;
+		color: #fff;
+		font-weight: bold;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+}
+
+.jifen {
+	width: 690rpx;
+	height: 86rpx;
+	background: #FFFFFF;
+	border-radius: 20rpx 20rpx 20rpx 20rpx;
+	margin-top: 41rpx;
+	justify-content: space-between;
+
+	.left {
+		margin-left: 32rpx;
+
+		.title {
+			width: 104rpx;
+			height: 32rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 800;
+			font-size: 26rpx;
+			color: #181818;
+			line-height: 32rpx;
+			margin: 0 12rpx 0 6rpx;
+		}
+
+		.scoring {
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 500;
-			font-size: 24rpx;
-			color: #9E9E9E;
+			font-size: 42rpx;
+			color: #FFB134;
 			line-height: 32rpx;
-
-			span {
-				margin-right: 8rpx;
-			}
 		}
 	}
-	.service{
-		margin-top: 30rpx;
-		height: 206rpx;
-		background: url("https://naweigetetest2.hschool.com.cn/dyqc/zhuliren.png");
-		background-size: 690rpx 206rpx;
-		padding-bottom: 0;
-	}
-	.hot {
-      //   margin-top: 30rpx;
-      margin-bottom: 100rpx;
 
-     
-    }
+	.right {
+		margin-right: 32rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #9E9E9E;
+		line-height: 32rpx;
+
+		span {
+			margin-right: 8rpx;
+		}
+	}
+}
+.mymoney {
+	margin-top: 30rpx;
+	width: 690rpx;
+	height: 206rpx;
+	background: #323232;
+	border-radius: 24rpx;
+	position: relative;
+	align-items: flex-start;
+	.myyue{
+		margin-top: 40rpx;
+		margin-left: 30rpx;
+		color: #ffffff;
+	}
+	.tixian{
+		width: 148rpx;
+		height: 68rpx;
+		position: absolute;
+		right: -10rpx;
+		top: 45rpx;
+		
+	}
+	.tixianwz{
+		position: absolute;
+		right: 35rpx;
+		top: 62rpx;
+		font-size: 28rpx;
+		color: #323232;
+	}
+	.botmoney{
+		margin-top: 30rpx;
+		margin-left: 30rpx;
+		color: #777777;
+		font-weight: 400;
+		font-size: 26rpx;
+		.shu{
+			width: 2rpx;
+			height: 22rpx;
+			margin: 0 20rpx;
+			background: #848484;
+		}
+	}
 	
-  .part {
+}
+
+.service {
+	margin-top: 30rpx;
+	height: 206rpx;
+	background: url("https://naweigetetest2.hschool.com.cn/dyqc/zhuliren.png");
+	background-size: 690rpx 206rpx;
+	padding-bottom: 0;
+}
+
+.hot {
+	//   margin-top: 30rpx;
+	margin-bottom: 100rpx;
+
+
+}
+
+.part {
 	width: 162rpx;
 	height: 70rpx;
 	background: url(@/static/index/shangche.png);
-	background-size: 162rpx 70rpx ;
+	background-size: 162rpx 70rpx;
 	background-repeat: no-repeat;
 	font-family: 'YouSheBiaoTiHei';
 	font-weight: 400;
 	font-size: 42rpx;
 	color: #BBFC5B;
-	}
-	.part1{
-  width: 162rpx;
-  height: 70rpx;
-  background: url(@/static/index/shangchew.png);
-  background-size: 162rpx 70rpx;
-  background-repeat: no-repeat;
-  font-family: 'YouSheBiaoTiHei';
-  font-weight: 400;
-  font-size: 42rpx;
-  color: #9C9C9C;
 }
-	.content {
-    // height: 462rpx;
-    // overflow-x: auto;
-    /* 允许横向滚动 */
-    // white-space: nowrap;
 
-    width: 690rpx;
+.part1 {
+	width: 162rpx;
+	height: 70rpx;
+	background: url(@/static/index/shangchew.png);
+	background-size: 162rpx 70rpx;
+	background-repeat: no-repeat;
+	font-family: 'YouSheBiaoTiHei';
+	font-weight: 400;
+	font-size: 42rpx;
+	color: #9C9C9C;
+}
 
-    .bbb {
-      background: #ffffff;
-      margin-top: 24rpx;
-      border-radius: 36rpx;
-    }
+.content {
+	// height: 462rpx;
+	// overflow-x: auto;
+	/* 允许横向滚动 */
+	// white-space: nowrap;
 
-    .right {
-      margin-left: 30rpx;
-      width: 100%;
+	width: 690rpx;
 
-      .title {
-        width: 95%;
-        font-family: PingFang SC, PingFang SC;
-        font-weight: bold;
-        font-size: 30rpx;
-        color: #323232;
-      }
-      .first-image {
-        font-family: PingFang SC, PingFang SC;
-        font-weight: 400;
-        font-size: 24rpx;
-        color: #9C9C9C ;
+	.bbb {
+		background: #ffffff;
+		margin-top: 24rpx;
+		border-radius: 36rpx;
+	}
 
-        span {
-          font-family: Source Han Sans CN, Source Han Sans CN;
-          font-weight: 400;
-          font-size: 26rpx;
-          color: #222222;
-        }
-      }
-      .row {
-        margin: 10rpx 0 26rpx 0;
+	.right {
+		margin-left: 30rpx;
+		width: 100%;
 
-        .remen {
-          // width: 136rpx;
-          height: 40rpx;
-          background: #ebfaf5;
-          border-radius: 4rpx 4rpx 4rpx 4rpx;
+		.title {
+			width: 95%;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: bold;
+			font-size: 30rpx;
+			color: #323232;
+		}
 
-          font-family: Source Han Sans CN, Source Han Sans CN;
-          font-weight: 400;
-          font-size: 24rpx;
-          color: #14bc84;
-          line-height: 28rpx;
-          padding: 2rpx 8rpx;
-        }
+		.first-image {
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #9C9C9C;
 
-        .line-colum {
-          width: 1rpx;
-          height: 32rpx;
-          background: #7a7a7a;
-          margin: 0 13rpx;
-        }
+			span {
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				font-size: 26rpx;
+				color: #222222;
+			}
+		}
 
-        .name {
-          width: 110rpx;
-          height: 32rpx;
-          font-family: PingFang SC, PingFang SC;
-          font-weight: 500;
-          font-size: 26rpx;
-          color: #7a7a7a;
-          line-height: 32rpx;
-          margin-left: 12rpx;
-        }
-      }
+		.row {
+			margin: 10rpx 0 26rpx 0;
+
+			.remen {
+				// width: 136rpx;
+				height: 40rpx;
+				background: #ebfaf5;
+				border-radius: 4rpx 4rpx 4rpx 4rpx;
+
+				font-family: Source Han Sans CN, Source Han Sans CN;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #14bc84;
+				line-height: 28rpx;
+				padding: 2rpx 8rpx;
+			}
+
+			.line-colum {
+				width: 1rpx;
+				height: 32rpx;
+				background: #7a7a7a;
+				margin: 0 13rpx;
+			}
+
+			.name {
+				width: 110rpx;
+				height: 32rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				font-size: 26rpx;
+				color: #7a7a7a;
+				line-height: 32rpx;
+				margin-left: 12rpx;
+			}
+		}
 
 
-      .jigou {
-        width: 312rpx;
-        // height: 32rpx;
-        font-family: PingFang SC, PingFang SC;
-        font-weight: 500;
-        font-size: 26rpx;
-        color: #7a7a7a;
-        margin: 4rpx 0 14rpx 0;
-      }
+		.jigou {
+			width: 312rpx;
+			// height: 32rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			font-size: 26rpx;
+			color: #7a7a7a;
+			margin: 4rpx 0 14rpx 0;
+		}
 
-      .time {
-        font-family: Source Han Sans CN, Source Han Sans CN;
-        font-weight: 400;
-        font-size: 26rpx;
-        color: #323232 ;
-        line-height: 30rpx;
-        
-          .time_tex{
-            width: 116rpx;
-            height: 42rpx;
-            background: #BBFC5B;
-            border-radius: 159rpx;
-            font-weight: 400;
-            font-size: 24rpx;
-            color: #323232;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-          }
-          .time_texs{
-            background: #FF4810;
-            color: #ffffff;
-          }
-        
-      }
-      .imgs_con{
-          width: 202rpx;
-          height: 202rpx;
-          margin-right: 12rpx;
-          &:first-child{
-            border-radius: 18rpx 0 0 18rpx;
-         }
-         &:nth-child(3){
-          border-radius: 0 18rpx 18rpx 0;
-         }
-      }
+		.time {
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #323232;
+			line-height: 30rpx;
 
-    }
+			.time_tex {
+				width: 116rpx;
+				height: 42rpx;
+				background: #BBFC5B;
+				border-radius: 159rpx;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #323232;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
 
-    .bottom {
-      margin: 32rpx 0 32rpx 24rpx;
-      width: 655rpx;
-      .toptext{
-        width: 480rpx;
-        .smalld{
-          margin-left: 0 !important;
-        }
-      }
-      .number {
-        font-family: Source Han Sans CN, Source Han Sans CN;
-        font-weight: 400;
-        font-size: 26rpx;
-        color: #3D3D3D;
-        line-height: 30rpx;
-        width: 242rpx;
-        margin-left: 20rpx;
-      }
+			.time_texs {
+				background: #FF4810;
+				color: #ffffff;
+			}
 
-      .text {
-        font-family: PingFang SC, PingFang SC;
-        font-weight: 800;
-        font-size: 26rpx;
-        color: #7a7a7a;
-      }
+		}
 
-      .money {
-        width: 150rpx;
-        font-family: PingFang SC, PingFang SC;
-        font-weight: 800;
-        font-size: 36rpx;
-        color: #ff2323;
-        justify-content: flex-end;
-      }
-    }
+		.imgs_con {
+			width: 202rpx;
+			height: 202rpx;
+			margin-right: 12rpx;
 
-    .ovr {
-      width: 312rpx;
-      background: #ffffff;
-      border-radius: 20rpx 20rpx 20rpx 20rpx;
-      margin-top: 18rpx;
-      margin-right: 24rpx;
-    }
-  }
+			&:first-child {
+				border-radius: 18rpx 0 0 18rpx;
+			}
+
+			&:nth-child(3) {
+				border-radius: 0 18rpx 18rpx 0;
+			}
+		}
+
+	}
+
+	.bottom {
+		margin: 32rpx 0 32rpx 24rpx;
+		width: 655rpx;
+
+		.toptext {
+			width: 480rpx;
+
+			.smalld {
+				margin-left: 0 !important;
+			}
+		}
+
+		.number {
+			font-family: Source Han Sans CN, Source Han Sans CN;
+			font-weight: 400;
+			font-size: 26rpx;
+			color: #3D3D3D;
+			line-height: 30rpx;
+			width: 242rpx;
+			margin-left: 20rpx;
+		}
+
+		.text {
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 800;
+			font-size: 26rpx;
+			color: #7a7a7a;
+		}
+
+		.money {
+			width: 150rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 800;
+			font-size: 36rpx;
+			color: #ff2323;
+			justify-content: flex-end;
+		}
+	}
+
+	.ovr {
+		width: 312rpx;
+		background: #ffffff;
+		border-radius: 20rpx 20rpx 20rpx 20rpx;
+		margin-top: 18rpx;
+		margin-right: 24rpx;
+	}
+}
 </style>
\ No newline at end of file
diff --git a/static/detail/left.png b/static/detail/left.png
new file mode 100644
index 0000000..d4e1f10
Binary files /dev/null and b/static/detail/left.png differ
diff --git a/static/detail/right.png b/static/detail/right.png
new file mode 100644
index 0000000..d0f054f
Binary files /dev/null and b/static/detail/right.png differ
diff --git a/static/fabu/组 4259.png b/static/fabu/check.png
similarity index 100%
rename from static/fabu/组 4259.png
rename to static/fabu/check.png
diff --git a/static/fabu/组 4259(1).png b/static/fabu/nocheck.png
similarity index 100%
rename from static/fabu/组 4259(1).png
rename to static/fabu/nocheck.png
diff --git a/static/index/xiaoxilogo.png b/static/index/xiaoxilogo.png
new file mode 100644
index 0000000..5ac6dc6
Binary files /dev/null and b/static/index/xiaoxilogo.png differ
diff --git a/static/index/xitongxiaoxi.png b/static/index/xitongxiaoxi.png
new file mode 100644
index 0000000..8bd501b
Binary files /dev/null and b/static/index/xitongxiaoxi.png differ
diff --git a/static/my/centerBack.png b/static/my/centerBack.png
deleted file mode 100644
index ae34382..0000000
Binary files a/static/my/centerBack.png and /dev/null differ
diff --git a/static/my/hotac.png b/static/my/hotac.png
deleted file mode 100644
index b5f5f75..0000000
Binary files a/static/my/hotac.png and /dev/null differ
diff --git a/static/my/qjt.png b/static/my/qjt.png
new file mode 100644
index 0000000..6517cea
Binary files /dev/null and b/static/my/qjt.png differ
diff --git a/static/my/tixian.png b/static/my/tixian.png
new file mode 100644
index 0000000..7799a05
Binary files /dev/null and b/static/my/tixian.png differ
diff --git a/utils/uqrcode.js b/utils/uqrcode.js
new file mode 100644
index 0000000..2290ab3
--- /dev/null
+++ b/utils/uqrcode.js
@@ -0,0 +1,34 @@
+//---------------------------------------------------------------------
+// uQRCode二维码生成插件 v4.0.6
+// 
+// uQRCode是一款基于Javascript环境开发的二维码生成插件，适用所有Javascript运行环境的前端应用和Node.js。
+// 
+// Copyright (c) Sansnn uQRCode All rights reserved.
+// 
+// Licensed under the Apache License, Version 2.0.
+//   http://www.apache.org/licenses/LICENSE-2.0
+// 
+// github地址：
+//   https://github.com/Sansnn/uQRCode
+// 
+// npm地址：
+//   https://www.npmjs.com/package/uqrcodejs
+// 
+// uni-app插件市场地址：
+//   https://ext.dcloud.net.cn/plugin?id=1287
+// 
+// 复制使用请保留本段注释，感谢支持开源！
+// 
+//---------------------------------------------------------------------
+
+//---------------------------------------------------------------------
+// 当前文件格式为 es，将 bundle 保留为 ES 模块文件，适用于其他打包工具以及支持 <script type=module> 标签的浏览器（别名: esm，module）
+// 如需在其他环境使用，请获取环境对应的格式文件
+// 格式说明：
+// amd - 异步模块定义，适用于 RequireJS 等模块加载器
+// cjs - CommonJS，适用于 Node 环境和其他打包工具（别名：commonjs）
+// es - 将 bundle 保留为 ES 模块文件，适用于其他打包工具以及支持 <script type=module> 标签的浏览器（别名: esm，module）
+// umd - 通用模块定义，生成的包同时支持 amd、cjs 和 iife 三种格式
+//---------------------------------------------------------------------
+
+function o(o){this.mode=r.MODE_8BIT_BYTE,this.data=o;}function e(o,e){this.typeNumber=o,this.errorCorrectLevel=e,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=new Array;}o.prototype={getLength:function(o){return this.data.length},write:function(o){for(var e=0;e<this.data.length;e++)o.put(this.data.charCodeAt(e),8);}},e.prototype={addData:function(e){var r=new o(e);this.dataList.push(r),this.dataCache=null;},isDark:function(o,e){if(o<0||this.moduleCount<=o||e<0||this.moduleCount<=e)throw new Error(o+","+e);return this.modules[o][e]},getModuleCount:function(){return this.moduleCount},make:function(){if(this.typeNumber<1){var o=1;for(o=1;o<40;o++){for(var e=v.getRSBlocks(o,this.errorCorrectLevel),r=new p,t=0,i=0;i<e.length;i++)t+=e[i].dataCount;for(i=0;i<this.dataList.length;i++){var n=this.dataList[i];r.put(n.mode,4),r.put(n.getLength(),h.getLengthInBits(n.mode,o)),n.write(r);}if(r.getLengthInBits()<=8*t)break}this.typeNumber=o;}this.makeImpl(!1,this.getBestMaskPattern());},makeImpl:function(o,r){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var t=0;t<this.moduleCount;t++){this.modules[t]=new Array(this.moduleCount);for(var i=0;i<this.moduleCount;i++)this.modules[t][i]=null;}this.setupPositionProbePattern(0,0),this.setupPositionProbePattern(this.moduleCount-7,0),this.setupPositionProbePattern(0,this.moduleCount-7),this.setupPositionAdjustPattern(),this.setupTimingPattern(),this.setupTypeInfo(o,r),this.typeNumber>=7&&this.setupTypeNumber(o),null==this.dataCache&&(this.dataCache=e.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,r);},setupPositionProbePattern:function(o,e){for(var r=-1;r<=7;r++)if(!(o+r<=-1||this.moduleCount<=o+r))for(var t=-1;t<=7;t++)e+t<=-1||this.moduleCount<=e+t||(this.modules[o+r][e+t]=0<=r&&r<=6&&(0==t||6==t)||0<=t&&t<=6&&(0==r||6==r)||2<=r&&r<=4&&2<=t&&t<=4);},getBestMaskPattern:function(){for(var o=0,e=0,r=0;r<8;r++){this.makeImpl(!0,r);var t=h.getLostPoint(this);(0==r||o>t)&&(o=t,e=r);}return e},createMovieClip:function(o,e,r){var t=o.createEmptyMovieClip(e,r);this.make();for(var i=0;i<this.modules.length;i++)for(var n=1*i,a=0;a<this.modules[i].length;a++){var d=1*a;this.modules[i][a]&&(t.beginFill(0,100),t.moveTo(d,n),t.lineTo(d+1,n),t.lineTo(d+1,n+1),t.lineTo(d,n+1),t.endFill());}return t},setupTimingPattern:function(){for(var o=8;o<this.moduleCount-8;o++)null==this.modules[o][6]&&(this.modules[o][6]=o%2==0);for(var e=8;e<this.moduleCount-8;e++)null==this.modules[6][e]&&(this.modules[6][e]=e%2==0);},setupPositionAdjustPattern:function(){for(var o=h.getPatternPosition(this.typeNumber),e=0;e<o.length;e++)for(var r=0;r<o.length;r++){var t=o[e],i=o[r];if(null==this.modules[t][i])for(var n=-2;n<=2;n++)for(var a=-2;a<=2;a++)this.modules[t+n][i+a]=-2==n||2==n||-2==a||2==a||0==n&&0==a;}},setupTypeNumber:function(o){for(var e=h.getBCHTypeNumber(this.typeNumber),r=0;r<18;r++){var t=!o&&1==(e>>r&1);this.modules[Math.floor(r/3)][r%3+this.moduleCount-8-3]=t;}for(r=0;r<18;r++){t=!o&&1==(e>>r&1);this.modules[r%3+this.moduleCount-8-3][Math.floor(r/3)]=t;}},setupTypeInfo:function(o,e){for(var r=this.errorCorrectLevel<<3|e,t=h.getBCHTypeInfo(r),i=0;i<15;i++){var n=!o&&1==(t>>i&1);i<6?this.modules[i][8]=n:i<8?this.modules[i+1][8]=n:this.modules[this.moduleCount-15+i][8]=n;}for(i=0;i<15;i++){n=!o&&1==(t>>i&1);i<8?this.modules[8][this.moduleCount-i-1]=n:i<9?this.modules[8][15-i-1+1]=n:this.modules[8][15-i-1]=n;}this.modules[this.moduleCount-8][8]=!o;},mapData:function(o,e){for(var r=-1,t=this.moduleCount-1,i=7,n=0,a=this.moduleCount-1;a>0;a-=2)for(6==a&&a--;;){for(var d=0;d<2;d++)if(null==this.modules[t][a-d]){var u=!1;n<o.length&&(u=1==(o[n]>>>i&1)),h.getMask(e,t,a-d)&&(u=!u),this.modules[t][a-d]=u,-1==--i&&(n++,i=7);}if((t+=r)<0||this.moduleCount<=t){t-=r,r=-r;break}}}},e.PAD0=236,e.PAD1=17,e.createData=function(o,r,t){for(var i=v.getRSBlocks(o,r),n=new p,a=0;a<t.length;a++){var d=t[a];n.put(d.mode,4),n.put(d.getLength(),h.getLengthInBits(d.mode,o)),d.write(n);}var u=0;for(a=0;a<i.length;a++)u+=i[a].dataCount;if(n.getLengthInBits()>8*u)throw new Error("code length overflow. ("+n.getLengthInBits()+">"+8*u+")");for(n.getLengthInBits()+4<=8*u&&n.put(0,4);n.getLengthInBits()%8!=0;)n.putBit(!1);for(;!(n.getLengthInBits()>=8*u||(n.put(e.PAD0,8),n.getLengthInBits()>=8*u));)n.put(e.PAD1,8);return e.createBytes(n,i)},e.createBytes=function(o,e){for(var r=0,t=0,i=0,n=new Array(e.length),a=new Array(e.length),d=0;d<e.length;d++){var u=e[d].dataCount,s=e[d].totalCount-u;t=Math.max(t,u),i=Math.max(i,s),n[d]=new Array(u);for(var g=0;g<n[d].length;g++)n[d][g]=255&o.buffer[g+r];r+=u;var l=h.getErrorCorrectPolynomial(s),c=new f(n[d],l.getLength()-1).mod(l);a[d]=new Array(l.getLength()-1);for(g=0;g<a[d].length;g++){var m=g+c.getLength()-a[d].length;a[d][g]=m>=0?c.get(m):0;}}var v=0;for(g=0;g<e.length;g++)v+=e[g].totalCount;var p=new Array(v),C=0;for(g=0;g<t;g++)for(d=0;d<e.length;d++)g<n[d].length&&(p[C++]=n[d][g]);for(g=0;g<i;g++)for(d=0;d<e.length;d++)g<a[d].length&&(p[C++]=a[d][g]);return p};for(var r={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},t={L:1,M:0,Q:3,H:2},i=0,n=1,a=2,d=3,u=4,s=5,g=6,l=7,h={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(o){for(var e=o<<10;h.getBCHDigit(e)-h.getBCHDigit(h.G15)>=0;)e^=h.G15<<h.getBCHDigit(e)-h.getBCHDigit(h.G15);return (o<<10|e)^h.G15_MASK},getBCHTypeNumber:function(o){for(var e=o<<12;h.getBCHDigit(e)-h.getBCHDigit(h.G18)>=0;)e^=h.G18<<h.getBCHDigit(e)-h.getBCHDigit(h.G18);return o<<12|e},getBCHDigit:function(o){for(var e=0;0!=o;)e++,o>>>=1;return e},getPatternPosition:function(o){return h.PATTERN_POSITION_TABLE[o-1]},getMask:function(o,e,r){switch(o){case i:return (e+r)%2==0;case n:return e%2==0;case a:return r%3==0;case d:return (e+r)%3==0;case u:return (Math.floor(e/2)+Math.floor(r/3))%2==0;case s:return e*r%2+e*r%3==0;case g:return (e*r%2+e*r%3)%2==0;case l:return (e*r%3+(e+r)%2)%2==0;default:throw new Error("bad maskPattern:"+o)}},getErrorCorrectPolynomial:function(o){for(var e=new f([1],0),r=0;r<o;r++)e=e.multiply(new f([1,c.gexp(r)],0));return e},getLengthInBits:function(o,e){if(1<=e&&e<10)switch(o){case r.MODE_NUMBER:return 10;case r.MODE_ALPHA_NUM:return 9;case r.MODE_8BIT_BYTE:case r.MODE_KANJI:return 8;default:throw new Error("mode:"+o)}else if(e<27)switch(o){case r.MODE_NUMBER:return 12;case r.MODE_ALPHA_NUM:return 11;case r.MODE_8BIT_BYTE:return 16;case r.MODE_KANJI:return 10;default:throw new Error("mode:"+o)}else {if(!(e<41))throw new Error("type:"+e);switch(o){case r.MODE_NUMBER:return 14;case r.MODE_ALPHA_NUM:return 13;case r.MODE_8BIT_BYTE:return 16;case r.MODE_KANJI:return 12;default:throw new Error("mode:"+o)}}},getLostPoint:function(o){for(var e=o.getModuleCount(),r=0,t=0;t<e;t++)for(var i=0;i<e;i++){for(var n=0,a=o.isDark(t,i),d=-1;d<=1;d++)if(!(t+d<0||e<=t+d))for(var u=-1;u<=1;u++)i+u<0||e<=i+u||0==d&&0==u||a==o.isDark(t+d,i+u)&&n++;n>5&&(r+=3+n-5);}for(t=0;t<e-1;t++)for(i=0;i<e-1;i++){var s=0;o.isDark(t,i)&&s++,o.isDark(t+1,i)&&s++,o.isDark(t,i+1)&&s++,o.isDark(t+1,i+1)&&s++,0!=s&&4!=s||(r+=3);}for(t=0;t<e;t++)for(i=0;i<e-6;i++)o.isDark(t,i)&&!o.isDark(t,i+1)&&o.isDark(t,i+2)&&o.isDark(t,i+3)&&o.isDark(t,i+4)&&!o.isDark(t,i+5)&&o.isDark(t,i+6)&&(r+=40);for(i=0;i<e;i++)for(t=0;t<e-6;t++)o.isDark(t,i)&&!o.isDark(t+1,i)&&o.isDark(t+2,i)&&o.isDark(t+3,i)&&o.isDark(t+4,i)&&!o.isDark(t+5,i)&&o.isDark(t+6,i)&&(r+=40);var g=0;for(i=0;i<e;i++)for(t=0;t<e;t++)o.isDark(t,i)&&g++;return r+=10*(Math.abs(100*g/e/e-50)/5)}},c={glog:function(o){if(o<1)throw new Error("glog("+o+")");return c.LOG_TABLE[o]},gexp:function(o){for(;o<0;)o+=255;for(;o>=256;)o-=255;return c.EXP_TABLE[o]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},m=0;m<8;m++)c.EXP_TABLE[m]=1<<m;for(m=8;m<256;m++)c.EXP_TABLE[m]=c.EXP_TABLE[m-4]^c.EXP_TABLE[m-5]^c.EXP_TABLE[m-6]^c.EXP_TABLE[m-8];for(m=0;m<255;m++)c.LOG_TABLE[c.EXP_TABLE[m]]=m;function f(o,e){if(null==o.length)throw new Error(o.length+"/"+e);for(var r=0;r<o.length&&0==o[r];)r++;this.num=new Array(o.length-r+e);for(var t=0;t<o.length-r;t++)this.num[t]=o[t+r];}function v(o,e){this.totalCount=o,this.dataCount=e;}function p(){this.buffer=new Array,this.length=0;}function C(o){return o.setFillStyle=o.setFillStyle||function(e){o.fillStyle=e;},o.setFontSize=o.setFontSize||function(e){o.font=`${e}px`;},o.setTextAlign=o.setTextAlign||function(e){o.textAlign=e;},o.setTextBaseline=o.setTextBaseline||function(e){o.textBaseline=e;},o.setGlobalAlpha=o.setGlobalAlpha||function(e){o.globalAlpha=e;},o.setStrokeStyle=o.setStrokeStyle||function(e){o.strokeStyle=e;},o.setShadow=o.setShadow||function(e,r,t,i){o.shadowOffsetX=e,o.shadowOffsetY=r,o.shadowBlur=t,o.shadowColor=i;},o.draw=o.draw||function(o,e){e&&e();},o.clearRect=o.clearRect||function(e,r,t,i){o.draw(!1);},o}function b(o,e){var r=this.data="",t=this.size=200;this.useDynamicSize=!1,this.dynamicSize=t;var i=this.typeNumber=-1;this.errorCorrectLevel=b.errorCorrectLevel.H;var n=this.margin=0;this.areaColor="#FFFFFF",this.backgroundColor="rgba(255,255,255,0)",this.backgroundImageSrc=void 0;var a=this.backgroundImageWidth=void 0,d=this.backgroundImageHeight=void 0,u=this.backgroundImageX=void 0,s=this.backgroundImageY=void 0;this.backgroundImageAlpha=1,this.backgroundImageBorderRadius=0;var g=this.backgroundPadding=0;this.foregroundColor="#000000",this.foregroundImageSrc=void 0;var l=this.foregroundImageWidth=void 0,h=this.foregroundImageHeight=void 0,c=this.foregroundImageX=void 0,m=this.foregroundImageY=void 0,f=this.foregroundImagePadding=0;this.foregroundImageBackgroundColor="#FFFFFF";var v=this.foregroundImageBorderRadius=0,p=this.foregroundImageShadowOffsetX=0,k=this.foregroundImageShadowOffsetY=0,y=this.foregroundImageShadowBlur=0;this.foregroundImageShadowColor="#808080";var w=this.foregroundPadding=0,I=this.positionProbeBackgroundColor=void 0,B=this.positionProbeForegroundColor=void 0,S=this.separatorColor=void 0,P=this.positionAdjustBackgroundColor=void 0,L=this.positionAdjustForegroundColor=void 0,D=this.timingBackgroundColor=void 0,A=this.timingForegroundColor=void 0,E=this.typeNumberBackgroundColor=void 0,T=this.typeNumberForegroundColor=void 0,N=this.darkBlockColor=void 0;this.base=void 0,this.modules=[],this.moduleCount=0,this.drawModules=[];var M=this.canvasContext=void 0;this.loadImage,this.drawReserve=!1,this.isMaked=!1,Object.defineProperties(this,{data:{get(){if(""===r||void 0===r)throw console.error("[uQRCode]: data must be set!"),new b.Error("data must be set!");return r},set(o){r=String(o);}},size:{get:()=>t,set(o){t=Number(o);}},typeNumber:{get:()=>i,set(o){i=Number(o);}},margin:{get:()=>n,set(o){n=Number(o);}},backgroundImageWidth:{get(){return void 0===a?this.dynamicSize:this.useDynamicSize?this.dynamicSize/this.size*a:a},set(o){a=Number(o);}},backgroundImageHeight:{get(){return void 0===d?this.dynamicSize:this.useDynamicSize?this.dynamicSize/this.size*d:d},set(o){d=Number(o);}},backgroundImageX:{get(){return void 0===u?0:this.useDynamicSize?this.dynamicSize/this.size*u:u},set(o){u=Number(o);}},backgroundImageY:{get(){return void 0===s?0:this.useDynamicSize?this.dynamicSize/this.size*s:s},set(o){s=Number(o);}},backgroundPadding:{get:()=>g,set(o){g=o>1?1:o<0?0:o;}},foregroundImageWidth:{get(){return void 0===l?(this.dynamicSize-2*this.margin)/4:this.useDynamicSize?this.dynamicSize/this.size*l:l},set(o){l=Number(o);}},foregroundImageHeight:{get(){return void 0===h?(this.dynamicSize-2*this.margin)/4:this.useDynamicSize?this.dynamicSize/this.size*h:h},set(o){h=Number(o);}},foregroundImageX:{get(){return void 0===c?this.dynamicSize/2-this.foregroundImageWidth/2:this.useDynamicSize?this.dynamicSize/this.size*c:c},set(o){c=Number(o);}},foregroundImageY:{get(){return void 0===m?this.dynamicSize/2-this.foregroundImageHeight/2:this.useDynamicSize?this.dynamicSize/this.size*m:m},set(o){m=Number(o);}},foregroundImagePadding:{get(){return this.useDynamicSize?this.dynamicSize/this.size*f:f},set(o){f=Number(o);}},foregroundImageBorderRadius:{get(){return this.useDynamicSize?this.dynamicSize/this.size*v:v},set(o){v=Number(o);}},foregroundImageShadowOffsetX:{get(){return this.useDynamicSize?this.dynamicSize/this.size*p:p},set(o){p=Number(o);}},foregroundImageShadowOffsetY:{get(){return this.useDynamicSize?this.dynamicSize/this.size*k:k},set(o){k=Number(o);}},foregroundImageShadowBlur:{get(){return this.useDynamicSize?this.dynamicSize/this.size*y:y},set(o){y=Number(o);}},foregroundPadding:{get:()=>w,set(o){w=o>1?1:o<0?0:o;}},positionProbeBackgroundColor:{get(){return I||this.backgroundColor},set(o){I=o;}},positionProbeForegroundColor:{get(){return B||this.foregroundColor},set(o){B=o;}},separatorColor:{get(){return S||this.backgroundColor},set(o){S=o;}},positionAdjustBackgroundColor:{get(){return P||this.backgroundColor},set(o){P=o;}},positionAdjustForegroundColor:{get(){return L||this.foregroundColor},set(o){L=o;}},timingBackgroundColor:{get(){return D||this.backgroundColor},set(o){D=o;}},timingForegroundColor:{get(){return A||this.foregroundColor},set(o){A=o;}},typeNumberBackgroundColor:{get(){return E||this.backgroundColor},set(o){E=o;}},typeNumberForegroundColor:{get(){return T||this.foregroundColor},set(o){T=o;}},darkBlockColor:{get(){return N||this.foregroundColor},set(o){N=o;}},canvasContext:{get(){if(void 0===M)throw console.error("[uQRCode]: use drawCanvas, you need to set the canvasContext!"),new b.Error("use drawCanvas, you need to set the canvasContext!");return M},set(o){M=C(o);}}}),b.plugins.forEach((o=>o(b,this,!1))),o&&this.setOptions(o),e&&(this.canvasContext=C(e));}f.prototype={get:function(o){return this.num[o]},getLength:function(){return this.num.length},multiply:function(o){for(var e=new Array(this.getLength()+o.getLength()-1),r=0;r<this.getLength();r++)for(var t=0;t<o.getLength();t++)e[r+t]^=c.gexp(c.glog(this.get(r))+c.glog(o.get(t)));return new f(e,0)},mod:function(o){if(this.getLength()-o.getLength()<0)return this;for(var e=c.glog(this.get(0))-c.glog(o.get(0)),r=new Array(this.getLength()),t=0;t<this.getLength();t++)r[t]=this.get(t);for(t=0;t<o.getLength();t++)r[t]^=c.gexp(c.glog(o.get(t))+e);return new f(r,0).mod(o)}},v.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],v.getRSBlocks=function(o,e){var r=v.getRsBlockTable(o,e);if(null==r)throw new Error("bad rs block @ typeNumber:"+o+"/errorCorrectLevel:"+e);for(var t=r.length/3,i=new Array,n=0;n<t;n++)for(var a=r[3*n+0],d=r[3*n+1],u=r[3*n+2],s=0;s<a;s++)i.push(new v(d,u));return i},v.getRsBlockTable=function(o,e){switch(e){case t.L:return v.RS_BLOCK_TABLE[4*(o-1)+0];case t.M:return v.RS_BLOCK_TABLE[4*(o-1)+1];case t.Q:return v.RS_BLOCK_TABLE[4*(o-1)+2];case t.H:return v.RS_BLOCK_TABLE[4*(o-1)+3];default:return}},p.prototype={get:function(o){var e=Math.floor(o/8);return 1==(this.buffer[e]>>>7-o%8&1)},put:function(o,e){for(var r=0;r<e;r++)this.putBit(1==(o>>>e-r-1&1));},getLengthInBits:function(){return this.length},putBit:function(o){var e=Math.floor(this.length/8);this.buffer.length<=e&&this.buffer.push(0),o&&(this.buffer[e]|=128>>>this.length%8),this.length++;}},e.errorCorrectLevel=t,b.errorCorrectLevel=e.errorCorrectLevel,b.Error=function(o){this.errMsg="[uQRCode]: "+o;},b.plugins=[],b.use=function(o){"function"==typeof o&&b.plugins.push(o);},b.prototype.loadImage=function(o){return Promise.resolve(o)},b.prototype.setOptions=function(o){var e,r,t,i,n,a,d,u,s,g,l,h,c,m,f,v,p,C,b,k,y,w,I,B,S,P,L,D,A,E,T,N,M,z,R,_,O,F,x,H,X,Y,j,W,G,K,Q,U,$,J,q,V,Z,oo,eo,ro;o&&(Object.keys(o).forEach((e=>{this[e]=o[e];})),function(o={},e={},r=!1){let t;t=r?o:{...o};for(let o in e){var i=e[o];null!=i&&(i.constructor==Object?t[o]=this.deepReplace(t[o],i):i.constructor!=String||i?t[o]=i:t[o]=t[o]);}}(this,{data:o.data||o.text,size:o.size,useDynamicSize:o.useDynamicSize,typeNumber:o.typeNumber,errorCorrectLevel:o.errorCorrectLevel,margin:o.margin,areaColor:o.areaColor,backgroundColor:o.backgroundColor||(null===(e=o.background)||void 0===e?void 0:e.color),backgroundImageSrc:o.backgroundImageSrc||(null===(r=o.background)||void 0===r||null===(t=r.image)||void 0===t?void 0:t.src),backgroundImageWidth:o.backgroundImageWidth||(null===(i=o.background)||void 0===i||null===(n=i.image)||void 0===n?void 0:n.width),backgroundImageHeight:o.backgroundImageHeight||(null===(a=o.background)||void 0===a||null===(d=a.image)||void 0===d?void 0:d.height),backgroundImageX:o.backgroundImageX||(null===(u=o.background)||void 0===u||null===(s=u.image)||void 0===s?void 0:s.x),backgroundImageY:o.backgroundImageY||(null===(g=o.background)||void 0===g||null===(l=g.image)||void 0===l?void 0:l.y),backgroundImageAlpha:o.backgroundImageAlpha||(null===(h=o.background)||void 0===h||null===(c=h.image)||void 0===c?void 0:c.alpha),backgroundImageBorderRadius:o.backgroundImageBorderRadius||(null===(m=o.background)||void 0===m||null===(f=m.image)||void 0===f?void 0:f.borderRadius),backgroundPadding:o.backgroundPadding,foregroundColor:o.foregroundColor||(null===(v=o.foreground)||void 0===v?void 0:v.color),foregroundImageSrc:o.foregroundImageSrc||(null===(p=o.foreground)||void 0===p||null===(C=p.image)||void 0===C?void 0:C.src),foregroundImageWidth:o.foregroundImageWidth||(null===(b=o.foreground)||void 0===b||null===(k=b.image)||void 0===k?void 0:k.width),foregroundImageHeight:o.foregroundImageHeight||(null===(y=o.foreground)||void 0===y||null===(w=y.image)||void 0===w?void 0:w.height),foregroundImageX:o.foregroundImageX||(null===(I=o.foreground)||void 0===I||null===(B=I.image)||void 0===B?void 0:B.x),foregroundImageY:o.foregroundImageY||(null===(S=o.foreground)||void 0===S||null===(P=S.image)||void 0===P?void 0:P.y),foregroundImagePadding:o.foregroundImagePadding||(null===(L=o.foreground)||void 0===L||null===(D=L.image)||void 0===D?void 0:D.padding),foregroundImageBackgroundColor:o.foregroundImageBackgroundColor||(null===(A=o.foreground)||void 0===A||null===(E=A.image)||void 0===E?void 0:E.backgroundColor),foregroundImageBorderRadius:o.foregroundImageBorderRadius||(null===(T=o.foreground)||void 0===T||null===(N=T.image)||void 0===N?void 0:N.borderRadius),foregroundImageShadowOffsetX:o.foregroundImageShadowOffsetX||(null===(M=o.foreground)||void 0===M||null===(z=M.image)||void 0===z?void 0:z.shadowOffsetX),foregroundImageShadowOffsetY:o.foregroundImageShadowOffsetY||(null===(R=o.foreground)||void 0===R||null===(_=R.image)||void 0===_?void 0:_.shadowOffsetY),foregroundImageShadowBlur:o.foregroundImageShadowBlur||(null===(O=o.foreground)||void 0===O||null===(F=O.image)||void 0===F?void 0:F.shadowBlur),foregroundImageShadowColor:o.foregroundImageShadowColor||(null===(x=o.foreground)||void 0===x||null===(H=x.image)||void 0===H?void 0:H.shadowColor),foregroundPadding:o.foregroundPadding,positionProbeBackgroundColor:o.positionProbeBackgroundColor||(null===(X=o.positionProbe)||void 0===X?void 0:X.backgroundColor)||(null===(Y=o.positionDetection)||void 0===Y?void 0:Y.backgroundColor),positionProbeForegroundColor:o.positionProbeForegroundColor||(null===(j=o.positionProbe)||void 0===j?void 0:j.foregroundColor)||(null===(W=o.positionDetection)||void 0===W?void 0:W.foregroundColor),separatorColor:o.separatorColor||(null===(G=o.separator)||void 0===G?void 0:G.color),positionAdjustBackgroundColor:o.positionAdjustBackgroundColor||(null===(K=o.positionAdjust)||void 0===K?void 0:K.backgroundColor)||(null===(Q=o.alignment)||void 0===Q?void 0:Q.backgroundColor),positionAdjustForegroundColor:o.positionAdjustForegroundColor||(null===(U=o.positionAdjust)||void 0===U?void 0:U.foregroundColor)||(null===($=o.alignment)||void 0===$?void 0:$.foregroundColor),timingBackgroundColor:o.timingBackgroundColor||(null===(J=o.timing)||void 0===J?void 0:J.backgroundColor),timingForegroundColor:o.timingForegroundColor||(null===(q=o.timing)||void 0===q?void 0:q.foregroundColor),typeNumberBackgroundColor:o.typeNumberBackgroundColor||(null===(V=o.typeNumber)||void 0===V?void 0:V.backgroundColor)||(null===(Z=o.versionInformation)||void 0===Z?void 0:Z.backgroundColor),typeNumberForegroundColor:o.typeNumberForegroundColor||(null===(oo=o.typeNumber)||void 0===oo?void 0:oo.foregroundColor)||(null===(eo=o.versionInformation)||void 0===eo?void 0:eo.foregroundColor),darkBlockColor:o.darkBlockColor||(null===(ro=o.darkBlock)||void 0===ro?void 0:ro.color)},!0));},b.prototype.make=function(){let{foregroundColor:o,backgroundColor:r,typeNumber:t,errorCorrectLevel:i,data:n,size:a,margin:d,useDynamicSize:u}=this;if(o===r)throw console.error("[uQRCode]: foregroundColor and backgroundColor cannot be the same!"),new b.Error("foregroundColor and backgroundColor cannot be the same!");var s=new e(t,i);s.addData(function(o){o=o.toString();for(var e,r="",t=0;t<o.length;t++)(e=o.charCodeAt(t))>=1&&e<=127?r+=o.charAt(t):e>2047?(r+=String.fromCharCode(224|e>>12&15),r+=String.fromCharCode(128|e>>6&63),r+=String.fromCharCode(128|e>>0&63)):(r+=String.fromCharCode(192|e>>6&31),r+=String.fromCharCode(128|e>>0&63));return r}(n)),s.make(),this.base=s,this.typeNumber=s.typeNumber,this.modules=s.modules,this.moduleCount=s.moduleCount,this.dynamicSize=u?Math.ceil((a-2*d)/s.moduleCount)*s.moduleCount+2*d:a,function(o){let{dynamicSize:e,margin:r,backgroundColor:t,backgroundPadding:i,foregroundColor:n,foregroundPadding:a,modules:d,moduleCount:u}=o,s=(e-2*r)/u,g=s,l=0;i>0&&(l=g*i/2,g-=2*l);let h=s,c=0;a>0&&(c=h*a/2,h-=2*c);for(var m=0;m<u;m++)for(var f=0;f<u;f++){var v=f*s+r,p=m*s+r;if(d[m][f]){var C=c,b=v+c,k=p+c,y=h,w=h;d[m][f]={type:["foreground"],color:n,isBlack:!0,isDrawn:!1,destX:v,destY:p,destWidth:s,destHeight:s,x:b,y:k,width:y,height:w,paddingTop:C,paddingRight:C,paddingBottom:C,paddingLeft:C};}else C=l,b=v+l,k=p+l,y=g,w=g,d[m][f]={type:["background"],color:t,isBlack:!1,isDrawn:!1,destX:v,destY:p,destWidth:s,destHeight:s,x:b,y:k,width:y,height:w,paddingTop:C,paddingRight:C,paddingBottom:C,paddingLeft:C};}}(this),function(o){let{modules:e,moduleCount:r,positionProbeBackgroundColor:t,positionProbeForegroundColor:i}=o,n=r-7;[[0,0,1],[1,0,1],[2,0,1],[3,0,1],[4,0,1],[5,0,1],[6,0,1],[0,1,1],[1,1,0],[2,1,0],[3,1,0],[4,1,0],[5,1,0],[6,1,1],[0,2,1],[1,2,0],[2,2,1],[3,2,1],[4,2,1],[5,2,0],[6,2,1],[0,3,1],[1,3,0],[2,3,1],[3,3,1],[4,3,1],[5,3,0],[6,3,1],[0,4,1],[1,4,0],[2,4,1],[3,4,1],[4,4,1],[5,4,0],[6,4,1],[0,5,1],[1,5,0],[2,5,0],[3,5,0],[4,5,0],[5,5,0],[6,5,1],[0,6,1],[1,6,1],[2,6,1],[3,6,1],[4,6,1],[5,6,1],[6,6,1]].forEach((o=>{var r=e[o[0]][o[1]],a=e[o[0]+n][o[1]],d=e[o[0]][o[1]+n];d.type.push("positionProbe"),a.type.push("positionProbe"),r.type.push("positionProbe"),r.color=1==o[2]?i:t,a.color=1==o[2]?i:t,d.color=1==o[2]?i:t;}));}(this),function(o){let{modules:e,moduleCount:r,separatorColor:t}=o;[[7,0],[7,1],[7,2],[7,3],[7,4],[7,5],[7,6],[7,7],[0,7],[1,7],[2,7],[3,7],[4,7],[5,7],[6,7]].forEach((o=>{var i=e[o[0]][o[1]],n=e[r-o[0]-1][o[1]],a=e[o[0]][r-o[1]-1];a.type.push("separator"),n.type.push("separator"),i.type.push("separator"),i.color=t,n.color=t,a.color=t;}));}(this),function(o){let{typeNumber:e,modules:r,moduleCount:t,foregroundColor:i,backgroundColor:n,positionAdjustForegroundColor:a,positionAdjustBackgroundColor:d,timingForegroundColor:u,timingBackgroundColor:s}=o;const g=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]][e-1];if(g){const o=[[-2,-2,1],[-1,-2,1],[0,-2,1],[1,-2,1],[2,-2,1],[-2,-1,1],[-1,-1,0],[0,-1,0],[1,-1,0],[2,-1,1],[-2,0,1],[-1,0,0],[0,0,1],[1,0,0],[2,0,1],[-2,1,1],[-1,1,0],[0,1,0],[1,1,0],[2,1,1],[-2,2,1],[-1,2,1],[0,2,1],[1,2,1],[2,2,1]],e=g.length;for(let l=0;l<e;l++)for(let h=0;h<e;h++){let{x:e,y:c}={x:g[l],y:g[h]};e<9&&c<9||e>t-9-1&&c<9||c>t-9-1&&e<9||o.forEach((o=>{var t=r[e+o[0]][c+o[1]];t.type.push("positionAdjust"),t.type.includes("timing")?1==o[2]?t.color=a==i?u:a:t.color=a==i&&d==n?s:d:t.color=1==o[2]?a:d;}));}}}(this),function(o){let{modules:e,moduleCount:r,timingForegroundColor:t,timingBackgroundColor:i}=o,n=r-16;for(let o=0;o<n;o++){var a=e[6][8+o],d=e[8+o][6];a.type.push("timing"),d.type.push("timing"),a.color=1&o^1?t:i,d.color=1&o^1?t:i;}}(this),function(o){let{modules:e,moduleCount:r,darkBlockColor:t}=o;var i=e[r-7-1][8];i.type.push("darkBlock"),i.color=t;}(this),function(o){let{typeNumber:e,modules:r,moduleCount:t,typeNumberBackgroundColor:i,typeNumberForegroundColor:n}=o;if(e<7)return r;const a=[0,0,0,0,0,0,0,"000111110010010100","001000010110111100","001001101010011001","001010010011010011","001011101111110110","001100011101100010","001101100001000111","001110011000001101","001111100100101000","010000101101111000","010001010001011101","010010101000010111","010011010100110010","010100100110100110","010101011010000011","010110100011001001","010111011111101100","011000111011000100","011001000111100001","011010111110101011","011011000010001110","011100110000011010","011101001100111111","011110110101110101","011111001001010000","100000100111010101","100001011011110000","100010100010111010","100011011110011111","100100101100001011","100101010000101110","100110101001100100","100111010101000001","101000110001101001"];let d=a[e]+a[e],u=[t-11,t-10,t-9];[[5,u[2]],[5,u[1]],[5,u[0]],[4,u[2]],[4,u[1]],[4,u[0]],[3,u[2]],[3,u[1]],[3,u[0]],[2,u[2]],[2,u[1]],[2,u[0]],[1,u[2]],[1,u[1]],[1,u[0]],[0,u[2]],[0,u[1]],[0,u[0]],[u[2],5],[u[1],5],[u[0],5],[u[2],4],[u[1],4],[u[0],4],[u[2],3],[u[1],3],[u[0],3],[u[2],2],[u[1],2],[u[0],2],[u[2],1],[u[1],1],[u[0],1],[u[2],0],[u[1],0],[u[0],0]].forEach(((o,e)=>{var t=r[o[0]][o[1]];t.type.push("typeNumber"),t.color="1"==d[e]?n:i;}));}(this),this.isMaked=!0,this.drawModules=[];},b.prototype.getDrawModules=function(){if(this.drawModules&&this.drawModules.length>0)return this.drawModules;let o=this.drawModules=[],{modules:e,moduleCount:r,dynamicSize:t,areaColor:i,backgroundImageSrc:n,backgroundImageX:a,backgroundImageY:d,backgroundImageWidth:u,backgroundImageHeight:s,backgroundImageAlpha:g,backgroundImageBorderRadius:l,foregroundImageSrc:h,foregroundImageX:c,foregroundImageY:m,foregroundImageWidth:f,foregroundImageHeight:v,foregroundImagePadding:p,foregroundImageBackgroundColor:C,foregroundImageBorderRadius:b,foregroundImageShadowOffsetX:k,foregroundImageShadowOffsetY:y,foregroundImageShadowBlur:w,foregroundImageShadowColor:I}=this;i&&o.push({name:"area",type:"area",color:i,x:0,y:0,width:t,height:t}),n&&o.push({name:"backgroundImage",type:"image",imageSrc:n,mappingName:"backgroundImageSrc",x:a,y:d,width:u,height:s,alpha:g,borderRadius:l});for(var B=0;B<r;B++)for(var S=0;S<r;S++){var P=e[B][S];P.isDrawn||(P.type.includes("foreground")?o.push({name:"foreground",type:"tile",color:P.color,destX:P.destX,destY:P.destY,destWidth:P.destWidth,destHeight:P.destHeight,x:P.x,y:P.y,width:P.width,height:P.height,paddingTop:P.paddingTop,paddingRight:P.paddingRight,paddingBottom:P.paddingBottom,paddingLeft:P.paddingLeft,rowIndex:B,colIndex:S}):o.push({name:"background",type:"tile",color:P.color,destX:P.destX,destY:P.destY,destWidth:P.destWidth,destHeight:P.destHeight,x:P.x,y:P.y,width:P.width,height:P.height,paddingTop:P.paddingTop,paddingRight:P.paddingRight,paddingBottom:P.paddingBottom,paddingLeft:P.paddingLeft,rowIndex:B,colIndex:S}),P.isDrawn=!0);}return h&&o.push({name:"foregroundImage",type:"image",imageSrc:h,mappingName:"foregroundImageSrc",x:c,y:m,width:f,height:v,padding:p,backgroundColor:C,borderRadius:b,shadowOffsetX:k,shadowOffsetY:y,shadowBlur:w,shadowColor:I}),o},b.prototype.isBlack=function(o,e){var r=this.moduleCount;return !(0>o||0>e||o>=r||e>=r)&&this.modules[o][e].isBlack},b.prototype.drawCanvas=function(){let{isMaked:o,canvasContext:e,useDynamicSize:r,dynamicSize:t,foregroundColor:i,foregroundPadding:n,backgroundColor:a,backgroundPadding:d,drawReserve:u,margin:s}=this;if(!o)return console.error("[uQRCode]: please execute the make method first!"),Promise.reject(new b.Error("please execute the make method first!"));let g=this.getDrawModules(),l=async(o,r)=>{try{e.clearRect(0,0,t,t),e.draw(!1);for(var i=0;i<g.length;i++){var n=g[i];switch(e.save(),n.type){case"area":e.setFillStyle(n.color),e.fillRect(n.x,n.y,n.width,n.height);break;case"tile":var a=n.x,d=n.y,s=n.width,l=n.height;e.setFillStyle(n.color),e.fillRect(a,d,s,l);break;case"image":if("backgroundImage"===n.name){a=Math.round(n.x),d=Math.round(n.y),s=Math.round(n.width),l=Math.round(n.height);s<2*(c=Math.round(n.borderRadius))&&(c=s/2),l<2*c&&(c=l/2),e.setGlobalAlpha(n.alpha),c>0&&(e.beginPath(),e.moveTo(a+c,d),e.arcTo(a+s,d,a+s,d+l,c),e.arcTo(a+s,d+l,a,d+l,c),e.arcTo(a,d+l,a,d,c),e.arcTo(a,d,a+s,d,c),e.closePath(),e.setStrokeStyle("rgba(0,0,0,0)"),e.stroke(),e.clip());try{var h=await this.loadImage(n.imageSrc);e.drawImage(h,a,d,s,l);}catch(o){throw console.error(`[uQRCode]: ${n.mappingName} invalid!`),new b.Error(`${n.mappingName} invalid!`)}}else if("foregroundImage"===n.name){a=Math.round(n.x),d=Math.round(n.y),s=Math.round(n.width),l=Math.round(n.height);var c,m=Math.round(n.padding);s<2*(c=Math.round(n.borderRadius))&&(c=s/2),l<2*c&&(c=l/2);var f=a-m,v=d-m,p=s+2*m,C=l+2*m,k=Math.round(p/s*c);p<2*k&&(k=p/2),C<2*k&&(k=C/2),e.save(),e.setShadow(n.shadowOffsetX,n.shadowOffsetY,n.shadowBlur,n.shadowColor),k>0?(e.beginPath(),e.moveTo(f+k,v),e.arcTo(f+p,v,f+p,v+C,k),e.arcTo(f+p,v+C,f,v+C,k),e.arcTo(f,v+C,f,v,k),e.arcTo(f,v,f+p,v,k),e.closePath(),e.setFillStyle(n.backgroundColor),e.fill()):(e.setFillStyle(n.backgroundColor),e.fillRect(f,v,p,C)),e.restore(),e.save(),k>0?(e.beginPath(),e.moveTo(f+k,v),e.arcTo(f+p,v,f+p,v+C,k),e.arcTo(f+p,v+C,f,v+C,k),e.arcTo(f,v+C,f,v,k),e.arcTo(f,v,f+p,v,k),e.closePath(),e.setFillStyle(m>0?n.backgroundColor:"rgba(0,0,0,0)"),e.fill()):(e.setFillStyle(m>0?n.backgroundColor:"rgba(0,0,0,0)"),e.fillRect(f,v,p,C)),e.restore(),c>0&&(e.beginPath(),e.moveTo(a+c,d),e.arcTo(a+s,d,a+s,d+l,c),e.arcTo(a+s,d+l,a,d+l,c),e.arcTo(a,d+l,a,d,c),e.arcTo(a,d,a+s,d,c),e.closePath(),e.setStrokeStyle("rgba(0,0,0,0)"),e.stroke(),e.clip());try{h=await this.loadImage(n.imageSrc);e.drawImage(h,a,d,s,l);}catch(o){throw console.error(`[uQRCode]: ${n.mappingName} invalid!`),new b.Error(`${n.mappingName} invalid!`)}}}u&&e.draw(!0),e.restore();}e.draw(!0),setTimeout(o,150);}catch(o){if(!(o instanceof b.Error))throw o;r(o);}};return new Promise(((o,e)=>{l(o,e);}))},b.prototype.draw=function(){return this.drawCanvas()},b.prototype.register=function(o){o&&o(b,this,!0);};export{b as default};
\ No newline at end of file