zhengkaixin há 4 anos atrás
pai
commit
8d62c8dc80

+ 1 - 1
.env.production

@@ -2,7 +2,7 @@ NODE_ENV=production
 VUE_APP_NODE_NAME=production
 OUT_PUT_NAME=prod
 VUE_APP_LOCAL_STORAGE_PREFIX=prod
-VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/smart-school-server/
+VUE_APP_BACKEND_URL=https://ykt.xiaoxinda.com/
 #appid
 VUE_APP_WXAPPID=wx907e84ad32e6e142
 

+ 0 - 0
public/images/avator.png → src/assets/img/avator.png


+ 0 - 0
public/images/banner.jpg → src/assets/img/banner.jpg


+ 0 - 0
public/images/index1.png → src/assets/img/index1.png


+ 0 - 0
public/images/index2.jpg → src/assets/img/index2.jpg


+ 0 - 0
public/images/index3.png → src/assets/img/index3.png


+ 0 - 0
public/images/index4.jpg → src/assets/img/index4.jpg


+ 9 - 1
src/utils/request.js

@@ -10,10 +10,18 @@ import {
 } from '@/utils/storage'
 
 axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+var BACKEND_URL = process.env.VUE_APP_BACKEND_URL;
+
+if (process.env.VUE_APP_NODE_NAME == 'devlopment') {
+		//BACKEND_URL='http://192.168.33.120:8086/shinestar-server';
+		 BACKEND_URL="https://ykt.xiaoxinda.com/"
+		//BACKEND_URL='http://223.75.170.44:6060/shinestar-server';
+		
+}
 
 // 创建axios实例
 const service = axios.create({
-	baseURL: process.env.VUE_APP_BACKEND_URL,
+	baseURL: BACKEND_URL,
 	timeout: 20000,
 	// 请求头信息
 	headers: {

+ 29 - 6
src/views/Home.vue

@@ -1,22 +1,24 @@
 <template>
 	<div class="container">
+		<common></common>
+		
 		<nav>
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
 			12355青少年网络综合服务平台
 		</nav>
 		<div class="banner">
-			<img src="../../public/images/banner.jpg" alt="">
+			<img src="@/assets/img/banner.jpg" alt="">
 		</div>
 		<ul class="jigou">
 			<li>
 				<div class="minitit">主办机构</div>
-				<div class="zhuban-img1"><img src="../../public/images/index3.png" alt=""></div>
+				<div class="zhuban-img1"><img src="@/assets/img/index3.png" alt=""></div>
 			</li>
 			<li>
 				<div class="minitit">协办机构</div>
 				<div class="secondtit">荆州市未成年人保护中心</div>
-				<div class="zhuban-img2"><span><img src="../../public/images/index2.jpg" alt=""></span><span><img
-							src="../../public/images/index4.jpg" alt=""></span></div>
+				<div class="zhuban-img2"><span><img src="@/assets/img/index2.jpg" alt=""></span><span><img
+							src="@/assets/img/index4.jpg" alt=""></span></div>
 			</li>
 		</ul>
 		<div class="con1">
@@ -63,7 +65,7 @@
 						<p>孩子就要中考了,异常焦虑、烦躁、常
 							常失眠,吃饭呕吐,无缘无故就想哭怎
 							么办?
-						</p><span><img src="../../public/images/avator.png" alt=""></span>
+						</p><span><img src="@/assets/img/avator.png" alt=""></span>
 					</a></div>
 				<div class="casedetail"><span>1小时前</span>.<span>320人浏览过</span>
 				</div>
@@ -75,7 +77,27 @@
 </template>
 
 <script>
+	
+ import Common from '@/components/Common.vue'
+ 
 	export default {
+		
+		name: '',
+		components: {
+			Common
+		},
+		
+		created() {
+			
+		},
+		methods: {
+			
+		},mounted() {
+			console.log(111)
+		},
+		destroyed() {
+			
+		},
 		data() {
 			return {
 				items: [{
@@ -206,7 +228,7 @@
 
 	.con2 {
 		margin-bottom: 16px;
-		font-size: 15px;
+		font-size: 12px;
 		text-align: center;
 		color: #838383;
 	}
@@ -215,6 +237,7 @@
 		margin: 0 20px 20px 20px;
 		width: 100%;
 		display: flex;
+		font-size: 12px;
 	}
 
 	.zhixun-dl dt {