调整接口

build/utils.js

@@ -47,6 +47,7 @@ exports.cssLoaders = function (options) {
     if (options.extract) {
       return ExtractTextPlugin.extract({
         use: loaders,
+		publicPath:'../../',
         fallback: 'vue-style-loader'
       })
     } else {

build/webpack.dev.conf.js

@@ -60,7 +60,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     // copy custom static assets
     new CopyWebpackPlugin([
       {
-        from: path.resolve(__dirname, '../static'),
+        from: path.resolve(__dirname, '../static/img'),
         to: config.dev.assetsSubDirectory,
         ignore: ['.*']
       }

build/webpack.prod.conf.js

@@ -111,7 +111,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     // copy custom static assets
     new CopyWebpackPlugin([
       {
-        from: path.resolve(__dirname, '../static'),
+        from: path.resolve(__dirname, '../static/img'),
         to: config.build.assetsSubDirectory,
         ignore: ['.*']
       }

config/index.js

@@ -43,7 +43,7 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    assetsPublicPath: './',
 
     /**
      * Source Maps

package-lock.json

@@ -11658,9 +11658,9 @@
       "integrity": "sha1-UkKUktY8YuuYmATBFVLj0i53kwM=",
       "dev": true
     },
-    "node_modules/static-extend": {
+    "node_modules../../static/img-extend": {
       "version": "0.1.2",
-      "resolved": "https://registry.nlark.com/static-extend/download/static-extend-0.1.2.tgz",
+      "resolved": "https://registry.nlark.com../../static/img-extend/download../../static/img-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "dependencies": {
@@ -11671,7 +11671,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/define-property": {
+    "node_modules../../static/img-extend/node_modules/define-property": {
       "version": "0.2.5",
       "resolved": "https://registry.nlark.com/define-property/download/define-property-0.2.5.tgz",
       "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
@@ -11683,7 +11683,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor": {
+    "node_modules../../static/img-extend/node_modules/is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.nlark.com/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
@@ -11695,7 +11695,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+    "node_modules../../static/img-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
@@ -11707,7 +11707,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-data-descriptor": {
+    "node_modules../../static/img-extend/node_modules/is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.nlark.com/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
@@ -11719,7 +11719,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
+    "node_modules../../static/img-extend/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
       "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
@@ -11731,7 +11731,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-descriptor": {
+    "node_modules../../static/img-extend/node_modules/is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.nlark.com/is-descriptor/download/is-descriptor-0.1.6.tgz",
       "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
@@ -11745,7 +11745,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/kind-of": {
+    "node_modules../../static/img-extend/node_modules/kind-of": {
       "version": "5.1.0",
       "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz",
       "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
@@ -23807,7 +23807,7 @@
     },
     "static-extend": {
       "version": "0.1.2",
-      "resolved": "https://registry.nlark.com/static-extend/download/static-extend-0.1.2.tgz",
+      "resolved": "https://registry.nlark.com../../static/img-extend/download../../static/img-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
       "requires": {

src/assets/css/electron.css

@@ -35,7 +35,7 @@ img {
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	background: url(/static/home/logo-bottom.png) no-repeat;
+	background: url(/static/img/home/logo-bottom.png) no-repeat;
 	background-size: 100% 100%;
 	width: 177px;
 	height: 162px;
@@ -71,12 +71,12 @@ img {
 }
 .activeTitle {
 	color: #FFFFFF;
-	background: url(/static/home/title-bottom-01.png) no-repeat;
+	background: url(/static/img/home/title-bottom-01.png) no-repeat;
 	background-size: 100% 100%;
 }
 .activeTitle2 {
 	color: #FFFFFF;
-	background: url(/static/home/title-bottom-02.png) no-repeat;
+	background: url(/static/img/home/title-bottom-02.png) no-repeat;
 	background-size: 100% 100%;
 }
 /* 天气 */
@@ -116,7 +116,7 @@ img {
 .left-one {
 	position: relative;
 	margin-bottom: 20px;
-	background: url(/static/home/left-kuang.png) no-repeat;
+	background: url(/static/img/home/left-kuang.png) no-repeat;
 	background-size: 100% 100%;
 	width: 390px;
 	height: 296px;
@@ -181,7 +181,7 @@ img {
 }
 .center-title {color: #7557CC;font-size: 36px;text-align: center;line-height: 40px;padding-top: 40px;}
 .center-img-box {
-	background: url(/static/home/class-dongt.png) no-repeat;
+	background: url(/static/img/home/class-dongt.png) no-repeat;
 	background-size: 100% 100%;
 	width: 967px;
 	height: 900px;
@@ -199,7 +199,7 @@ img {
 	width: 390px;
 	height: 900px;
 	flex-shrink: 0;
-	background: url(/static/home/right-back.png) no-repeat;
+	background: url(/static/img/home/right-back.png) no-repeat;
 	background-size: 100% 100%;
 }
 .right-content {color: #7557CC;text-align: center;height: 90%; overflow: hidden;overflow-y: scroll;}
@@ -244,7 +244,7 @@ img {
 .class-left-one {
 	position: relative;
 	margin-bottom: 20px;
-	background: url(/static/attendancedetail/babyactive-left.png) no-repeat;
+	background: url(/static/img/attendancedetail/babyactive-left.png) no-repeat;
 	background-size: 100% 100%;
 	width: 464px;
 	height: 826px;
@@ -342,7 +342,7 @@ img {
 	position: relative;
 	display: inline-block;
 	width: 100%;
-	background: url(/static/attendancedetail/babyactive-right.png) no-repeat;
+	background: url(/static/img/attendancedetail/babyactive-right.png) no-repeat;
 	background-size: 100% 100%;
 	margin-left: 30px;
 	height: 826px;
@@ -372,6 +372,11 @@ img {
 	margin-top: 57px;
 	margin-bottom: 110px;
 	display: flex;
+	overflow: hidden;
+	overflow-y: scroll;
+}
+.babyalbum-box::-webkit-scrollbar,.attendance-box::-webkit-scrollbar{
+	display: none;
 }
 .attendance-left {
 	min-width: 230px;
@@ -392,7 +397,7 @@ img {
 .attendance-left-item-box {display: flex;align-items: center;font-size: 24px;color: #FFE68F;width: 100%;height: 76px;padding: 0 10px;}
 .attendance-active {background-color: #6348b0;}
 .attendance-left-item-box img{width: 20px;height: 20px;margin-right: 10px;}
-.attendance-right .attendance-right-item-box {
+.attendance-right-item-box {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
@@ -528,10 +533,10 @@ img {
 .notice-title div{font-size: 18px;color: #3F3F3F;font-weight: bold;}
 .noticeInfo-time {font-size: 14px;color: #959595;}
 /* 新闻动态 */
-.news-box {display: flex;border-bottom: 1px solid #D3D3D3;padding-bottom: 18px;margin-top: 18px;}
+.news-box {display: flex;border-bottom: 1px solid #D3D3D3;padding-bottom: 18px;margin-top: 18px;height: 194px;}
 .news-box:first-child {margin-top: 0px;}
 .news-img {width: 202px;height: auto;object-fit: cover;margin-right: 20px;flex-shrink: 0;}
-.news-right-box {display: flex;flex-direction: column;justify-content: space-between;}
+.news-right-box {display: flex;flex-direction: column;justify-content: space-between;width: 100%;}
 .news-content-box {display: flex;justify-content: space-between;align-items: flex-end;}
 .news-content-box .clips1 {font-size: 20px;font-weight: 800;color: #3F3F3F;margin-right: 30px;}
 .new-time-box {font-size: 14px;font-weight: 500;color: #959595;flex-shrink: 0;width: 170px;display: flex;justify-content: space-between;}
@@ -542,7 +547,7 @@ img {
 /* 教师风采 */
 .teacher-title {text-align: left;padding-right: 50px;}
 .teacher-content-box {border-top: 1px solid #D3D3D3;margin-top: 18px;padding-top: 23px;display: flex;}
-.teacher-img {width: 208px;height: 208px;border-radius: 100%;border: 5px solid #ECE6FF;flex-shrink: 0;margin-right: 58px;}
+.teacher-img {width: 208px;height: 208px;border-radius: 100%;border: 5px solid #ECE6FF;flex-shrink: 0;margin-right: 58px;object-fit: cover;}
 .teacher-right-box {font-size: 16px;color: #666666;line-height: 30px;}
 /* 宝宝相册详情 */
 .babyalbum-detail-box {

src/components/attendanceDetail.vue

@@ -15,7 +15,7 @@
 					<div :style="{background:['#9C7CFA','#FF9393','#D3D3D3','#F4B52F'][item.status]}">{{['正常','未到校','离校','请假'][item.status]}}</div>
 				</div>
 				<div v-if="isNothing" class="nothing-box">
-					<img src="/static/attendancedetail/-s-暂无.png">
+					<img src="../../static/img/attendancedetail/icon-nothing.png">
 					<div>{{['没有出勤','暂无离校','暂无未到校','没有请假'][navIndex]}}的宝宝</div>
 				</div>
 			</div>
@@ -28,21 +28,21 @@
 		data() {
 			return {
 				navArr:[
-					{icon:'/static/attendancedetail/icon-attendancedetail.png',title:'出勤详情',num:12},
-					{icon:'/static/attendancedetail/icon-lixiao.png',title:'离校情况',num:0},
-					{icon:'/static/attendancedetail/icon-weidao.png',title:'未到校宝宝',num:0},
-					{icon:'/static/attendancedetail/icon-qingj.png',title:'请假宝宝',num:0},
+					{icon:'../../static/img/attendancedetail/icon-attendancedetail.png',title:'出勤详情',num:12},
+					{icon:'../../static/img/attendancedetail/icon-lixiao.png',title:'离校情况',num:0},
+					{icon:'../../static/img/attendancedetail/icon-weidao.png',title:'未到校宝宝',num:0},
+					{icon:'../../static/img/attendancedetail/icon-qingj.png',title:'请假宝宝',num:0},
 				],
 				navIndex:0,
 				teatherArr:[
-					{teatherImg:'/static/seconds/tu-01.png',teatherName:'张跑跑',status:0},
-					{teatherImg:'/static/seconds/tu-01.png',teatherName:'张跑跑',status:1},
-					{teatherImg:'/static/seconds/tu-01.png',teatherName:'张跑跑',status:2},
-					{teatherImg:'/static/seconds/tu-01.png',teatherName:'张跑跑',status:3},
-					{teatherImg:'/static/seconds/tu-01.png',teatherName:'张跑跑',status:0},
-					{teatherImg:'/static/seconds/tu-01.png',teatherName:'张跑跑',status:0},
-					{teatherImg:'/static/seconds/tu-01.png',teatherName:'张跑跑',status:0},
-					{teatherImg:'/static/seconds/tu-01.png',teatherName:'张跑跑',status:0},
+					{teatherImg:'../../static/img/seconds/tu-01.png',teatherName:'张跑跑',status:0},
+					{teatherImg:'../../static/img/seconds/tu-01.png',teatherName:'张跑跑',status:1},
+					{teatherImg:'../../static/img/seconds/tu-01.png',teatherName:'张跑跑',status:2},
+					{teatherImg:'../../static/img/seconds/tu-01.png',teatherName:'张跑跑',status:3},
+					{teatherImg:'../../static/img/seconds/tu-01.png',teatherName:'张跑跑',status:0},
+					{teatherImg:'../../static/img/seconds/tu-01.png',teatherName:'张跑跑',status:0},
+					{teatherImg:'../../static/img/seconds/tu-01.png',teatherName:'张跑跑',status:0},
+					{teatherImg:'../../static/img/seconds/tu-01.png',teatherName:'张跑跑',status:0},
 				],
 				isNothing:false
 			}

src/components/babyActivity.vue

@@ -8,8 +8,8 @@
 				<div class="class-left-one">
 					<div class="baby-left-content">
 						<div class="class-left-title">
-							<img src="/static/home/flower.png" >
-							<img src="/static/home/flower.png" >
+							<img src="../../static/img/home/flower.png" >
+							<img src="../../static/img/home/flower.png" >
 							<div class="pultitle">班级情况</div>
 						</div>
 						<div class="baby-content-box">
@@ -92,11 +92,11 @@
 				weekNum:0,
 				dateTime:'2021年12月28日',
 				teatherArr:[
-					{name:'张芳芳',headImg:'/static/seconds/tu-01.png'},
-					{name:'张芳芳',headImg:'/static/seconds/tu-01.png'},
-					{name:'张芳芳',headImg:'/static/seconds/tu-01.png'},
-					{name:'张芳芳',headImg:'/static/seconds/tu-01.png'},
-					{name:'张芳芳',headImg:'/static/seconds/tu-01.png'},
+					{name:'张芳芳',headImg:'../../static/img/seconds/tu-01.png'},
+					{name:'张芳芳',headImg:'../../static/img/seconds/tu-01.png'},
+					{name:'张芳芳',headImg:'../../static/img/seconds/tu-01.png'},
+					{name:'张芳芳',headImg:'../../static/img/seconds/tu-01.png'},
+					{name:'张芳芳',headImg:'../../static/img/seconds/tu-01.png'},
 				],
 				kebiaoArr:['时间','星期一','星期二','星期三','星期四','星期五'],
 				dataArr:[],

src/components/babyAlbum.vue

@@ -3,16 +3,16 @@
 		<!-- 主体内容 -->
 		<div v-if="!showDetail" class="babyalbum-box">
 			<div v-if="isNothing" class="babyalbum-item-box" @click="goDetail(index)" v-for="(item,index) in babyArr" :key="index">
-				<img src="" alt="">
-				<span>{{item.babyName}}的相册</span>
-				<div :style="{background:'#9C7CFA'}">{{item.albumNum}}张图</div>
+				<img :src="item.Head_Img" alt="">
+				<span>{{item.StuName}}的相册</span>
+				<div :style="{background:'#9C7CFA'}">{{item.PhotoCount}}张图</div>
 			</div>
 			<div v-if="!isNothing" class="nothing-box">
-				<img src="/static/attendancedetail/-s-暂无.png">
+				<img src="../../static/img/attendancedetail/icon-nothing.png">
 				<div>暂无宝宝相册</div>
 			</div>
 		</div>
-		<babyAlbumDetail v-if="showDetail" @backBaby="backBaby"></babyAlbumDetail>
+		<babyAlbumDetail v-if="showDetail" :babyalbumList="babyalbumList" @backBaby="backBaby"></babyAlbumDetail>
 	</div>
 </template>
 <script>
@@ -26,16 +26,20 @@
 			return {
 				babyArr:[],
 				isNothing:true,
-				showDetail:false
+				showDetail:false,
+				babyalbumList:[]
 			}
 		},
 		methods: {
 			goDetail(e){
+				this.babyobj = this.babyArr[e];
 				this.showDetail = true;
+				this.babyphotodetailsEv(this.babyobj.UserGuid);
 			},
 			backBaby(e){
 				this.showDetail = e;
 			},
+			// 查询宝宝列表
 			async babyphotoEv() {
 				let data = await this.$axios({
 					// 调用 serviceAPI
@@ -50,6 +54,18 @@
 					this.isNothing = false;
 				}
 			},
+			// 查询宝宝详情
+			async babyphotodetailsEv(userGuid) {
+				let data = await this.$axios({
+					// 调用 serviceAPI
+					url: this.$https.babyphotodetails,
+					methods: "get",
+					params: {
+						StuGuid:userGuid
+					},
+				});
+				this.babyalbumList = data.data.data;
+			},
 		},
 		mounted() {
 			this.babyphotoEv();

src/components/babyAlbumDetail.vue

@@ -4,84 +4,39 @@
 		<div class="baby-detail-top">
 			<div class="baby-top-box">
 				<div>宝宝相册>宝宝详情</div>
-				<img src="/static/kindergartenIntroduce/icon-back.png" @click="backBaby">
+				<img src="../../static/img/kindergartenIntroduce/icon-back.png" @click="backBaby">
 			</div>
-			<div class="baby-name">龚柯源的相册</div>
+			<div class="baby-name">{{babyalbumList[0].StuName}}的相册</div>
 		</div>
 		<div class="baby-album-box">
-			<img src="/static/babyalbum/-s-选择1.png" class="swiper-button-prev">
+			<img src="../../static/img/babyalbum/choose-01.png" class="swiper-button-prev">
 			<div style="width: 80%;margin: 0 auto;">
 				<div class="swiper-container">
 					<div class="swiper-wrapper">
-						<div class="swiper-slide" style="display: flex;justify-content: center;">
-							<img src="/static/seconds/tu-01.png" style="width: 100%;object-fit: cover;">
-						</div>
-						<div class="swiper-slide" style="display: flex;justify-content: center;">
-							<img src="/static/seconds/tu-01.png" style="width: 100%;object-fit: cover;">
-						</div>
-						<div class="swiper-slide" style="display: flex;justify-content: center;">
-							<img src="/static/seconds/tu-01.png" style="width: 100%;object-fit: cover;">
-						</div>
-						<div class="swiper-slide" style="display: flex;justify-content: center;">
-							<img src="/static/seconds/tu-01.png" style="width: 100%;object-fit: cover;">
-						</div>
-						<div class="swiper-slide" style="display: flex;justify-content: center;">
-							<img src="/static/seconds/tu-01.png" style="width: 100%;object-fit: cover;">
+						<div class="swiper-slide" v-for="(item,index) in babyalbumList" :key="index" style="display: flex;justify-content: center;">
+							<img :src="item.Url" style="width: 100%;object-fit: cover">
 						</div>
 					</div>
 				</div>
 			</div>
-			<img src="/static/babyalbum/-s-选择2.png" class="swiper-button-next">
+			<img src="../../static/img/babyalbum/choose-02.png" class="swiper-button-next">
 		</div>
 	</div>
 </template>
 <script>
 	export default {
+		props:{
+			babyalbumList:{
+				type:Array,
+				default:()=>{
+					return []
+				}
+			}
+		},
 		name: 'babyActivity',
 		data() {
 			return {
-				babyArr: [{
-						babyImg: '',
-						babyName: '张跑跑',
-						albumNum: 0
-					},
-					{
-						babyImg: '',
-						babyName: '张跑跑',
-						albumNum: 0
-					},
-					{
-						babyImg: '',
-						babyName: '张跑跑',
-						albumNum: 0
-					},
-					{
-						babyImg: '',
-						babyName: '张跑跑',
-						albumNum: 0
-					},
-					{
-						babyImg: '',
-						babyName: '张跑跑',
-						albumNum: 0
-					},
-					{
-						babyImg: '',
-						babyName: '张跑跑',
-						albumNum: 0
-					},
-					{
-						babyImg: '',
-						babyName: '张跑跑',
-						albumNum: 0
-					},
-					{
-						babyImg: '',
-						babyName: '张跑跑',
-						albumNum: 0
-					},
-				],
-				isNothing: false
+				
 			}
 		},
 		methods: {
@@ -91,30 +46,60 @@
 			}
 		},
 		mounted() {
+			setTimeout(()=>{
+				var swiper = require('../utils/swiper-bundle.min.js');
+				// new Swiper('.swiper-container', {
+				// 	watchSlidesProgress: true,
+				// 	loop: true,
+				// 	slidesPerView: 3, //'auto'
+				// 	centeredSlides: true,
+				// 	centeredSlidesBounds: true,
+				// 	// 如果需要前进后退按钮
+				// 	nextButton: '.swiper-button-next',
+				// 	prevButton: '.swiper-button-prev',
+				// 	// 如果需要自动切换海报
+				// 	autoplay: false,
+				// })
 				new Swiper('.swiper-container', {
-				watchSlidesProgress: true,
-				loop: true,
-				slidesPerView: 3, //'auto'
+				     paginationClicsable: true,
+				    effect: 'coverflow',
 				    centeredSlides: true,
-				centeredSlidesBounds: true,
-				// 如果需要前进后退按钮
-				nextButton: '.swiper-button-next',
-				prevButton: '.swiper-button-prev',
-				// 如果需要自动切换海报
-				autoplay: false,
-			})
+				    spaceBetween: '0%',
+				    slidesPerView: 2,
+				    loop: true,
+				    // autoplay: {
+				    //     disableOnInteraction: false,
+				    // },
+					navigation: {
+						nextEl: '.swiper-button-next',
+						prevEl: '.swiper-button-prev',
+					},
+				    coverflowEffect: {
+				        rotate: 0, //slide做3d旋转时Y轴的旋转角度
+				        stretch: 220, //每个slide之间的拉伸值，越大slide靠得越紧。5.3.6 后可使用%百分比
+				        depth: 200, //slide的位置深度。值越大z轴距离越远，看起来越小。
+				        modifier: 1, //depth和rotate和stretch的倍率，相当于depth*modifier、rotate*modifier、stretch*modifier，值越大这三个参数的效果越明显。
+				        slideShadows: false,
+				    },
+				    on: {
+				        transitionEnd: function () {
+				            this.activeIndex
+				        }
+				    }
+				});
+			},100)
 		}
 	}
 </script>
 <style>
+	@import url("../assets/css/swiper-bundle.min.css");
+	/* .swiper-slide {
+		transform: scale(1.2)!important;
+	} */
 	.swiper-slide {
 		width: 690px;
 		height: 515px;
-		z-index: 10;
-		transform: scale(.8);
-	}
-	.swiper-slide-active {
-		transform: scale(1);
-		z-index: 60;
+		background-color: #F5F5F5;
+		box-shadow: 10px 10px 10px 10px rgba(134, 105, 220, 0.2);
 	}
 </style>

src/components/header.vue

@@ -5,7 +5,7 @@
 			<!-- logo -->
 			<div class="logo-box">
 				<div class="logo">
-					<img src="/static/home/logo.png">
+					<img src="../../static/img/home/logo.png">
 					<div>都江堰市机关幼儿园</div>
 				</div>
 			</div>
@@ -27,7 +27,7 @@
 				</div>
 			</div>
 			<!-- 功能图标 -->
-			<div><img @click="clickFun" src="/static/home/icon-set.png"></div>
+			<div><img @click="clickFun" src="../../static/img/home/icon-set.png"></div>
 		</div>
 		<!-- 头部导航 end -->
 		
@@ -50,17 +50,17 @@
 		
 		<!-- 底部 -->
 		<div class="footer">
-			<img src="/static/home/foot-icon.png">
-			<img v-if="activeIndex==1" src="/static/kindergartenIntroduce/chahua-01.png" >
-			<img v-if="activeIndex==2" src="/static/home/baby-foot.png">
-			<img v-if="activeIndex==3" src="/static/attendancedetail/-s-插画.png">
-			<img v-if="activeIndex==4 || activeIndex==5" src="/static/babyalbum/-s-插画.png">
+			<img src="../../static/img/home/foot-icon.png">
+			<img v-if="activeIndex==1" src="../../static/img/kindergartenIntroduce/chahua-01.png" >
+			<img v-if="activeIndex==2" src="../../static/img/home/baby-foot.png">
+			<img v-if="activeIndex==3" src="../../static/img/attendancedetail/chah.png">
+			<img v-if="activeIndex==4 || activeIndex==5" src="../../static/img/babyalbum/chah.png">
 		</div>
 		<!-- 网络弹框 -->
 		<div v-if="isNetwork" class="popu-box">
 			<div class="item-row">班排设备ID：*******</div>
 			<div class="item-row">网络链接状态：网络监测（{{onLine?'已连接':'已断开'}}）<img v-if="onLine"
-					src="/static/home/icon-link.png" style="width: 20px;"></div>
+					src="../../static/img/home/icon-link.png" style="width: 20px;"></div>
 			<div class="item-row">
 				<span style="flex-shrink: 0;">班牌显示模式：</span>
 				<div class="mode-box">
@@ -238,7 +238,7 @@
 			},
 		},
 		mounted() {
-			this.weather = `/static/2.png`;
+			this.weather = `/static/img/weather/2.png`;
 			this.weatherEv();
 			window.addEventListener('online', this.updateOnlineStatus); //网络由异常到正常时触发
 			window.addEventListener('offline', this.updateOnlineStatus); //网络由正常到异常时触发

src/components/homepage.vue

@@ -69,7 +69,7 @@
 						</div>
 						<div class="notice-time">
 							<div>2021-11-15</div>
-							<div><img src="/static/home/slices.png" />15</div>
+							<div><img src="../../static/img/home/slices.png" />15</div>
 						</div>
 					</div>
 				</div>
@@ -80,13 +80,13 @@
 				<div class="center-img-box">
 					<div class="center-title">班级动态</div>
 					<div class="img-box">
-						<img src="/static/seconds/tu-01.png" style="object-fit: cover" />
+						<img src="../../static/img/seconds/tu-01.png" style="object-fit: cover" />
 					</div>
 				</div>
 				<!-- 提醒 -->
 				<div class="remind-box">
 					<div class="msg-box">
-						<img src="/static/home/icon-notice.png" />
+						<img src="../../static/img/home/icon-notice.png" />
 						<div>{{ noticeData }}</div>
 					</div>
 					<div class="msg-box">
@@ -214,69 +214,69 @@
 			this.schedulingWeb();
 			this.babyBirthday()
 			this.dynamicPicture()
-			// // 引用mobile-detect文件
-			// var MobileDetect = require('../utils/mobile-detect.js');
-			// console.log(navigator.language, '当前系统语言');
-			// // 判断是不是手机
-			// if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
-			// 	// this.is_telephone = "是";
-			// 	console.log("是手机");
-			// } else {
-			// 	// this.is_telephone = "不是";
-			// 	console.log("不是手机");
-			// }
-			// // 检测是浏览器端还是微信端
-			// let ua = navigator.userAgent.toLowerCase();
-			// // 微信端
-			// if (String(ua.match(/MicroMessenger/i)) === 'micromessenger') {
-			// 	console.log('是微信');
-			// 	// this.isWechat = true        
-			// } else {
-			// 	// this.isWechat = false
-			// 	console.log('不是微信');
-			// }
-			// var md = new MobileDetect(navigator.userAgent);
-			// // 品牌
-			// console.log(md.mobile(), '手机品牌');
-			// // 操作系统
-			// console.log(md.os(), '操作系统');
-			// var device_type = navigator.userAgent; //获取userAgent信息
-			// var networkStr = device_type.match(/NetType\/\w+/) ? device_type.match(/NetType\/\w+/)[0] : 'NetType/other';
-			// networkStr = networkStr.toLowerCase().replace('nettype/', '');
-			// var networkType;
-			// switch (networkStr) {
-			// 	case 'wifi':
-			// 		networkType = 'wifi';
-			// 		break;
-			// 	case '4g':
-			// 		networkType = '4g';
-			// 		break;
-			// 	case '3g':
-			// 		networkType = '3g';
-			// 		break;
-			// 	case '3gnet':
-			// 		networkType = '3g';
-			// 		break;
-			// 	case '2g':
-			// 		networkType = '2g';
-			// 		break;
-			// 	default:
-			// 		networkType = 'other';
-			// }
-			// // this.device_network_type = networkType;
-			// console.log(networkType, '网络类型');
-			// var os = md.os(); //获取系统
-			// var model = "";
-			// if (os == "iOS") { //ios系统的处理
-			// 	model = md.mobile();
-			// } else if (os == "AndroidOS") { //Android系统的处理
-			// 	var sss = device_type.split(";");
-			// 	var i = sss.contains("Build/");
-			// 	if (i > -1) {
-			// 		model = sss[i].substring(0, sss[i].indexOf("Build/"));
-			// 	}
-			// }
-			// console.log(model, '手机型号');
+			// 引用mobile-detect文件
+			var MobileDetect = require('../utils/mobile-detect.js');
+			console.log(navigator.language, '当前系统语言');
+			// 判断是不是手机
+			if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) {
+				// this.is_telephone = "是";
+				console.log("是手机");
+			} else {
+				// this.is_telephone = "不是";
+				console.log("不是手机");
+			}
+			// 检测是浏览器端还是微信端
+			let ua = navigator.userAgent.toLowerCase();
+			// 微信端
+			if (String(ua.match(/MicroMessenger/i)) === 'micromessenger') {
+				console.log('是微信');
+				// this.isWechat = true        
+			} else {
+				// this.isWechat = false
+				console.log('不是微信');
+			}
+			var md = new MobileDetect(navigator.userAgent);
+			// 品牌
+			console.log(md.mobile(), '手机品牌');
+			// 操作系统
+			console.log(md.os(), '操作系统');
+			var device_type = navigator.userAgent; //获取userAgent信息
+			var networkStr = device_type.match(/NetType\/\w+/) ? device_type.match(/NetType\/\w+/)[0] : 'NetType/other';
+			networkStr = networkStr.toLowerCase().replace('nettype/', '');
+			var networkType;
+			switch (networkStr) {
+				case 'wifi':
+					networkType = 'wifi';
+					break;
+				case '4g':
+					networkType = '4g';
+					break;
+				case '3g':
+					networkType = '3g';
+					break;
+				case '3gnet':
+					networkType = '3g';
+					break;
+				case '2g':
+					networkType = '2g';
+					break;
+				default:
+					networkType = 'other';
+			}
+			// this.device_network_type = networkType;
+			console.log(networkType, '网络类型');
+			var os = md.os(); //获取系统
+			var model = "";
+			if (os == "iOS") { //ios系统的处理
+				model = md.mobile();
+			} else if (os == "AndroidOS") { //Android系统的处理
+				var sss = device_type.split(";");
+				var i = sss.contains("Build/");
+				if (i > -1) {
+					model = sss[i].substring(0, sss[i].indexOf("Build/"));
+				}
+			}
+			console.log(model, '手机型号');
 
 		},
 		created() {

src/components/kindIntroduction.vue

@@ -8,7 +8,7 @@
 						<img :src="item.icon">
 						<div>{{item.title}}</div>
 					</div>
-					<img src="/static/kindergartenIntroduce/icon-choose.png" >
+					<img src="../../static/img/kindergartenIntroduce/icon-choose.png" >
 				</div>
 			</div>
 			<div class="introduction-right">
@@ -45,10 +45,10 @@
 		data() {
 			return {
 				navArr:[
-					{icon:'/static/kindergartenIntroduce/icon-parkIntroduce.png',title:'园区介绍'},
-					{icon:'/static/kindergartenIntroduce/icon-teacher-style.png',title:'教师风采'},
-					{icon:'/static/kindergartenIntroduce/icon-new.png',title:'新闻动态'},
-					{icon:'/static/kindergartenIntroduce/icon-notice-msg.png',title:'公告信息'},
+					{icon:'../../static/img/kindergartenIntroduce/icon-parkIntroduce.png',title:'园区介绍'},
+					{icon:'../../static/img/kindergartenIntroduce/icon-teacher-style.png',title:'教师风采'},
+					{icon:'../../static/img/kindergartenIntroduce/icon-new.png',title:'新闻动态'},
+					{icon:'../../static/img/kindergartenIntroduce/icon-notice-msg.png',title:'公告信息'},
 				],
 				navIndex:0,
 			}

src/components/newsInformation.vue

@@ -2,21 +2,21 @@
 	<div>
 		<template v-if="!showDetail">
 			<div class="news-box" v-for="(item,index) in dataArr" :key="index" @click="goDetail(index)">
-				<img class="news-img" :src="item.imgSrc || '/static/seconds/tu-01.png'" >
+				<img class="news-img" :src="item.Head_Img || '../../static/img/seconds/tu-01.png'" >
 				<div class="news-right-box">
 					<div>
 						<div class="news-content-box">
-							<div class="clips1">{{item.title}}</div>
+							<div class="clips1">{{item.Title}}</div>
 							<div class="new-time-box">
-								<span>{{item.time.split(' ')[0]}}</span>
-								<span>{{item.time.split(' ')[1]}}</span>
+								<span>{{item.dateyear}}</span>
+								<span>{{item.datetime}}</span>
 							</div>
 						</div>
-						<div class="clips3">{{item.content}}</div>
+						<div class="clips3">{{item.Content}}</div>
 					</div>
 					<div class="news-num-box">
-						<img src="/static/kindergartenIntroduce/icon-browse.png">
-						<div>{{item.num}}人浏览</div>
+						<img src="../../static/img/kindergartenIntroduce/icon-browse.png">
+						<div>{{item.BroweTotal}}人浏览</div>
 					</div>
 				</div>
 			</div>
@@ -35,13 +35,7 @@
 		data() {
 			return {
 				showDetail:false,
-				dataArr:[
-					{imgSrc:'',title:'西区第一幼儿园创新开学第一课西区第一幼',time:'2021-10-29 19:28:28',content:'伴随着2019年春天的着2019年春天的脚步，西区第一幼儿园的孩着2019年春天的脚步，西区第一幼儿园的孩脚步，西区第一幼儿园的孩子们结束寒假，回到想念已久的幼儿园。本学期开学第一课一改往年单一的内容，除了开展例行的安全与常规教育外，还特别贴近幼儿的生活实际，以幼儿喜爱的方式分班级开展了“爱的抱抱”、“好久不见”、“美好的一天',num:'220'},
-					{imgSrc:'',title:'西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课',time:'2021-10-29 19:28:28',content:'伴随着2019年春天的着2019年春天的脚步，西区第一幼儿园的孩着2019年春天的脚步，西区第一幼儿园的孩脚步，西区第一幼儿园的孩子们结束寒假，回到想念已久的幼儿园。本学期开学第一课一改往年单一的内容，除了开展例行的安全与常规教育外，还特别贴近幼儿的生活实际，以幼儿喜爱的方式分班级开展了“爱的抱抱”、“好久不见”、“美好的一天',num:'220'},
-					{imgSrc:'',title:'西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课',time:'2021-10-29 19:28:28',content:'伴随着2019年春天的着2019年春天的脚步，西区第一幼儿园的孩着2019年春天的脚步，西区第一幼儿园的孩脚步，西区第一幼儿园的孩子们结束寒假，回到想念已久的幼儿园。本学期开学第一课一改往年单一的内容，除了开展例行的安全与常规教育外，还特别贴近幼儿的生活实际，以幼儿喜爱的方式分班级开展了“爱的抱抱”、“好久不见”、“美好的一天',num:'220'},
-					{imgSrc:'',title:'西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课',time:'2021-10-29 19:28:28',content:'伴随着2019年春天的着2019年春天的脚步，西区第一幼儿园的孩着2019年春天的脚步，西区第一幼儿园的孩脚步，西区第一幼儿园的孩子们结束寒假，回到想念已久的幼儿园。本学期开学第一课一改往年单一的内容，除了开展例行的安全与常规教育外，还特别贴近幼儿的生活实际，以幼儿喜爱的方式分班级开展了“爱的抱抱”、“好久不见”、“美好的一天',num:'220'},
-					{imgSrc:'',title:'西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课西区第一幼儿园创新开学第一课',time:'2021-10-29 19:28:28',content:'伴随着2019年春天的着2019年春天的脚步，西区第一幼儿园的孩着2019年春天的脚步，西区第一幼儿园的孩脚步，西区第一幼儿园的孩子们结束寒假，回到想念已久的幼儿园。本学期开学第一课一改往年单一的内容，除了开展例行的安全与常规教育外，还特别贴近幼儿的生活实际，以幼儿喜爱的方式分班级开展了“爱的抱抱”、“好久不见”、“美好的一天',num:'220'},
-				],
+				dataArr:[],
 				dataObj:''
 			}
 		},
@@ -50,25 +44,50 @@
 			goDetail(e) {
 				this.dataObj = this.dataArr[e];
 				this.showDetail = true
+				this.classnewsdetailsEv(this.dataObj.Guid);
 			},
 			// 继承详情返回事件
 			backNews(e){
 				this.showDetail = e;
 			},
-			async classnewsdetailsEv() {
+			async getnewsEv() {
+				let data = await this.$axios({
+					// 调用 serviceAPI
+					url: this.$https.getnews,
+					methods: "get",
+					params: {
+						EquipmentID: "yaohaotest001",
+					},
+				});
+				data.data.data.forEach(item=>{
+					let obj = {
+						BroweTotal: item.BroweTotal,
+						Content: item.Content,
+						DisplayName: item.DisplayName,
+						Guid: item.Guid,
+						Head_Img: item.Head_Img,
+						dateyear: item.PublishTime.split(' ')[0],
+						datetime: item.PublishTime.split(' ')[1],
+						Title: item.Title
+					}
+					this.dataArr.push(obj)
+				})
+			},
+			async classnewsdetailsEv(guid) {
 				let data = await this.$axios({
 					// 调用 serviceAPI
 					url: this.$https.classnewsdetails,
 					methods: "get",
 					params: {
 						EquipmentID: "yaohaotest001",
+						Guid:guid
 					},
 				});
-				console.log(data.data.data);
+				this.dataObj = data.data.data;
 			},
 		},
 		mounted() {
-			this.classnewsdetailsEv();
+			this.getnewsEv();
 		}
 	}
 </script>

src/components/newsInformationDetail.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<!-- <div class="yiqing-title" style="text-align: left;">攀枝花市西区第一幼儿园分园招生公告</div>
-		<img src="/static/kindergartenIntroduce/icon-back.png" style="width: 48px;height: 48px;position: absolute;top: 20px;right: 20px;" >
+		<img src="../../static/img/kindergartenIntroduce/icon-back.png" style="width: 48px;height: 48px;position: absolute;top: 20px;right: 20px;" >
 		<div class="yiqing-content">
 			尊敬的各位家长：<br />
 			攀枝花市西区第一幼儿园分园系全日制公办幼儿园，由攀枝花市西区第一幼儿园统一管理。隶属攀枝花市西区教育体育局。
@@ -16,17 +16,15 @@
 			（三）按照相关要求设定班级数<br />
 			2018年秋季学期将面向西区招生；共开设7个班。
 		</div> -->
-		<div class="yiqing-title clips1" style="text-align: left;padding-right: 50px;">{{dataObj.title}}</div>
-		<img src="/static/kindergartenIntroduce/icon-back.png" class="back-img" @click="backNews">
-		<div class="yiqing-content">
-			{{dataObj.content}}
-		</div>
+		<div class="yiqing-title clips1" style="text-align: left;padding-right: 50px;">{{dataObj.Title}}</div>
+		<img src="../../static/img/kindergartenIntroduce/icon-back.png" class="back-img" @click="backNews">
+		<div class="yiqing-content" v-html="dataObj.Content"></div>
 	</div>
 </template>
 
 <script>
 	export default {
-		name: 'newsInformation',
+		name: 'newsInformationDetail',
 		props:{
 			dataObj:{
 				type:Object,

src/components/noticeInfo.vue

@@ -1,24 +1,43 @@
 <template>
 	<div>
-		<div class="noticeInfo-item" v-for="(item,index) in dataArr" :key="index">
+		<template v-if="!showDetail">
+			<div class="noticeInfo-item" v-for="(item,index) in dataArr" :key="index" @click="goDetail(index)">
 				<div class="notice-title">
-				<img src="/static/kindergartenIntroduce/icon-notice.png" alt="">
+					<img src="../../static/img/kindergartenIntroduce/icon-notice.png" alt="">
 					<div class="clips1">{{item.Title}}</div>
 				</div>
 				<div class="noticeInfo-time flex-s0">{{item.PublishTime.split(' ')[0]}}</div>
 			</div>
+		</template>
+		<newsInformationDetail v-if="showDetail" :dataObj="dataObj" @backNews="backNews"></newsInformationDetail>
 	</div>
 </template>
 
 <script>
+	import newsInformationDetail from '@/components/newsInformationDetail.vue';
 	export default {
+		components:{
+			newsInformationDetail
+		},
 		name: 'noticeInfo',
 		data() {
 			return {
-				dataArr:[]
+				dataArr:[],
+				showDetail:false,
+				dataObj:{}
 			}
 		},
 		methods: {
+			// 查看详情
+			goDetail(e) {
+				this.dataObj = this.dataArr[e];
+				this.showDetail = true
+				this.classnewsdetailsEv(this.dataObj.Guid);
+			},
+			// 继承详情返回事件
+			backNews(e){
+				this.showDetail = e;
+			},
 			async getnoticeEv() {
 				let data = await this.$axios({
 					// 调用 serviceAPI
@@ -31,6 +50,19 @@
 				this.dataArr = data.data.data;
 				// console.log(data.data.data);
 			},
+			async classnewsdetailsEv(guid) {
+				let data = await this.$axios({
+					// 调用 serviceAPI
+					url: this.$https.classnewsdetails,
+					methods: "get",
+					params: {
+						EquipmentID: "yaohaotest001",
+						Guid:guid
+					},
+				});
+				this.dataObj = data.data.data;
+				console.log(this.dataObj);
+			},
 		},
 		mounted() {
 			this.getnoticeEv();

src/components/parkIntroduce.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<div class="yiqing-title" style="text-align: left">琦琦幼儿园</div>
+		<div class="yiqing-title" style="text-align: left">{{introduceData.OrganName}}</div>
 		<div class="yiqing-content">
 			<div v-html="introduceData.Remark"></div>
 			<div class="introduce-img">
@@ -23,7 +23,7 @@
 			async introduce() {
 				let data = await this.$axios({
 					// 调用 serviceAPI
-					url: this.$https.introduce,
+					url: this.$https.mechanism,
 					methods: "get",
 					params: {
 						EquipmentID: "yaohaotest001",

src/components/teacherStyle.vue

@@ -30,6 +30,7 @@
 			goDetail(e){
 				this.teacherInfo = this.teatherArr[e];
 				this.showDetail = true;
+				this.getteachers_demeanor_detailEv(this.teacherInfo.Guid);
 			},
 			// 继承详情返回事件
 			backstyle(e){
@@ -46,6 +47,19 @@
 				});
 				this.teatherArr = data.data.data;
 			},
+			async getteachers_demeanor_detailEv(guid) {
+				let data = await this.$axios({
+					// 调用 serviceAPI
+					url: this.$https.getteachers_demeanor_detail,
+					methods: "get",
+					params: {
+						// EquipmentID: "yaohaotest001",
+						Guid:guid,
+						OrgGuid:'6a6d885c-45d2-0b5b-ef1f-b0e1964df0fe'
+					},
+				});
+				this.teacherInfo = data.data.data;
+			},
 		},
 		mounted() {
 			this.checkTeacherStyle();

src/components/teacherStyleDetail.vue

@@ -1,14 +1,10 @@
 <template>
 	<div>
-		<div class="yiqing-title clips1 teacher-title">{{teacherInfo.teatherName}}</div>
-		<img src="/static/kindergartenIntroduce/icon-back.png" class="back-img" @click="backstyle">
+		<div class="yiqing-title clips1 teacher-title">{{teacherInfo.Title}}</div>
+		<img src="../../static/img/kindergartenIntroduce/icon-back.png" class="back-img" @click="backstyle">
 		<div class="teacher-content-box">
-			<img src="/static/seconds/tu-01.png" class="teacher-img" >
-			<div class="teacher-right-box">
-				<div>优秀教师：方慧慧（初级教师）</div>
-				<div style="margin-top: 10px;"><span style="letter-spacing: 32px;">教</span>龄：10年</div>
-				<div>教学业绩：2011年学前教育专业毕业后，考入攀枝花市实验幼儿园，从事幼教事业已有整整10个年头。在工作中，始终保持着积极热情、谦虚踏实的学习状态，热心对待工作，真心呵护幼儿，诚心服务家长。多次参加园级，市级各类比赛，均获得优异的成绩。制作的教玩具《插插乐》获攀枝花市优秀玩教具比赛一等奖；《好玩的小动物》获得四川省优秀玩教具比赛荣获二等奖；论文《如何提高小班幼儿参加体育活动的兴趣》在中国幼儿教育学会主办的中国幼儿教育系统年度论文评选活动中荣获一等奖；论文《浅谈在建构游戏中构建有效的师幼互动》参与了中国人生科学学会美育研究会“十三五”科研规划重点课题，获得课题科研成果一等奖。每一个孩子都是一颗会发光的星星，找寻不同的角度，发现不同的时间里孩子们发光发亮的美丽 ， 我愿将自己全部的爱献给孩子们，让他们在人生起跑线上跑好第一步。</div>
-			</div>
+			<img :src="teacherInfo.PictureUrls" class="teacher-img" >
+			<div class="teacher-right-box" v-html="teacherInfo.Content"></div>
 		</div>
 	</div>
 </template>

src/config.js

@@ -21,7 +21,11 @@ const url = {
 	babyphoto:host + '/api/admin/electronicclasscard/babyphoto',//宝宝相册
 	babyphotodetails:host + '/api/admin/electronicclasscard/babyphotodetails',//宝宝相册详情
 	getbabynowtimecourse:host + '/api/admin/electronicclasscardcourse/getbabynowtimecourse',//查看当前课程及下节课内容
-	getbabycourse:host + '/api/admin/electronicclasscardcourse/getbabycourse'//查看一周的宝宝课表
+	getbabycourse:host + '/api/admin/electronicclasscardcourse/getbabycourse',//查看一周的宝宝课表
+	getteachers_demeanor_detail:host + '/api/admin/organ/get_teacherfc_details_v1',//获取教师风采详情
+	getnews:host + '/api/admin/electronicclasscard/getnews',//获取新闻动态850601
+	
+	
 }
 
 module.exports = url