From 796cc0ff52db4e9b58c625d3d6ea4bfd969a4417 Mon Sep 17 00:00:00 2001
From: zhangkai <847704969@qq.com>
Date: Wed, 30 Apr 2025 18:10:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ui=E7=BB=86=E8=8A=82=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                     |   21 +-
 components/my-tabbar.vue                    |  125 +-
 components/qrcodeSwiper.vue                 |  125 +
 packageA/activity/acList.vue                | 1523 -----------
 packageA/activity/activityDetaill.vue       | 1376 ----------
 packageA/activity/exercise.vue              |  471 ----
 packageA/activity/exerciseDetaill.vue       | 1085 --------
 packageA/center/teacherClass.vue            |  509 ----
 packageA/index/About.vue                    |   61 -
 packageA/index/previousDetail.vue           | 1227 ---------
 packageA/my/cancelActivity copy.vue         |  421 ----
 packageA/my/exercise.vue                    |   12 +-
 packageA/my/orderList copy.vue              |  718 ------
 packageA/my/orderList.vue                   |   46 +-
 packageA/my/pendinPayDetail.vue             |   47 +-
 packageA/my/person-detail.vue               |    2 +-
 pages.json                                  |   52 +-
 pages/activity/index.vue                    |  662 +++--
 pages/activity/stationStemys.vue            |  144 ++
 pages/afterSales/index.vue                  | 1150 +++++----
 pages/afterSales/info.vue                   |   12 +-
 pages/center/applyDetail.vue                |   32 +-
 pages/center/detail copy.vue                | 1782 -------------
 pages/center/detail.vue                     |   20 +-
 pages/center/index.vue                      |  134 +-
 pages/center/index1.vue                     |  905 -------
 pages/index/index.vue                       |   35 +-
 pages/my/index.vue                          | 2517 ++++++++++---------
 static/detail/left.png                      |  Bin 0 -> 2064 bytes
 static/detail/right.png                     |  Bin 0 -> 2091 bytes
 static/fabu/{组 4259.png => check.png}      |  Bin
 static/fabu/{组 4259(1).png => nocheck.png} |  Bin
 static/index/xiaoxilogo.png                 |  Bin 0 -> 8879 bytes
 static/index/xitongxiaoxi.png               |  Bin 0 -> 7261 bytes
 static/my/centerBack.png                    |  Bin 33544 -> 0 bytes
 static/my/hotac.png                         |  Bin 26286 -> 0 bytes
 static/my/qjt.png                           |  Bin 0 -> 448 bytes
 static/my/tixian.png                        |  Bin 0 -> 2277 bytes
 utils/uqrcode.js                            |   34 +
 39 files changed, 2961 insertions(+), 12287 deletions(-)
 create mode 100644 components/qrcodeSwiper.vue
 delete mode 100644 packageA/activity/acList.vue
 delete mode 100644 packageA/activity/activityDetaill.vue
 delete mode 100644 packageA/activity/exercise.vue
 delete mode 100644 packageA/activity/exerciseDetaill.vue
 delete mode 100644 packageA/center/teacherClass.vue
 delete mode 100644 packageA/index/About.vue
 delete mode 100644 packageA/index/previousDetail.vue
 delete mode 100644 packageA/my/cancelActivity copy.vue
 delete mode 100644 packageA/my/orderList copy.vue
 create mode 100644 pages/activity/stationStemys.vue
 delete mode 100644 pages/center/detail copy.vue
 delete mode 100644 pages/center/index1.vue
 create mode 100644 static/detail/left.png
 create mode 100644 static/detail/right.png
 rename static/fabu/{组 4259.png => check.png} (100%)
 rename static/fabu/{组 4259(1).png => nocheck.png} (100%)
 create mode 100644 static/index/xiaoxilogo.png
 create mode 100644 static/index/xitongxiaoxi.png
 delete mode 100644 static/my/centerBack.png
 delete mode 100644 static/my/hotac.png
 create mode 100644 static/my/qjt.png
 create mode 100644 static/my/tixian.png
 create mode 100644 utils/uqrcode.js

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 0000000000000000000000000000000000000000..d4e1f102bcf0a44b643543d8a58687ac5831a8f1
GIT binary patch
literal 2064
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

literal 0
HcmV?d00001

diff --git a/static/detail/right.png b/static/detail/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0f054f21f2244ccf689bd2246d129776e08692a
GIT binary patch
literal 2091
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
V;A=ccO0@t0002ovPDHLkV1g-H!yNzs

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..5ac6dc6fe5c728782f2eb0987923b4c9b088cf90
GIT binary patch
literal 8879
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

literal 0
HcmV?d00001

diff --git a/static/index/xitongxiaoxi.png b/static/index/xitongxiaoxi.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bd501bce44385892081e7810773bae9c920f22d
GIT binary patch
literal 7261
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

literal 0
HcmV?d00001

diff --git a/static/my/centerBack.png b/static/my/centerBack.png
deleted file mode 100644
index ae34382c4fc5d9af71ab03cceb7a8646e65b3b27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33544
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

diff --git a/static/my/hotac.png b/static/my/hotac.png
deleted file mode 100644
index b5f5f75709162066b1a9943f21f6766f2cb2d349..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26286
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
MSy2OADQ_P3f9TM0hX4Qo

diff --git a/static/my/qjt.png b/static/my/qjt.png
new file mode 100644
index 0000000000000000000000000000000000000000..6517cea7822176d1a242f8a3e6f7f1d69e7f1319
GIT binary patch
literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px$dPzh<RA@u(+Tl$DF$@LZ_cmYzMqmU+fDPy-Fac!(x&ds!2#mlAY+w}WDj}rM
zqp|(mlKj6refCqN<V>9T;+gv}fv4W#*};F`K{LAq@Ce`<z$btwlG`eU8H%WxT>y9o
z(2(EPJ;{d($Wh=8fR_%W1TqrX+;Ze7utl>)v_-YIq{ty)6Pej>G2NqO$YJ1uyaVuj
zU{jGGU4WI5ZosNYS71e?JFpru1Xu|f2CRY%1y(?Y1J%eBpc0t|R3TG=3S>Gk8z}*1
zB4xloAU7m;$6kL(fh&=(ByT6MQvqoQ&1}s<`7|TC61O9{IX0f{IY|eza1vl9E*+SS
zO9d)$X+RY&1*pV@1J$@tU<F(lunH~&SPAD2tcG(1R>ZjhtKwXMm2tzsWy<2?z%T6K
zBaiI3wBq-*6z9>wHvIF}sjwX90qhL|mB0-Hms_!`AER8`DpO7_z<oU1hC{N=s+C%j
qJDJQ1OkifUBfd2|7*W;CcYXm?M&daNs$RJO0000<MNUMnLSTY%J-D*~

literal 0
HcmV?d00001

diff --git a/static/my/tixian.png b/static/my/tixian.png
new file mode 100644
index 0000000000000000000000000000000000000000..7799a058046db4acd0ceb77ca5995793ffb72d52
GIT binary patch
literal 2277
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

literal 0
HcmV?d00001

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