#

components/beUpload/beUpload.vue

@@ -0,0 +1,139 @@
+<template>
+  <button class="info_btn" @click="addImg($event)">
+    {{ navName }}
+    <input
+      type="file"
+      :accept="acc"
+      style="display: none"
+      capture="camera"
+      @change="beforeUpload($event)"
+    />
+  </button>
+</template>
+
+<script>
+// import "../common/aws-sdk-2.235.1.min.js";
+import { getNowDate } from "../../tool/Date.js";
+export default {
+  components: {},
+  props: [ 'navName','accept','progress'],
+  data() {
+    return {
+      inputShow: true,
+      acc:"",
+    };
+  },
+ watch: {
+    accept: {
+      immediate: true,
+      deep: true,
+      handler(newValue, oldValue) {
+        this.getAccept();
+      },
+    },
+  },
+  methods: {
+    addImg(e) {
+		console.log(e);
+      var el = e.currentTarget || e;
+	  console.log(el);
+      el.getElementsByTagName("input")[0].click();
+      e.target.value = "";
+    },
+    beforeUpload(event) {
+      console.log(event);
+      // const loading = this.openLoading();
+      var file = event.target.files[0];
+      var credentials = {
+        accessKeyId: "AKIATLPEDU37QV5CHLMH",
+        secretAccessKey: "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",
+      }; //秘钥形式的登录上传
+      window.AWS.config.update(credentials);
+      window.AWS.config.region = "cn-northwest-1"; //设置区域
+      var bucket = new window.AWS.S3({
+        params: {
+          Bucket: "ccrb",
+        },
+      }); //选择桶
+      var _this = this;
+      _this.progress?_this.progress.show = true:'';
+      _this.progress?_this.progress.value = 0:'';
+      if (file) {
+        var params = {
+          Key:
+            file.name.split(".")[0] +
+            new Date().getTime() +
+            "." +
+            file.name.split(".")[file.name.split(".").length - 1],
+          ContentType: file.type,
+          Body: file,
+          "Access-Control-Allow-Credentials": "*",
+          ACL: "public-read",
+        }; //key可以设置为桶的相抵路径，Body为文件， ACL最好要设置
+        var options = {
+          partSize: 2048 * 1024 * 1024,
+          queueSize: 2,
+          leavePartsOnError: true,
+        };
+        bucket
+          .upload(params, options)
+          .on("httpUploadProgress", function (evt) {
+            //进度条
+            _this.progress?_this.progress.value = Math.round((evt.loaded/evt.total)*100):'';
+          })
+          .send(function (err, data) {
+            _this.inputShow = true;
+            if (err) {
+              _this.$message.error("上传失败");
+            } else {
+              let size = file.size;
+              let unit = "B"
+              if(size>1000000000){
+                size = size/1024/1024/1024;
+                unit = "G"
+              }else if(size>1000000){
+                size = size/1024/1024
+                unit = "MB"
+              }else if(size>1000){
+                size = size/1024
+                unit = "KB"
+              }
+              size = Math.floor(size);
+              _this.$emit('getFile',{fileName:file.name,size:`${size}${unit}`,uploadTime:getNowDate(),url:data.Location})
+            }
+          });
+      }
+    },
+    getAccept(){
+        if(this.accept){
+            this.acc = this.accept;
+        }else{
+            this.acc = "*";
+        }
+    },
+  },
+  created(){
+    this.getAccept();
+  },
+};
+</script>
+
+<style scoped>
+.info_btn{
+  color: #fff;
+  background-color: #0f7eff;
+  padding: 8px 24px;
+  font-size: 0.9375rem;
+  box-shadow: 0px 1px 3px 0px rgb(0 0 0 / 20%), 0px 2px 2px 0px rgb(0 0 0 / 14%),
+    0px 3px 1px -2px rgb(0 0 0 / 12%);
+  min-width: 64px;
+  font-weight: 500;
+  border-radius: 4px;
+  box-sizing: border-box;
+  border: none;
+  cursor: pointer;
+}
+.info_btn:hover {
+  background-color: #4f7cd5 !important;
+}
+</style>

components/statusBar/statusBar.vue

@@ -96,7 +96,9 @@
 				
 				.postTit{
 					height: 40px;
-					color: #000;
+					color: rgba(0, 0, 0, 0.88);
+					font-size: 34rpx;
+					// font-family: Microsoft YaHei;
 					font-weight: bold;
 					display: inline-block; /* 将容器设置为行内块元素 */
 					vertical-align: bottom; /* 将文字垂直对齐到底部 */

pages.json

@@ -196,7 +196,16 @@
 
 		}
 
-	],
+	    ,{
+            "path" : "pages/liveActivityList/liveActivityList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"tabBar": {
 		// "custom": true,
 		"backgroundColor": "#ffffff",

pages/activityList/activityList.vue

@@ -3,7 +3,7 @@
 		<statusBar :item="navbarData"></statusBar>
 		<!-- <teaching-case :item="teaData"></teaching-case> -->
 		<view class="" style="padding-bottom: 50rpx;">
-			<teaching-case v-for="(item,index) in activeList" :item="teaData" :key="index" :activeList="item" :indexId="index"></teaching-case>
+			<teaching-case :activeList="activeList" :indexId="index"></teaching-case>
 		</view>
 
 
@@ -15,50 +15,30 @@
 		data() {
 			return {
 				navbarData: {
-					title: '常规教研活动列表',
+					title: '常规教研活动',
 					btn: 1
 				},
 				teaData: {
 					btn: 1
 				},
-				activeList: [
-				  {
-				    img: "http://43.139.158.220:5007/img/static/img/img1.png",
-				    count: "17",
-					price: "188",
-				    className: "丽湖职教双创教育国际虚拟教研室2023年常规教研活动安排",
-				    intro:
-				      "丽湖职教双创教育国际虚拟教研室为立足全国，辐射海外的国际化教研室，围绕创新创业教育的人才培养与课程建设开展深度研究。教研室以贯彻落实立德树人根本任务，通过加强跨专业、跨校、跨地域的教研交流，推动高校协同打造国际化的精品教学资",
-				  },
-				  {
-				    img: "http://43.139.158.220:5007/img/static/img/img2.png",
-				    count: "6",
-					price: "188",
-				    className:
-				      "赛创融合、协同育人—高职院校双创大赛赛事组织| 丽湖职教双创教育国际虚拟教研室常规教研活动第3期顺利举",
-				    intro:
-				      " 为全面落实双创教育“以赛促教、以赛促学、以赛促创”，提升学校双创大赛的组织效果和参赛成绩，促进更多教育成果落地，实现赛创融合育人的目标，丽湖职教双创教育国际虚拟教研室于4月26日组织举办了第3期线上教研活动，活动主题为“赛",
-				  },
-				  {
-				    img: "http://43.139.158.220:5007/img/static/img/img3.png",
-				    count: "1",
-					price: "188",
-				    className:
-				      "产教融合情境下的双创通识课程建设 | 丽湖职教双创教育国际虚拟教研室常规教研活动第2期顺利举行",
-				    intro:
-				      "【图片】为提升职业院校双创课程建设水平，促进双创课程的改革与发展，丽湖职教双创教育国际虚拟教研室于3月29日组织举办了以“产教融合情境下的双创通识课程建设”为主题的第2期线上教研活动，来自全国各职业院校的60多位教师参会。本",
-				  },
-				  {
-				    img: "http://43.139.158.220:5007/img/static/img/img4.png",
-				    count: "0",
-					price: "188",
-				    className:
-				      "打造双创“金课” | 丽湖职教双创教育国际虚拟教研室常规教研活动第1期顺利举行",
-				    intro:
-				      "为推动高职院校双创课程建设，打造更多的双创精品课程和金课，丽湖职教双创教育国际虚拟教研室于2月22日组织举办了以“如何打造高职双创金课”为主题的第1期教研活动，来自全国各高职院校的80多位教师参会。本次活动由",
-				  },
-				],
+				activeList: [],
 			};
+		},
+		methods:{
+			// 获取教研活动
+			getData(){
+				let data={
+					openid:uni.getStorageSync('oId'),ty:1
+				}
+					this.$request('/selectActivity',"POST",data).then(res=>{
+						console.log(res[0]);
+						// this.activeList=[...this.activeList,...res[0]]
+						this.activeList=res[0]
+					})
+			},
+		},
+		onShow() {
+			this.getData()
 		}
 	}
 </script>

pages/activityList_2/activityList_2.vue

@@ -3,7 +3,7 @@
 		<statusBar :item="navbarData"></statusBar>
 		<!-- <teaching-case :item="teaData"></teaching-case> -->
 		<view class="" style="padding-bottom: 50rpx;">
-			<teaching-case v-for="(item,index) in activeList" :item="teaData" :key="index" :activeList="item" :indexId="index"></teaching-case>
+			<teaching-case  :activeList="activeList" :indexId="index"></teaching-case>
 		</view>
 
 
@@ -15,45 +15,30 @@
 		data() {
 			return {
 				navbarData: {
-					title: '专题教研活动列表',
+					title: '专题教研活动',
 					btn: 1
 				},
 				teaData: {
 					btn: 1,
 					btn_2: 1,
 				},
-				activeList: [{
-						img: "http://43.139.158.220:5007/img/static/img/1695656271245-image.png",
-						count: "3842",
-						price: "299",
-						className: "丽湖职教双创教育国际虚拟教研室启动大会暨双创教育国际论坛圆满举行",
-						intro: "丽湖职教双创教育国际虚拟教研室为立足全国，辐射海外的国际化教研室，围绕创新创业教育的人才培养与课程建设开展深度研究。教研室以贯彻落实立德树人根本任务，通过加强跨专业、跨校、跨地域的教研交流，推动高校协同打造国际化的精品教学资",
-					},
-					{
-						img: "http://43.139.158.220:5007/img/static/img/img1.png",
-						count: "17",
-						price: "299",
-						className: "丽湖职教双创教育国际虚拟教研室2023年常规教研活动安排",
-						intro: "丽湖职教双创教育国际虚拟教研室为立足全国，辐射海外的国际化教研室，围绕创新创业教育的人才培养与课程建设开展深度研究。教研室以贯彻落实立德树人根本任务，通过加强跨专业、跨校、跨地域的教研交流，推动高校协同打造国际化的精品教学资",
-					},
-					{
-						img: "http://43.139.158.220:5007/img/static/img/img3.png",
-						count: "1",
-						price: "299",
-						className: "产教融合情境下的双创通识课程建设 | 丽湖职教双创教育国际虚拟教研室常规教研活动第2期顺利举行",
-						intro: "【图片】为提升职业院校双创课程建设水平，促进双创课程的改革与发展，丽湖职教双创教育国际虚拟教研室于3月29日组织举办了以“产教融合情境下的双创通识课程建设”为主题的第2期线上教研活动，来自全国各职业院校的60多位教师参会。本",
-					},
-					{
-						img: "http://43.139.158.220:5007/img/static/yym/83b48be81d4ed9c93908737496f2a54.png",
-						count: "3842",
-						price: "299",
-						className: "丽湖职教双创教育国际虚拟教研室 • 常规教研活动 第9期",
-						intro: "丽湖职教双创教育国际虚拟教研室 • 常规教研活动 第9期：主题为创新创业在线课程建设与运营。【图片】【图片】【图片】【图片】【图片】"
-					},
-				],
+				activeList: [],
 			};
 		},
 		methods: {
+			getData(){
+				let data={
+					openid:uni.getStorageSync('oId'),ty:1
+				}
+					this.$request('/selectActivity',"POST",data).then(res=>{
+						console.log(res[0]);
+						// this.activeList=[...this.activeList,...res[0]]
+						this.activeList=res[0]
+					})
+			},
+		},
+		onShow() {
+			this.getData()
 		}
 	}
 </script>

pages/activityPage/activityPage.vue

@@ -3,28 +3,28 @@
 		<statusBar :item="navBarData"></statusBar>
 		<viewX-Case class="mid">
 			<template #title>
-				<view class="title three-font">直播活动</view>
+				<view class="title three-font" >直播活动</view>
 			</template>
 			<template #lookMore>
-				<view class="lookMore fz-font"> 查看更多 </view>
+				<view class="lookMore fz-font" @click="gotoLiveList">查看更多</view>
 			</template>
 			<template #activeBlock>
 				<view class="activeData" v-for="(item, index) in liveList" :key="index" @click="gotoAnnoun(index)">
 					<!-- <image src="http://43.139.158.220:5007/img/static/activity/bg1.png" mode="aspectFill"></image> -->
-					<image :src="liveList[index].img" mode="aspectFill"></image>
+					<image :src="item.pic" mode="aspectFill"></image>
 
 					<view class="liveBroadcast">
 						<view class="title">
 							<view class="tag bqZ-font">类型</view>
-							<text three-font>{{ item.className }}</text>
+							<text three-font>{{ item.acName }}</text>
 						</view>
 
 						<view class="operate">
 							<view class="left">
 								<view class="img">
-									<image :src="liveList[index].imgName" mode="aspectFill"></image>
+									<image :src="item.avatar" mode="aspectFill"></image>
 								</view>
-								<view class="user fwb-font">{{ item.name }}</view>
+								<view class="user fwb-font">{{ item.username }}</view>
 							</view>
 							<view class="collection">
 								<!-- <view class="" style="display: flex;margin-right: 10rpx;align-items: center;"> -->
@@ -73,67 +73,17 @@
 					btn: 1,
 				},
 				title: "uni-fab",
-				liveList: [{
-						img: "http://43.139.158.220:5007/img/static/yym/83b48be81d4ed9c93908737496f2a54.png",
-						className: "丽湖职教双创教育国际虚拟教研室 • 常规教研活动 第9期",
-						imgName: "http://43.139.158.220:5007/img/static/activity/Name1.png",
-						name: "李芳",
-					},
-					{
-						img: "http://43.139.158.220:5007/img/static/img/1695656271245-image.png",
-						className: "丽湖职教双创教育国际虚拟教研室启动大会暨双创教育国际论坛圆满举行",
-						imgName: "http://43.139.158.220:5007/img/static/activity/Name3.png",
-						name: "郑秀",
-					},
-					{
-						img: "http://43.139.158.220:5007/img/static/img/img3.png",
-						className: "产教融合情境下的双创通识课程建设 | 丽湖职教双创教育国际虚拟教研室常规教研活动第2期顺利举行",
-						imgName: "http://43.139.158.220:5007/img/static/activity/Name3.png",
-						name: "杨哲旗",
-					},
-					{
-						img: "http://43.139.158.220:5007/img/static/img/img4.png",
-						className: "打造双创“金课” | 丽湖职教双创教育国际虚拟教研室常规教研活动第1期顺利举行",
-						imgName: "http://43.139.158.220:5007/img/static/activity/Name2.png",
-						name: "杨广",
-					},
-				],
-				activeList: [
-					// {
-					// 	pic: "http://43.139.158.220:5007/img/static/img/img1.png",
-					// 	pers: "17",
-					// 	cost: "188",
-					// 	acName: "丽湖职教双创教育国际虚拟教研室2023年常规教研活动安排",
-					// 	brief: "丽湖职教双创教育国际虚拟教研室为立足全国，辐射海外的国际化教研室，围绕创新创业教育的人才培养与课程建设开展深度研究。教研室以贯彻落实立德树人根本任务，通过加强跨专业、跨校、跨地域的教研交流，推动高校协同打造国际化的精品教学资",
-					// },
-					// {
-					// 	pic: "http://43.139.158.220:5007/img/static/img/img2.png",
-					// 	pers: "6",
-					// 	cost: "188",
-					// 	acName: "赛创融合、协同育人—高职院校双创大赛赛事组织| 丽湖职教双创教育国际虚拟教研室常规教研活动第3期顺利举",
-					// 	brief: " 为全面落实双创教育“以赛促教、以赛促学、以赛促创”，提升学校双创大赛的组织效果和参赛成绩，促进更多教育成果落地，实现赛创融合育人的目标，丽湖职教双创教育国际虚拟教研室于4月26日组织举办了第3期线上教研活动，活动主题为“赛",
-					// },
-					// {
-					// 	pic: "http://43.139.158.220:5007/img/static/img/img3.png",
-					// 	pers: "1",
-					// 	cost: "188",
-					// 	acName: "产教融合情境下的双创通识课程建设 | 丽湖职教双创教育国际虚拟教研室常规教研活动第2期顺利举行",
-					// 	brief: "【图片】为提升职业院校双创课程建设水平，促进双创课程的改革与发展，丽湖职教双创教育国际虚拟教研室于3月29日组织举办了以“产教融合情境下的双创通识课程建设”为主题的第2期线上教研活动，来自全国各职业院校的60多位教师参会。本",
-					// },
-					// {
-					// 	pic: "http://43.139.158.220:5007/img/static/img/img4.png",
-					// 	pers: "0",
-					// 	cost: "188",
-					// 	acName: "打造双创“金课” | 丽湖职教双创教育国际虚拟教研室常规教研活动第1期顺利举行",
-					// 	brief: "为推动高职院校双创课程建设，打造更多的双创精品课程和金课，丽湖职教双创教育国际虚拟教研室于2月22日组织举办了以“如何打造高职双创金课”为主题的第1期教研活动，来自全国各高职院校的80多位教师参会。本次活动由",
-					// },
-				],
+				// 直播活动列表
+				liveList: [],
+				// 教研活动列表
+				activeList: [],
 			};
 		},
 		methods: {
+			// 获取教研活动
 			getData(){
 				let data={
-					openid:uni.getStorageSync('oId')
+					openid:uni.getStorageSync('oId'),ty:1
 				}
 					this.$request('/selectActivity',"POST",data).then(res=>{
 						console.log(res[0]);
@@ -141,6 +91,17 @@
 						this.activeList=res[0]
 					})
 			},
+			// 获取直播活动
+			getData2(){
+				let data={
+					openid:uni.getStorageSync('oId'),ty:0
+				}
+					this.$request('/selectActivity',"POST",data).then(res=>{
+						console.log(res[0]);
+						// this.activeList=[...this.activeList,...res[0]]
+						this.liveList=res[0]
+					})
+			},
 			lookMore() {
 				const value = this.$store.state.user.openid;
 				if (value == '') {
@@ -153,6 +114,11 @@
 					});
 				}
 			},
+			gotoLiveList(){
+					uni.navigateTo({
+						url:'/pages/liveActivityList/liveActivityList'
+					})
+			},
 			fabClick() {
 				const value = this.$store.state.user.openid;
 				if (value == '') {
@@ -190,6 +156,7 @@
 		},
 		onShow() {
 			this.getData()
+			this.getData2()
 		}
 	};
 </script>

pages/liveActivityList/liveActivityList.vue

@@ -0,0 +1,48 @@
+<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"></teaching-case>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				navbarData: {
+					title: '直播活动',
+					btn: 1
+				},
+				teaData: {
+					btn: 1
+				},
+				activeList: [],
+			};
+		},
+		methods:{
+			// 获取教研活动
+			getData(){
+				let data={
+					openid:uni.getStorageSync('oId'),ty:0
+				}
+					this.$request('/selectActivity',"POST",data).then(res=>{
+						console.log(res[0]);
+						// this.activeList=[...this.activeList,...res[0]]
+						this.activeList=res[0]
+					})
+			},
+		},
+		onShow() {
+			this.getData()
+		}
+	}
+</script>
+
+<style lang="scss">
+	.activityList {}
+</style>

pages/login/login.vue

@@ -52,10 +52,7 @@
 				} = e.detail
 				this.avatarUrl = avatarUrl
 
-				// //对临时图片链接进行base64编码
-				// var avatarUrl_base64 = 'data:image/jpeg;base64,' + wx.getFileSystemManager().readFileSync(this.avatarUrl,
-				// 	'base64')
-				// console.log(avatarUrl_base64);
+				
 				let openid=uni.getStorageSync('oId')
 				const uploadTask = uni.uploadFile({
 					url: 'http://localhost:3001/img', // post请求地址
@@ -116,7 +113,8 @@
 						console.log('还未注册过，开始注册');
 						this.$request('/login', 'POST', {
 							openid:oId,
-							Nme:'默认名称'
+							Nme:'默认名称', 
+							avatar:'http://43.139.158.220:5007/img/static/mine/Avatar_default.png'
 						}).then(res => {
 							console.log(res,11111);
 							uni.setStorageSync('token',res.token)

pages/mine/mine.vue

@@ -4,7 +4,9 @@
 		<view class="mineBox">
 			<view class="userInformation" @click="gotoMineEdit">
 				<view class="userAvatar">
-					<image :src="isManage!=='' ? userAvatar : 'http://43.139.158.220:5007/img/static/mine/Avatar_default.png'" mode="aspectFill"></image>
+					<image
+						:src="isManage!=='' ? userAvatar : 'http://43.139.158.220:5007/img/static/mine/Avatar_default.png'"
+						mode="aspectFill"></image>
 				</view>
 				<view class="userInfo">
 					<view class="infoTextone">
@@ -21,45 +23,53 @@
 					<view class="optionItem" @click="goToSub(1)">
 						<view class="option_left">
 							<span class="option_icon">
-								<image src="http://43.139.158.220:5007/img/static/mine/Subscribe.png" mode="aspectFill"></image>
+								<image src="http://43.139.158.220:5007/img/static/mine/Subscribe.png" mode="aspectFill">
+								</image>
 							</span>
 							<text class="option_text fwb-font">我的订阅</text>
 						</view>
 						<view class="option_right">
-							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill"></image>
+							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill">
+							</image>
 						</view>
 					</view>
 					<view class="optionItem" @click="gotoMineCollect">
 						<view class="option_left">
 							<span class="option_icon">
-								<image src="http://43.139.158.220:5007/img/static/mine/Collect.png" mode="aspectFill"></image>
+								<image src="http://43.139.158.220:5007/img/static/mine/Collect.png" mode="aspectFill">
+								</image>
 							</span>
 							<text class="option_text fwb-font">我的收藏</text>
 						</view>
 						<view class="option_right">
-							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill"></image>
+							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill">
+							</image>
 						</view>
 					</view>
 					<view class="optionItem" @click="gotoMineActive">
 						<view class="option_left">
 							<span class="option_icon">
-								<image src="http://43.139.158.220:5007/img/static/mine/active.png" mode="aspectFill"></image>
+								<image src="http://43.139.158.220:5007/img/static/mine/active.png" mode="aspectFill">
+								</image>
 							</span>
 							<text class="option_text fwb-font">我的活动</text>
 						</view>
 						<view class="option_right">
-							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill"></image>
+							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill">
+							</image>
 						</view>
 					</view>
 					<view class="optionItem" @click="gotoMineClass">
 						<view class="option_left">
 							<span class="option_icon">
-								<image src="http://43.139.158.220:5007/img/static/mine/myClass.png" mode="aspectFill"></image>
+								<image src="http://43.139.158.220:5007/img/static/mine/myClass.png" mode="aspectFill">
+								</image>
 							</span>
 							<text class="option_text fwb-font">我的教研室</text>
 						</view>
 						<view class="option_right">
-							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill"></image>
+							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill">
+							</image>
 						</view>
 					</view>
 				</view>
@@ -67,25 +77,30 @@
 					<view class="optionItem">
 						<view class="option_left">
 							<span class="option_icon">
-								<image src="http://43.139.158.220:5007/img/static/mine/help.png" mode="aspectFill"></image>
+								<image src="http://43.139.158.220:5007/img/static/mine/help.png" mode="aspectFill">
+								</image>
 							</span>
 							<text class="option_text fwb-font">反馈帮助</text>
 						</view>
 						<view class="option_right">
-							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill"></image>
+							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill">
+							</image>
 						</view>
 					</view>
 					<view class="optionItem" @click="gotoMineEdit">
 						<view class="option_left">
 							<span class="option_icon">
-								<image src="http://43.139.158.220:5007/img/static/mine/setting.png" mode="aspectFill"></image>
+								<image src="http://43.139.158.220:5007/img/static/mine/setting.png" mode="aspectFill">
+								</image>
 							</span>
 							<text class="option_text fwb-font">我的设置</text>
 						</view>
 						<view class="option_right">
-							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill"></image>
+							<image src="http://43.139.158.220:5007/img/static/mine/arrow-right.png" mode="aspectFill">
+							</image>
 						</view>
 					</view>
+					<!-- <beUpload @getFile="getFile" :navName="'上传文件'" :accept="accept" :progress="progress">111</beUpload> -->
 				</view>
 			</view>
 		</view>
@@ -93,179 +108,201 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			navBarData: {
-				title: '我的',
-				btn: 0
-			},
-			username: '刘雨潼',
-			userAvatar: 'http://43.139.158.220:5007/img/static/mine/Avatar.png',
-			isManage: ''
-		};
-	},
-	methods: {
-		goToSub(i) {
-			uni.navigateTo({
-				url: '/pages/mineSubscribe/mineSubscribe'
-			});
-		},
-		
-		gotoMineClass(){
-			uni.navigateTo({
-				url:'/pages/mineClass/mineClass'
-			})
-		},
-		gotoMineCollect(){
-			uni.navigateTo({
-				url:'/pages/mineCollect/mineCollect'
-			})
-		},
-		gotoMineEdit(){
-			uni.navigateTo({
-				url:'/pages/mineEdit/mineEdit'
-			})
+	export default {
+		data() {
+			return {
+				accept: "*",
+				progress: {
+					value: 50,
+					show: false,
+				},
+				navBarData: {
+					title: '我的',
+					btn: 0
+				},
+				username: '刘雨潼',
+				userAvatar: 'http://43.139.158.220:5007/img/static/mine/Avatar.png',
+				isManage: ''
+			};
 		},
-		gotoMineEdit(){
-			uni.navigateTo({
-				url:'/pages/mineEdit/mineEdit'
-			})
+		methods: {
+			getFile(val) {
+				// console.log(val);
+				
+				this.ajax
+					.post("https://cxcy.ssti.net.cn/api/UploadFirmFile", {
+						uid: this.$store.state.userInfo.userid,
+						file: JSON.stringify(val),
+					})
+					.then((res) => {
+						if (res.data == 1) {
+							this.$message.success("上传成功");
+						} else {
+							this.$message.error("上传失败");
+						}
+						this.getData();
+					});
+			},
+			goToSub(i) {
+				uni.navigateTo({
+					url: '/pages/mineSubscribe/mineSubscribe'
+				});
+			},
+
+			gotoMineClass() {
+				uni.navigateTo({
+					url: '/pages/mineClass/mineClass'
+				})
+			},
+			gotoMineCollect() {
+				uni.navigateTo({
+					url: '/pages/mineCollect/mineCollect'
+				})
+			},
+			gotoMineEdit() {
+				uni.navigateTo({
+					url: '/pages/mineEdit/mineEdit'
+				})
+			},
+			gotoMineEdit() {
+				uni.navigateTo({
+					url: '/pages/mineEdit/mineEdit'
+				})
+			},
+			gotoMineActive() {
+				uni.navigateTo({
+					url: '/pages/mineActive/mineActive'
+				})
+			}
 		},
-		gotoMineActive(){
-			uni.navigateTo({
-				url:'/pages/mineActive/mineActive'
-			})
+		onShow() {
+			console.log(this.$store.state.user.openid, 11111);
+			this.isManage = this.$store.state.user.openid;
+			console.log(this.isManage == "");
 		}
-	},
-	onShow() {
-		console.log(this.$store.state.user.openid,11111);
-		this.isManage =this.$store.state.user.openid;
-		console.log(this.isManage=="");
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-.mineBox {
-	width: 100%;
-
-	// 头像信息
-	.userInformation {
+	.mineBox {
 		width: 100%;
-		height: 100px;
-		padding: 0 18px;
-		background-color: white;
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
 
-		.userAvatar {
-			flex: 1;
-			// height: 80%;
-			
+		// 头像信息
+		.userInformation {
+			width: 100%;
+			height: 100px;
+			padding: 0 18px;
+			background-color: white;
 			display: flex;
+			justify-content: flex-start;
 			align-items: center;
 
-			image {
-				width: 128rpx;
-				height: 128rpx;
-			}
-		}
-
-		.userInfo {
-			margin-left: 10px;
-			flex: 4;
-			height: 80%;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-evenly;
+			.userAvatar {
+				flex: 1;
+				// height: 80%;
 
-			.infoTextone {
 				display: flex;
 				align-items: center;
 
-				span {
-					&:first-child {
-						color: #000;
-						// font-size: 40rpx;
-						font-weight: 600;
-					}
+				image {
+					width: 128rpx;
+					height: 128rpx;
+				}
+			}
 
-					&.manage {
-						border: 1px #ffa338 solid;
-						// font-size: 11px;
-						display: flex;
-						white-space: nowrap;
-						justify-content: center;
-						align-items: center;
-						padding: 2px 4px;
-						border-radius: 3px;
-						margin-right: 10rpx;
-						color: #ffa338;
-						margin-left: 5px;
+			.userInfo {
+				margin-left: 10px;
+				flex: 4;
+				height: 80%;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-evenly;
+
+				.infoTextone {
+					display: flex;
+					align-items: center;
+
+					span {
+						&:first-child {
+							color: #000;
+							// font-size: 40rpx;
+							font-weight: 600;
+						}
+
+						&.manage {
+							border: 1px #ffa338 solid;
+							// font-size: 11px;
+							display: flex;
+							white-space: nowrap;
+							justify-content: center;
+							align-items: center;
+							padding: 2px 4px;
+							border-radius: 3px;
+							margin-right: 10rpx;
+							color: #ffa338;
+							margin-left: 5px;
+						}
 					}
 				}
-			}
 
-			.infoTexttwo {
-				span {
-					color: rgb(153, 153, 153);
-					// font-size: 26rpx;
+				.infoTexttwo {
+					span {
+						color: rgb(153, 153, 153);
+						// font-size: 26rpx;
+					}
 				}
 			}
 		}
-	}
-
-	// 个人资料选项
-	.userOptionsBox {
-		width: 100%;
-		margin-top: 10px;
 
-		.optionsItemBox {
-			background-color: #fff;
+		// 个人资料选项
+		.userOptionsBox {
 			width: 100%;
-			margin-bottom: 10px;
-			padding: 5px 23px;
+			margin-top: 10px;
 
-			.optionItem {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				height: 81rpx;
-				// font-size: 28rpx;
+			.optionsItemBox {
+				background-color: #fff;
+				width: 100%;
+				margin-bottom: 10px;
+				padding: 5px 23px;
 
-				.option_left {
+				.optionItem {
 					display: flex;
+					justify-content: space-between;
 					align-items: center;
-					height: 40rpx;
+					height: 81rpx;
+					// font-size: 28rpx;
 
-					.option_icon {
-						height: 100%;
-						width: 40rpx;
+					.option_left {
+						display: flex;
+						align-items: center;
+						height: 40rpx;
 
-						image {
-							width: 100%;
+						.option_icon {
 							height: 100%;
+							width: 40rpx;
+
+							image {
+								width: 100%;
+								height: 100%;
+							}
 						}
-					}
 
-					.option_text {
-						margin-left: 10px;
-						color:rgba(0, 0, 0, 0.8);
+						.option_text {
+							margin-left: 10px;
+							color: rgba(0, 0, 0, 0.8);
+						}
 					}
-				}
 
-				.option_right {
-					height: 40rpx;
+					.option_right {
+						height: 40rpx;
 
-					image {
-						height: 34rpx;
-						width: 30rpx;
+						image {
+							height: 34rpx;
+							width: 30rpx;
+						}
 					}
 				}
 			}
 		}
 	}
-}
-</style>
+</style>

pages/publish/publish.vue

@@ -46,6 +46,34 @@
 				</view>
 			</view>
 
+
+			<view class="userOptionsBox">
+				<view class="optionsItemBox">
+					<picker mode="selector" :range="classifyList" @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">{{classify}}</view>
+									</view>
+									<view class="arrow">
+										<image src="../../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="recruitmentList" @change="handelRecruitment">
@@ -228,23 +256,28 @@
 				pic: '../../static/publish/photo.png',
 				imageValue: '',
 
+				// 分类
+				classifyList: ['直播活动', '教研活动'],
+				classify: '请选择',
+
 				// 人数
 				recruitmentList: Array.from({
 					length: 100
 				}, (_, index) => index + 1), //100人
-				recruitment: '无',
+				recruitment: '请选择',
+				
 				// 活动形式
 				activityformList: ['户外活动', 'xxxx', 'xxxx'],
-				activityform: '无',
+				activityform: '请选择',
 
 				// 活动地址
 				addressList: ['深圳xxxx大学', '深圳xxxx大学', '深圳xxxx大学'],
-				address: '无',
+				address: '请选择',
 				// 活动费用
 				fundsList: Array.from({
 					length: 30
 				}, (_, index) => (index + 1) * 100).map(item => item),
-				funds: '无',
+				funds: '请选择',
 
 
 				activityDate: currentDate,
@@ -261,51 +294,18 @@
 			}
 		},
 		methods: {
-			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) {
-								// console.log(res.data);
-								that.imageValue = res.data
-								// let url = JSON.parse(res.data)
-								// console.log(url.data);
-							},
-							fail: function(uploadFileFail) {
-								console.log('Error:', uploadFileFail.data);
-							},
-							complete: () => {
-								// 接口调用结束的回调函数（调用成功、失败都会执行）
-								// console.log('Complete:');
-							}
-						});
-					}
-				});
 
-			},
 
 			submitForm() {
 				if (
 					this.activitytitle.trim() === '' ||
 					this.activityintro.trim() === '' ||
 					this.imageValue == '' ||
-					this.recruitment.value === '无' ||
-					this.activityform.trim() === '无' ||
-					this.address.trim() === '无' ||
-					this.funds === '无'
+					this.classify == '请选择' ||
+					this.recruitment.value === '请选择' ||
+					this.activityform.trim() === '请选择' ||
+					this.address.trim() === '请选择' ||
+					this.funds === '请选择'
 				) {
 					// 弹出弹框或其他处理逻辑
 					uni.showToast({
@@ -314,12 +314,14 @@
 					});
 					return;
 				}
+				this.classify=this.classify=="直播活动"?0:1
 				// 将文本框内容和图片链接存储在一个对象中
 				const formData = {
 					id: this.$store.state.user.openid,
 					activitytitle: this.activitytitle,
 					activityintro: this.activityintro,
 					img: this.imageValue,
+					classify:this.classify,
 					recruitment: this.recruitment,
 					activityform: this.activityform,
 					address: this.address,
@@ -329,20 +331,24 @@
 					// price: "188",
 					// count: "6",
 				};
-				console.log(formData);
+				// return console.log(formData);
 
 
 				this.$request('/insertActive', 'POST', formData).then(res => {
 					console.log(res.data);
-					if(res.code==200){
+					if (res.code == 200) {
 						uni.switchTab({
-							url:"/pages/activityPage/activityPage"
+							url: "/pages/activityPage/activityPage"
 						})
 					}
-					
+
 				})
 
 			},
+			handelclassify(e) {
+				this.classify = this.classifyList[e.detail.value]
+				console.log(this.classify);
+			},
 			handelRecruitment(e) {
 				this.recruitment = this.recruitmentList[e.detail.value]
 				console.log(this.imageValue);
@@ -377,6 +383,44 @@
 				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请求地址
+							// url: 'https://cxcy.ssti.net.cn/api/UploadFirmFile', // post请求地址
+							filePath: tempFilePaths,
+							filePath: tempFilePaths,
+							name: 'file', // 待确认
+							header: {
+								// 不要写这个不然报错
+								// 'Content-Type': 'multipart/form-data',
+							},
+							success: function(res) {
+								// console.log(res.data);
+								that.imageValue = res.data
+								// let url = JSON.parse(res.data)
+								// console.log(url.data);
+							},
+							fail: function(uploadFileFail) {
+								console.log('Error:', uploadFileFail.data);
+							},
+							complete: () => {
+								// 接口调用结束的回调函数（调用成功、失败都会执行）
+								// console.log('Complete:');
+							}
+						});
+					}
+				});
+			
+			},
 		},
 	}
 </script>

pages/teachingList/teachingList.vue

@@ -3,7 +3,7 @@
 		<statusBar :item="navbarBata"></statusBar>
 		<!-- <teaching-case></teaching-case> -->
 		<view class="" style="padding-bottom: 50rpx;">
-			<teaching-case v-for="(item,index) in classList" :key="index" :classList='item' :indexId="index"></teaching-case>
+			<teaching-case :classList='classList'></teaching-case>
 		</view>
 
 	</view>
@@ -14,7 +14,7 @@
 		data() {
 			return {
 				navbarBata: {
-					title: '推荐课程列表',
+					title: '推荐课程',
 					btn: 1
 				},
 				classList: [

tool/Date.js

@@ -0,0 +1,49 @@
+function getNowDate(type=0) {
+    let date = new Date();
+    let year = date.getFullYear(); //年
+    let month = date.getMonth() + 1; //月
+    let day = date.getDate(); //日
+    let hour = date.getHours(); //时
+    let minutes = date.getMinutes(); //分
+    let seconds = date.getSeconds(); //秒
+    if (month > 1 && month <= 9) month = "0" + month;
+    if (day > 0 && day <= 9) day = "0" + day;
+    if (hour > 0 && hour < 9) hour = "0" + hour;
+    if (minutes > 0 && minutes <= 9) minutes = "0" + minutes;
+    if (seconds > 0 && seconds < 9) seconds = "0" + seconds;
+    if(type==0){
+      return `${year}-${month}-${day} ${hour}:${minutes}:${seconds}`;
+    }else if(type==1){
+      return `${year}年${month}月${day}日`;
+    }
+    
+}
+
+//比较两时间之差
+function DifferDate(Date1, Date2) {
+    if (typeof(Date1) == "string") Date1 = Date.parse(Date1);
+    if (typeof(Date2) == "string") Date2 = Date.parse(Date2);
+    return Math.floor((Date1 - Date2) / (24 * 3600 * 1000));
+}
+
+function GetTime(data){
+    let cdata = JSON.parse(data);
+    if(cdata[0]==cdata[1])return cdata[0];
+    let sp1 = cdata[0].split('-')
+    let sp2  =cdata[1].split('-')
+    if(sp1[0]==sp2[0]){
+      if(sp1[1]==sp2[1]){
+        return `${sp1[0]}-${sp1[1]}-${sp1[2]} 至 ${sp2[2]}`
+      }else{
+        return `${sp1[0]}-${sp1[1]}-${sp1[2]} 至 ${sp2[1]}-${sp2[2]}`
+      }           
+    }else{
+      return cdata[0]+" 至 "+cdata[1]
+    }
+}
+
+export {
+    getNowDate,
+    DifferDate,
+    GetTime,
+}