删除多余文件，添加排行页面

App.vue

@@ -117,12 +117,12 @@
 		
 					if (num == 0) {
 						uni.hideTabBarRedDot({
-							index: 3
+							index: 4
 						})
 					} else {
 						Vue.prototype.msgnum = num
 						uni.setTabBarBadge({
-							index: 3,
+							index: 4,
 							text: num.toString()
 						})
 					}

components/teaching-case/teaching-case.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="teaching_case">
 
-		<view class="cont" @click="gotoWeb" v-for="(item, index) in acList" :key="index" :data-kid="item.href">
+		<view class="cont" @click="gotoWeb" v-for="(item, index) in acList" :key="index" :data-kid="item">
 
 			<view class="starView" @click.stop="coll" :data-e="item">
 				<image class="star" :src="collArr.includes(item.cid) ? pic_coll2 : pic_coll " mode="aspectFill"></image>
@@ -146,9 +146,11 @@
 				}
 
 				// return console.log('aaaaaa', e.currentTarget.dataset);
-				let acid = e.currentTarget.dataset.kid
+				let data = e.currentTarget.dataset.kid
+				// console.log(data);
 				uni.navigateTo({
-					url: "/pages/skipone/skipone?url=" + encodeURIComponent(acid),
+					// url: "/pages/skipone/skipone?item='+ encodeURIComponent(JSON.stringify(item))"
+					url: "/pages/skipone/skipone?item="+encodeURIComponent(JSON.stringify(data))
 				});
 
 			},

manifest.json

@@ -18,7 +18,8 @@
         },
         /* 模块配置 */
         "modules" : {
-            "Share" : {}
+            "Share" : {},
+            "OAuth" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -51,6 +52,9 @@
                         "appid" : "wx1260af162664fd04",
                         "UniversalLinks" : ""
                     }
+                },
+                "oauth" : {
+                    "univerify" : {}
                 }
             }
         }

pages.json

@@ -24,14 +24,7 @@
 			}
 
 		},
-		{
-			"path": "pages/publish/publish",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
 
-		},
 		{
 			"path": "pages/login/login",
 			"style": {
@@ -61,20 +54,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/activityPage/activityPage",
-			"style": {
-				"navigationBarTitleText": "活动页",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/message/message",
-			"style": {
-				"navigationBarTitleText": "消息",
-				"enablePullDownRefresh": false
-			}
-
 		},
 		{
 			"path": "pages/skipone/skipone",
@@ -91,13 +70,6 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/teachingDetail/teachingDetail",
-			"style": {
-				"navigationBarTitleText": "教研室详情",
-				"enablePullDownRefresh": false
-			}
-
 		}, {
 			"path": "pages/teachingList/teachingList",
 			"style": {
@@ -105,63 +77,9 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/mineSubscribe/mineSubscribe",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/activityList/activityList",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/activityDetail/activityDetail",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/jys/jys",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/hd/hd",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/hdxx/hdxx",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/mineClass/mineClass",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/mineCollect/mineCollect",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
+		},
 
-		}, {
+		{
 			"path": "pages/mineEdit/mineEdit",
 			"style": {
 				"navigationBarTitleText": "",
@@ -183,89 +101,191 @@
 			}
 
 		}, {
-			"path": "pages/messageSystem/messageSystem",
+			"path": "pages/activityPageNew/activityPageNew",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/messageDy/messageDy",
+			"path": "pages/msg/msg",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
-			"path": "pages/activityList_2/activityList_2",
+			"path": "pages/activityDetailNew/activityDetailNew",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 
-		}
-
-		, {
-			"path": "pages/liveActivityList/liveActivityList",
-			"style": {
-				"navigationBarTitleText": ""
-				// "enablePullDownRefresh": false,
-				// "enablePullDownRefresh": true
-				// "onReachBottomDistance": 50
-			}
-
 		}, {
-			"path": "pages/Sign/Sign",
+			"path": "pages/mineCollNew/mineCollNew",
 			"style": {
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 
-		}, {
-			"path": "pages/mineRelease/mineRelease",
+		},
+		{
+			"path": "pages/ranking/ranking",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "排行",
 				"enablePullDownRefresh": false
 			}
-
 		}
-	    ,{
-            "path" : "pages/activityPageNew/activityPageNew",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/msg/msg",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/activityDetailNew/activityDetailNew",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/mineCollNew/mineCollNew",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+		// {
+		// 	"path": "pages/jys/jys",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }, 
+		// {
+		// 	"path": "pages/activityList_2/activityList_2",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }
+
+		// , 
+		// {
+		// 	"path": "pages/activityList/activityList",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+		// {
+		// 	"path": "pages/teachingDetail/teachingDetail",
+		// 	"style": {
+		// 		"navigationBarTitleText": "教研室详情",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+		// {
+		// 	"path": "pages/Sign/Sign",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+		// {
+		// 	"path": "pages/publish/publish",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+		// {
+		// 	"path": "pages/mineSubscribe/mineSubscribe",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }, 
+		// {
+		// 	"path": "pages/messageSystem/messageSystem",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }, 
+		// {
+		// 	"path": "pages/mineRelease/mineRelease",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }
+		// ,
+		// {
+		// 	"path": "pages/message/message",
+		// 	"style": {
+		// 		"navigationBarTitleText": "消息",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+		// {
+		// 	"path": "pages/mineCollect/mineCollect",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+		// {
+		// 	"path": "pages/mineClass/mineClass",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }, 
+		// {
+		// 	"path": "pages/messageDy/messageDy",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+		// {
+		// 	"path": "pages/liveActivityList/liveActivityList",
+		// 	"style": {
+		// 		"navigationBarTitleText": ""
+		// 		// "enablePullDownRefresh": false,
+		// 		// "enablePullDownRefresh": true
+		// 		// "onReachBottomDistance": 50
+		// 	}
+
+		// }, 
+		// {
+		// 	"path": "pages/activityDetail/activityDetail",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+		// {
+		// 	"path": "pages/activityPage/activityPage",
+		// 	"style": {
+		// 		"navigationBarTitleText": "活动页",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+		// {
+		// 	"path": "pages/hd/hd",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// },
+		// {
+		// 	"path": "pages/hdxx/hdxx",
+		// 	"style": {
+		// 		"navigationBarTitleText": "",
+		// 		"enablePullDownRefresh": false
+		// 	}
+
+		// }, 
+	],
 	"tabBar": {
 		// "custom": true,
 		"backgroundColor": "#ffffff",
@@ -292,13 +312,13 @@
 				"iconPath": "static/tabbar/zyk.png",
 				"selectedIconPath": "static/tabbar/zyk2.png"
 			},
-			
-			// {
-			// 	"pagePath": "pages/message/message",
-			// 	"text": "项目",
-			// 	"iconPath": "static/tabbar/xx.png",
-			// 	"selectedIconPath": "static/tabbar/xx2.png"
-			// },
+
+			{
+				"pagePath": "pages/ranking/ranking",
+				"text": "排行",
+				"iconPath": "static/tabbar/Ranking1.png",
+				"selectedIconPath": "static/tabbar/Ranking.png"
+			},
 			{
 				"pagePath": "pages/mine/mine",
 				"text": "我的",

pages/Sign/Sign.vue

@@ -1,95 +0,0 @@
-<template>
-	<view class="sign">
-		<statusBar :item="navBarData"></statusBar>
-		<view class="signBox">
-			<view class="img">
-				<image src="https://teacherapi.cocorobo.cn/teaching-file/static/lg.png" mode="aspectFill"></image>
-			</view>
-			<view style="font-size: 34rpx;font-weight: 400;color: rgba(0, 0, 0, 0.8);padding: 30rpx 0;">报名成功</view>
-			<!-- <text>等待管理员审核</text> -->
-			<button @click="gotoAct">查看活动</button>
-			<text style="font-size: 24rpx;font-weight: 400;color: rgba(0, 86, 168, 1);" @click="gotoIndex">返回首页</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navBarData: {
-					title: '报名结果',
-					// btn: 2
-				},
-			};
-		},
-		methods: {
-			gotoIndex() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				})
-			},
-			gotoAct(){
-				uni.navigateTo({
-					url:'/pages/mineActive/mineActive'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.sign {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100vh;
-
-		.signBox {
-			width: 100%;
-			text-align: center;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-around;
-
-			.img {
-				width: 100%;
-				height: 160rpx;
-
-				image {
-					width: 160rpx;
-					height: 160rpx;
-				}
-			}
-
-			// text {
-			// 	&:nth-child(2) {
-			// 		font-size: 34rpx;
-			// 		margin-bottom: 8px;
-			// 		font-weight: 600;
-			// 	}
-
-			// 	&:nth-child(3) {
-			// 		font-size: 24rpx;
-			// 		color: rgb(144, 145, 147);
-			// 		margin-bottom: 15px;
-			// 	}
-
-			// 	&:nth-child(5) {
-			// 		font-size: 24rpx;
-			// 	}
-			// }
-
-			button {
-				width: 200rpx;
-				height: 64rpx;
-				color: white;
-				line-height: 64rpx;
-				background-color: #0056A8;
-				font-size: 28rpx;
-				border-radius: 100px;
-				margin-bottom: 10px;
-			}
-		}
-	}
-</style>

pages/activityDetail/activityDetail.vue

@@ -1,592 +0,0 @@
-<template>
-	<!-- 教研室详情 -->
-	<view class="activeDetail">
-		<statusBar :item="navbar"></statusBar>
-
-		<!-- 顶部 -->
-		<view class="backPic">
-			<image src="https://teacherapi.cocorobo.cn/teaching-file/static//yym/Rectangle 40.png" mode="aspectFill">
-			</image>
-			<view class="card">
-				<view class="cardTop">
-					<view class="title three-font">{{ actItemList.acName }}</view>
-					<view class="icons">
-						<view class="icon" @click="coll">
-							<image :src="collArr.includes(actItemList.acId) ? pic_coll2 : pic_coll "
-								style="width: 42rpx;height: 42rpx;" mode="aspectFill"></image>
-						</view>
-						<view class="icon" @click="sub">
-							<image
-								:src="subArr.includes(actItemList.acId) ? pic_sub2 : pic_sub "
-								style="width: 38rpx;height: 42rpx;" mode="aspectFill"></image>
-						</view>
-					</view>
-				</view>
-				<view class="col fz-font">
-					活动日期：<text class="col2"> {{ actItemList.begin_at}}</text> 
-				</view>
-				<view class="col fz-font">
-					招募人数：<text class="col2"> {{actItemList.bnum}}/{{ actItemList.pers}}</text> 
-				</view>
-				<view class="col fz-font tag">
-					<view class=" tag">活动地址：</view>
-					<text class="col2">{{actItemList.address}}</text>
-				</view>
-			</view>
-		</view>
-
-
-		<!-- 创建者用户名 -->
-		<view style="padding:30rpx;padding-top: 30rpx;">
-			<view class="creator">
-				<image
-					:src="actItemList.avatar"
-					mode="aspectFill"></image>
-				<view class="creName btn-font">
-					{{ actItemList.username }}
-				</view>
-			</view>
-		</view>
-
-
-
-		<!-- 教研室详情 -->
-		<view class="" style="padding: 0 30rpx;">
-			<!-- <detailBlock :actItemList='actItemList' :item="judge"></detailBlock> -->
-			<view class="detailBlock">
-				<view class="tit fwb-font">活动详情</view>
-				<view class="cont sZw-font">
-					活动时间：<text>{{ actItemList.begin_at }}</text>
-				</view>
-				<view class="cont sZw-font">
-					活动形式：<text style="color: #0056a8;">{{ actItemList.acshape }}</text>
-				</view>
-				<view class="cont sZw-font">
-					<!-- <view id="myElement" class="activeTit">
-						教研室概况：查看更多查看更多查看更多看更多查看更多查看更多查看更多查看更多查看更多查看更多查看更多看更多查看更多查看更多查看更多查看更多
-				   </view>
-					<text class="zdwz" style="color: #0056a8;float: right;" @click="zdwz">收起</text> -->
-					<view class="content">
-						<view ref="p" :class="getClassNames">
-							<text style="color: #999999;">教研室概况：</text>
-							{{actItemList.brief}}
-						</view>
-			
-						<view ref="btnnn" :class="getClassNames1" @click="qqq">
-							<!-- {{isAll ? '收起' : '展开'}} -->
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-
-		<!-- 当前成员 -->
-		<!-- {{!applyUserlist.length}} -->
-		<view style="padding: 0 30rpx;" v-if="applyUserlist.length">
-			<view class="member">
-				<view class="memberTop">
-					<view class="btn-font">当前成员</view>
-					<view class="fz-font" style="color: rgba(0, 0, 0, 0.4);display: flex;align-items: center;"
-						@click="gotoMorePer">
-						<text>查看更多</text>
-						<image src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right.png"
-							style="width: 32rpx;height: 32rpx;" mode="aspectFill"></image>
-					</view>
-				</view>
-
-				<view class="pers" >
-					<view class="per"  v-for="(i,index) in applyUserlist" :key="index">
-						<image :src="i.avatar" mode=""></image>
-						<view class="perName fz-font">
-							{{i.username}}
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 申请加入 -->
-		<view class="btnBlock">
-				<button class="btn btn1 zw-font" v-if="actItemList.openid==oid">本人创建，暂不支持加入</button>
-				<button class="btn zw-font" v-if="!isSign && actItemList.openid!=oid" @click="applyAdd">申请加入</button>
-				<button class="btn btn1 zw-font" v-if="isSign && actItemList.openid!=oid">已加入</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navbar: {
-					title: '活动详情',
-					btn: 1
-				},
-				// 是否已加入
-				isSign:0,
-				// 用户openid
-				oid:'',
-				// 活动id
-				acId:'',
-				// 页面数据
-				actItemList: {},
-				// 用户收藏列表
-				collArr:[],
-				// 用户订阅列表
-				subArr:[],
-				
-				// 报名列表
-				applyUserlist:[],
-			
-				
-				
-				pic_coll: 'https://teacherapi.cocorobo.cn/teaching-file/static/yym/Star 1 (Stroke).png',
-				pic_coll2: 'https://teacherapi.cocorobo.cn/teaching-file/static//mine/Collect_yellow.png',
-				pic_sub: 'https://teacherapi.cocorobo.cn/teaching-file/static/yym/Vector (Stroke).png',
-				pic_sub2: '../../static/mine/dingyue_blue.png'
-				
-				
-				// pic_coll:'https://teacherapi.cocorobo.cn/teaching-file/static//yym/Star 1 (Stroke) (2).png',
-				// pic_coll2:'https://teacherapi.cocorobo.cn/teaching-file/static//mine/Collect_yellow.png',
-				// pic_sub:'https://teacherapi.cocorobo.cn/teaching-file/static/yym/Vector (Stroke) (1).png',
-				// pic_sub2:'https://teacherapi.cocorobo.cn/teaching-file/static/dingyue_blue.png',
-			};
-		},
-		methods: {
-			// 获取页面数据
-			getdata(){
-				let data = {
-					oid:this.$store.state.user.openid,
-					acId: this.acId,
-				}
-				this.$request('/selectActivityID', "POST", data).then(res => {
-					console.log('获取页面数据',res[0][0]);
-					this.actItemList = res[0][0]
-				})
-				
-			},
-			addview(){
-				let data={
-					oid:this.$store.state.user.openid,
-					acId: this.acId,
-				}
-				this.$request('/updateView', "POST", data).then(res => {
-					console.log(res[0][0]);
-					this.actItemList = res[0][0]
-				})
-			},
-			// 收藏事件
-			coll(){
-				//判断是否收藏
-				let iscoll = null
-				
-				// 查询是否收藏过
-				let data = {
-					acid: this.acId,
-					oid: this.$store.state.user.openid, //用户id
-					ty: 0
-				}
-				this.$request('/selectOneOperator', 'POST', data).then(res => {
-					// console.log('查询是否收藏过',res);
-					res[0].length ? iscoll = true : iscoll = false;
-				
-					// iscoll为true表示已经收藏过，执行删除  为true则收藏
-					if (iscoll) {
-						console.log('执行删除');
-						this.$request('/deleteOperator', 'POST', data).then(res => {
-							// console.log(res);
-							this.getColl()
-						})
-					} else {
-						console.log('执行添加');
-						this.$request('/insertOperator', 'POST', data).then(res => {
-							// console.log(res);
-							this.getColl()
-						})
-					}
-				})
-			},
-			// 订阅事件
-			sub(){
-				//判断是否订阅
-				let iscoll = null
-				
-				// 查询是否订阅过
-				let data = {
-					acid: this.acId,
-					oid: this.$store.state.user.openid, //用户id
-					ty: 1
-				}
-				this.$request('/selectOneOperator', 'POST', data).then(res => {
-					// console.log('查询是否订阅过',res);
-					res[0].length ? iscoll = true : iscoll = false;
-					
-					// iscoll为true表示已经订阅过，执行删除  为true则订阅
-					if (iscoll) {
-						console.log('执行删除');
-						this.$request('/deleteOperator', 'POST', data).then(res => {
-							console.log(res);
-							this.getSub()
-						})
-					} else {
-						console.log('执行添加');
-						this.$request('/insertOperator', 'POST', data).then(res => {
-							console.log(res);
-							this.getSub()
-							// 添加消息页面订阅通知提示订阅成功
-							this.addMessage()
-						})
-					}
-				})
-			},
-			// 添加消息页面订阅通知提示订阅成功
-			addMessage() {
-				let data = {
-					oid: this.$store.state.user.openid,
-					acid: this.acId,
-					type: 2,
-					con: ``
-				}
-				this.$request('/insertMessage', "POST", data).then(res => {
-					console.log(res);
-				})
-			},
-			// 申请加入
-			applyAdd() {
-				
-				uni.navigateTo({
-					url: `/pages/jys/jys?acId=${this.acId}&tit=${'活动报名'}`
-				})
-			},
-			// 查看更多报名同学
-			gotoMorePer() {
-				uni.navigateTo({
-					url: `/pages/dy/dy?acId=${this.acId}`
-				})
-			},
-			// 获取是否订阅
-			getSub(){
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					type: 1
-				}
-				this.$request('/selectOperator', 'POST', data).then(res => {
-					// console.log('获取', res);
-					// 每次调用前清零，防止push叠加错误
-					this.subArr = []
-					// 将acid遍历到subArrsubArr中
-					res[0].forEach(i => {
-						this.subArr.push(i.acId)
-					})
-				
-				})
-				
-			},
-			//获取是否收藏
-			getColl() {
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					type: 0
-				}
-				this.$request('/selectOperator', 'POST', data).then(res => {
-					// console.log('获取收藏', res);
-					// 每次调用前清零，防止push叠加错误
-					this.collArr = []
-					// 将acid遍历到collArr中
-					res[0].forEach(i => {
-						this.collArr.push(i.acId)
-					})
-				})
-			},
-			//判断是否报名
-			btnEnroll() {
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					aid:this.acId,
-					type: 2
-				}
-				this.$request('/selectSignup', 'POST', data).then(res => {
-					// console.log('获取报名', res[0][0]);
-					this.isSign=res[0][0].num
-				})
-			},
-			// 获取报名用户
-			getUsers(){
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					aid:this.acId,
-					type: 2,
-					page: 1, //下拉获取更多的备用字段
-					lim: 6 //一次获取多少数据
-				}
-				this.$request('/selectApplyUser', 'POST', data).then(res => {
-					console.log('获取报名用户列表', res[0]);
-					this.applyUserlist=res[0]
-				})
-			}
-
-		},
-		onLoad(e) {
-			console.log('接收参数',e);
-			this.acId=e.acId
-			this.oid=this.$store.state.user.openid
-			// this.getActivity()
-			// 获取是否已经报名
-			this.btnEnroll()
-			// 获取页面数据
-			this.getdata()
-			// 是否收藏
-			this.getColl()
-			// 是否订阅
-			this.getSub()
-			// 获取报名人名单
-			this.getUsers()
-		}
-	}
-</script>
-
-<style lang="scss">
-	.activeDetail {
-		padding-bottom: 80px;
-
-		.backPic {
-			width: 750rpx;
-			position: relative;
-			margin-bottom: 30rpx;
-			image {
-				width: 100%;
-				display: block;
-			}
-
-			.card {
-				position: absolute;
-				width: 690rpx;
-				bottom: -30rpx;
-				left: 50%;
-				padding: 30rpx;
-				// background-color: rgba(0, 0, 0, 0.26);
-				background-color: #ffffff;
-				border-radius: 10px;
-				transform: translate(-50%, 0);
-				// border: 1rpx #667870 solid;
-				color: #ffffff;
-
-				// display: flex;
-				// flex-direction: column;
-				// justify-content: space-between;
-				.cardTop {
-					display: flex;
-					justify-content: space-between;
-
-					.title {
-						margin-bottom: 20rpx;
-						width: 80%;
-						// height: 48rpx;
-						color:rgba(0, 0, 0, 0.8);
-						font-family: PingFang SC;
-						// overflow: hidden;
-						// text-overflow: ellipsis;
-						// white-space: nowrap;
-						
-						display: -webkit-box;
-						word-break: break-all;
-						text-overflow: ellipsis;
-						overflow: hidden;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-					}
-
-					.icons {
-						flex: 1;
-						display: flex;
-						// align-items: center;
-						justify-content: space-between;
-
-						.icon {
-							width: 48rpx;
-							height: 48rpx;
-							display: flex;
-							align-items: center;
-							justify-content: center;
-						}
-					}
-
-				}
-
-				.col {
-					margin-bottom: 10rpx;
-					// font-weight: 100;
-					color:rgba(0, 0, 0, 0.4);
-				}
-				.col2 {
-					color:rgba(0, 0, 0, 0.8);
-					// font-weight: bold;
-				}
-				.tag {
-					display: flex;
-					align-items: center;
-				}
-			}
-
-			// background-image: url(https://teacherapi.cocorobo.cn/teaching-file/static//resource/jqr.png);
-		}
-
-
-		.creator {
-			display: flex;
-			padding: 30rpx;
-			background-color: #ffffff;
-			align-items: center;
-			// margin-top: 20rpx;
-			border-radius: 10px;
-
-			image {
-				width: 96rpx;
-				height: 96rpx;
-				border-radius: 50%;
-				margin-right: 20rpx;
-			}
-
-			.creName {
-				font-weight: bold;
-			}
-		}
-
-		.member {
-			background-color: #ffffff;
-			margin-top: 20rpx;
-			padding: 30rpx;
-			border-radius: 10px;
-			margin-bottom: 30rpx;
-
-			.memberTop {
-				display: flex;
-				justify-content: space-between;
-				margin-bottom: 10px;
-			}
-
-			.pers {
-				display: flex;
-				width: 100%;
-				// justify-content: space-between;
-
-				.per {
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					width: 16%;
-					image {
-						width: 72rpx;
-						height: 72rpx;
-						border-radius: 50%;
-					}
-
-					.perName {
-						text-align: center;
-						display: -webkit-box;
-						word-break: break-all;
-						text-overflow: ellipsis;
-						overflow: hidden;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 1;
-					}
-				}
-
-			}
-
-		}
-
-		.btnBlock {
-			position: fixed;
-			bottom: 0;
-			width: 750rpx;
-			background-color: #ffffff;
-			// padding: 20px 0;
-			padding: 2vh 0;
-
-			.btn {
-				width: 432rpx;
-				height: 88rpx;
-				font-weight: 500;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				margin: auto;
-				background-color: #0056a8;
-				color: #ffffff;
-			}
-			.btn1 {
-				background-color: rgba(139, 190, 255, 1);
-			}
-		}
-		.detailBlock {
-			background-color: #ffffff;
-			border-radius: 10rpx;
-			padding: 30rpx;
-		
-			.tit {
-				font-weight: 600;
-				margin-bottom: 10px;
-			}
-		
-			.cont {
-				color: #999999;
-				margin-bottom: 10px;
-		
-				text {
-					color: #666666;
-				}
-		
-				.content {
-					white-space: normal;
-					/*隐藏溢出*/
-					/*当文本溢出包含元素时显示省略符号来代表被修剪的文本*/
-					/*规定段落中的文本不进行换行*/
-					letter-spacing: 2rpx;
-					display: -webkit-box;
-					word-break: break-all;
-					text-overflow: ellipsis;
-					overflow: hidden;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 4;
-				}
-		
-				.content .p {
-					width: 90%;
-					color: #666666;
-					// max-width: 100%;
-					// display:inline-block;
-					display: block;
-					// float: left;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					// padding-right: 50rpx;
-					/*设置文字溢出时显示省略号*/
-		
-				}
-		
-				.content .p.is-expanded {
-					width: 100%;
-					overflow: visible;
-					white-space: normal;
-					/*文字溢出时不再显示省略号*/
-				}
-		
-				.btn-more {
-					float: right;
-					display: inline-block;
-					// width: 60px;
-					transform: translate(0, -100%);
-					color: #0056a8;
-				}
-		
-				.btn-more.is-zd {
-					transform: none;
-					// transform: translate(0,0);
-				}
-			}
-		}
-	}
-</style>

pages/activityDetailNew/activityDetailNew.vue

@@ -95,7 +95,6 @@
 					</view>
 					<text class="icotxt">收藏</text>
 				</view>
-				<!-- <view class="ico" style="position: relative;" @click="share"> -->
 				<view class="ico" style="position: relative;">
 					<view class="imgBlock">
 						<image class="icoimg" style="height: 70%;width: 65%;" src="../../static/union.png"
@@ -238,16 +237,7 @@
 					url: "/pages/skipone/skipone?url=" + encodeURIComponent(link),
 				});
 			},
-			share() {
-
-				// onShareAppMessage() {
-				uni.showToast({
-					title: '暂未开发，还不能分享哦',
-					icon: 'none'
-				})
-
-
-			},
+			
 			// 获取页面数据
 			getdata() {
 				this.uLoading = true

pages/activityList/activityList.vue

@@ -1,85 +0,0 @@
-<template>
-	<view class="activeList">
-		<statusBar :item="navbarData"></statusBar>
-		<scroll-view class="list" scroll-y="true">
-			<view>
-				<teaching-case :activeList="activeList" :indexId="index"></teaching-case>
-			</view>
-		</scroll-view>
-		<view class="loading">
-			<view v-if="newsLoading==1">数据加载中...</view>
-			<view v-if="newsLoading==2">没有更多了~~</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navbarData: {
-					title: '活动推荐列表',
-					btn: 1
-				},
-				// teaData: {
-				// 	btn: 1
-				// },
-				activeList: [],
-				// 触底加载动画提示
-				newsLoading: 0, //0默认值  1加载中 2没有更多了
-				currentPage: 1,
-
-			};
-		},
-		methods: {
-			// 获取教研活动
-			getData() {
-				let data = {
-					openid: uni.getStorageSync('oId'),
-					ty: 1,
-					page: this.currentPage, //下拉获取更多的备用字段
-					lim: 15 //一次获取多少数据
-				}
-				this.$request('/selectActivity', "POST", data).then(res => {
-					console.log(res[0]);
-					if (!res[0].length) {
-						this.newsLoading = 2
-					} else {
-						this.newsLoading = 0
-					}
-					this.activeList = [...this.activeList, ...res[0]]
-					// this.activeList = res[0]
-				})
-			},
-
-		},
-		// 触底加载更多
-		onReachBottom() {
-			console.log(111);
-			if (this.newsLoading == 2) return
-			
-			this.newsLoading = 1
-			this.currentPage++
-			setTimeout(this.getData, 1000)
-
-		},
-		onLoad() {
-			this.getData()
-		}
-	}
-</script>
-
-<style lang="scss">
-	.activeList {
-		.loading {
-			height: 50rpx;
-			text-align: center;
-			padding-top: 20rpx;
-			padding-bottom: 100rpx;
-			font-size: 26rpx;
-			color: #888;
-			line-height: 2em;
-		}
-	}
-</style>

pages/activityList_2/activityList_2.vue

@@ -1,94 +0,0 @@
-<template>
-	<view class="activeList">
-		<statusBar :item="navbarData"></statusBar>
-		<!-- <teaching-case :item="teaData"></teaching-case> -->
-		<!-- <view class="" style="padding-bottom: 50rpx;">
-			<teaching-case :activeList="activeList" :indexId="index" :item="teaData"></teaching-case>
-		</view> -->
-
-		<scroll-view class="list" scroll-y="true">
-			<view>
-				<teaching-case :activeList="activeList" :indexId="index" :item="teaData"></teaching-case>
-			</view>
-		</scroll-view>
-
-		<view class="loading">
-			<view v-if="newsLoading==1">数据加载中...</view>
-			<view v-if="newsLoading==2">没有更多了~~</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navbarData: {
-					title: '精选活动列表',
-					btn: 1
-				},
-				
-				teaData: {
-					btn: 1,
-					btn_2: 1,
-				},
-				// 渲染数据
-				activeList: [],
-				// 触底加载动画提示
-				newsLoading: 0, //0默认值  1加载中 2没有更多了
-				currentPage: 1,
-			};
-		},
-		methods: {
-			// 获取页面数据
-			getData() {
-				let data = {
-					openid: uni.getStorageSync('oId'),
-					ty: 2,
-					page: this.currentPage, //下拉获取更多的备用字段
-					lim: 15 //一次获取多少数据
-				}
-				this.$request('/selectActivity', "POST", data).then(res => {
-					console.log(res[0]);
-					if (!res[0].length) {
-						this.newsLoading = 2
-					} else {
-						this.newsLoading = 0
-					}
-					this.activeList=[...this.activeList,...res[0]]
-					// this.activeList = res[0]
-				})
-			},
-		},
-		// 触底加载更多
-		onReachBottom() {
-			console.log(111);
-			if (this.newsLoading == 2) {
-				return
-			}
-			this.newsLoading = 1
-			this.currentPage++
-			setTimeout(this.getData,2000)
-			
-		},
-		
-		onLoad() {
-			// 一进页面就加载数据
-			this.getData()
-		}
-	}
-</script>
-
-<style lang="scss">
-	.activeList {
-		.loading{
-			height: 50rpx;
-			text-align: center;
-			padding-top: 20rpx;
-			padding-bottom: 100rpx;
-			font-size: 26rpx;
-			color:#888;
-			line-height: 2em;
-		}
-	}
-</style>

pages/activityPage/activityPage.vue

@@ -1,383 +0,0 @@
-<template>
-	<view class="activity">
-		<statusBar :item="navBarData"></statusBar>
-		<viewX-Case class="mid">
-			<template #title>
-				<view class="title three-font">直播活动</view>
-			</template>
-			<template #lookMore>
-				<view class="lookMore fz-font" @click="gotoLiveList">查看更多</view>
-			</template>
-			<template #activeBlock>
-				<view class="activeData" v-for="(item, index) in liveList" :key="index">
-					<!-- <image src="https://teacherapi.cocorobo.cn/teaching-file/static//activity/bg1.png" mode="aspectFill"></image> -->
-					<image :src="item.pic" mode="aspectFill" @click="gotoAnnoun" :data-index="item.acId"></image>
-
-					<view class="liveBroadcast">
-						<view class="title">
-							<view class="tag bqZ-font">类型</view>
-							<text three-font>{{ item.acName }}</text>
-						</view>
-
-						<view class="operate">
-							<view class="left">
-								<view class="img">
-									<image :src="item.avatar" mode="aspectFill"></image>
-								</view>
-								<view class="user fwb-font">{{ item.username }}</view>
-							</view>
-							<view class="collection" @click="coll" :data-e="item">
-								<view class="img">
-									<image :src="collArr.includes(item.acId) ? pic_coll2 : pic_coll" mode="aspectFill">
-									</image>
-								</view>
-								<text class="fz-font">收藏</text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</template>
-		</viewX-Case>
-
-		<viewX-Case style="margin-top: 10px">
-			<template #title>
-				<view class="title three-font">活动推荐</view>
-			</template>
-			<template #lookMore>
-				<view class="lookMore fz-font" @click="lookMore">查看更多</view>
-			</template>
-			<template #activeBlock>
-				<!-- <activity-case v-for="i in 10" :key="i"></activity-case> -->
-				<teaching-case :activeList="activeList"></teaching-case>
-			</template>
-		</viewX-Case>
-
-
-		<view class="" style="height: 30rpx; width: 100%"> </view>
-		<view class="qiu" @click="fabClick">
-			<image src="https://teacherapi.cocorobo.cn/teaching-file/static//yym/jia.png" mode="aspectFill"></image>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navBarData: {
-					title: "活动", //导航栏标题
-					btn: 0, //是否显示返回按钮 0不显示  1 显示
-				},
-				actData: {
-					btn: 1,
-				},
-				title: "uni-fab",
-				// 直播活动列表
-				liveList: [],
-				// 教研活动列表
-				activeList: [],
-				collArr: [],
-				pic_coll: 'https://teacherapi.cocorobo.cn/teaching-file/static/yym/Star 1 (Stroke).png',
-				pic_coll2: 'https://teacherapi.cocorobo.cn/teaching-file/static/mine/Collect_yellow.png'
-			};
-		},
-		methods: {
-			// 获取活动推荐
-			getData() {
-				let data = {
-					openid: uni.getStorageSync('oId'),
-					ty: 1,
-					page: 1, //下拉获取更多的备用字段
-					lim: 12 //一次获取多少数据
-				}
-				this.$request('/selectActivity', "POST", data).then(res => {
-					console.log(res[0]);
-					this.activeList = res[0]
-				})
-			},
-			// 获取直播活动
-			getData2() {
-				let data = {
-					openid: uni.getStorageSync('oId'),
-					ty: 0,
-					page: 1, //下拉获取更多的备用字段
-					lim: 12 //一次获取多少数据
-				}
-				this.$request('/selectActivity', "POST", data).then(res => {
-					this.liveList = res[0]
-				})
-			},
-
-			// 获取收藏
-			getcoll() {
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					type: 0
-				}
-				this.$request('/selectOperator', 'POST', data).then(res => {
-					// console.log('获取收藏', res);
-					// 每次调用前清零，防止push叠加错误
-					this.collArr = []
-					// 将acid遍历到collArr中
-					res[0].forEach(i => {
-						this.collArr.push(i.acId)
-					})
-
-				})
-			},
-			// 收藏事件
-			coll(event) {
-				// 未登录去登录
-				const value = this.$store.state.user.openid;
-				if (value == '') {
-					uni.navigateTo({
-						url: "/pages/login_Wechat/login_Wechat",
-					});
-					return
-				}
-
-
-				let aId = event.currentTarget.dataset.e.acId
-
-				let iscoll = null
-
-				// 查询是否收藏过
-				let data = {
-					acid: aId,
-					oid: this.$store.state.user.openid, //用户id
-					ty: 0
-				}
-				this.$request('/selectOneOperator', 'POST', data).then(res => {
-					// console.log('查询是否收藏过',res);
-					res[0].length ? iscoll = true : iscoll = false;
-
-					// iscoll为true表示已经收藏过，执行删除  为true则收藏
-					if (iscoll) {
-						console.log('执行删除');
-						this.$request('/deleteOperator', 'POST', data).then(res => {
-							console.log(res);
-							console.log('this', this);
-							this.getcoll()
-						})
-					} else {
-						console.log('执行添加');
-						this.$request('/insertOperator', 'POST', data).then(res => {
-							console.log(res);
-							this.getcoll()
-						})
-					}
-				})
-			},
-			// 查看更多常规教研活动事件
-			lookMore() {
-				const value = this.$store.state.user.openid;
-				if (value == '') {
-					uni.navigateTo({
-						url: "/pages/login_Wechat/login_Wechat",
-					});
-				} else {
-					uni.navigateTo({
-						url: "/pages/activityList/activityList",
-					});
-				}
-			},
-			// 查看更多直播活动事件
-			gotoLiveList() {
-				uni.navigateTo({
-					url: '/pages/liveActivityList/liveActivityList'
-				})
-			},
-			// 跳转到发布页
-			fabClick() {
-				const value = this.$store.state.user.openid;
-				if (value == '') {
-					uni.navigateTo({
-						url: "/pages/login_Wechat/login_Wechat",
-					});
-				} else {
-					uni.navigateTo({
-						url: "/pages/publish/publish",
-					});
-				}
-			},
-			// 跳转活动详情页
-			gotoAnnoun(e) {
-				// return console.log( e.currentTarget.dataset.index);
-				let aid = e.currentTarget.dataset.index
-				const value = this.$store.state.user.openid;
-				if (value == '') {
-					uni.navigateTo({
-						url: "/pages/login_Wechat/login_Wechat",
-					});
-				} else {
-					uni.navigateTo({
-						url: `/pages/activityDetail/activityDetail?acId=${aid}`,
-					});
-				}
-			},
-
-		},
-		onShow() {
-			this.getData()
-			this.getData2()
-			this.getcoll()
-			this.getAllMessage()    // 调用app.js中的方法
-		}
-	};
-</script>
-
-<style lang="scss">
-	.activity {
-		.qiu {
-			width: 90rpx;
-			height: 90rpx;
-			position: fixed;
-			z-index: 19;
-			right: 30rpx;
-			bottom: 10vh;
-			border-radius: 50%;
-			background-color: rgba(0, 86, 168, 1);
-			display: flex;
-			justify-content: center;
-			align-items: center;
-
-			image {
-				position: absolute;
-
-				width: 36rpx;
-				height: 36rpx;
-			}
-		}
-
-		.mid {
-
-			// margin:20px 0;
-			.activeData {
-				width: 460rpx;
-				display: inline-block;
-				margin-right: 20px;
-
-				image {
-					width: 100%;
-					height: 120px;
-					border-radius: 10px;
-					margin-bottom: 10px;
-				}
-
-				.liveBroadcast {
-					flex: 1;
-					width: 460rpx;
-					display: flex;
-					flex-direction: column;
-					align-content: flex-end;
-
-					.title {
-						display: flex;
-						align-items: center;
-						margin-bottom: 10rpx;
-
-						.tag {
-						
-							flex-shrink: 0;
-							border: 1px #00b2b6 solid;
-							font-size: 20rpx;
-							width: 64rpx;
-							display: flex;
-							height: 34rpx;
-							white-space: nowrap;
-							justify-content: center;
-							align-items: center;
-							// padding: 4px 12px 4px 12px;
-							border-radius: 5rpx;
-							margin-right: 10rpx;
-							color: #00b2b6;
-						}
-
-						text {
-							// display: -webkit-box;//对象作为弹性伸缩盒子模型显示
-							// overflow: hidden;//溢出隐藏
-							// -webkit-box-orient: vertical;//设置伸缩盒子对象的子元素的排列方式
-							// -webkit-line-clamp: 2;//设置 块元素包含的文本行数
-							overflow: hidden;
-							text-overflow: ellipsis;
-							white-space: nowrap;
-						}
-					}
-
-					.operate {
-						display: flex;
-						justify-content: space-between;
-						align-items: center;
-						padding: 20rpx 0;
-						color: #666666;
-
-						.left {
-							display: flex;
-							align-items: center;
-
-							.img {
-								width: 48rpx;
-								height: 48rpx;
-								margin-right: 10rpx;
-
-								image {
-									width: 100%;
-									height: 100%;
-									border-radius: 50%;
-								}
-							}
-
-							.user {
-								width: 70%;
-								overflow: hidden;
-								text-overflow: ellipsis;
-								white-space: nowrap;
-							}
-
-						}
-
-						.collection {
-							display: flex;
-							align-items: center;
-							justify-content: space-between;
-							width: 88rpx;
-							height: 32rpx;
-							position: relative;
-
-							.img {
-								position: absolute;
-								left: 0;
-								top: 6rpx;
-								transform: translate(-130%, 0);
-							}
-
-							image {
-								width: 27rpx;
-								height: 25rpx;
-								display: block;
-							}
-
-							// float: right;
-							// font-size: 14px;
-							// padding-top: 10px;
-						}
-					}
-				}
-			}
-
-			.activeData:nth-child(1) {
-				margin-left: 15px;
-			}
-		}
-
-		.title {
-			font-weight: bold;
-			// color: #999999;
-		}
-
-		.lookMore {
-			color: #666666;
-			// font-size: 14px;
-		}
-	}
-</style>

pages/activityPageNew/activityPageNew.vue

@@ -36,8 +36,7 @@
 		</view>
 
 		<!-- <swiper class="scroll-view-height" @change="swipeIndex" @transition='cutS' @animationfinish='ani' -->
-		<swiper class="scroll-view-height" @change="swipeIndex"
-			:current="current" :duration="300">
+		<swiper class="scroll-view-height" @change="swipeIndex" :current="current" :duration="300">
 
 			<!-- 常规教研 -->
 			<swiper-item>
@@ -335,7 +334,7 @@
 		},
 		// 分享
 		onShareAppMessage() {
-		
+
 			uni.share({
 				provider: "weixin",
 				scene: "WXSceneSession",
@@ -350,13 +349,13 @@
 			});
 		},
 		onLoad() {
-
-		},
-		onShow() {
-			this.pulist = []
-			this.teclist = []
 			this.getpuData() //获取常规列表
 			this.getTecData() //获取专题列表
+		},
+		onShow() {
+			// this.pulist = []
+			// this.teclist = []
+
 			this.getAllMessage() // 调用app.js中的方法
 			// 获取收藏事件
 			this.$refs.listBlock1.getdata() //专题

pages/hd/hd.vue

@@ -1,291 +0,0 @@
-<template>
-	<view class="hd">
-		<statusBar :item="navBarData"></statusBar>
-		
-		<view class="top" v-for="(item,index) in actItemList" :key="index">
-				<view class="card">
-					<image class="image" :src="item.pic" mode="aspectFill"></image>
-					<view class="text">
-						
-						<view class="text_title">
-							<view class="manage bqZ-font">类型</view>
-							<view class="t1 bmTit-font">{{ item.acName }}</view>
-						</view>
-						<view class="col sZw-font">
-							活动日期：{{ item.create_at.split('T')[0] }}
-						</view>
-						<view class="col sZw-font">
-							招募人数：0/{{ item.pers }}
-						</view>
-					</view>
-				</view>
-		</view>
-		
-		<!-- <uni-card :is-shadow="false"> -->
-			<view class="xinxi">
-				<view class="card2">
-					<view class="hdxx">
-						<view class="xxTit btn-font">活动信息</view>
-						<view class="textcolor">
-							<view class="name  sZw-font">
-								姓名:
-								<input type="text" style=" text-align: right;" maxlength="10" placeholder="请输入姓名"
-									placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="nickname" />
-							</view>
-							<view class="name  sZw-font">
-								联系方式:
-								<input type="text" style=" text-align: right;" maxlength="11" placeholder="请输入联系方式"
-									placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="telephone" />
-							</view>
-							<view class="name  sZw-font">
-								单位:
-								<input type="text" style=" text-align: right;" maxlength="15" placeholder="请输入单位"
-									placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="units" />
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		<!-- </uni-card> -->
-		<view class="buttons">
-			<view class="button-container">
-				<button @click="button1Action" class="btn1 sZw-font">清空填写信息</button>
-				<!-- <text class="button-spacing"></text> -->
-				<!-- 添加间距 -->
-				<button :disabled="isButtonDisabled" :style="isButtonDisabled ? 'background-color:#87CEFA;' : 'background-colo:#0056a8;'" @click="gotoSign" class="btn2 sZw-font">申请加入</button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			navBarData: {
-				title: '活动报名',
-				btn: 1
-			},
-			nickname: '',
-			telephone: '',
-			units: '',
-			actItemList:[],
-			isButtonDisabled: false,
-		};
-	},
-	methods: {
-		button1Action() {
-			this.nickname = ''
-			this.telephone = ''
-			this.units = ''
-		},
-		gotoSign() {
-			// 这里添加按钮2点击后触发的动作
-			if (this.nickname.trim() === '' || this.telephone.trim() === '') {
-				uni.showToast({
-					title: '请填写完整的表单内容',
-					icon: 'none'
-				});
-				return;
-			}
-			let data = {
-				acId: this.actItemList[0].acId,
-				openid: uni.getStorageSync('oId'),
-				acName: this.actItemList[0].acName,
-				brief: this.actItemList[0].brief,
-				pic: this.actItemList[0].pic,
-				pers: this.actItemList[0].pers,
-				acshape: this.actItemList[0].acshape,
-				// create_at:this.actItemList[0].create_at,
-				address: this.actItemList[0].address,
-				type: this.actItemList[0].type,
-				begin_at: this.actItemList[0].begin_at,
-				endTime: this.actItemList[0].endTime,
-				cost: this.actItemList[0].cost
-			}
-			console.log(data);
-			console.log('1111');
-			console.log(this.actItemList[0].acId);
-			this.$request('/insertActivityEnroll', "POST", data).then(res => {
-				console.log(res);
-				uni.navigateTo({
-					url: '/pages/Sign/Sign'
-				})
-			})
-			
-		},
-		enrollPublisher(clickedAcId) {
-			this.$request('/selectPublisher', "POST", {
-				openid: uni.getStorageSync('oId'),
-				acId: clickedAcId,
-			}).then(res => {
-				const openid = uni.getStorageSync('oId')
-				console.log(res[0][0].openid);
-				if (openid === res[0][0].openid) {
-					uni.showToast({
-						title: '您是该活动的发布者，不能报名',
-						icon: 'none'
-					});
-					this.isButtonDisabled = true
-					return;
-				}
-			})
-		},
-		getActivity() {
-			// 获取当前页面的URL
-			const routes = getCurrentPages();
-			console.log(routes);
-			const acId = routes[2].options.acId
-			const ty = routes[2].options.ty
-			let data = {
-				acId: acId,
-				ty: ty
-			}
-			this.$request('/selectActivityID', "POST", data).then(res => {
-				console.log(res[0]);
-				// this.activeList=[...this.activeList,...res[0]]
-				this.actItemList = res[0]
-				const clickedAcId = this.actItemList[0].acId;
-				this.enrollPublisher(clickedAcId)
-			})
-		},
-	},
-	onShow() {
-		this.getActivity()
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.hd {
-	.top{
-		width: 690rpx;
-		height: 192rpx;
-		background-color: #ffffff;
-		margin: auto;
-		margin-top: 30rpx;
-		// padding: 24rpx;
-		padding: 16rpx 24rpx;
-		border-radius: 10rpx;
-		.col{
-			color: #999999;
-		}
-	}
-	.card {
-		// margin-top: 40rpx;
-		display: flex;
-		.image {
-			flex-shrink: 0;
-			width: 160rpx;
-			height: 160rpx;
-			border-radius: 4px;
-		}
-		
-		.text {
-			margin-left: 10px; // 增加一点空间
-			display: flex;
-			flex-direction: column;
-			justify-content: space-between;
-			.text_title {
-				display: flex;
-				align-items: center;
-				.manage {
-					// padding:4rpx 12rpx 4rpx 12rpx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					width: 68rpx;
-					height: 36rpx;
-					border-radius: 5rpx;
-					color: #00b2b6;
-					border: 1px solid #00b2b6;
-					// border-radius: 10rpx;
-					margin-right: 10rpx;
-				}
-				.t1 {
-					color: black;
-					width: 350rpx;
-					font-weight: 550;
-					overflow:hidden;
-					text-overflow:ellipsis;
-					white-space:nowrap;
-				}
-			}
-
-		}
-	}
-	.xinxi{
-		background-color: #ffffff;
-		width: 690rpx;
-		// height: 272rpx;
-		margin: auto;
-		margin-top: 20rpx;
-		padding: 20rpx 24rpx;
-		border-radius: 12rpx;
-	}
-	.hdxx {
-		.xxTit {
-			color: black;
-			// font-size: 18px;
-			// font-weight: 400px;
-			line-height: 42px;
-		}
-		.textcolor {
-			color: #999999;
-			line-height: 42px;
-			.name {
-				display: flex;
-				justify-content: space-between;
-				margin-bottom: 20rpx;
-				.nickname {
-					width: 350rpx;
-					text-align: end;
-					// padding-right: 10rpx;
-					// margin-right: 10rpx;
-					font-size: 28rpx;
-					color: rgb(153, 153, 153);
-				}
-			}
-		}
-	}
-	.buttons {
-		background-color: white;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		width: 100%;
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		height: 137rpx;
-		// padding-bottom: 50rpx;
-		// font-size: 30rpx;
-		.button-container {
-			width: 100%;
-			display: flex;
-			justify-content: space-around;
-			.btn1{
-				width: 326rpx;
-				height: 71rpx;
-				border: 1px solid #666666;
-				border-radius: 50px;
-				height: 70rpx;
-				line-height: 70rpx;
-				// font-size: 35rpx;
-				color: #666666;
-			}
-			.btn2{
-				width: 326rpx;
-				height: 71rpx;
-				background-color: #0056a8;
-				border-radius: 50px;
-				height: 70rpx;
-				line-height: 70rpx;
-				color: #ffffff;
-			}
-		}
-		
-		
-	}
-}
-</style>

pages/hdxx/hdxx.vue

@@ -1,194 +0,0 @@
-<template>
-  <view class="hdxx">
-    <statusBar :item="navBarData"></statusBar>
-    <view class="content" @click="gotoInform">
-      <view class="text">
-        <view class="header">
-          <view class="disC three-font">
-            活动开始提醒
-            <text class="sj fwb-font">13:28</text>
-          </view>
-        </view>
-        <view class="main">
-          <view class="fwb-font">
-            <text class="btn-font" style="color: #0056a8"
-              >“丽湖职教双创教育国际虚拟教研室·常规教研活动第9期”</text
-            >
-            活动现在已经在我们的平台上正式上
-            线，欢迎您点击浏览和积极参加。不要错过这个令
-            人兴奋的机会，我们期待着与您一同度过难忘的时
-            光。点击活动名称进入活动详情哦！
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- <view class="content">
-			<view class="text">
-				<view class="header">
-					<view>
-						活动发布成功
-						<view class="sj">13:28</view>
-					</view>
-				</view>
-				<view class="main">
-					<view>
-						恭喜！您已成功完成
-						<view>“XXXX讲座”</view>
-						活动报名。您的参与信息已经成功提交，您现在是我们活动的一部分，我们非常期待与您共度美好时光。
-						<view style="text-indent: 2em" >
-							以下是一些额外信息，以确保您充分了解您的参与：
-						</view>  
-					</view>
-					<view class="custom-list">
-						<view class="list-item">活动名称：[活动名称]</view>
-						<view class="list-item">日期：[活动日期]</view>
-						<view class="list-item">时间：[活动时间]</view>
-						<view class="list-item">地点：[活动地点]</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="content">
-			<view class="text">
-				<view class="header">
-					<view>
-						活动已结束
-						<view class="sj">13:28</view>
-					</view>
-				</view>
-				<view class="main">
-					<view>
-						<view>“XXXX讲座”</view>
-						活动已圆满结束，我们要对您的热情参与表示由衷的感谢。您的支持和参与使这次活动变得特别而难忘。
-						再次感谢您的参与，我们期待将来再次与您共享更多精彩的活动。敬请期待未来的活动通知！
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="content">
-			<view class="text">
-				<view class="header">
-					<view>
-						活动开始提醒
-						<view class="sj">13:28</view>
-					</view>
-				</view>
-				<view class="main">
-					<view>
-						<view>“XXXX讲座”</view>
-						活动快开始啦！准备好迎接精彩时刻了吗？不要错过这个令人兴奋的机会，我们期待着与您一同度过难忘的时光。请确保您已经做好了所有必要的准备，包括查看活动时间、地点和其他重要信息。
-					</view>
-				</view>
-			</view>
-		</view> -->
-    <!-- 		<view class="content">
-			<view class="text">
-				<view class="header">
-					<view class="disC three-font">
-						成功加入教研室
-						<text class="sj fwb-font">13:28</text>
-					</view>
-				</view>
-				<view class="main">
-					<view style="text-indent: 0em">
-						尊敬的
-						<text>XXX</text>
-					</view>
-
-					<view>
-						我们很高兴通知您，您已成功加入
-						<text class="btn-font" style="color: #0056a8;">[教研室名称]</text>
-						！欢迎加入我们的团队，我们期待与您一同合作并共同追求卓越教育。
-					</view>
-				</view>
-			</view>
-		</view> -->
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      navBarData: {
-        title: "活动消息",
-        btn: 1,
-      },
-    };
-  },
-  methods: {
-    gotoInform() {
-      // const web = this.classList[this.current];
-      const url =
-        "https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1234";
-      uni.navigateTo({
-        url: "/pages/skipone/skipone?url=" + encodeURIComponent(url),
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss">
-.hdxx {
-  padding-bottom: 80rpx;
-}
-
-.content {
-  padding: 10px;
-  margin: 10px;
-  background-color: white;
-  border-radius: 8px;
-
-  // margin-top: 5px;
-  .disC {
-    display: flex;
-    justify-content: space-between;
-    align-items: baseline;
-  }
-
-  .text {
-    .header {
-      view {
-        color: black;
-        // font-size: 16px;
-        font-weight: 600;
-        margin-bottom: 10px;
-        display: flex;
-        justify-content: space-between;
-
-        .sj {
-          color: #999999;
-          // font-size: 13px;
-          font-weight: 500;
-        }
-      }
-    }
-
-    .main {
-      color: #999999;
-
-      view {
-        font-weight: 400;
-        // font-size: 14px;
-        text-indent: 2em;
-
-        view {
-          color: #0056a8;
-          font-weight: 600;
-        }
-      }
-
-      .custom-list {
-        padding-left: 5px;
-        padding-top: 3px;
-      }
-
-      .custom-list .list-item::before {
-        content: "• ";
-      }
-    }
-  }
-}
-</style>

pages/index/index.vue

@@ -6,7 +6,7 @@
 		<msgPop></msgPop>
 
 		<view class="top">
-			<image src="https://teacherapi.cocorobo.cn/teaching-file/static/yym/Rectangle25.png" mode="aspectFill"
+			<image :src="adv.img" mode="aspectFill"
 				@click="gotoHome">
 			</image>
 		</view>
@@ -79,6 +79,7 @@
 				isRote: false,
 				animation: null,
 				animationData: {},
+				adv: {},
 
 
 				// 推荐课程
@@ -130,7 +131,7 @@
 					lim: 12 //一次获取多少数据
 				}
 				this.$request('/selectActivity', "POST", data).then(res => {
-					console.log('推荐活动', res[0]);
+					// console.log('推荐活动', res[0]);
 					this.classList = res[0]
 
 					// console.log('推荐课程',this.classList);
@@ -148,15 +149,17 @@
 
 			// 顶部大图跳转外部链接
 			gotoHome() {
+				console.log(this.adv);
 				// const web = this.classList[this.current];
-				const url = "https://mp.weixin.qq.com/s/QZEGcvBn3aW7aHirMFLBQA";
+				const url = this.adv.href
 				uni.navigateTo({
-					url: "/pages/skipone/skipone?url=" + encodeURIComponent(url),
+					url: "/pages/skipone/skipone?item="+encodeURIComponent(JSON.stringify(url))
+					// url: "/pages/skipone/skipone?url=" + encodeURIComponent(JSON.stringify(url)),
 				});
 			},
 			// 分享
 			onShareAppMessage() {
-			
+
 				uni.share({
 					provider: "weixin",
 					scene: "WXSceneSession",
@@ -175,16 +178,25 @@
 					url: "/pages/login_Wechat/login_Wechat",
 				});
 			},
+			// 获取顶部大图
+			getAdv() {
+				this.$request('/selectAdvertisement', "get", {
+					typ: 0
+				}).then(res => {
+					console.log(res);
+					this.adv=res[0][0]
+				})
+			}
 
 		},
 		onLoad() {
 			// this.animation = uni.createAnimation()	
-			
+			this.getAdv()
 		},
 		onShow() {
 			// 清空推荐课程
 			// this.classList = []
-			console.log(this.$store.state.msgpop);
+			// console.log(this.$store.state.msgpop);
 			// 获取数据
 			this.getlistBlock1Data()
 

pages/jys/jys.vue

@@ -1,468 +0,0 @@
-<template>
-	<view class="jys">
-		<statusBar :item="navBarData"></statusBar>
-
-		<view class="top">
-			<view class="card">
-				<image class="image" :src="actItemList.pic" mode="aspectFill"></image>
-				<view class="text">
-
-					<view class="text_title">
-						<view class="manage bqZ-font">类型</view>
-						<view class="t1 bmTit-font">{{ actItemList.acName }}</view>
-					</view>
-					<view class="col sZw-font">
-						负责人：{{ actItemList.username }}
-					</view>
-					<view class="col sZw-font">
-						教研室标签：暂无
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- <uni-card :is-shadow="false"> -->
-<!-- 		<view class="xinxi">
-			<view class="card2">
-				<view class="hdxx">
-					<view class="xxTit btn-font">活动信息</view>
-					<view class="textcolor">
-						<view class="name  sZw-font">
-							姓名:
-							<input type="text" style=" text-align: right;" maxlength="10" placeholder="请输入姓名"
-								placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="applyname" />
-						</view>
-						<view class="name  sZw-font">
-							联系方式:
-							<input @blur="handleInput" type="number" style=" text-align: right;" maxlength="11"
-								placeholder="请输入联系方式" placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);"
-								v-model="phone" />
-						</view>
-						<view class="name  sZw-font">
-							单位:
-							<input type="text" style=" text-align: right;" maxlength="15" placeholder="请输入单位"
-								placeholder-style="font-size: 28rpx; color: rgb(153, 153, 153);" v-model="stations" />
-						</view>
-					</view>
-				</view>
-			</view>
-		</view> -->
-		<view class="buttons">
-			<view class="button-container">
-				<!-- <button @click="button1Action" class="btn1 sZw-font">清空填写信息</button> -->
-				<!-- <text class="button-spacing"></text> -->
-				<!-- 添加间距 -->
-				<button style="background-colo:#0056a8;" @click="showPop" class="btn2 sZw-font">申请加入</button>
-			</view>
-		</view>
-
-		<!-- 弹窗 -->
-		<view>
-			<view class="mask" v-show="showPopup" @click="closePopup"></view>
-			<view class="popup-container" v-show="showPopup">
-				<view class="popup">
-					<view class="header">
-						<text>确认报名</text>
-					</view>
-					<view class="footer">
-						<view class="cancel-btn" @click="showPopup=false">取消</view>
-
-						<view class="confirm-btn" @click="gotoSign">确认</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view>
-			<view class="mask" v-show="showPopupConfirm" @click="closePopup"></view>
-			<view class="popup-container" style="height: 175px;" v-show="showPopupConfirm">
-				<view class="popup">
-					<view class="header" style="margin-top: 15px;">
-						<image src="https://teacherapi.cocorobo.cn/teaching-file/static//gou1.png" mode="aspectFill">
-						</image>
-						<text style="margin-bottom: 24px;">报名成功</text>
-					</view>
-
-				</view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navBarData: {
-					title: '活动报名',
-					btn: 1
-				},
-
-				//控制弹窗
-				showPopup: false,
-				// 成功弹窗
-				showPopupConfirm: false,
-
-				// 用户名
-				applyname: '',
-				// 联系方式
-				phone: '',
-				// 单位
-				stations: '',
-
-				// 决定你能不能报名
-				isApply: false,
-
-				// 获取的渲染数据
-				actItemList: {},
-			};
-		},
-		methods: {
-			// 清空填写信息
-			button1Action() {
-				this.applyname = ''
-				this.phone = ''
-				this.stations = ''
-			},
-			handleInput(e) {
-				const {
-					value
-				} = e.target
-				// console.log('value',value);
-				const newValue = value.replace(/[^\d]/g, '') // 只允许输入数字
-				// console.log('newValue',newValue);
-				// if (newValue.length <= 11) {
-				this.phone = newValue;
-				// }
-			},
-			// 确定按钮显示弹窗
-			showPop() {
-				// if (this.applyname == '') return uni.showToast({
-				// 	title: '请输入姓名',
-				// 	icon: 'none'
-				// })
-				// if (this.phone == '') return uni.showToast({
-				// 	title: '请输入联系方式',
-				// 	icon: 'none'
-				// })
-				// if (this.stations == '') return uni.showToast({
-				// 	title: '请输入单位',
-				// 	icon: 'none'
-				// })
-				// if (this.phone.length != 11) return uni.showToast({
-				// 	title: '号码不足11位，请检查',
-				// 	icon: 'none'
-				// })
-				this.showPopup = true
-			},
-			// 确定报名
-			gotoSign() {
-				// 做最后判断防止同一时间进入报名页面都报名成功
-				this.$request('/selectIntercept', "POST", {
-					oid: this.$store.state.user.openid,
-					acid: this.acId
-				}).then(res => {
-					let c = res[0][0]
-					console.log(res[0][0]);
-					console.log(c.bnum >= c.pers * 1);
-					if (c.bnum >= c.pers * 1) {
-						return uni.showToast({
-							title: '已有人先您一步报名，名额已满',
-							icon: "none"
-						})
-					} else {
-						let data = {
-							oid: this.$store.state.user.openid, //用户id
-							acid: this.acId,
-							ty: 2,
-							ume: this.applyname,
-							pho: this.phone,
-							sta: this.stations
-						}
-						this.$request('/insertSignup', "POST", data).then(res => {
-							// console.log(res);
-
-							// 添加消息页面系统通知提示报名成功
-							this.addMessage()
-
-
-							// 弹窗关闭
-							this.showPopup = false
-							uni.reLaunch({
-								url: '/pages/Sign/Sign',
-							})
-							// uni.navigateTo({
-							// 	url: '/pages/Sign/Sign',
-							// 	success() {
-							// 		//跳转成功后，禁止返回
-							// 		uni.navigateBack({
-							// 			delta:0
-							// 		})
-							// 	}
-							// })
-						})
-					}
-				})
-			},
-			// 添加消息页面系统通知提示报名成功
-			addMessage() {
-				let data = {
-					oid: this.$store.state.user.openid,
-					acid: this.acId,
-					type: 0,
-				}
-				this.$request('/insertMessage', "POST", data).then(res => {
-					console.log(res);
-				})
-			},
-			// 获取页面数据
-			getActivity() {
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					acId: this.acId,
-				}
-				this.$request('/selectActivityID', "POST", data).then(res => {
-					console.log(res[0]);
-					this.actItemList = res[0][0]
-				})
-			},
-		},
-		onLoad(e) {
-			console.log('进来了', e);
-			// 接受参数
-			this.acId = e.acId
-			// 导航栏显示教研室报名还是活动报名
-			this.navBarData.title = e.tit
-
-			this.getActivity()
-		}
-	};
-</script>
-
-<style lang="scss" scoped>
-	.jys {
-		.top {
-			width: 690rpx;
-			height: 192rpx;
-			background-color: #ffffff;
-			margin: auto;
-			margin-top: 30rpx;
-			// padding: 24rpx;
-			padding: 16rpx 24rpx;
-			border-radius: 10rpx;
-
-			.col {
-				color: #999999;
-			}
-		}
-
-		.card {
-			// margin-top: 40rpx;
-			display: flex;
-
-			.image {
-				flex-shrink: 0;
-				width: 160rpx;
-				height: 160rpx;
-				border-radius: 4px;
-			}
-
-			.text {
-				margin-left: 10px; // 增加一点空间
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.text_title {
-					display: flex;
-					align-items: center;
-
-					.manage {
-						// padding:4rpx 12rpx 4rpx 12rpx;
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						width: 68rpx;
-						height: 36rpx;
-						border-radius: 5rpx;
-						color: #00b2b6;
-						border: 1px solid #00b2b6;
-						// border-radius: 10rpx;
-						margin-right: 10rpx;
-					}
-
-					.t1 {
-						color: black;
-						width: 350rpx;
-						font-weight: 550;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-					}
-				}
-
-			}
-		}
-
-		.xinxi {
-			background-color: #ffffff;
-			width: 690rpx;
-			// height: 272rpx;
-			margin: auto;
-			margin-top: 20rpx;
-			padding: 20rpx 24rpx;
-			border-radius: 12rpx;
-		}
-
-		.hdxx {
-			.xxTit {
-				color: black;
-				// font-size: 18px;
-				// font-weight: 400px;
-				line-height: 42px;
-			}
-
-			.textcolor {
-				color: #999999;
-				line-height: 42px;
-
-				.name {
-					display: flex;
-					justify-content: space-between;
-					margin-bottom: 20rpx;
-
-					.nickname {
-						width: 350rpx;
-						text-align: end;
-						// padding-right: 10rpx;
-						// margin-right: 10rpx;
-						font-size: 28rpx;
-						color: rgb(153, 153, 153);
-					}
-				}
-			}
-		}
-
-		.buttons {
-			background-color: white;
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			width: 100%;
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-			height: 137rpx;
-
-			// padding-bottom: 50rpx;
-			// font-size: 30rpx;
-			.button-container {
-				width: 100%;
-				display: flex;
-				justify-content: space-around;
-
-				.btn1 {
-					width: 326rpx;
-					height: 71rpx;
-					border: 1px solid #666666;
-					border-radius: 50px;
-					height: 70rpx;
-					line-height: 70rpx;
-					// font-size: 35rpx;
-					color: #666666;
-				}
-
-				.btn2 {
-					width: 600rpx;
-					height: 71rpx;
-					background-color: #0056a8;
-					border-radius: 50px;
-					height: 70rpx;
-					line-height: 70rpx;
-					color: #ffffff;
-				}
-			}
-
-
-		}
-
-		.mask {
-			position: fixed;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			background-color: rgba(0, 0, 0, 0.3);
-			z-index: 999;
-			overflow: hidden;
-			// display: none;
-		}
-
-		.popup-container {
-			position: fixed;
-			top: 50%;
-			left: 50%;
-			transform: translate(-50%, -50%);
-			width: 520rpx;
-			height: 260rpx;
-			z-index: 1000;
-			// display: none;
-
-			.popup {
-				width: 100%;
-				height: 100%;
-				display: flex;
-				flex-direction: column;
-				background-color: #fff;
-				border-radius: 16rpx;
-				overflow: hidden;
-
-				.header {
-					flex: 1;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-					flex-direction: column;
-					margin-top: 24px;
-					font-size: 34rpx;
-					font-weight: 600;
-
-					image {
-						width: 150rpx;
-						height: 150rpx;
-						margin-top: 15px;
-						margin-bottom: 15px;
-					}
-				}
-
-				.footer {
-					width: 100%;
-					display: flex;
-					overflow: hidden;
-
-					.cancel-btn {
-						width: 50%;
-						height: 100rpx;
-						background-color: #F7F7F7;
-						color: #000;
-						font-size: 34rpx;
-						text-align: center;
-						border-bottom-left-radius: 16rpx;
-						line-height: 50px;
-					}
-
-					.confirm-btn {
-						width: 50%;
-						height: 100rpx;
-						background-color: #0081FE;
-						color: #fff;
-						font-size: 34rpx;
-						text-align: center;
-						line-height: 50px;
-					}
-				}
-			}
-		}
-	}
-</style>

pages/liveActivityList/liveActivityList.vue

@@ -1,108 +0,0 @@
-<template>
-	<view class="activityList">
-		<statusBar :item="navbarData"></statusBar>
-		<!-- <teaching-case :item="teaData"></teaching-case> -->
-		<!-- <view class="" style="padding-bottom: 50rpx;">
-			<teaching-case :activeList="activeList" :indexId="index" :item="teaData"></teaching-case>
-		</view> -->
-
-
-		<scroll-view class="list" scroll-y="true">
-			<view>
-				<teaching-case :activeList="activeList" :indexId="index" :item="teaData"></teaching-case>
-			</view>
-
-		</scroll-view>
-
-
-		<view class="loading">
-			<view v-if="newsLoading==1">数据加载中...</view>
-			<view v-if="newsLoading==2">没有更多了~~</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navbarData: {
-					title: '直播活动',
-					btn: 1
-				},
-				teaData: {
-					btn: 1,
-					btn_2: 2
-				},
-				// 数据
-				activeList: [],
-				// 触底加载动画提示
-				newsLoading: 1, //0默认值  1加载中 2没有更多了
-				currentPage: 1,
-
-			};
-		},
-		methods: {
-			// 获取教研活动
-			getData() {
-				let data = {
-					openid: uni.getStorageSync('oId'),
-					ty: 0,
-					page: this.currentPage, //下拉获取更多的字段
-					lim: 15 //一次获取多少数据
-				}
-				this.$request('/selectActivity', "POST", data).then(res => {
-					console.log(res[0]);
-					if (!res[0].length) {
-						this.newsLoading = 2
-					} else {
-						this.newsLoading = 0
-					}
-					this.activeList = [...this.activeList, ...res[0]]
-					// this.activeList=res[0]
-				})
-			},
-		},
-		// 触底加载更多
-		onReachBottom() {
-			console.log(111);
-			if (this.newsLoading == 2) {
-				return
-			}
-			this.newsLoading = 1
-			this.currentPage++
-			setTimeout(this.getData,2000)
-			
-		},
-		// onShow() {
-		// 	this.getData()
-		// }
-		onLoad() {
-			this.getData()
-		}
-	}
-</script>
-
-<style lang="scss">
-	.activityList {
-		.list {
-			// height: 100vh;
-			// background-color: rebeccapurple;
-		}
-
-		.bottom {
-			margin: 30rpx auto;
-			text-align: center;
-		}
-		
-		.loading{
-			height: 50rpx;
-			text-align: center;
-			padding-top: 20rpx;
-			padding-bottom: 100rpx;
-			font-size: 26rpx;
-			color:#888;
-			line-height: 2em;
-		}
-	}
-</style>

pages/login_Wechat/login_Wechat.vue

@@ -37,6 +37,7 @@
 
 
 		<button class="btn" @click="gotoIndex">一键登录</button>
+		<!-- <button class="btn" @click="gotoIndex2">一键登录</button> -->
 		<!-- <view class="footer" @click="goto">
 			<text>手机号登录/账号密码登录</text>
 		</view> -->
@@ -445,7 +446,7 @@
 					if (res[0].length) {
 						let aaa = res[0][0]
 						if (aaa.cid !== null) {
-							console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
+							// console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');
 							this.inpTxt = aaa.cid
 						}
 						if (aaa.sid !== null) {
@@ -490,7 +491,8 @@
 				// console.log(avatarUrl)
 				let that = this
 				const uploadTask = uni.uploadFile({
-					url: 'http://127.0.0.1:7334/img', // post请求地址
+					// url: 'http://127.0.0.1:7334/img', // post请求地址
+					url: 'https://awsupload.cocorobo.cn/img', // post请求地址
 					// url: 'https://cxcy.ssti.net.cn/api/UploadFirmFile', // post请求地址
 					// filePath: tempFilePaths,
 					filePath: avatarUrl,
@@ -516,6 +518,29 @@
 
 				// this.avatarUrl = avatarUrl
 			},
+			// 手机号一键登录
+			gotoIndex2(){
+				uni.getProvider({
+				  service: 'oauth',
+				  success: function (res) {
+				    console.log(res.provider)// ['qq', 'univerify']
+				  }
+				});
+				return
+				uni.preLogin({
+					provider: 'univerify',
+					success(){  //预登录成功
+						// 显示一键登录选项
+					},
+					fail(res){  // 预登录失败
+						// 不显示一键登录选项（或置灰）
+				    // 根据错误信息判断失败原因，如有需要可将错误提交给统计服务器
+						console.log(res.errCode)
+						console.log(res.errMsg)
+					}
+				})
+
+			},
 			// 登录
 			gotoIndex() {
 				if (this.avatarUrl ==
@@ -660,7 +685,7 @@
 						return
 					} else {
 						this.isLogin = true
-						// this.avatarUrl = data.avatar
+						this.avatarUrl = data.avatar
 						this.nickname = data.username
 					}
 				})

pages/message/message.vue

@@ -1,317 +0,0 @@
-<template>
-  <view class="messBox">
-    <statusBar :item="navbarData"></statusBar>
-    <view class="" v-if="msgLogin !==''">
-      <view class="mesItem" @click="goToMesDetail">
-        <view class="leftBox">
-          <view class="mesImg">
-            <image
-              src="https://teacherapi.cocorobo.cn/teaching-file/static//message/notice.svg"
-              mode="aspectFill"
-            ></image>
-          </view>
-
-          <view class="mesBrief">
-            <view class="tit">活动通知</view>
-            <view class="breif fz-font" style="line-height: 40rpx"
-              >活动开始提醒</view
-            >
-          </view>
-        </view>
-
-        <view class="right">
-          <view class="">
-            <view v-if="acmsg" class="newMessage"></view>
-          </view>
-          <view class="mesTime fz-font">{{xacmsg.create_at}}</view>
-        </view>
-      </view>
-
-      <view class="mesItem" @click="goToMeGXt">
-        <view class="leftBox">
-          <view class="mesImg">
-            <image
-              src="https://teacherapi.cocorobo.cn/teaching-file/static//message/system.svg"
-              mode=""
-            ></image>
-          </view>
-
-          <view class="mesBrief">
-            <view class="tit">系统通知</view>
-            <view class="breif fz-font" style="line-height: 40rpx"
-              >已加入“{{xsysmsg.acName}}”{{xsysmsg.type>=2?'教研室':'活动'}}</view
-            >
-          </view>
-        </view>
-
-        <view class="right">
-          <view class="">
-            <view v-if="sysmsg" class="newMessage"></view>
-          </view>
-          <view class="mesTime fz-font">{{xsysmsg.create_at}}</view>
-        </view>
-      </view>
-
-      <view class="mesItem" @click="goToMegDy">
-        <view class="leftBox">
-          <view class="mesImg">
-            <image
-              src="https://teacherapi.cocorobo.cn/teaching-file/static//message/subscribe.svg"
-              mode=""
-            ></image>
-          </view>
-          <view class="mesBrief">
-            <view class="tit">订阅消息</view>
-            <view class="breif fz-font" style="line-height: 40rpx"
-              >欢迎订阅“{{xdymsg.acName}}”{{xdymsg.type>=2?'教研室':'活动'}}</view
-            >
-          </view>
-        </view>
-        <view class="right">
-          <view class="">
-            <view v-if="dymsg" class="newMessage"></view>
-          </view>
-          <view class="mesTime fz-font">{{xdymsg.create_at}}</view>
-        </view>
-      </view>
-    </view>
-    <view v-else class="noLogin">
-      <!--  未登录展示样式 -->
-      <view class="mid">
-        <image
-          src="https://teacherapi.cocorobo.cn/teaching-file/static//yym/Vector.png"
-          mode="aspectFill"
-        ></image>
-        <view class="tit" style="">您暂时还没有消息</view>
-        <view class="brief fz-font" style="color: rgba(0, 0, 0, 0.4)"
-          >快去登录查看消息吧</view
-        >
-        <view class="btn" @click="gotoLogin">去登录</view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      navbarData: {
-        title: "消息",
-      },
-    
-	  // 判断是否显示红点
-      acmsg: 0,
-	  sysmsg: 0,
-      dymsg: 0,
-	  // 判断是否登录
-      msgLogin: '',
-	  // 最新一条数据
-	  xacmsg: {},
-	  xsysmsg: {},
-	  xdymsg: {},
-    };
-  },
-  methods: {
-    goToMesDetail() {
-      uni.navigateTo({
-        url: "/pages/hdxx/hdxx",
-      });
-    },
-    goToMeGXt() {
-      uni.navigateTo({
-        url: "/pages/messageSystem/messageSystem",
-      });
-    },
-    goToMegDy() {
-      uni.navigateTo({
-        url: "/pages/messageDy/messageDy",
-      });
-    },
-    gotoLogin() {
-      uni.navigateTo({
-        url: "/pages/login_Wechat/login_Wechat",
-      });
-    },
-	// 获得首页显示的第一条消息
-	// getOneMsg(){
-	// 	this.$request('/selectGroupMessage', "POST", {
-	// 		oid: this.$store.state.user.openid
-	// 	}).then(res => {
-	// 		console.log(res);
-	// 	})
-	// },
-	// 信息页面分组查询未读信息
-	getGroupMsg(){
-		this.$request('/selectGroupMessage', "POST", {
-			oid: this.$store.state.user.openid
-		}).then(res => {
-			console.log('出来了',res);
-			this.acmsg=0;
-			this.sysmsg=0;
-			this.dymsg=0;
-			res[0].forEach(e=>{
-				if(e.type==0){
-					this.acmsg=e.num
-				}else if(e.type==1){
-					this.sysmsg=e.num
-				}else{
-					this.dymsg=e.num
-				}
-			})
-			this.xacmsg=res[1][0];
-			this.xsysmsg=res[2][0];
-			this.xdymsg=res[3][0];
-		})
-	},
-  },
-  onShow() {
-	  // 判断是否登录
-    this.msgLogin = this.$store.state.user.openid;
-	// 信息页面分组查询未读信息
-	this.getGroupMsg()
-	// 调用app.js中的方法
-	this.getAllMessage()    
-  },
-};
-</script>
-
-<style lang="scss">
-.messBox {
-  background: #fff;
-  display: flex;
-  flex-direction: column;
-  flex-wrap: nowrap;
-  // align-items: center;
-
-  // 未登录展示样式
-  .noLogin {
-    width: 750rpx;
-    height: 80vh;
-    background-color: #f0f2f5;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    .mid {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      height: 20vh;
-      justify-content: space-between;
-
-      .tit {
-        margin-top: 30rpx;
-        font-weight: 400;
-        color: rgba(0, 0, 0, 0.8);
-        line-height: 48rpx;
-        font-size: 34rpx;
-      }
-
-      .brief {
-        margin-top: 10rpx;
-      }
-
-      image {
-        width: 175rpx;
-        height: 148rpx;
-      }
-
-      .btn {
-        margin-top: 30rpx;
-        width: 160rpx;
-        height: 64rpx;
-        font-size: 28rpx;
-        // font-weight: 600;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        background-color: rgba(0, 86, 168, 1);
-        border-radius: 100rpx;
-        color: #ffffff;
-      }
-    }
-  }
-
-  .mesItem {
-    display: flex;
-    // flex-direction: row;
-    // flex-wrap: nowrap;
-    // align-items: flex-end;
-    justify-content: space-between;
-    width: 750rpx;
-    padding: 30rpx 20rpx;
-    // position: relative;
-
-    .leftBox {
-      display: flex;
-      justify-content: flex-start;
-      // flex-direction: row;
-      // flex-wrap: nowrap;
-      // align-items: center;
-
-      .mesImg {
-        width: 96rpx;
-        height: 96rpx;
-        // padding: 30rpx 5rpx;
-        margin-right: 25rpx;
-
-        image {
-          width: 100%;
-          height: 100%;
-        }
-      }
-
-      .mesBrief {
-        display: flex;
-		width: 450rpx;
-        flex-direction: column;
-        justify-content: space-between;
-
-        .tit {
-          font-size: 32rpx;
-          font-weight: 400;
-          line-height: 48rpx;
-          color: #333333;
-        }
-
-        .breif {
-			width: 90%;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			color: rgba(51, 51, 51, 1);
-        }
-      }
-
-      // .mesBrief:nth-child(1){
-      // 	// font-size: 36rpx;
-      // }
-      // .mesBrief:nth-last-child(1){
-      // 	color: #999;
-      // 	padding: 10rpx 0 0 0;
-      // }
-    }
-
-    .right {
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      align-items: center;
-      padding-top: 10px;
-
-      .mesTime {
-        color: #999;
-        bottom: 30px;
-      }
-
-      .newMessage {
-        width: 16rpx;
-        height: 16rpx;
-        background: red;
-        border-radius: 10rpx;
-      }
-    }
-  }
-}
-</style>

pages/messageDy/messageDy.vue

@@ -1,183 +0,0 @@
-<template>
-	<view class="messageDy">
-		<statusBar :item="navBarData"></statusBar>
-
-		<scroll-view scroll-y="true" :scroll-top="scrollTop" id="scrollview" class="scrollV"
-			:style="{height:screenHeight - navheight+'px'}">
-			<view class="reverse" id="msglistview">
-				<view class="content" v-for="(item,index) in list" :key="index">
-					<view class="conblock">
-						<view class="header">
-							<view class="disC three-font">
-								成功订阅[{{item.acName}}]{{item.type>=2?'教研室':'活动'}}
-							</view>
-						</view>
-						<view class="sj fwb-font">{{item.create_at}}</view>
-						<view class="main">
-							<view class="fwb-font">
-								尊敬的
-								<text>{{item.username}}</text>
-							</view>
-
-							<view class="fwb-font" style="text-indent: 2em;width: 100%;">
-								我们很高兴通知您，您已成功订阅
-								<text class="btn-font Xbold" style="color: #0056a8;">[{{item.acName}}]</text>
-								！欢迎加入我们的团队，我们期待与您一同合作并共同追求卓越教育。
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navBarData: {
-					title: '订阅消息',
-					btn: 1
-				},
-				newsLoading: 0, //0默认值  1加载中 2没有更多了
-				currentPage: 1,
-				list: [],
-				scrollTop: 0,
-				navheight: this.navheight, //导航栏高度
-				screenHeight: this.screenHeight
-			};
-		},
-		methods: {
-
-			// 获取数据
-			getdata() {
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					type: 2,
-					page: this.currentPage,
-					lim: 30
-				}
-				this.$request('/selectMessage', "POST", data).then(res => {
-					console.log('获取', res[0]);
-					// this.list = [this.list,...res[0]]
-					this.list = res[0]
-					// console.log('获取',this.list);
-				})
-			},
-			// 聊天记录自动跳转底部
-			scrollToBottom() {
-				let that = this
-				let query = uni.createSelectorQuery()
-				query.select('#scrollview').boundingClientRect()
-				query.select('#msglistview').boundingClientRect()
-				query.exec((res) => {
-					// console.log('res', res);
-					console.log('res', res[0].height, res[1].height);
-					if (res[1].height > res[0].height) {
-						that.scrollTop = res[1].height - res[0].height
-					}
-				})
-			},
-
-			// 更新已读
-			updateisread() {
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					type: 2,
-				}
-				this.$request('/updateIsRead', "POST", data).then(res => {
-					// console.log('获取', res);
-				})
-			},
-		},
-		// 进入页面渲染完毕后调用
-		onReady() {
-			// this.scrollToBottom()
-			this.scrollToBottom();
-			console.log(11111);
-		},
-		onLoad() {
-			this.getdata()
-			// 更新已读
-			this.updateisread()
-			// this.scrollToBottom()
-		}
-	};
-</script>
-
-<style lang="scss">
-	.messageDy {
-		height: 100vh;
-		
-	}
-
-	.scrollV {
-		// overflow: hidden;
-		// height: 200rpx !important;
-		// background-color: #0056a8;
-	}
-
-
-
-	.reverse {
-		display: flex;
-		flex-direction: column-reverse;
-		padding-bottom: 80rpx;
-
-		.content {
-			padding: 10px;
-			margin: 10px;
-			background-color: white;
-			border-radius: 8px;
-			display: flex;
-			justify-content: center;
-
-			.conblock {
-				.header {
-					color: black;
-					font-weight: 600;
-					display: flex;
-					justify-content: space-between;
-
-					.disC {
-						display: flex;
-						width: 100%;
-						font-weight: bold;
-						justify-content: space-between;
-						align-items: baseline;
-						/*隐藏溢出*/
-						/*当文本溢出包含元素时显示省略符号来代表被修剪的文本*/
-						/*规定段落中的文本不进行换行*/
-						white-space: normal;
-						letter-spacing: 2rpx;
-						display: -webkit-box;
-						word-break: break-all;
-						text-overflow: ellipsis;
-						overflow: hidden;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						/*设置 需要显示的行数*/
-					}
-				}
-
-				.sj {
-					color: #999999;
-					font-weight: 500;
-					padding: 10rpx 0;
-				}
-
-				.main {
-					color: #999999;
-					font-weight: 400;
-
-					.Xbold {
-						color: #0056a8;
-						font-weight: 600;
-					}
-
-				}
-			}
-		}
-	}
-</style>

pages/messageSystem/messageSystem.vue

@@ -1,182 +0,0 @@
-<template>
-	<view class="messageSys">
-		<statusBar :item="navBarData"></statusBar>
-		<scroll-view scroll-y="true" :scroll-top="scrollTop" id="scrollview"  :style="{height:(screenHeight - navheight)+'px' }">
-			<view class="reverse" id="msglistview">
-				<view class="content" v-for="(item,index) in list" :key="index">
-					<view class="conblock">
-						<view class="header">
-							<view class="disC three-font">
-								成功加入[{{item.acName}}]{{item.type>=2?'教研室':'活动'}}
-							</view>
-						</view>
-						<view class="sj fwb-font">{{item.create_at}}</view>
-						<view class="main">
-							<view class="fwb-font">
-								尊敬的
-								<text>{{item.username}}</text>
-							</view>
-
-							<view class="fwb-font" style="text-indent: 2em;">
-								我们很高兴通知您，您已成功加入
-								<text class="btn-font" style="color: #0056a8;">[{{item.acName}}]</text>
-								！欢迎加入我们的团队，我们期待与您一同合作并共同追求卓越教育。
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navBarData: {
-					title: '系统消息',
-					btn: 1
-				},
-				newsLoading: 0, //0默认值  1加载中 2没有更多了
-				currentPage: 1,
-
-				navheight: this.navheight, //导航栏高度
-				scrollTop: 0,
-				// 渲染列表
-				list: [],
-			};
-		},
-		methods: {
-			// 获取数据
-			getdata() {
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					type: 1,
-					page: this.currentPage,
-					lim: 30
-				}
-				this.$request('/selectMessage', "POST", data).then(res => {
-					// console.log('获取', res[0]);
-					// this.list = [this.list,...res[0]]
-					this.list = res[0]
-					// console.log('获取',this.list);
-				})
-			},
-			updateisread() {
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					type: 1,
-				}
-				this.$request('/updateIsRead', "POST", data).then(res => {
-					// console.log('获取', res);
-				})
-			},
-			// 聊天记录自动跳转底部
-			scrollToBottom() {
-				let that = this
-				let query = uni.createSelectorQuery()
-				query.select('#scrollview').boundingClientRect()
-				query.select('#msglistview').boundingClientRect()
-				query.exec((res) => {
-					// console.log('res', res);
-					console.log('res',res[1].height, res[0].height);
-					// console.log(res[1].height, res[0].height);
-					if (res[1].height > res[0].height) {
-						that.scrollTop = res[1].height - res[0].height
-					}
-				})
-			}
-		},
-		onShow() {
-			// 获取页面数据
-			this.getdata()
-			// 更新已读
-			this.updateisread()
-		},
-		// 进入页面渲染完毕后调用
-		onReady() {
-			this.scrollToBottom()
-		},
-		onLoad() {
-			// this.userName = this.$store.state.user.userName
-			// this.getdata()
-		}
-	}
-</script>
-
-<style lang="scss">
-	.classTest {
-		font-size: 30px;
-	}
-
-	.messageSys {
-		padding-bottom: 80rpx;
-		
-	}
-
-
-	.reverse {
-		// flex: 1;
-		display: flex;
-		flex-direction: column-reverse;
-		.content {
-			padding: 10px;
-			margin: 10px;
-			background-color: white;
-			border-radius: 8px;
-
-			.conblock {
-				.header {
-					color: black;
-					font-weight: 600;
-					display: flex;
-					justify-content: space-between;
-
-					.disC {
-						display: flex;
-						width: 100%;
-						font-weight: bold;
-						justify-content: space-between;
-						align-items: baseline;
-						/*隐藏溢出*/
-						/*当文本溢出包含元素时显示省略符号来代表被修剪的文本*/
-						/*规定段落中的文本不进行换行*/
-						white-space: normal;
-						letter-spacing: 2rpx;
-						display: -webkit-box;
-						word-break: break-all;
-						text-overflow: ellipsis;
-						overflow: hidden;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						/*设置 需要显示的行数*/
-					}
-				}
-
-				.sj {
-					color: #999999;
-					font-weight: 500;
-					padding: 10rpx 0;
-				}
-
-				.main {
-					color: #999999;
-
-					view {
-						font-weight: 400;
-						// font-size: 14px;
-
-
-						view {
-							color: #0056a8;
-							font-weight: 600;
-						}
-					}
-
-
-				}
-			}
-		}
-	}
-</style>

pages/mine/mine.vue

@@ -237,12 +237,12 @@
 					this.msgn = num
 					if (num == 0) {
 						uni.hideTabBarRedDot({
-							index: 3
+							index: 4
 						})
 					} else {
 
 						uni.setTabBarBadge({
-							index: 3,
+							index: 4,
 							text: num.toString()
 						})
 					}
@@ -275,7 +275,7 @@
 			// if (!this.$store.state.user.openid) {
 			this.getMag() // 调用app.js中的方法
 			// }
-
+			// this.getAllMessage() // 调用app.js中的方法
 			// console.log(this.$store.state);
 
 			this.userAvatar = this.$store.state.user.avatar;

pages/mineClass/mineClass.vue

@@ -1,274 +0,0 @@
-<template>
-	<view>
-		<statusBar :item="navBarData"></statusBar>
-
-		<!-- <view class="activeBox" v-for="i in 5" :key="i"> -->
-		<view class="activeBox" v-for="(item,index) in classList" :key="index">
-
-			<view class="teaching_case">
-				<view class="img">
-					<!-- <image src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/Rectangle 23.png" mode="aspectFill"></image> -->
-					<image :src="classList[index].url" mode="aspectFill"></image>
-				</view>
-
-				<view class="right" @click="gotoAnnoun(index)">
-					<view class="title">
-						<view class="tag">类型</view>
-						<text>{{ item.className }}</text>
-					</view>
-
-					<!-- <view class="introduce">
-						{{ item.th_name }}
-					</view> -->
-					
-					<text class="introduce">{{ item.intro }}</text>
-
-					<view class="operate">
-						<view class="left">
-							<view class="leftCollect">
-								<view class="icon">
-									<image src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/Collect_yellow.png"
-										mode="aspectFill"></image>
-								</view>
-								<view class="text">
-									<span>收藏</span>
-								</view>
-							</view>
-							<view class="leftSubscribe">
-								<view class="icon">
-									<image src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/Subscribe_gray.png"
-										mode="aspectFill"></image>
-								</view>
-								<view class="text">
-									<span>订阅</span>
-								</view>
-							</view>
-						</view>
-						<view class="btnGoto">
-							<view class="text">查看详情</view>
-							<view class="arrow">
-								<image src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right-blue.png"
-									mode="aspectFill"></image>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="" style="padding-bottom: 50rpx;">
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navBarData: {
-					title: '我的教研室',
-					btn: 1
-				},
-				classList: [{
-						url: "https://teacherapi.cocorobo.cn/teaching-file/static//img/ydjk.png",
-						className: "运动与健康",
-						intro:"《运动与健康》全面地阐述体育运动与健康的关系、如何向体育运动要健康、不同运动项目的健康机制、运动损伤的预防与处理等基本内容。"
-					},
-					{
-						url: "https://teacherapi.cocorobo.cn/teaching-file/static//img/shyy.png",
-						className: "生活英语听说",
-						intro: " 你想在生活中使用英语和来自中外的朋友们交流吗？这门课中，我们邀请了50多位美国、英国、爱尔兰、加拿大、澳大利亚、哥伦比亚的朋友聊生活常见话题，带你领略一次不一样的英语学习之旅吧。Let’s go！"
-					},
-					{
-						url: "https://teacherapi.cocorobo.cn/teaching-file/static//img/yyll.jpg",
-						className: "科研伦理与学术规范",
-						intro:" 所有研究生必须培养其科研与学术的“底线意识”，即遵守科研伦理与学术规范。本课程有助于学生规避学术风险，提高科研规范性，为严谨扎实从事科研工作打好基础。"
-					},
-					{
-						url: "https://teacherapi.cocorobo.cn/teaching-file/static//img/kylw.png",
-						className: "如何写好科研论文",
-						intro: " 你在为发表论文发愁吗？你了解准备一篇科研论文需要哪些步骤吗？本课程将为你讲述论文写作的原理，步骤及技巧，帮助你更有效的写作和发表学术论文。"
-					},
-				],
-			};
-		},
-		methods:{
-			gotoAnnoun(index) {
-				const value = uni.getStorageSync("login");
-				if (value == 0) {
-					uni.navigateTo({
-						url: "/pages/login/login",
-					});
-				} else {
-					const urls = [
-						"https://www.xuetangx.com/course/HUBU10011000132/16906642?channel=i.area.course_list_all",
-						"https://www.xuetangx.com/course/THU05021000376?channel=i.area.course_list_all",
-						"https://www.xuetangx.com/course/BNU03031000037/16905009?channel=i.area.course_list_all",
-						"https://www.xuetangx.com/course/THU04011000365/16906220?channel=i.area.course_list_all",
-					];
-					if (index >= 0 && index < urls.length) {
-						const url = urls[index];
-						uni.navigateTo({
-							url: "/pages/skipone/skipone?url=" + encodeURIComponent(url),
-						});
-					}
-				}
-			},
-		},
-		
-	}
-</script>
-
-<style lang="scss">
-	.activeBox {
-		width: 100%;
-		background-color: #fff;
-		padding: 10px 0;
-
-		.teaching_case {
-			display: flex;
-			justify-content: space-between;
-			padding: 0 15px;
-
-			.img {
-				width: 180rpx;
-				height: 180rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 10rpx;
-				}
-			}
-
-			.right {
-				padding-left: 15px;
-				flex: 1;
-				width: 100rpx;
-				display: flex;
-				flex-direction: column;
-				align-content: flex-end;
-
-				.title {
-					display: flex;
-					align-items: center;
-					margin-bottom: 5px;
-
-					.tag {
-						border: 1px #00b2b6 solid;
-						font-size: 20rpx;
-						width: 64rpx;
-						display: flex;
-						height: 32rpx;
-						white-space: nowrap;
-						justify-content: center;
-						align-items: center;
-						// padding: 4px 12px 4px 12px;
-						border-radius: 5rpx;
-						margin-right: 10rpx;
-						color: #00b2b6;
-					}
-
-					text {
-						width: 180px;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-					}
-
-				}
-
-				.introduce {
-					width: 230px;
-					font-size: 28rpx;
-					color: #a7a7a7;
-					margin-top: 8px;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-				}
-				
-				
-
-				.operate {
-					display: flex;
-					justify-content: space-between;
-					align-items: flex-end;
-					margin-top: 15px;
-
-					.left {
-						display: flex;
-						flex-direction: row;
-						// justify-content: space-between;
-						width: 260rpx;
-						color: #00000099;
-						font-size: 24rpx;
-
-						.leftCollect {
-							display: flex;
-							align-items: flex-end;
-							margin-right: 15px;
-
-							.text {
-								display: flex;
-								margin-left: 5px;
-							}
-
-							.icon {
-								display: flex;
-
-								image {
-									width: 32rpx;
-									height: 32rpx;
-								}
-							}
-						}
-
-						.leftSubscribe {
-							display: flex;
-							align-items: flex-end;
-
-							// margin-left: 15px;
-							.text {
-								display: flex;
-								margin-left: 5px;
-							}
-
-							.icon {
-								display: flex;
-
-								image {
-									width: 32rpx;
-									height: 32rpx;
-								}
-							}
-						}
-					}
-
-					.btnGoto {
-						width: 80px;
-						// height: 24px;
-						display: flex;
-						flex-direction: row;
-						justify-content: flex-start;
-						align-items: center;
-						align-items: flex-end;
-
-						.text {
-							font-size: 24rpx;
-							color: #3081E8;
-						}
-
-						.arrow {
-							line-height: 10px;
-
-							image {
-								width: 32rpx;
-								height: 32rpx;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-</style>

pages/mineCollect/mineCollect.vue

@@ -1,231 +0,0 @@
-<template>
-	<view>
-		<statusBar :item="navBarData"></statusBar>
-
-		<view class="collectBox">
-			<view class="collect_length">
-				<text>共{{ classList.length }}条收藏</text>
-			</view>
-			<!-- <view class="classBox" @click="gotoWeb(index)" v-for="(item,index) in classList" :key="index"> -->
-			<view class="classBox" v-for="(item,index) in classList" :key="index" @click="gotoDetail" :data-all="item">
-				<view class="classTitle">
-					<text>{{ item.acName }}</text>
-					<image src="https://teacherapi.cocorobo.cn/teaching-file/static/mine/Collect_yellow.png"
-						mode="aspectFill" @click.stop="coll" :data-e="item"></image>
-					<!-- <image :src="collArr.includes(item.acId) ? pic2 : '' " style="width: 28rpx; height: 26rpx" mode="aspectFill"  @click="coll" :data-e="item"></image> -->
-
-				</view>
-				<view class="classContent">
-					<view class="contentLeft">
-						<view class="constDate">
-							<text class="manage">类型</text>
-							<text>|</text>
-							<text class="c_data">{{item.dtime}}</text>
-							<!-- <text class="c_time">21:07</text> -->
-						</view>
-						<view class="classIntro">
-							<text>{{ item.brief }}</text>
-						</view>
-					</view>
-					<view class="contentRight">
-						<image :src="item.pic" mode="aspectFill"></image>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navBarData: {
-					title: '我的收藏',
-					btn: 1
-				},
-				collArr: [], 
-				classList: [],
-				
-				
-			};
-		},
-		methods: {
-			getData() {
-				
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					type: 0
-				}
-				this.$request('/selectOperator', 'POST', data).then(res => {
-					console.log('获取收藏', res);
-					
-					this.classList = res[0]
-				})
-			},
-			
-			// 这里获取的活动肯定是已收藏的，就不用判断直接删除就可以了
-			coll(event) {
-				
-				let aId = event.currentTarget.dataset.e.acId
-				
-				let data = {
-					acid: aId,
-					oid: this.$store.state.user.openid, //用户id
-					ty: 0
-				}
-				
-				this.$request('/deleteOperator', 'POST', data).then(res => {
-					console.log(res);
-					this.getData()
-				})
-			},
-			// 跳转到详情页
-			gotoDetail(e) {
-				let data=e.currentTarget.dataset.all
-				
-				if(data.type<=1){
-					uni.navigateTo({
-						url: `/pages/activityDetail/activityDetail?acId=${data.acId}`,
-					});
-				}else{
-					uni.navigateTo({
-						url: `/pages/teachingDetail/teachingDetail?acId=${data.acId}`
-					});
-				}
-			},
-		},
-		onShow() {
-			this.getData()
-		}
-	}
-</script>
-
-<style lang="scss">
-	.collectBox {
-		margin: 0 30rpx;
-		// margin-bottom: 30rpx;
-		padding-bottom: 50rpx;
-
-		.collect_length {
-			width: 100%;
-			height: 40rpx;
-			font-size: 24rpx;
-			font-weight: 400;
-			color: #00000099;
-			display: flex;
-			align-items: center;
-			margin-top: 6px;
-			margin-bottom: 6px;
-		}
-
-		.classBox {
-			width: 100%;
-			height: 248rpx;
-			background-color: #fff;
-			border-radius: 20rpx;
-			padding: 0 16rpx;
-			margin-bottom: 20rpx;
-
-			.classTitle {
-				display: flex;
-				padding-top: 15px;
-				justify-content: space-between;
-				margin-bottom: 6px;
-
-				text {
-					font-size: 32rpx;
-					font-weight: 500;
-					display: -webkit-box;
-					word-break: break-all;
-					text-overflow: ellipsis;
-					overflow: hidden;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 1;
-				}
-
-				image {
-					flex-shrink: 0;
-					width: 32rpx;
-					height: 32rpx;
-				}
-			}
-
-			.classContent {
-				width: 100%;
-				display: flex;
-				justify-content: space-between;
-
-				.contentLeft {
-					display: flex;
-					flex-direction: column;
-
-					.constDate {
-						display: flex;
-						margin-bottom: 6px;
-
-						text {
-							color: #00000066;
-							font-size: 24rpx;
-							font-weight: 400;
-
-							&.manage {
-								border: 1px #00B2B6 solid;
-								font-size: 10px;
-								display: flex;
-								white-space: nowrap;
-								justify-content: center;
-								align-items: center;
-								padding: 1px 6px;
-								border-radius: 3px;
-								margin-right: 10rpx;
-								color: #00B2B6;
-								font-weight: 600;
-							}
-
-							&:nth-child(2) {
-								color: #E7E7E7;
-								;
-								margin-left: 4px;
-							}
-
-							&:nth-child(3) {
-								margin-left: 6px;
-							}
-
-							&:nth-child(4) {
-								margin-left: 6px;
-							}
-						}
-					}
-
-					.classIntro {
-						width: 93%;
-
-						text {
-							color: #00000099;
-							font-size: 28rpx;
-							display: -webkit-box;
-							word-break: break-all;
-							text-overflow: ellipsis;
-							overflow: hidden;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 2;
-							/*设置 需要显示的行数*/
-							line-height: 23px;
-						}
-					}
-				}
-
-				.contentRight {
-					image {
-						width: 182rpx;
-						height: 132rpx;
-						border-radius: 8rpx;
-					}
-				}
-			}
-
-		}
-	}
-</style>

pages/mineEdit/mineEdit.vue

@@ -8,7 +8,7 @@
 					<text>头像</text>
 				</view>
 				<view class="userAvatar" @click="updateava">
-					<image :src="userData.avatar"></image>
+					<image :src="userData.avatar" mode="aspectFill"></image>
 				</view>
 			</view>
 			<view class="setName">
@@ -177,8 +177,8 @@
 			<view class="popup-container2" style="height: 175px;" v-show="showPopupConfirm">
 				<view class="popup">
 					<view class="header" style="margin-top: 15px;">
-						<view class="imgShade" >
-							<image  src="../../static/mine/gou3.png" mode="aspectFill">
+						<view class="imgShade">
+							<image src="../../static/mine/gou3.png" mode="aspectFill">
 						</view>
 						</image>
 						<text style="margin-bottom: 24px;">修改成功</text>
@@ -460,32 +460,31 @@
 					sourceType: ['album', 'camera'], //从相册选择或者拍照
 					success: (res) => {
 						const tempFilePaths = res.tempFilePaths[0];
-						that.userData.avatar = tempFilePaths
-						// const uploadTask = uni.uploadFile({
-						// 	url: 'http://139.159.246.165:7006/img', // post请求地址
-						// 	filePath: tempFilePaths,
-						// 	name: 'file', // 待确认
-						// 	header: {
-						// 		// 不要写这个不然报错
-						// 		// 'Content-Type': 'multipart/form-data',
-						// 	},
-						// 	formData: {
-						// 		// 携带的用户数据
-						// 		// userId: that.$store.getters.getUser._id, // 用户ID
-						// 	},
-						// 	success: function(res) {
-						// 		// console.log(res);
-						// 		that.userData.avatar = res.data
-
-						// 	},
-						// 	fail: function(uploadFileFail) {
-						// 		console.log('Error:', uploadFileFail.data);
-						// 	},
-						// 	complete: () => {
-						// 		// 接口调用结束的回调函数（调用成功、失败都会执行）
-						// 		// console.log('Complete:');
-						// 	}
-						// });
+						// that.userData.avatar = tempFilePaths
+						const uploadTask = uni.uploadFile({
+							url: 'https://awsupload.cocorobo.cn/img', // post请求地址
+							// url: 'http://139.159.246.165:7006/img', // post请求地址
+							filePath: tempFilePaths,
+							name: 'file', // 待确认
+							header: {
+								// 不要写这个不然报错
+								// 'Content-Type': 'multipart/form-data',
+							},
+							success: function(res) {
+								// console.log(res);
+								that.userData.avatar = res.data
+								let img = JSON.parse(res.data)
+								console.log('上传图片', img);
+								that.userData.avatar = img.fileUrl
+							},
+							fail: function(uploadFileFail) {
+								console.log('Error:', uploadFileFail.data);
+							},
+							complete: () => {
+								// 接口调用结束的回调函数（调用成功、失败都会执行）
+								// console.log('Complete:');
+							}
+						});
 
 
 					}
@@ -644,8 +643,8 @@
 		// align-items: center;
 		background-color: #0081FE;
 	}
-	
-	::v-deep .u-safe-bottom{
+
+	::v-deep .u-safe-bottom {
 		display: none;
 	}
 
@@ -806,7 +805,8 @@
 				margin-top: 24px;
 				font-size: 34rpx;
 				font-weight: 600;
-				.imgShade{
+
+				.imgShade {
 					width: 170rpx;
 					height: 170rpx;
 					display: flex;
@@ -817,6 +817,7 @@
 					box-shadow: 0 0 10rpx #0056A8;
 					margin-bottom: 10rpx;
 				}
+
 				image {
 					width: 150rpx;
 					height: 150rpx;
@@ -858,6 +859,8 @@
 		display: flex;
 		align-items: center;
 		font-size: 32rpx;
+		width: 60px;
+		flex-shrink: 0;
 
 	}
 

pages/mineRelease/mineRelease.vue

@@ -1,458 +0,0 @@
-<template>
-	<view>
-		<statusBar :item="navBarData"></statusBar>
-		<view class="activeBox" v-for="(item,index) in activeList" :key="index">
-			<view class="teaching_case" >
-				<view class="img">
-					<!-- <image src="https://teacherapi.cocorobo.cn/teaching-file/static//activity/bg2.png" mode="aspectFill"></image> -->
-					<image :src="item.pic" mode="aspectFill"></image>
-
-				</view>
-
-				<view class="right">
-					<view class="title">
-						<view class="tag bqZ-font">类型</view>
-						<text class="three-font" style="font-weight: 550;">{{ item.acName }}</text>
-					</view>
-
-					<view class="introduce">
-						<view class="money fNum-font"><text class="three-font">￥</text> {{ item.cost }}</view>
-					</view>
-
-					<view class="operate">
-						<view class="left">
-							<view class="person">浏览{{item.views}} · 订阅{{ item.snum }} · 收藏{{ item.dnum }} · 已购{{ item.bnum }}</view>
-							<!-- <view class="person"> 订阅{{ item.snum }} · 收藏{{ item.dnum }} </view> -->
-						</view>
-
-						<view class="Oright" @click="gotoActdetail" :data-info="item">
-							<view class="text">查看详情</view>
-							<view class="arrow">
-								<image
-									src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right-blue.png"
-									mode="aspectFill"></image>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="controls">
-				<view class="controls_btns">
-					<button @click="gotoEdit" :data-aid="item.acId">编辑</button>
-					<button @click="actDelete" :data-aid="item.acId">删除</button>
-				</view>
-			</view>
-		</view>
-
-		<view class="loading">
-			<view v-if="newsLoading==1">数据加载中...</view>
-			<view v-if="newsLoading==2">没有更多了~~</view>
-		</view>
-
-		<view class="" style="width: 100%;height: 50rpx;"></view>
-
-		<!-- 弹窗 -->
-		<view>
-			<!-- <view class="mask" v-show="showPopup" @click="closePopup"></view> -->
-			<view class="popup-container" v-show="showPopup">
-				<view class="popup">
-					<view class="header">
-						<text>确认删除</text>
-					</view>
-					<view class="footer">
-						<view class="cancel-btn" @click="showPopup= false">取消</view>
-						<view class="confirm-btn" @click="confirm">确认</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<view>
-			<!-- <view class="mask" v-show="showPopupConfirm" @click="closePopup"></view> -->
-			<view class="popup-container" style="height: 175px;" v-show="showPopupConfirm">
-				<view class="popup">
-					<view class="header" style="margin-top: 15px;">
-						<image src="https://teacherapi.cocorobo.cn/teaching-file/static//gou1.png" mode="aspectFill">
-						</image>
-						<text style="margin-bottom: 24px;">删除成功</text>
-					</view>
-		
-				</view>
-			</view>
-		</view>
-		
-		
-		
-		
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navBarData: {
-					title: '我的发布', //导航栏标题
-					btn: 1 //是否显示返回按钮 0不显示  1 显示
-				},
-				showPopup: false,
-				showPopupConfirm:false,
-				deleteAcId: '',
-				// 触底加载动画提示
-				newsLoading: 0, //0默认值  1加载中 2没有更多了
-				// 分页查询
-				currentPage: 1,
-				// 渲染数据列表
-				activeList: [],
-			};
-		},
-		methods: {
-			// 获取数据渲染数据
-			getpublish() {
-				// const oid = 
-				let data = {
-					openid: this.$store.state.user.openid,
-					page: this.currentPage, //下拉获取更多的备用字段
-					lim: 15 //一次获取多少数据
-				}
-				this.$request('/selectMyPublish', "POST", data).then(res => {
-					console.log("我的发布", res[0]);
-					// 看是否有发布过数据，没有的话提示通知
-					if (!res[0].length) {
-						this.newsLoading = 2
-						return
-					} else {
-						this.activeList = [...this.activeList,...res[0]]
-					}
-				})
-			},
-			// 查看详情
-			gotoActdetail(e) {
-				// console.log(e.currentTarget.dataset.aid);
-				let data = e.currentTarget.dataset.info
-				console.log(data);
-				if(data.type==0 || data.type==1){
-					uni.navigateTo({
-						url: `/pages/activityDetail/activityDetail?acId=${data.acId}`
-					});
-					return
-				}else{
-					uni.navigateTo({
-						url: `/pages/teachingDetail/teachingDetail?acId=${data.acId}`
-					});
-				}
-			},
-			// 编辑功能
-			gotoEdit(e) {
-				console.log(e);
-				let acid = e.currentTarget.dataset.aid
-				uni.navigateTo({
-					url: `/pages/publish/publish?acId=${acid}`
-				});
-			},
-			// 显示删除弹窗
-			actDelete(e) {
-				this.deleteAcId = e.currentTarget.dataset.aid;
-				this.showPopup = true; //显示弹窗
-			},
-			// 删除功能
-			confirm() {
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					aid: this.deleteAcId,
-				}
-				this.showPopupConfirm=true
-				this.$request('/deleteMyPublish', "POST", data).then(res => {
-					
-					this.showPopup = false
-					
-					setTimeout(()=>{
-						this.showPopupConfirm=false
-					},1500)
-					
-					// 在列表里也将他删除
-					this.newsLoading=0
-					this.currentPage=1
-					// this.activeList=this.activeList.filter(e=>{
-					// 	return e.acId!=this.deleteAcId
-					// })
-					 this.activeList=[]
-					this.getpublish()
-				})
-			},
-			closePopup() {
-				// 取消操作
-				this.showPopup = false
-				this.deleteAcId = null
-			},
-		},
-		// 触底加载更多
-		onReachBottom() {
-			if (this.newsLoading == 2) {
-				return
-			}
-			this.newsLoading = 1
-			this.currentPage++
-			setTimeout(this.getpublish, 1000)
-
-		},
-		onShow() {
-			// 重新恢复初始状态
-			this.newsLoading = 0
-			this.currentPage=1
-			this.activeList=[]
-			this.getpublish();
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.loading {
-		height: 50rpx;
-		text-align: center;
-		padding-top: 20rpx;
-		padding-bottom: 100rpx;
-		font-size: 26rpx;
-		color: #888;
-		line-height: 2em;
-	}
-
-	.activeBox {
-		width: 750rpx;
-		padding: 30rpx;
-		background-color: #fff;
-		// &:first-child{
-		// 	padding: 10px 0 0 0;
-		// }
-
-		.teaching_case {
-			display: flex;
-			justify-content: space-between;
-			// padding: 10px 10px;
-			// border-top: 1px solid #E7E7E7;
-			padding-bottom: 25rpx;
-
-			.img {
-				width: 160rpx;
-				height: 160rpx;
-				margin-right: 20rpx;
-
-				image {
-					width: 160rpx;
-					height: 160rpx;
-					border-radius: 10rpx;
-				}
-			}
-
-			.right {
-				// padding-left: 15px;
-				flex: 1;
-				display: flex;
-				flex-direction: column;
-				// align-content: flex-end;
-				justify-content: space-between;
-
-				// box-sizing: border-box;
-				.title {
-					display: flex;
-					align-items: center;
-
-					margin-bottom: 5px;
-
-					.tag {
-						border: 1px #00b2b6 solid;
-						// font-size: 20rpx;
-						width: 64rpx;
-						height: 38rpx;
-						display: flex;
-						white-space: nowrap;
-						justify-content: center;
-						align-items: center;
-						padding: 1rpx 4rpx;
-						border-radius: 3px;
-						margin-right: 10rpx;
-						color: #00b2b6;
-					}
-
-					text {
-						width: 190px;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-					}
-
-				}
-
-				.introduce {
-					width: 230px;
-					// font-size: 28rpx;
-					// color: #a7a7a7;
-					// margin-top: 8px;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-
-					.money {
-						color: #FFA338;
-						font-weight: bold;
-						font-size: 36rpx;
-						line-height: 20px;
-					}
-				}
-
-				.operate {
-					display: flex;
-					justify-content: space-between;
-					align-items: baseline;
-
-					.left {
-						display: flex;
-						flex-direction: row;
-						justify-content: space-between;
-						align-items: baseline;
-						width: 330rpx;
-
-						.person {
-							color: #00000099;
-							font-size: 20rpx;
-							// margin-left: 6px;
-						}
-					}
-
-					.Oright {
-						// width: 200rpx;
-						display: flex;
-						justify-content: flex-end;
-						align-items: center;
-
-
-						.text {
-							font-size: 24rpx;
-							color: #3081E8;
-						}
-
-						.arrow {
-							display: flex;
-							justify-content: center;
-							margin-top: 5rpx;
-
-							image {
-								width: 32rpx;
-								height: 32rpx;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		.controls {
-			display: flex;
-			justify-content: flex-end;
-			padding: 0 10px;
-			border-top: 1px solid #E7E7E7;
-			align-items: center;
-			height: 45px;
-
-			.controls_btns {
-				display: flex;
-				align-items: center;
-				width: 115px;
-				height: 35px;
-
-				button {
-					width: 96rpx;
-					height: 48rpx;
-					font-size: 24rpx;
-					border-radius: 10rpx;
-					border: 1px solid #3081E8;
-					background-color: white;
-					color: #3081E8;
-					padding: 0;
-					line-height: 23px;
-				}
-
-			}
-		}
-	}
-
-	.mask {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background-color: rgba(0, 0, 0, 0.3);
-		z-index: 999;
-		overflow: hidden;
-		// display: none;
-	}
-
-	.popup-container {
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
-		width: 520rpx;
-		height: 260rpx;
-		z-index: 1000;
-		// display: none;
-		overflow: hidden;
-
-		.popup {
-			width: 100%;
-			height: 100%;
-			display: flex;
-			flex-direction: column;
-			background-color: #fff;
-			border-radius: 16rpx;
-			overflow: hidden;
-
-			.header {
-				flex: 1;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				flex-direction: column;
-				margin-top: 24px;
-				font-size: 34rpx;
-				font-weight: 600;
-
-				image {
-					width: 150rpx;
-					height: 150rpx;
-					margin-top: 15px;
-					margin-bottom: 15px;
-				}
-			}
-
-			.footer {
-				width: 100%;
-				display: flex;
-				overflow: hidden;
-
-				.cancel-btn {
-					width: 50%;
-					height: 100rpx;
-					background-color: #F7F7F7;
-					color: #000;
-					font-size: 34rpx;
-					text-align: center;
-					border-bottom-left-radius: 16rpx;
-					line-height: 50px;
-				}
-
-				.confirm-btn {
-					width: 50%;
-					height: 100rpx;
-					background-color: #0081FE;
-					color: #fff;
-					font-size: 34rpx;
-					text-align: center;
-					line-height: 50px;
-				}
-			}
-		}
-	}
-</style>

pages/mineSubscribe/mineSubscribe.vue

@@ -1,544 +0,0 @@
-<template>
-	<view class="content">
-		<statusBar :item="navBarData"></statusBar>
-
-		<!-- <view class="" style="width: 750rpx;height: 60px;">
-			<view class="activeTitle">
-				<view class="left" @click="phoneLogin" :class="current==0?active:test">
-					<text>教研室活动</text>
-					<view :class="current==0?yun:test"></view>
-				</view>
-				<view class="right" @click="accountLogin" :class="current==1?active:test">
-					<text class="zw-font">特色活动</text>
-					<view :class="current==1?yun:test"></view>
-				</view>
-			</view>
-		</view> -->
-
-
-		<view class="activeClass">
-			<view class="classBox" @click="gotoDetail" :data-all="item" v-for="(item,index) in classList" :key="index">
-
-				<view class="classLeft">
-					<!-- <view class="class_Img"> -->
-					<image :src="item.pic" mode="aspectFill"></image>
-					<!-- </view> -->
-
-					<view class="class_Text">
-						<view class="text_Title">
-							<text class="manage">类型</text>
-							<text class="wenzi">{{ item.acName }}</text>
-						</view>
-						<view class="text_Intro">
-							<text>{{ item.brief }}</text>
-						</view>
-						
-						<view class="classright">
-							<image src="https://teacherapi.cocorobo.cn/teaching-file/static/dingyue_blue.png" mode="aspectFill" @click.stop="sub" :data-e="item"></image>
-						</view>
-					</view>
-
-				</view>
-
-			</view>
-		</view>
-
-
-		<!-- <swiper class="scroll-view-height" @change="swipeIndex" :current="current" :duration="300">
-			<swiper-item>
-				<scroll-view scroll-y="true" style="height: 80vh;">
-					<view class="activeClass">
-						<view class="classBox" @click="" v-for="(item,index) in classList" :key="index">
-
-							<view class="classLeft">
-								<view class="class_Img">
-									<image :src="item.pic" mode="aspectFill"></image>
-								</view>
-								<view class="class_Text">
-									<view class="text_Title">
-										<text class="manage">类型</text>
-										<text>{{ item.acName }}</text>
-
-									</view>
-									<view class="text_Intro">
-										<text>{{ item.brief }}</text>
-									</view>
-								</view>
-							</view>
-							<view class="classright">
-								<image src="https://teacherapi.cocorobo.cn/teaching-file/static/dingyue_blue.png"
-									mode="aspectFill" @click="sub" :data-e="item"></image>
-
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-
-
-			</swiper-item>
-			<swiper-item>
-				<scroll-view scroll-y="true" style="height: 80vh;">
-					<view class="activeClass">
-						<view class="classBox" @click="gotoWeb_2(index)" v-for="(item,index) in activeList"
-							:key="index">
-							<view class="classLeft">
-								<view class="class_Img">
-									<image :src="activeList[index].img" mode="aspectFill"></image>
-								</view>
-								<view class="class_Text">
-									<view class="text_Title">
-										<text class="manage">类型</text>
-										<text>{{ item.className }}</text>
-									</view>
-									<view class="text_Intro">
-										<text>{{ item.intro }}</text>
-									</view>
-								</view>
-							</view>
-							<view class="classright">
-								<image src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/Union.png"
-									mode=""></image>
-							</view>
-						</view>
-					</view>
-				</scroll-view>
-			</swiper-item>
-		</swiper> -->
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navBarData: {
-					title: '我的订阅',
-					btn: 1
-				},
-				current: 0, //切换
-
-				aaa: `calc(100vh-60vh)`,
-
-				navheight: this.navheight, //导航栏高度
-
-				active: 'active', //类名
-				test: 'test',
-				yun: 'yun',
-				subArr: [],
-				// 渲染列表
-				classList: [],
-				activeList: [],
-			};
-		},
-		computed: {
-			dynamicStyle() {
-				return {
-					height: `calc(100vh - 10px)`
-				};
-			}
-		},
-		methods: {
-			getData() {
-				console.log(111);
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					type: 1
-				}
-				this.$request('/selectOperator', 'POST', data).then(res => {
-					console.log('获取订阅', res);
-					this.classList = res[0]
-				})
-				// let data = {
-				// 	oid: this.$store.state.user.openid, //用户id
-				// }
-				// this.$request('/selectSub', 'POST', data).then(res => {
-				// 	this.subArr = JSON.parse(res[0][0].sub)
-				// 	// console.log(this.collArr);
-				// 	// let a=this.collArr.join(', ');
-				// 	// return console.log({a});
-				// 	let data = {
-				// 		oid: this.$store.state.user.openid, //用户id
-				// 		list: this.subArr
-				// 	}
-				// 	// return console.log(data);
-				// 	this.$request('/selectSubList', 'POST', data).then(res => {
-				// 		// console.log("要渲染的数据", res);
-				// 		// this.collArr=res[0]
-				// 		this.classList = res[0]
-				// 		// console.log(this.classList);
-				// 	})
-				// })
-			},
-			// 这里获取的活动肯定是已订阅的，就不用判断直接删除就可以了
-			sub(event) {
-				let aId = event.currentTarget.dataset.e.acId
-				
-				let data = {
-					acid: aId,
-					oid: this.$store.state.user.openid, //用户id
-					ty: 1
-				}
-				
-				this.$request('/deleteOperator', 'POST', data).then(res => {
-					console.log(res);
-					this.getData()
-				})
-				// let aId = event.currentTarget.dataset.e.acId
-				// // 先获取用户订阅信息
-				// let data = {
-				// 	oid: this.$store.state.user.openid, //用户id
-				// }
-
-				// this.$request('/selectSub', 'POST', data).then(res => {
-
-				// 	let subs = JSON.parse(res[0][0].sub)
-
-				// 	// 把未取消订阅的数据提取出来
-				// 	const newArray = subs.filter(item => item !== aId);
-				// 	let arr3 = {
-				// 		oid: this.$store.state.user.openid, //用户id
-				// 		acid: JSON.stringify(newArray)
-				// 	}
-				// 	this.$request('/updateSub', 'POST', arr3).then(res => {
-				// 		// 删除后重新获取数据进行渲染
-				// 		this.getData()
-				// 		uni.showToast({
-				// 			title: '已取消订阅',
-				// 			icon: 'error',
-				// 			duration: 1000
-				// 		})
-				// 	})
-				// })
-			},
-			swipeIndex(index) {
-				this.current = index.detail.current;
-			},
-			phoneLogin() {
-				this.current = 0
-			},
-			accountLogin() {
-				this.current = 1
-			},
-			gotoWeb(index) {
-				const urls = [
-					"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1181",
-					"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1183",
-					"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210",
-					"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1234",
-				];
-				if (index >= 0 && index < urls.length) {
-					const url = urls[index];
-					uni.navigateTo({
-						url: "/pages/skipone/skipone?url=" + encodeURIComponent(url),
-					});
-				}
-			},
-			// 跳转详情页
-			gotoDetail(e){
-				let data=e.currentTarget.dataset.all
-				if(data.type<=1){
-					uni.navigateTo({
-						url: `/pages/activityDetail/activityDetail?acId=${data.acId}`,
-					});
-				}else{
-					uni.navigateTo({
-						url: `/pages/teachingDetail/teachingDetail?acId=${data.acId}`
-					});
-				}
-			},
-			gotoWeb_2(index) {
-				const urls = [
-					"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1183",
-					"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1211",
-					"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1210",
-					"https://szptxnjys.yuketang.cn/pro/portal/announcementdetail/1209",
-				];
-				if (index >= 0 && index < urls.length) {
-					const url = urls[index];
-					uni.navigateTo({
-						url: "/pages/skipone/skipone?url=" + encodeURIComponent(url),
-					});
-				}
-			}
-		},
-		onShow() {
-			this.getData()
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content {
-		height: 100vh;
-		width: 750rpx;
-		background-color: #ffffff;
-
-		.activeTitle {
-			position: fixed;
-			z-index: 9;
-			width: 100%;
-			height: 60px;
-			background-color: white;
-			border-top: 1px solid lightgray;
-			display: flex;
-			justify-content: center;
-			padding: 0 30px;
-			font-size: 34rpx;
-
-			.test {
-				// height: ;
-			}
-
-			.active {
-				position: relative;
-				font-weight: bold;
-
-				.yun {
-					width: 80rpx;
-					height: 0rpx;
-					position: absolute;
-					left: 50%;
-					top: 65%;
-					transform: translate(-50%, -50%);
-					box-shadow: 0px 0px 10px 2px #4a97f2;
-				}
-			}
-
-			.left {
-				width: 50%;
-				height: 100%;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-
-			.right {
-				width: 50%;
-				height: 100%;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-		}
-
-		.scroll-view-height {
-			// height: 200vmin;
-			height: 80vh;
-
-			// height: auto;
-			.activeClass {
-				width: 100%;
-
-				// height: auto;
-				.classBox {
-					display: flex;
-					justify-content: space-between;
-					padding: 0 47rpx;
-					background-color: #fff;
-					height: 144rpx;
-
-					.classLeft {
-						display: flex;
-						height: 100%;
-
-						.class_Img {
-							display: flex;
-							align-items: center;
-							flex-grow: 1;
-
-							image {
-								width: 80rpx;
-								height: 80rpx;
-								border-radius: 10rpx;
-							}
-						}
-
-						.class_Text {
-							display: flex;
-							justify-content: center;
-							flex-grow: 2;
-							flex-direction: column;
-							margin-left: 20rpx;
-
-							.text_Title {
-								display: flex;
-								margin-bottom: 6px;
-								align-items: center;
-
-								text {
-									&:last-child {
-										width: 220px;
-										color: #000;
-										font-size: 28rpx;
-										font-weight: 600;
-										display: -webkit-box;
-										word-break: break-all;
-										text-overflow: ellipsis;
-										overflow: hidden;
-										-webkit-box-orient: vertical;
-										-webkit-line-clamp: 1;
-										/*设置 需要显示的行数*/
-									}
-
-									&.manage {
-										
-										border: 1px #00b2b6 solid;
-										font-size: 20rpx;
-										width: 64rpx;
-										display: flex;
-										height: 32rpx;
-										white-space: nowrap;
-										justify-content: center;
-										align-items: center;
-										// padding: 4px 12px 4px 12px;
-										border-radius: 5rpx;
-										margin-right: 10rpx;
-										color: #00b2b6;
-									}
-								}
-							}
-
-							.text_Intro {
-								display: flex;
-
-								text {
-									font-size: 24rpx;
-									font-weight: 400;
-									color: rgb(191, 191, 191);
-									width: 90%;
-									letter-spacing: 2rpx;
-									display: -webkit-box;
-									word-break: break-all;
-									text-overflow: ellipsis;
-									overflow: hidden;
-									-webkit-box-orient: vertical;
-									-webkit-line-clamp: 1;
-									/*设置 需要显示的行数*/
-
-									// margin-left: 6px;
-								}
-							}
-						}
-					}
-
-					.classright {
-						display: flex;
-						height: 100%;
-						align-items: center;
-
-						image {
-							width: 38rpx;
-							height: 42rpx;
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.activeClass {
-		width: 100%;
-
-		.classBox {
-			width: 100%;
-			display: flex;
-			justify-content: space-between;
-			background-color: #fff;
-			position: relative;
-			padding: 40rpx;
-
-			.classLeft {
-				display: flex;
-				justify-content: space-between;
-				height: 100%;
-				width: 100%;
-				image {
-					width: 120rpx;
-					height: 120rpx;
-					border-radius: 10rpx;
-				}
-
-				// }
-
-				.class_Text {
-					display: flex;
-					justify-content: space-between;
-					flex: 1;
-					flex-direction: column;
-					margin-left: 20rpx;
-					position: relative;
-					.text_Title {
-						display: flex;
-						// justify-content: center;
-						align-items: center;
-						// justify-content: space-between;
-						// width: 500rpx;
-						.manage {
-							border: 1px #00b2b6 solid;
-							font-size: 20rpx;
-							width: 64rpx;
-							display: flex;
-							height: 32rpx;
-							white-space: nowrap;
-							justify-content: center;
-							align-items: center;
-							border-radius: 5rpx;
-							margin-right: 10rpx;
-							color: #00b2b6;
-						}
-						.wenzi {
-							// width: 100%;
-							line-height: 32rpx;
-							flex: 1;
-							padding-right: 50rpx;
-							color: #000;
-							font-size: 28rpx;
-							font-weight: 600;
-							display: -webkit-box;
-							word-break: break-all;
-							text-overflow: ellipsis;
-							overflow: hidden;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 1;
-						}
-
-						
-
-					}
-					.text_Intro {
-						display: flex;
-						width: 100%;
-						text {
-							font-size: 24rpx;
-							font-weight: 400;
-							color: rgb(191, 191, 191);
-							width: 90%;
-							letter-spacing: 2rpx;
-							display: -webkit-box;
-							word-break: break-all;
-							text-overflow: ellipsis;
-							overflow: hidden;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 1;
-							/*设置 需要显示的行数*/
-
-							// margin-left: 6px;
-						}
-					}
-				}
-			}
-
-			.classright {
-				height: 100%;
-				position: absolute;
-				top: 0;
-				right: 0;
-
-				image {
-					width: 38rpx;
-					height: 42rpx;
-				}
-			}
-		}
-	}
-</style>

pages/publish/publish.vue

@@ -1,820 +0,0 @@
-<template>
-	<view class="publish">
-		<statusBar :item="navBarData"></statusBar>
-
-		<view class="" style="background-color: #ffffff;">
-
-
-			<view class="pubTitle">
-				<input class="title" style="" placeholder="活动标题" v-model="activitytitle" />
-			</view>
-
-			<view class="pubMid">
-				<view class="mid">
-					<view class="txt">
-						<textarea class="txtClass" value="" placeholder="请输入内容" v-model="activityintro" />
-					</view>
-
-					<view class="pic" @click="uploadPic">
-						<view class="picCont">
-							<image :src="pic" mode="aspectFill"></image>
-							<view
-								style="font-size: 24rpx;line-height: 40rpx;font-weight: 400;color: rgba(0, 0, 0, 0.6);">
-								添加图片
-							</view>
-							<view
-								style="font-size: 20rpx;line-height: 36rpx;font-weight: 400;color: rgba(0, 0, 0, 0.4);">
-								（0/1）
-							</view>
-						</view>
-						<view class="pic_show" v-if="imageValue!==''">
-							<image :src="imageValue" mode="aspectFill"></image>
-						</view>
-					</view>
-
-				</view>
-			</view>
-
-
-			<view class="userOptionsBox">
-				<view class="optionsItemBox">
-					<picker mode="selector" :range="classifyList" :value="index" @change="handelclassify">
-						<view class="optionItem">
-							<view class="option_left">
-								<text class="option_text">
-									活动分类
-								</text>
-							</view>
-
-							<view class="option_right">
-								<view class="input_details">
-									<view class="details">
-										<view class="uni-input text">
-											{{classifyList[index]==null?'请选择':classifyList[index]}}
-										</view>
-									</view>
-									<view class="arrow">
-										<image
-											src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right.png"
-											mode="aspectFill"></image>
-									</view>
-								</view>
-							</view>
-						</view>
-					</picker>
-
-				</view>
-			</view>
-
-
-			<view class="userOptionsBox">
-				<view class="optionsItemBox">
-					<view class="optionItem">
-						<view class="option_left">
-							<text class="option_text">
-								招募人数
-							</text>
-						</view>
-
-						<view class="option_right">
-							<view class="input_details">
-								<view class="details">
-									<input type="text" class="title text" placeholder="请输入人数"
-										placeholder-style="color: rgb(153, 153, 153);" maxlength="2"
-										v-model="recruitment" />
-								</view>
-								<view class="arrow">
-									<image
-										src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right.png"
-										mode="aspectFill"></image>
-								</view>
-							</view>
-						</view>
-					</view>
-
-				</view>
-			</view>
-			<view class="userOptionsBox">
-				<view class="optionsItemBox">
-					<picker mode="selector" :range="activityformList" @change="handelActivityform">
-						<view class="optionItem">
-							<view class="option_left">
-								<text class="option_text">
-									活动形式
-								</text>
-							</view>
-
-							<view class="option_right">
-								<view class="input_details">
-									<view class="details">
-										<view class="uni-input text">{{activityform}}</view>
-									</view>
-									<view class="arrow">
-										<image
-											src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right.png"
-											mode="aspectFill"></image>
-									</view>
-								</view>
-							</view>
-						</view>
-					</picker>
-				</view>
-			</view>
-			<view class="userOptionsBox">
-				<view class="optionsItemBox">
-					<picker mode="selector" :range="addressList" @change="handeladdress">
-						<view class="optionItem">
-							<view class="option_left">
-								<text class="option_text">
-									活动地址
-								</text>
-							</view>
-
-							<view class="option_right">
-								<view class="input_details">
-									<view class="details">
-										<view class="uni-input text">{{address}}</view>
-									</view>
-									<view class="arrow">
-										<image
-											src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right.png"
-											mode="aspectFill"></image>
-									</view>
-								</view>
-							</view>
-						</view>
-					</picker>
-
-				</view>
-			</view>
-			<view class="userOptionsBox">
-				<view class="optionsItemBox">
-					<!-- <picker mode="date" :value="activityDate" :start="startDate" :end="endDate"
-						@change="activityDateChange">
-						<view class="optionItem">
-							<view class="option_left">
-								<text class="option_text">
-									活动时间
-								</text>
-							</view>
-
-							<view class="option_right">
-								<view class="input_details">
-									<view class="details">
-										<view class="uni-input text">{{ activityDate }}</view>
-									</view>
-									<view class="arrow">
-										<image src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right.png" mode="aspectFill"></image>
-									</view>
-								</view>
-							</view>
-						</view>
-					</picker> -->
-					<view class="optionItem" @click="show = true">
-						<view class="option_left">
-							<text class="option_text">
-								活动时间
-							</text>
-						</view>
-
-						<view class="option_right">
-							<view class="input_details">
-								<view class="details">
-									<!-- <view class="uni-input text">{{ activityDate }}</view> -->
-									<u-calendar :show="show" :mode="mode" @confirm="confirm" :closeOnClickOverlay="true"
-										@close="show=false"></u-calendar>
-									<view class="text">
-										{{ activityDate }}
-									</view>
-								</view>
-								<view class="arrow">
-									<image
-										src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right.png"
-										mode="aspectFill"></image>
-								</view>
-							</view>
-						</view>
-					</view>
-
-				</view>
-			</view>
-			<view class="userOptionsBox">
-				<view class="optionsItemBox">
-					<view class="optionItem">
-						<view class="option_left">
-							<text class="option_text">
-								活动费用(元)
-							</text>
-						</view>
-
-						<view class="option_right">
-							<view class="input_details">
-								<view class="details">
-									<!-- <view class="uni-input text">{{funds}}</view> -->
-									<input type="text" class="title text" placeholder="请输入费用"
-										placeholder-style="color: rgb(153, 153, 153);" maxlength="4" v-model="funds" />
-								</view>
-								<view class="arrow">
-									<image
-										src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right.png"
-										mode="aspectFill"></image>
-								</view>
-							</view>
-						</view>
-					</view>
-
-				</view>
-			</view>
-			<view class="userOptionsBox">
-				<view class="optionsItemBox">
-					<picker mode="date" :value="deadlineDate" :start="startDate" :end="endDate"
-						@change="deadlineDateChange">
-						<view class="optionItem">
-							<view class="option_left">
-								<text class="option_text">
-									报名截止
-								</text>
-							</view>
-
-							<view class="option_right">
-								<view class="input_details">
-									<view class="details">
-										<view class="uni-input text">{{ deadlineDate }}</view>
-									</view>
-									<view class="arrow">
-										<image
-											src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right.png"
-											mode="aspectFill"></image>
-									</view>
-								</view>
-							</view>
-						</view>
-					</picker>
-				</view>
-			</view>
-
-
-		</view>
-
-		<view class="" style="height: 10vh;width: 750rpx;position: relative;">
-			<view class="publish_now">
-				<button class="btn" @click="submitForm">{{ isedit?'立即修改':'立即上传' }}</button>
-			</view>
-		</view>
-
-		<!-- 弹窗 -->
-		<view>
-			<view class="mask" v-show="showPopup" @click="closePopup"></view>
-			<view class="popup-container" v-show="showPopup">
-				<view class="popup">
-					<view class="header">
-						<text>确认{{ isedit?'修改':'上传' }}</text>
-					</view>
-					<view class="footer">
-						<view class="cancel-btn" @click="closePopup">取消</view>
-						<view class="confirm-btn" v-if="isedit" @click="editPublish">确认</view>
-						<view class="confirm-btn" v-else @click="conf">确认</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view>
-			<view class="mask" v-show="showPopupConfirm" @click="closePopup"></view>
-			<view class="popup-container" style="height: 175px;" v-show="showPopupConfirm">
-				<view class="popup">
-					<view class="header" style="margin-top: 15px;">
-						<image src="https://teacherapi.cocorobo.cn/teaching-file/static//gou1.png" mode="aspectFill">
-						</image>
-						<text style="margin-bottom: 24px;">{{ isedit?'修改':'上传' }}成功</text>
-					</view>
-
-				</view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			const currentDate = this.getDate({
-				format: true
-			})
-			return {
-				navBarData: {
-					title: '发布', //导航栏标题
-					btn: 1 //是否显示返回按钮 0不显示  1 显示
-				},
-				//时间选择器
-				show: false,
-				mode: 'range',
-				//控制弹窗
-				showPopup: false,
-				// 成功弹窗
-				showPopupConfirm: false,
-				isFirstShow: true,
-				//按钮文本
-				// btntext: '立即发布',
-				// 弹窗文本
-				// poptext: '发布',
-				//acId
-				acId: '',
-
-				// 上传标题
-				activitytitle: '',
-				// 上传内容
-				activityintro: '',
-				// 上传图片
-				imageValue: '',
-				// index判断选择分类  0 直播活动      1 常规教研活动    2 专题教研活动  3 推荐课程  ，对应上面
-				index: null,
-				// 人数
-				recruitment: '',
-				// 活动费用
-				funds: '',
-				
-
-				// 活动地址选项
-				addressList: ['深圳××学院', '××××××××', '××××××', '××××××', '××××××'],
-				// 分类选项
-				classifyList: ['直播活动', '活动推荐', '精选活动', '教研室活动'],
-				// classifyList: ['直播活动', '常规教研活动', '专题教研活动'],
-				// 活动形式选项
-				activityformList: ['户外活动', '室内活动', '社会活动'],
-				// 默认图片
-				pic: 'https://teacherapi.cocorobo.cn/teaching-file/static//publish/photo.png',
-				// 默认分类
-				classify: '请选择',
-				// 默认活动形式
-				activityform: '请选择',
-				// 默认活动地址
-				address: '请选择',
-
-
-
-				// activityDate: currentDate,
-				// 活动时间默认显示
-				activityDate: '请选择',
-				// 报名截止默认显示
-				deadlineDate: '请选择',
-				// activeList: [],
-				formData: {},
-
-				// 上传和修改共用一个页面，为true修改 为false上传
-				isedit: false
-
-			};
-		},
-		computed: {
-			startDate() {
-				return this.getDate('start');
-			},
-			endDate() {
-				return this.getDate('end');
-			}
-		},
-		methods: {
-			confirm(e) {
-				// console.log(e);
-				// console.log(e[0], e[e.length - 1]);
-				this.activityDate = e[0] + '~' + e[e.length - 1]
-				this.show = false
-			},
-
-
-			// 上传按钮进行判断必填
-			submitForm() {
-				if (!this.activitytitle || this.activitytitle == null) return uni.showToast({title: '请填写标题',icon: 'none'})
-				if (!this.activityintro || this.activityintro == null) return uni.showToast({title: '请填写内容',icon: 'none'})
-				if (!this.imageValue || this.imageValue == null) return uni.showToast({title: '请添加图片',icon: 'none'})
-				if (!this.index || this.index == null) return uni.showToast({title: '请选择分类',icon: 'none'})
-				if (!this.recruitment || this.recruitment == null) return uni.showToast({title: '请输入招募人数',icon: 'none'})
-
-				this.showPopup = true; //显示弹窗
-
-			},
-			closePopup() {
-				// 取消操作
-				this.showPopup = false;
-				this.showPopupConfirm = false;
-				
-			},
-			// 上传活动
-			conf() {
-				this.formData = {
-					// id: this.$store.state.user.openid,
-					id:this.$store.state.user.openid,
-					activitytitle: this.activitytitle,
-					activityintro: this.activityintro,
-					img: this.imageValue,
-					recruitment: this.recruitment,
-					activityform: this.activityform=='请选择'?'-':this.activityform,
-					address: this.address=='请选择'?'-':this.address,
-					classify: this.index,
-					activityDate: this.activityDate=='请选择'?'-':this.activityDate,
-					deadlineDate: this.deadlineDate=='请选择'?'-':this.deadlineDate,
-					funds: this.funds
-				};
-				this.showPopup = false;
-				this.showPopupConfirm = true
-				
-				this.$request('/insertActive', 'POST', this.formData).then(res => {
-					// console.log(res.data);
-					// if (res.code == 200) {
-						setTimeout(() => {
-							uni.switchTab({
-								url: '/pages/activityPage/activityPage'
-							})
-							this.isedit=true
-							uni.removeStorageSync('formData');
-						}, 2000)
-					// }
-				}).catch(err=>{
-					console.log(err);
-				})
-			},
-			// 修改上传
-			editPublish() {
-					let data={
-						id: this.acId,
-						tit: this.activitytitle,
-						intro: this.activityintro,
-						img: this.imageValue,
-						per: this.recruitment,
-						activityform: this.activityform,
-						address: this.address,
-						ty: this.index,
-						activityDate: this.activityDate,
-						deadlineDate: this.deadlineDate,
-						funds: this.funds
-					}
-					this.showPopupConfirm = true
-					
-					// return console.log(data);				
-					this.$request('/updateMyPublish', 'POST', data).then(res => {
-						// console.log(res);
-						setTimeout(() => {
-							uni.navigateBack();
-						}, 1000)
-				
-					})
-			},
-			// 选择分类
-			handelclassify(e) {
-				this.index = e.detail.value
-			},
-			//选择活动形式
-			handelActivityform(e) {
-				this.activityform = this.activityformList[e.detail.value]
-			},
-			// 选择活动地址
-			handeladdress(e) {
-				this.address = this.addressList[e.detail.value]
-			},
-			// activityDateChange: function(e) {
-			// 	this.activityDate = e.detail.value
-			// },
-			deadlineDateChange: function(e) {
-				this.deadlineDate = e.detail.value
-			},
-			getDate(type) {
-				const date = new Date();
-				let year = date.getFullYear();
-				let month = date.getMonth() + 1;
-				let day = date.getDate();
-
-				if (type === 'start') {
-					year = year - 60;
-				} else if (type === 'end') {
-					year = year + 2;
-				}
-				month = month > 9 ? month : '0' + month;
-				day = day > 9 ? day : '0' + day;
-				return `${year}-${month}-${day}`;
-			},
-			// 上传图片
-			uploadPic() {
-				uni.chooseImage({
-					count: 1, // 图片数量
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album', 'camera'], //从相册选择或者拍照
-					success: (res) => {
-						const tempFilePaths = res.tempFilePaths[0];
-						// console.log(this);
-						let that = this
-						const uploadTask = uni.uploadFile({
-							url: 'http://139.159.246.165:7006/img', // post请求地址
-							filePath: tempFilePaths,
-							name: 'file', // 待确认
-							header: {
-								// 不要写这个不然报错
-								// 'Content-Type': 'multipart/form-data',
-							},
-							success: function(res) {
-								that.imageValue = res.data
-							},
-							fail: function(uploadFileFail) {
-								console.log('Error:', uploadFileFail.data);
-							},
-							complete: () => {
-								// 接口调用结束的回调函数（调用成功、失败都会执行）
-								// console.log('Complete:');
-							}
-						});
-					}
-				});
-
-			},
-		},
-		onLoad(e) {
-			console.log('获取参数', e);
-			if (e.acId) {
-				let data = {
-					oid: this.$store.state.user.openid,
-					aid: e.acId
-				}
-				this.$request('/selectAmendAct', 'POST', data).then(res => {
-					// console.log(res[0][0]);
-					let item = res[0][0]
-					this.acId = item.acId
-					this.activitytitle = item.acName
-					this.activityintro = item.brief
-					this.imageValue = item.pic
-					this.index = item.type
-					this.recruitment = item.pers
-					this.activityform = item.acshape
-					this.address = item.address
-					this.funds = item.cost
-					this.activityDate = item.begin_at
-					this.deadlineDate = item.endTime
-				})
-				this.isedit = true
-			}
-			// console.log(uni.getStorageSync('formData'));
-			// 获取缓存里面的数据
-			let setAll=uni.getStorageSync('formData')
-			if(setAll){
-				this.activitytitle = setAll.activitytitle
-				this.activityintro = setAll.activityintro
-				this.imageValue = setAll.imageValue
-				this.index = setAll.classify
-				this.recruitment = setAll.recruitment
-				this.activityform = setAll.activityform
-				this.address = setAll.address
-				this.funds = setAll.funds
-				this.activityDate = setAll.activityDate
-				this.deadlineDate = setAll.deadlineDate
-			}
-				
-			
-
-		},
-		beforeDestroy() {
-			// 在组件销毁之前保存表单数据到 Vuex 中
-			let data = {
-				activitytitle: this.activitytitle,
-				activityintro: this.activityintro,
-				imageValue: this.imageValue,
-				classify: this.index,
-				recruitment: this.recruitment,
-				activityform: this.activityform,
-				address: this.address,
-				funds: this.funds,
-				activityDate: this.activityDate,
-				deadlineDate: this.deadlineDate
-			}
-			if (!this.isedit) {
-				uni.setStorageSync('formData', data)
-			}
-
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.publish {
-		.liu {
-			//留白
-			width: 750rpx;
-			height: 68rpx;
-			position: absolute;
-			bottom: 0;
-			background-color: #ffffff;
-		}
-
-		.pubTitle {
-			width: 750rpx;
-			height: 96rpx;
-			padding: 24rpx 30rpx 0 30rpx;
-
-			.title {
-				font-size: 32rpx;
-				line-height: 48rpx;
-				font-weight: 500;
-			}
-		}
-
-		.pubMid {
-			width: 750rpx;
-			// height: 504rpx;
-			padding: 24rpx 30rpx 0 30rpx;
-
-			// background-color: #8BBEFF;
-			.mid {
-				width: 690rpx;
-				height: 440rpx;
-
-				// background-color: #f2f2f2;
-				.txt {
-					width: 690rpx;
-					height: 192rpx;
-
-					.txtClass {
-						width: 100%;
-						height: 100%;
-						font-size: 28rpx;
-						font-weight: 400;
-						line-height: 48rpx;
-					}
-				}
-
-				.pic {
-					width: 224rpx;
-					height: 224rpx;
-					background-color: rgba(242, 242, 242, 1);
-					display: flex;
-					position: relative;
-					justify-content: center;
-					align-items: center;
-
-					.pic_show {
-						position: absolute;
-						top: 0;
-						left: 0;
-						width: 100%;
-						height: 100%;
-						z-index: 10;
-						background-color: #8BBEFF;
-
-						image {
-							width: 100%;
-							height: 100%;
-						}
-					}
-
-					.picCont {
-						display: flex;
-						flex-direction: column;
-						justify-content: center;
-						align-items: center;
-
-						image {
-							width: 56rpx;
-							height: 66rpx;
-						}
-					}
-				}
-			}
-		}
-
-
-		// background-color: #fff;
-		height: 100vh;
-
-
-		.textCont {
-			padding: 16px;
-		}
-
-		.addPhoto {
-			background-color: #f2f2f2;
-			width: 224rpx;
-			height: 224rpx;
-			display: flex;
-			color: #616161;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			margin-left: 30rpx;
-
-			image {
-				width: 50px;
-				height: 50px;
-				// margin-left: 48px;
-			}
-
-			.photo {
-				color: #000000A3;
-				// padding-left: 44px;
-				// font-size: 14px;
-			}
-
-			.num {
-				color: #919191;
-				// padding-left: 56px;
-				// font-size: 14px;
-			}
-
-		}
-
-		.userOptionsBox {
-
-			width: 750rpx;
-			height: 96rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-
-			.optionsItemBox {
-				width: 690rpx;
-
-				.optionItem {
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-
-					.option_left {
-						display: flex;
-						align-items: center;
-						font-size: 28rpx;
-						line-height: 48rpx;
-						font-weight: 400;
-					}
-
-					.option_right {
-						height: 40rpx;
-
-						.input_details {
-							display: flex;
-							align-items: center;
-
-							.details {
-								display: flex;
-								flex-direction: row;
-								color: rgb(153, 153, 153);
-
-								.text {
-									font-size: 28rpx;
-									color: rgb(153, 153, 153);
-								}
-
-								input {
-									text-align: right;
-								}
-							}
-
-							.arrow {
-								display: flex;
-
-								image {
-									width: 32rpx;
-									height: 32rpx;
-								}
-							}
-						}
-
-					}
-				}
-			}
-		}
-
-		.publish_now {
-			position: absolute;
-			// bottom: 100rpx;
-			display: flex;
-			width: 750rpx;
-			justify-content: center;
-			padding-bottom: 50rpx;
-
-			.btn {
-				width: 432rpx;
-				height: 88rpx;
-				line-height: 88rpx;
-				// background-color: #8BBEFF;
-				background: rgba(0, 86, 168, 1);
-
-				color: #fff;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				margin-top: 20px;
-			}
-		}
-
-		.mask {
-			position: fixed;
-			top: 0;
-			left: 0;
-			width: 100%;
-			height: 100%;
-			background-color: rgba(0, 0, 0, 0.3);
-			z-index: 999;
-			overflow: hidden;
-			// display: none;
-		}
-
-
-	}
-</style>

pages/ranking/ranking.vue

@@ -0,0 +1,189 @@
+<template>
+	<view class="ranking">
+		<statusBar :item="navBarData"></statusBar>
+		<view class="top">
+			<image :src="adv.img" mode="aspectFill" @click="gotoHome">
+			</image>
+		</view>
+		<scroll-view class="scrollV" scroll-y="true">
+			<uni-table border stripe emptyText="暂无更多数据">
+				<!-- 表头行 -->
+				<uni-tr>
+					<uni-th width="100rpx" align="left">序号</uni-th>
+					<uni-th width="150rpx" align="left">姓名</uni-th>
+					<uni-th width="152rpx" align="left">单位</uni-th>
+					<uni-th width="100rpx" align="left">课程</uni-th>
+					<uni-th width="100rpx" align="left">活动</uni-th>
+					<uni-th width="150rpx" align="left" sortable>活跃度</uni-th>
+				</uni-tr>
+
+				<uni-tr>
+					<uni-th width="100rpx" align="left">序号</uni-th>
+					<uni-th width="150rpx" align="left">姓名</uni-th>
+					<uni-th width="150rpx" align="left">单位</uni-th>
+					<uni-th width="100rpx" align="left">课程</uni-th>
+					<uni-th width="100rpx" align="left">活动</uni-th>
+					<uni-th width="150rpx" align="left">活跃度</uni-th>
+				</uni-tr>
+				<!-- 表格数据行 -->
+				<uni-tr v-for="(i,index) in arrlist" :key="i.openid">
+					<uni-td>{{index + 1}}</uni-td>
+					<uni-td>
+						<view class="td" @click="show" :data-e="i.username">
+							{{ i.username }}
+						</view>
+					</uni-td>
+					<uni-td>
+						<view class="td" @click="show" :data-e="i.schoolName">
+							{{i.schoolName}}
+						</view>
+					</uni-td>
+					<uni-td>{{i.views}}</uni-td>
+					<uni-td>{{i.signNum}}</uni-td>
+					<uni-td>{{i.act}}</uni-td>
+				</uni-tr>
+
+
+			</uni-table>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				navBarData: {
+					title: '排行',
+					btn: 0
+				},
+				arrlist: [],
+				adv: {}
+			};
+		},
+		methods: {
+			getdata() {
+				this.$request('/selectUserActivity', "get", {
+					oid: this.$store.state.user.openid
+				}).then(res => {
+					// return console.log(res[0]);
+
+					this.arrlist = res[0]
+
+					this.arrlist.forEach(e => {
+						// console.log(e);
+						e.act = e.act.toFixed(0)
+					})
+					// this.arrlist.sort(function(a, b) {
+					// 	return b.act - a.act
+					// });
+
+				})
+			},
+			show(e) {
+				let data = e.currentTarget.dataset.e
+				console.log(data);
+				uni.showToast({
+					title: data,
+					icon: 'none'
+				})
+			},
+			getMag() {
+				this.$request('/selectAllMessage', "POST", {
+					oid: this.$store.state.user.openid
+				}).then(res => {
+					console.log('获取未读信息', res[0][0].msg);
+					let num = res[0][0].msg
+					this.msgn = num
+					if (num == 0) {
+						uni.hideTabBarRedDot({
+							index: 3
+						})
+					} else {
+						uni.setTabBarBadge({
+							index: 3,
+							text: num.toString()
+						})
+					}
+				})
+			},
+			gotoHome() {
+				// console.log(this.adv);
+				// const web = this.classList[this.current];
+				const url = this.adv.href
+				uni.navigateTo({
+					url: "/pages/skipone/skipone?item=" + encodeURIComponent(JSON.stringify(url))
+					// url: "/pages/skipone/skipone?url=" + encodeURIComponent(JSON.stringify(url)),
+				});
+			},
+			// 获取顶部大图
+			getAdv() {
+				this.$request('/selectAdvertisement', "get", {
+					typ: 1
+				}).then(res => {
+					console.log(res);
+					this.adv = res[0][0]
+				})
+			}
+		},
+		onLoad() {
+			this.getAdv()
+		},
+		onShow() {
+			// this.getMag()
+			this.getAllMessage() // 调用app.js中的方法
+			this.getdata()
+		}
+	}
+</script>
+
+<style lang="scss">
+	.ranking {
+		display: flex;
+		flex-direction: column;
+		height: 100vh;
+
+		.top {
+			width: 750rpx;
+			height: 288rpx;
+			display: flex;
+			margin-bottom: 20rpx;
+			align-items: center;
+			background-color: #fff;
+			justify-content: center;
+
+			image {
+				height: 246rpx;
+				width: 690rpx;
+				border-radius: 10rpx;
+			}
+		}
+
+		.scrollV {
+			flex: 1;
+			overflow: hidden;
+		}
+	}
+
+	// 顶部大图
+
+	/deep/ .uni-table-tr:nth-child(1) {
+		position: fixed;
+		background-color: #F7FBFF;
+		transform: translate(0, -5rpx);
+		padding-bottom: 7rpx;
+	}
+
+	/deep/ .uni-table-td:nth-child(1) {
+			background-color: #F7FBFF;
+		}
+
+		.td {
+			display: -webkit-box;
+			word-break: break-all;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 1;
+		}
+</style>

pages/skipone/skipone.vue

@@ -1,8 +1,6 @@
 <template>
 	<view class="">
 		<web-view v-if="url1" :src="url1"></web-view>
-		<!-- <iframe :src="url1"></iframe> -->
-		<!-- <iframe :src="url" frameborder="0" style="width: 100%; height: 100vh;"></iframe> -->
 	</view>
 </template>
 
@@ -16,9 +14,26 @@
 
 			};
 		},
-		onLoad(options) {
-			// console.log(options);
-			this.url1 = decodeURIComponent(options.url);
+		methods: {
+			addViews(data) {
+				this.$request('/updateUserViews', 'POST', data).then(res => {
+					console.log(res);
+				})
+			}
+		},
+		onLoad(e) {
+			console.log(e);
+			const data = JSON.parse(decodeURIComponent(e.item));
+			// return console.log('data',data);
+			// let data = JSON.parse(item)
+			if(typeof data === 'object'){
+				this.addViews({
+					oid: this.$store.state.user.openid,
+					cid: data.cid
+				})
+				return this.url1 = data.href
+			}
+			this.url1=data
 		}
 	}
 </script>

pages/teachingDetail/teachingDetail.vue

@@ -1,641 +0,0 @@
-<template>
-	<!-- 教研室详情 -->
-	<view class="teachingDetail">
-		<statusBar :item="navbar"></statusBar>
-
-		<!-- 顶部 -->
-		<view class="backPic">
-			<image src="https://teacherapi.cocorobo.cn/teaching-file/static//yym/Rectangle 40.png" mode="aspectFill">
-			</image>
-			<view class="card">
-				<view class="cardTop">
-					<view class="title three-font">{{ actItemList.acName }}</view>
-					<view class="icons">
-						<view class="icon" @click="coll">
-							<image :src="collArr.includes(actItemList.acId) ? pic_coll2 : pic_coll "
-								style="width: 42rpx;height: 42rpx;" mode="aspectFill"></image>
-						</view>
-						<view class="icon" @click="sub">
-							<image
-								:src="subArr.includes(actItemList.acId) ? pic_sub2 : pic_sub "
-								style="width: 38rpx;height: 42rpx;" mode="aspectFill"></image>
-						</view>
-					</view>
-				</view>
-				<view class="col fz-font">
-					成立日期：{{ actItemList.create_at}}
-				</view>
-				<view class="col fz-font">
-					当前人数：{{actItemList.bnum}}/{{ actItemList.pers }}人
-				</view>
-				<view class="tag col">
-					<view class="fz-font tag">教研标签：</view>
-					
-					<view class="" style="display: flex;">
-						<view class="bqZ-font"
-							style="color: #00b2b6; border: 1px #00b2b6 solid;padding: 2rpx 10rpx;border-radius: 5rpx;font-weight: 600;">
-							暂无
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 两个大资料文件 -->
-		<view class="teaData">
-			<view class="cla">
-				<view class="tit1 three-font">课程资料</view>
-				<view class="tit2 fz-font">教研室专属课程</view>
-			</view>
-			<view class="cla2">
-				<view class="tit1 titColor three-font">资源文件</view>
-				<view class="tit2 titColor fz-font">教研室专属资源</view>
-			</view>
-		</view>
-
-		<!-- 教研室详情 -->
-		<view class="" style="padding: 0 30rpx;">
-			<!-- <detailBlock :actItemList='actItemList' :item="judge"></detailBlock> -->
-			<view class="detailBlock">
-				<view class="tit fwb-font">教研室详情</view>
-				<view class="cont sZw-font">
-					会议时间：<text>{{ actItemList.begin_at }}</text>
-				</view>
-				<view class="cont sZw-font">
-					活动形式：<text style="color: #0056a8;">{{ actItemList.acshape }}</text>
-				</view>
-				<view class="cont sZw-font">
-					<!-- <view id="myElement" class="activeTit">
-						教研室概况：查看更多查看更多查看更多看更多查看更多查看更多查看更多查看更多查看更多查看更多查看更多看更多查看更多查看更多查看更多查看更多
-				   </view>
-					<text class="zdwz" style="color: #0056a8;float: right;" @click="zdwz">收起</text> -->
-					<view class="content">
-						<view ref="p" :class="getClassNames">
-							<text style="color: #999999;">教研室概况：</text>
-							{{actItemList.brief}}
-						</view>
-			
-						<view ref="btnnn" :class="getClassNames1" @click="qqq">
-							<!-- {{isAll ? '收起' : '展开'}} -->
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<!-- 创建者用户名 -->
-		<view style="padding: 0 30rpx;">
-			<view class="creator">
-				<image
-					:src="actItemList.avatar"
-					mode="aspectFill"></image>
-				<view class="creName btn-font">
-					{{ actItemList.username }}
-				</view>
-			</view>
-		</view>
-
-		<!-- 当前成员 -->
-		<view style="padding: 0 30rpx;">
-			<view class="member">
-				<view class="memberTop">
-					<view class="btn-font">当前成员</view>
-					<view class="fz-font" style="color: rgba(0, 0, 0, 0.4);display: flex;align-items: center;"
-						@click="gotoMorePer">
-						<text>查看更多</text>
-						<image src="https://teacherapi.cocorobo.cn/teaching-file/static//mine/arrow-right.png"
-							style="width: 32rpx;height: 32rpx;" mode="aspectFill"></image>
-					</view>
-				</view>
-
-				<view class="pers" >
-					<view class="per"  v-for="(i,index) in applyUserlist" :key="index">
-						<image :src="i.avatar" mode=""></image>
-						<view class="perName fz-font">
-							{{i.username}}
-						</view>
-					</view>
-					
-					<!-- <view class="" v-if="!applyUserlist.length" style="width: 200rpx">
-						暂无人员
-					</view> -->
-				</view>
-			</view>
-		</view>
-
-		<!-- 申请加入 -->
-		<view class="btnBlock">
-			<button class="btn btn1 zw-font" v-if="actItemList.bnum>=actItemList.pers">报名人数已满</button>
-			<button class="btn btn1 zw-font" v-else-if="actItemList.openid==oid">本人创建，暂不支持加入</button>
-			<button class="btn zw-font" v-else-if="!isSign && actItemList.openid!=oid" @click="applyAdd">申请加入</button>
-			<button class="btn btn1 zw-font" v-else-if="isSign && actItemList.openid!=oid">已加入</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				navbar: {
-					title: '活动详情',
-					btn: 1
-				},
-				// 用户openid
-				oid:'',
-				// 活动id
-				acId:'',
-				// 页面数据
-				actItemList: {},
-				
-				// 用户收藏列表
-				collArr:[],
-				
-				// 用户订阅列表
-				subArr:[],
-				
-				// 是否已加入
-				isSign:0,
-				
-				// 报名列表
-				applyUserlist:[],
-				
-				pic_coll:'https://teacherapi.cocorobo.cn/teaching-file/static//yym/Star 1 (Stroke) (2).png',
-				pic_coll2:'https://teacherapi.cocorobo.cn/teaching-file/static//mine/Collect_yellow.png',
-				pic_sub:'https://teacherapi.cocorobo.cn/teaching-file/static/yym/Vector (Stroke) (1).png',
-				pic_sub2:'https://teacherapi.cocorobo.cn/teaching-file/static/dingyue_blue.png',
-			};
-		},
-		methods: {
-			// 获取页面数据
-			getdata(){
-				let data = {
-					oid:this.$store.state.user.openid,
-					acId: this.acId,
-				}
-				this.$request('/selectActivityID', "POST", data).then(res => {
-					console.log(res[0][0]);
-					this.actItemList = res[0][0]
-				})
-				
-			},
-			// 收藏事件
-			coll(){
-				//判断是否收藏
-				let iscoll = null
-				
-				// 查询是否收藏过
-				let data = {
-					acid: this.acId,
-					oid: this.$store.state.user.openid, //用户id
-					ty: 0
-				}
-				this.$request('/selectOneOperator', 'POST', data).then(res => {
-					// console.log('查询是否收藏过',res);
-					res[0].length ? iscoll = true : iscoll = false;
-				
-					// iscoll为true表示已经收藏过，执行删除  为true则收藏
-					if (iscoll) {
-						console.log('执行删除');
-						this.$request('/deleteOperator', 'POST', data).then(res => {
-							// console.log(res);
-							this.getColl()
-						})
-					} else {
-						console.log('执行添加');
-						this.$request('/insertOperator', 'POST', data).then(res => {
-							// console.log(res);
-							this.getColl()
-						})
-					}
-				})
-			},
-			// 订阅事件
-			sub(){
-				//判断是否订阅
-				let iscoll = null
-				
-				// 查询是否订阅过
-				let data = {
-					acid: this.acId,
-					oid: this.$store.state.user.openid, //用户id
-					ty: 1
-				}
-				this.$request('/selectOneOperator', 'POST', data).then(res => {
-					// console.log('查询是否订阅过',res);
-					res[0].length ? iscoll = true : iscoll = false;
-					
-					// iscoll为true表示已经订阅过，执行删除  为true则订阅
-					if (iscoll) {
-						console.log('执行删除');
-						this.$request('/deleteOperator', 'POST', data).then(res => {
-							console.log(res);
-							this.getSub()
-						})
-					} else {
-						console.log('执行添加');
-						this.$request('/insertOperator', 'POST', data).then(res => {
-							console.log(res);
-							this.getSub()
-							// 添加消息页面订阅通知提示订阅成功
-							this.addMessage()
-						})
-					}
-				})
-			},
-			// 添加消息页面订阅通知提示订阅成功
-			addMessage() {
-				let data = {
-					oid: this.$store.state.user.openid,
-					acid: this.acId,
-					type: 2,
-					con: ``
-				}
-				this.$request('/insertMessage', "POST", data).then(res => {
-					console.log(res);
-				})
-			},
-			// 申请加入
-			applyAdd() {
-				uni.navigateTo({
-					url: `/pages/jys/jys?acId=${this.acId}&tit=${'教研室报名'}`
-				})
-			},
-			// 查看更多报名同学
-			gotoMorePer() {
-				uni.navigateTo({
-					url: `/pages/dy/dy?acId=${this.acId}`
-				})
-			},
-			// 获取是否订阅
-			getSub(){
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					type: 1
-				}
-				this.$request('/selectOperator', 'POST', data).then(res => {
-					console.log('获取订阅', res);
-					// 每次调用前清零，防止push叠加错误
-					this.subArr = []
-					// 将acid遍历到subArrsubArr中
-					res[0].forEach(i => {
-						this.subArr.push(i.acId)
-					})
-				
-				})
-				
-			},
-			//获取是否收藏
-			getColl() {
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					type: 0
-				}
-				this.$request('/selectOperator', 'POST', data).then(res => {
-					// console.log('获取收藏', res);
-					// 每次调用前清零，防止push叠加错误
-					this.collArr = []
-					// 将acid遍历到collArr中
-					res[0].forEach(i => {
-						this.collArr.push(i.acId)
-					})
-				})
-			},
-			//获取是否报名
-			btnEnroll() {
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					aid:this.acId,
-					type: 2
-				}
-				this.$request('/selectSignup', 'POST', data).then(res => {
-					// console.log('获取报名', res[0][0]);
-					this.isSign=res[0][0].num
-				})
-			},
-			// 获取报名用户
-			getUsers(){
-				let data = {
-					oid: this.$store.state.user.openid, //用户id
-					aid:this.acId,
-					type: 2,
-					page: 1, //下拉获取更多的备用字段
-					lim: 6 //一次获取多少数据
-				}
-				this.$request('/selectApplyUser', 'POST', data).then(res => {
-					console.log('获取报名用户列表', res[0]);
-					this.applyUserlist=res[0]
-				})
-			}
-			
-		},
-		onLoad(e) {
-			// console.log('接收参数',e);
-			this.acId=e.acId
-			this.oid=this.$store.state.user.openid
-			
-			
-			// this.getActivity()
-			// 获取页面数据
-			this.getdata()
-			// 获取是否收藏
-			this.getColl()
-			// 获取是否订阅
-			this.getSub()
-			// 获取是否报名
-			this.btnEnroll()
-			// 获取报名人名单
-			this.getUsers()
-		}
-	}
-</script>
-
-<style lang="scss">
-	.teachingDetail {
-		padding-bottom: 80px;
-
-		.backPic {
-			width: 750rpx;
-			position: relative;
-
-			image {
-				width: 100%;
-				display: block;
-			}
-
-			.card {
-				position: absolute;
-				width: 690rpx;
-				// height: 256rpx;
-				bottom: 10px;
-				// top: 40%;
-				left: 50%;
-				padding: 30rpx;
-				background-color: rgba(0, 0, 0, 0.26);
-				border-radius: 10px;
-				transform: translate(-50%, 0);
-				border: 1rpx #667870 solid;
-				color: #ffffff;
-
-				// display: flex;
-				// flex-direction: column;
-				// justify-content: space-between;
-				.cardTop {
-					display: flex;
-					justify-content: space-between;
-
-					.title {
-						margin-bottom: 20rpx;
-						width: 80%;
-						// height: 48rpx;
-						color: #ffffff;
-						font-family: PingFang SC;
-						// overflow: hidden;
-						// text-overflow: ellipsis;
-						// white-space: nowrap;
-						
-						display: -webkit-box;
-						word-break: break-all;
-						text-overflow: ellipsis;
-						overflow: hidden;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-					}
-
-					.icons {
-						flex: 1;
-						display: flex;
-						// align-items: center;
-						justify-content: space-between;
-
-						.icon {
-							width: 48rpx;
-							height: 48rpx;
-							display: flex;
-							align-items: center;
-							justify-content: center;
-						}
-					}
-
-				}
-
-				.col {
-					margin-bottom: 10rpx;
-					font-weight: 100;
-					color: #f0edea;
-				}
-				.tag {
-					display: flex;
-					align-items: center;
-				}
-			}
-
-			// background-image: url(https://teacherapi.cocorobo.cn/teaching-file/static//resource/jqr.png);
-		}
-
-		.teaData {
-			width: 750rpx;
-			display: flex;
-			padding: 20rpx 30rpx;
-			justify-content: space-between;
-
-			// padding: 20px 0;
-			.cla {
-				width: 49%;
-				background: linear-gradient(to bottom, #fcfcff 30%, #e8ecfd 100%);
-				border-radius: 10px;
-				padding: 35rpx 30rpx;
-				color: #424f85;
-
-				.tit1 {
-					// font-size: 38rpx;
-					margin-bottom: 10rpx;
-					font-weight: bold;
-				}
-
-				.tit2 {
-					// font-size: 22px;
-					// font-size: 30rpx;
-					// margin-bottom: 5px;
-				}
-			}
-
-			.cla2 {
-				width: 45%;
-				background: linear-gradient(to bottom, #fcfcff 10%, #fef3ea 100%);
-				border-radius: 10px;
-				padding: 35rpx 30rpx;
-				color: #855e42;
-
-				.tit1 {
-					// font-size: 38rpx;
-					margin-bottom: 10rpx;
-					font-weight: bold;
-				}
-
-				.tit2 {
-					// font-size: 22px;
-					// margin-bottom: 5px;
-					// font-size: 30rpx;
-				}
-			}
-		}
-
-
-		.creator {
-			display: flex;
-			padding: 30rpx;
-			background-color: #ffffff;
-			align-items: center;
-			margin-top: 20rpx;
-			border-radius: 10px;
-
-			image {
-				width: 96rpx;
-				height: 96rpx;
-				border-radius: 50%;
-				margin-right: 20rpx;
-			}
-
-			.creName {
-				font-weight: bold;
-			}
-		}
-
-		.member {
-			background-color: #ffffff;
-			margin-top: 20rpx;
-			padding: 30rpx;
-			border-radius: 10px;
-			margin-bottom: 30rpx;
-
-			.memberTop {
-				display: flex;
-				justify-content: space-between;
-				margin-bottom: 10px;
-			}
-
-			.pers {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				width: 16%;
-
-				.per {
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-					image {
-						width: 72rpx;
-						height: 72rpx;
-						border-radius: 50%;
-					}
-
-					.perName {
-						text-align: center;
-						display: -webkit-box;
-						word-break: break-all;
-						text-overflow: ellipsis;
-						overflow: hidden;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 1;
-					}
-				}
-
-			}
-
-		}
-
-		.btnBlock {
-			position: fixed;
-			bottom: 0;
-			width: 750rpx;
-			background-color: #ffffff;
-			// padding: 20px 0;
-			padding: 2vh 0;
-
-			.btn {
-				width: 432rpx;
-				height: 88rpx;
-				font-weight: 500;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				margin: auto;
-				background-color: #0056a8;
-				color: #ffffff;
-			}
-			.btn1 {
-				background-color: rgba(139, 190, 255, 1);
-			}
-		}
-		.detailBlock {
-			background-color: #ffffff;
-			border-radius: 10rpx;
-			padding: 30rpx;
-		
-			.tit {
-				font-weight: 600;
-				margin-bottom: 10px;
-			}
-		
-			.cont {
-				color: #999999;
-				margin-bottom: 10px;
-		
-				text {
-					color: #666666;
-				}
-		
-				.content {
-					white-space: normal;
-					/*隐藏溢出*/
-					/*当文本溢出包含元素时显示省略符号来代表被修剪的文本*/
-					/*规定段落中的文本不进行换行*/
-					letter-spacing: 2rpx;
-					display: -webkit-box;
-					word-break: break-all;
-					text-overflow: ellipsis;
-					overflow: hidden;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 4;
-				}
-		
-				.content .p {
-					width: 90%;
-					color: #666666;
-					// max-width: 100%;
-					// display:inline-block;
-					display: block;
-					// float: left;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
-					// padding-right: 50rpx;
-					/*设置文字溢出时显示省略号*/
-		
-				}
-		
-				.content .p.is-expanded {
-					width: 100%;
-					overflow: visible;
-					white-space: normal;
-					/*文字溢出时不再显示省略号*/
-				}
-		
-				.btn-more {
-					float: right;
-					display: inline-block;
-					// width: 60px;
-					transform: translate(0, -100%);
-					color: #0056a8;
-				}
-		
-				.btn-more.is-zd {
-					transform: none;
-					// transform: translate(0,0);
-				}
-			}
-		}
-	}
-</style>