Bladeren bron

Merge branch 'dev' of http://222.92.16.3:3000/hzh/snd-escloud into dev

wangjiang988 6 jaren geleden
bovenliggende
commit
b45dcf6e2d

+ 4 - 4
src/main/resources/application.yml

@@ -15,9 +15,9 @@ spring:
   #激活哪一个环境的配置文件
   profiles:
 
-#    active: dev
+    active: dev
 #    active: test
-    active: aliyun
+#    active: aliyun
 #    active: vpn
 #    active: prod_in
 #    active: prod_out
@@ -161,8 +161,8 @@ logging:
 
 #数据库密码加密
 #java -cp druid-1.1.0.jar com.alibaba.druid.filter.config.ConfigTools 你的密码
-publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALw6xjHT/QV52gcADFaltXUZ1DRFhqj//Jv3lKQS4oTxJS1xuziVfA/iPX39P/7C1D4hJ6giolAMXzoAtd+MuP8CAwEAAQ==
-password: MlDcZS8463xfTRe8W0n/OeCcBofRF11E3ttKoL8jV5yVZ5zOhBUKV0mJ5tw+bCjbxAYNAwH9vtAYfUfuPfjNdQ==
+publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAIYbzRqmoxLzAPpQer64U9MI+2WQOHMMl6BsYvSfBVodl2VjosyLSFDTu9UKYNh8P7cDujohKjc8GDiH6i/wq08CAwEAAQ==
+password: WD7ZuG4T27mDBFRXye2IfZZgrDsmPCtkMDfj8fGss8Iz/4aF27TLznaZ2mUbU273q5spfMzqUTmCiR1GvXZRMA==
 
 #上传文件配置信息
 #文件仓库地址

BIN
src/main/resources/static/assets/images/userImg.png


+ 154 - 3
src/main/resources/static/home/css/home.css

@@ -407,7 +407,6 @@ em{
 	}
 }
 .name{
-
 	margin-left: 20px;
 	font-size: 24px;
 	overflow: hidden;
@@ -1624,8 +1623,7 @@ em{
 	top: 50%;
 	left: 50%;
 	margin: -100px 0 0 -200px;
-	width: 400px;
-	height: 200px;
+	width: 500px;
 	font-size: 20px;
 	text-align: center;
 	/*padding-top: 90px;*/
@@ -1646,4 +1644,157 @@ em{
 .popupInfo {
 	font-size: 16px;
 	text-align: left;
+}
+.dropMenu{
+	display: inline-block;
+	position: relative;
+	height: 100%;
+	vertical-align: middle;
+	margin-right: 15px;
+}
+.loginName {
+	font-size: 14px;
+	overflow: hidden;
+	margin-left: 0;
+	cursor: pointer;
+}
+.dropMenu .menu{
+	display: none;
+	background: #fff;
+	position: absolute;
+	top: 60px;
+	right: 0;
+	z-index: 5;
+	line-height: 40px;
+	white-space: nowrap;
+	border: 1px solid #ebeef5;
+	border-radius: 4px;
+	box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+}
+.dropMenu:hover .menu{
+	display: block;
+}
+.dropMenu .menu a{
+	display: block;
+	color: #606266;
+	padding: 3px 15px;
+}
+.dropMenu .menu a:hover {
+	color: #66b1ff;
+	background-color: #ecf5ff;
+}
+.toAdmin {
+	margin-right: 15px;
+	cursor: pointer;
+}
+.loginIcon {
+	margin-right: 15px;
+	max-height:80px;
+	max-width: 80px;
+}
+.feedback-form {
+	margin: 0;
+	padding: 0;
+	margin-bottom: 30px;
+}
+.feedback-form .feedback-single {
+	margin-bottom: 22px;
+}
+.feedback-single > span {
+	display: inline-block;
+	width: 100px;
+	text-align: right;
+	vertical-align: middle;
+	float: left;
+	font-size: 14px;
+	color: #606266;
+	line-height: 40px;
+	padding: 0 12px 0 0;
+	box-sizing: border-box;
+}
+.feedback-single .is_error {
+	border-color: #F56C6C;
+}
+.feedback-input {
+	margin-left: 100px;
+	line-height: 40px;
+	position: relative;
+	font-size: 14px;
+}
+.feedback-input .feedback_error {
+	color: #F56C6C;
+	font-size: 12px;
+	line-height: 1;
+	padding-top: 4px;
+	position: absolute;
+	top: 100%;
+	left: 0;
+}
+.feedback-input .feedback_right {
+	position: relative;
+	font-size: 14px;
+	display: inline-block;
+	width: 100%;
+}
+.feedback_right input {
+	-webkit-appearance: none;
+	background-color: #FFF;
+	background-image: none;
+	border-radius: 4px;
+	border: 1px solid #DCDFE6;
+	box-sizing: border-box;
+	color: #606266;
+	display: inline-block;
+	font-size: inherit;
+	height: 40px;
+	line-height: 40px;
+	outline: 0;
+	padding: 0 15px;
+	transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+	width: 100%;
+}
+.feedback_right textarea {
+	display: block;
+	resize: vertical;
+	padding: 5px 15px;
+	line-height: 1.5;
+	min-height: 80px;
+	box-sizing: border-box;
+	width: 100%;
+	font-size: inherit;
+	color: #606266;
+	background-color: #FFF;
+	background-image: none;
+	border: 1px solid #DCDFE6;
+	border-radius: 4px;
+}
+.feedback-button {
+	padding: 10px 0 20px 20px;
+	text-align: right;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.feedback_default {
+	font-weight: normal;
+	display: inline-block;
+	line-height: 1;
+	white-space: nowrap;
+	cursor: pointer;
+	background: #FFF;
+	border: 1px solid #DCDFE6;
+	color: #606266;
+	-webkit-appearance: none;
+	text-align: center;
+	box-sizing: border-box;
+	outline: 0;
+	margin: 0;
+	transition: .1s;
+	padding: 12px 20px;
+	font-size: 14px;
+	border-radius: 4px;
+}
+.feedback_confirm{
+	color: #FFF;
+	background-color: #409EFF;
+	border-color: #409EFF;
 }

+ 131 - 1
src/main/resources/templates/home/common/common.html

@@ -57,8 +57,13 @@
         loginUserId = localStorage.getItem('user_id')
         $(function () {
             if (loginUserName) {
-                document.getElementById('login_user_name').innerText = loginUserName;
+                // document.getElementsByClassName('.loginIcon')[0].src = loginUserName;
+                document.getElementsByClassName('loginName')[0].innerText = loginUserName;
                 document.getElementById('login-link').style.display = 'none'
+            } else {
+                document.getElementsByClassName('toAdmin')[0].style.display = 'none'
+                document.getElementsByClassName('loginIcon')[0].style.display = 'none'
+                document.getElementsByClassName('dropMenu')[0].style.display = 'none'
             }
         });
         $(function () {
@@ -67,6 +72,11 @@
             }
         });
 
+        function logOut() {
+            localStorage.clear()
+            window.location.href = 'http://' + window.location.host +  '/admin/logout'
+        }
+
         function showDT() {
             var days = new Array("日", "一", "二", "三", "四", "五", "六");
             var currentDT = new Date();
@@ -172,6 +182,126 @@
                 }
             });
         }
+        function checkTel (tel) {
+            var telObj = {}
+            if (/^1(3|4|5|7|8)\d{9}$/.test(tel)) {
+                telObj.type = '移动电话'
+                telObj.typeNumber = 1
+                telObj.isPass = true
+            } else if (/^0\d{2,3}-?\d{7,8}$/.test(tel)) {
+                telObj.type = '固定电话'
+                telObj.typeNumber = 2
+                telObj.isPass = true
+            } else {
+                telObj.type = '不是有效的电话号码!'
+                telObj.typeNumber = 0
+                telObj.isPass = false
+            }
+            return telObj
+        }
+        function checkEmail (email) {
+            return (/^[A-Za-z\d]+([-_.][A-Za-z\d]+)*@([A-Za-z\d]+[-.])+[A-Za-z\d]{2,5}$/.test(email))
+        }
+        function changeContact() {
+            var contractValue = $(".feedback_right input[dataValue='contact']").val()
+            if (contractValue == '') {
+                $(".feedback_right input[dataValue='contact']").addClass("is_error")
+                $(".feedback_error[dataValue='contact']").text('请输入联系人')
+                return false
+            } else if (contractValue.length >10 || contractValue.length < 2) {
+                $(".feedback_right input[dataValue='contact']").addClass("is_error")
+                $(".feedback_error[dataValue='contact']").text('长度在2-10个字符')
+                return false
+            } else {
+                $(".feedback_right input[dataValue='contact']").removeClass("is_error")
+                $(".feedback_error[dataValue='contact']").text('')
+                return true
+            }
+        }
+        function changeTel() {
+            var teltValue = $(".feedback_right input[dataValue='tel']").val()
+            if (teltValue == '') {
+                $(".feedback_right input[dataValue='tel']").addClass("is_error")
+                $(".feedback_error[dataValue='tel']").text('请输入电话')
+                return false
+            } else {
+                var checkTelObj = checkTel(teltValue)
+                if (!checkTelObj.isPass) {
+                    $(".feedback_right input[dataValue='tel']").addClass("is_error")
+                    $(".feedback_error[dataValue='tel']").text(checkTelObj.type)
+                    return false
+                } else {
+                    $(".feedback_right input[dataValue='tel']").removeClass("is_error")
+                    $(".feedback_error[dataValue='tel']").text('')
+                    return true
+                }
+            }
+        }
+        function changeEmail() {
+            var emailValue = $(".feedback_right input[dataValue='email']").val()
+            if (emailValue == '') {
+                $(".feedback_right input[dataValue='email']").addClass("is_error")
+                $(".feedback_error[dataValue='email']").text('请输入邮箱')
+                return false
+            } else {
+                var checkEmailObj = checkEmail(emailValue)
+                if (!checkEmailObj) {
+                    $(".feedback_right input[dataValue='email']").addClass("is_error")
+                    $(".feedback_error[dataValue='email']").text('请输入正确的邮箱地址')
+                    return false
+                } else {
+                    $(".feedback_right input[dataValue='email']").removeClass("is_error")
+                    $(".feedback_error[dataValue='email']").text('')
+                    return true
+                }
+            }
+        }
+        function changeContent() {
+            var contentValue = $(".feedback_right textarea[dataValue='content']").val()
+            if (contentValue == '') {
+                $(".feedback_right textarea[dataValue='content']").addClass("is_error")
+                $(".feedback_error[dataValue='content']").text('请输入反馈内容')
+                return false
+            } else if (contentValue.length > 500 || contentValue.length < 5) {
+                $(".feedback_right textarea[dataValue='content']").addClass("is_error")
+                $(".feedback_error[dataValue='content']").text('长度在5-500个字符')
+                return false
+            } else {
+                $(".feedback_right textarea[dataValue='content']").removeClass("is_error")
+                $(".feedback_error[dataValue='content']").text('')
+                return true
+            }
+        }
+        function feedbackCancel() {
+            $(".tips-popup").hide();
+        }
+        function feedbackSubmit() {
+            changeContact()
+            changeTel()
+            changeEmail()
+            changeContent()
+            var submitResult = changeContact() && changeTel() && changeEmail() && changeContent()
+            if (submitResult) {
+                $.ajax({
+                    url: 'http://' +  window.location.host+ '/api/serviceleague/f/v1/feedback',
+                    type: "post",
+                    dataType: "json",
+                    data:{
+                        "applyContent": $(".feedback_right textarea[dataValue='content']").val(),
+                        "applyEmail": $(".feedback_right input[dataValue='email']").val(),
+                        "applyName": $(".feedback_right input[dataValue='contact']").val(),
+                        "applyPhone": $(".feedback_right input[dataValue='tel']").val(),
+                    },
+                    success: function (result) {
+                        succeedMessage('反馈成功')
+                        $(".tips-popup").hide();
+                    },
+                    error: function () {
+                        errorMessage('反馈失败')
+                    }
+                });
+            }
+        }
     </script>
 </head>
 <body>

+ 12 - 5
src/main/resources/templates/home/common/footer.html

@@ -50,9 +50,9 @@
                 </p>
                 <div>
                     <a href="http://www.miit.gov.cn/" target="_blank">中华人民共和国工业和信息化部</a><br/>
-                    <a href="http://www.sme.gov.cn/" target="_blank">中国中小企业信息网</a><br/>
-                    <a href="http://www.jseic.gov.cn/" target="_blank">江苏省经济和信息化委员会</a><br/>
-                    <a href="http://www.szetc.gov.cn/szjxw/" target="_blank">苏州市经济和信息化委员会</a><br/>
+                    <a href="http://sme.miit.gov.cn/" target="_blank">中国中小企业信息网</a><br/>
+                    <a href="http://gxt.jiangsu.gov.cn/" target="_blank">江苏省工业和信息化厅</a><br/>
+                    <a href="http://www.szeic.gov.cn/" target="_blank">苏州市工业和信息化局</a><br/>
                     <a href="http://www.snd.gov.cn/snd/" target="_blank">苏州高新区管委会</a>
                 </div>
             </div>
@@ -61,7 +61,7 @@
                     <span class="link-title helpLink">帮助</span>
                 </p>
                 <div>
-                    <!--<a class="help-item" checkData="feedback">诉求反馈</a><br/>-->
+                    <a class="help-item" checkData="feedback">诉求反馈</a><br/>
                     <!--<a class="help-item" checkData="complaints">我要投诉</a><br/>-->
                     <a class="help-item" checkData="appcode">APP下载</a><br/>
                     <!--<a class="help-item" checkData="files">文件资料</a>-->
@@ -177,12 +177,19 @@
             $(".tips-content").removeClass("appCodestyle")
             $(".tips-popup").show();
             if(dataVal == 'feedback') {
-                $("#popupCentent").html('<div class="popupInfo"><p>投诉邮箱:qyfwzx@snd.gov.cn</p></div>')
+                $(".tips-content").css({"width": "500px"})
+                $("#popupCentent").html('<div class="feedback-form">' +
+                    '<div class="feedback-single"><span>联系人:</span><div class="feedback-input"><div class="feedback_right"><input type="text" dataValue="contact" oninput="changeContact()" placeholder="请输入联系人"></div><div  dataValue="contact" class="feedback_error"></div></div></div>' +
+                    '<div class="feedback-single"><span>电话:</span><div class="feedback-input"><div class="feedback_right"><input type="text" dataValue="tel" oninput="changeTel()" placeholder="请输入电话"></div><div class="feedback_error" dataValue="tel"></div></div></div>' +
+                    '<div class="feedback-single"><span>邮箱:</span><div class="feedback-input"><div class="feedback_right"><input type="text" dataValue="email" oninput="changeEmail()" placeholder="请输入邮箱"></div><div class="feedback_error" dataValue="email"></div></div></div>' +
+                    '<div class="feedback-single"><span>反馈内容:</span><div class="feedback-input"><div class="feedback_right"><textarea type="text" dataValue="content" oninput="changeContent()" placeholder="请输入反馈内容"></textarea></div><div class="feedback_error" dataValue="content"></div></div></div>' +
+                    '</div><div class="feedback-button"><span><button class="feedback_default" onclick="feedbackCancel()">取消</button><button style="margin-left: 10px;" class="feedback_default feedback_confirm" onClick="feedbackSubmit()">确定</button></span></div>')
             }
             else if(dataVal == 'complaints') {
                 $("#popupCentent").html('<div class="popupInfo"><p>投诉邮箱:qyfwzx@snd.gov.cn</p><p>投诉电话:0512-68755225</p></div>')
             }
             else if(dataVal == 'appcode') {
+                $(".tips-content").css({"width": "400px"})
                 $("#popupCentent").html('<div class="app-code clearfix">\n' +
                     '                        <div class="app-code-box">\n' +
                     '                            <img src="'+pagePath+'/home/image/appCode.png">\n' +

+ 13 - 3
src/main/resources/templates/home/common/header.html

@@ -30,7 +30,17 @@
 					<!--<a th:href="@{/home/login}" class="iconlogin"><i class="iconfont">&#xe634;</i></a>-->
 					<!--<span style="margin-right:10px;">登录人</span>-->
 					<!--<i class="iconfont">&#xe634;</i>-->
-					<span id="login_user_name" style="margin-right:10px;"></span>
+					<!--<span id="login_user_name" style="margin-right:10px;"></span>-->
+					<a th:href="@{/admin/home}" class="toAdmin">后台</a>
+					<img class="loginIcon" th:src="@{/assets/images/userImg.png}" alt="头像">
+					<div class="dropMenu">
+						<div class="loginName"></div>
+						<div class="menu">
+							<a th:href="@{/index/#/myActivity}">我的活动</a>
+							<a th:href="@{/index/#/favouriteActivity}">活动收藏</a>
+							<a onclick="logOut()">退出</a>
+						</div>
+					</div>
 					<a  id="login-link" style="margin-right:10px;" th:href="@{/home/login}">登录</a>
 					<a th:href="@{/home}"><img th:src="@{/assets/images/homePng.png}" alt=""></a>
 				</div>
@@ -64,10 +74,10 @@
 						<a th:href="@{/index/#/newsList}" data-title="通知公告">通知公告</a>
 					</li>
 					<li role="presentation" >
-						<a th:href="@{/home/informList/66}" data-title="政策雷达" target="_blank">政策雷达</a>
+						<a th:href="@{/serviceleague/home/policy}" data-title="政策雷达" target="_blank">政策雷达</a>
 					</li>
 					<li role="presentation" >
-						<a th:href="@{/home/informList/69}" data-title="申报服务">申报服务</a>
+						<a th:href="@{/serviceleague/home/projectApplyList}" data-title="申报服务">申报服务</a>
 					</li>
 					<li role="presentation" >
 						<a th:href="@{/index/#/activityHome}" data-title="专题活动">专题活动</a>

+ 1 - 1
src/main/resources/templates/home/html/projectDetail.html

@@ -40,7 +40,7 @@
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>
-                    <li th:if="${navigation_id!=2}" class="active"><a th:href="@{'/home/informList/'+${navigation_id}}">[[${navigation_name}]]</a>
+                    <li th:if="${navigation_id!=2}" class="active"><a th:href="@{/serviceleague/home/projectApplyList}">[[${navigation_name}]]</a>
                     </li>
                     <li th:if="${navigation_id==2}" class="active"><a th:href="@{/home/unionCompany}">[[${navigation_name}]]</a>
                     </li>