Skip to content

石磊 / cihai

Go to a project
Commit bb861dfe by 侯昆
Options

Merge branch 'master' of http://gitlab.coralcodes.com:30000/shil0009/cihai 

# Conflicts:
#	serverside/cihai-core/src/main/java/com/dookay/cihai/core/CihaiCoreApplication.java
2 parents 0767928c b62f49b0
Inline Side-by-side
Showing 4 changed files with 68 additions and 38 deletions
serverside/cihai-core/src/main/java/com/dookay/cihai/core/CihaiCoreApplication.java
package com.dookay.cihai.core; package com.dookay.cihai.core;
import com.dookay.coral.common.core.CoralCommonCoreMarker; import com.dookay.coral.common.core.CoralCommonCoreMarker;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
...@@ -11,7 +12,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; ...@@ -11,7 +12,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
CoralCommonCoreMarker.class, CoralCommonCoreMarker.class,
CiHaiCoreApplication.class CiHaiCoreApplication.class
}) })
@MapperScan(basePackageClasses = CiHaiCoreApplication.class)
public class CiHaiCoreApplication { public class CiHaiCoreApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/theme/detail.jsp
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="intro-box"> <div class="intro-box">
<div class="block block-strong inset"> <div class="block block-strong inset">
<div class="top-tip"> <div class="top-tip">
<img src="images/special-top.png"> <img src="${ctx}/static/images/special-top.png">
</div> </div>
<div class="txt-content"> <div class="txt-content">
<p class="intro-txt">中国共产党第十九次全国代表大会（简称党的十九大）于2017年10月18日至10月24日在北京召开。</p> <p class="intro-txt">中国共产党第十九次全国代表大会（简称党的十九大）于2017年10月18日至10月24日在北京召开。</p>
...@@ -41,13 +41,13 @@ ...@@ -41,13 +41,13 @@
<div class="about-word"> <div class="about-word">
<div class="special-title"> <div class="special-title">
<div class="tip"> <div class="tip">
<img src="images/special-tip.png"> <img src="${ctx}/static/images/special-tip.png">
</div> </div>
<div class="title">相关词条</div> <div class="title">相关词条</div>
</div> </div>
<div class="block block-strong inset"> <div class="block block-strong inset">
<div class="show-pic"> <div class="show-pic">
<img src="images/special-pic-01.jpg"> <img src="${ctx}/static/images/special-pic-01.jpg">
<div class="over-intro"> <div class="over-intro">
<div class="sub-title">习近平：新时代的领路人</div> <div class="sub-title">习近平：新时代的领路人</div>
<div class="txt">2017年10月18日上午，习近平站在人民大会堂万人大礼堂的讲台前作中共十九大报告，历时近3个半小时。</div> <div class="txt">2017年10月18日上午，习近平站在人民大会堂万人大礼堂的讲台前作中共十九大报告，历时近3个半小时。</div>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<div class="num-progress"> <div class="num-progress">
<div class="special-title"> <div class="special-title">
<div class="tip"> <div class="tip">
<img src="images/special-tip.png"> <img src="${ctx}/static/images/special-tip.png">
</div> </div>
<div class="title">"数"说十九大</div> <div class="title">"数"说十九大</div>
</div> </div>
...@@ -109,10 +109,10 @@ ...@@ -109,10 +109,10 @@
<span class="item">复兴号</span> <span class="item">复兴号</span>
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-02.jpg"> <img src="${ctx}/static/images/special-pic-02.jpg">
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-08.jpg"> <img src="${ctx}/static/images/special-pic-08.jpg">
</div> </div>
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
...@@ -126,10 +126,10 @@ ...@@ -126,10 +126,10 @@
<span class="item">复兴号</span> <span class="item">复兴号</span>
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-02.jpg"> <img src="${ctx}/static/images/special-pic-02.jpg">
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-08.jpg"> <img src="${ctx}/static/images/special-pic-08.jpg">
</div> </div>
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
...@@ -143,10 +143,10 @@ ...@@ -143,10 +143,10 @@
<span class="item">复兴号</span> <span class="item">复兴号</span>
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-02.jpg"> <img src="${ctx}/static/images/special-pic-02.jpg">
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-08.jpg"> <img src="${ctx}/static/images/special-pic-08.jpg">
</div> </div>
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
...@@ -160,10 +160,10 @@ ...@@ -160,10 +160,10 @@
<span class="item">复兴号</span> <span class="item">复兴号</span>
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-02.jpg"> <img src="${ctx}/static/images/special-pic-02.jpg">
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-08.jpg"> <img src="${ctx}/static/images/special-pic-08.jpg">
</div> </div>
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
...@@ -177,10 +177,10 @@ ...@@ -177,10 +177,10 @@
<span class="item">复兴号</span> <span class="item">复兴号</span>
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-02.jpg"> <img src="${ctx}/static/images/special-pic-02.jpg">
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-08.jpg"> <img src="${ctx}/static/images/special-pic-08.jpg">
</div> </div>
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
...@@ -194,10 +194,10 @@ ...@@ -194,10 +194,10 @@
<span class="item">复兴号</span> <span class="item">复兴号</span>
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-02.jpg"> <img src="${ctx}/static/images/special-pic-02.jpg">
</div> </div>
<div class="pic"> <div class="pic">
<img src="images/special-pic-08.jpg"> <img src="${ctx}/static/images/special-pic-08.jpg">
</div> </div>
</div> </div>
</div> </div>
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
<div class="relation-pic"> <div class="relation-pic">
<div class="special-title"> <div class="special-title">
<div class="tip"> <div class="tip">
<img src="images/special-tip.png"> <img src="${ctx}/static/images/special-tip.png">
</div> </div>
<div class="title">十九大图谱</div> <div class="title">十九大图谱</div>
</div> </div>
...@@ -218,40 +218,40 @@ ...@@ -218,40 +218,40 @@
<div class="word-analysis"> <div class="word-analysis">
<div class="special-title"> <div class="special-title">
<div class="tip"> <div class="tip">
<img src="images/special-tip.png"> <img src="${ctx}/static/images/special-tip.png">
</div> </div>
<div class="title">词云解析</div> <div class="title">词云解析</div>
</div> </div>
<div class="inner"> <div class="inner">
<img src="images/special-pic-07.png"> <img src="${ctx}/static/images/special-pic-07.png">
</div> </div>
</div> </div>
<!--相关新闻--> <!--相关新闻-->
<div class="about-news"> <div class="about-news">
<div class="special-title"> <div class="special-title">
<div class="tip"> <div class="tip">
<img src="images/special-tip.png"> <img src="${ctx}/static/images/special-tip.png">
</div> </div>
<div class="title">相关新闻</div> <div class="title">相关新闻</div>
</div> </div>
<div class="card"> <div class="card">
<div class="card-header">中外媒体看十九大：“科技创新”持续受关注。</div> <div class="card-header">中外媒体看十九大：“科技创新”持续受关注。</div>
<div class="card-content card-content-padding"> <div class="card-content card-content-padding">
<img src="images/special-pic-03.jpg"> <img src="${ctx}/static/images/special-pic-03.jpg">
</div> </div>
<div class="card-footer">美国媒体道琼斯通讯社、美联社、彭博社、CNBC和英国路透社等涉及十九大的报道热度均相对较高。</div> <div class="card-footer">美国媒体道琼斯通讯社、美联社、彭博社、CNBC和英国路透社等涉及十九大的报道热度均相对较高。</div>
</div> </div>
<div class="card"> <div class="card">
<div class="card-header">不忘初心，牢记使命，不断提高党的创造力。</div> <div class="card-header">不忘初心，牢记使命，不断提高党的创造力。</div>
<div class="card-content card-content-padding"> <div class="card-content card-content-padding">
<img src="images/special-pic-04.jpg"> <img src="${ctx}/static/images/special-pic-04.jpg">
</div> </div>
<div class="card-footer">党的十九大报告指出，五年来，党的创造力、凝聚力、战斗力显著增强。</div> <div class="card-footer">党的十九大报告指出，五年来，党的创造力、凝聚力、战斗力显著增强。</div>
</div> </div>
<div class="card"> <div class="card">
<div class="card-header">十九大报告：中国特色社会主义进入新时代的“宣言书”</div> <div class="card-header">十九大报告：中国特色社会主义进入新时代的“宣言书”</div>
<div class="card-content card-content-padding"> <div class="card-content card-content-padding">
<img src="images/special-pic-05.jpg"> <img src="${ctx}/static/images/special-pic-05.jpg">
</div> </div>
<div class="card-footer">中国共产党第十九次全国代表大会，中国特色社会主义进入新时代的关键时期召开的一次十分重要的大会。</div> <div class="card-footer">中国共产党第十九次全国代表大会，中国特色社会主义进入新时代的关键时期召开的一次十分重要的大会。</div>
</div> </div>
...@@ -261,20 +261,20 @@ ...@@ -261,20 +261,20 @@
<div class="pic-show"> <div class="pic-show">
<div class="special-title"> <div class="special-title">
<div class="tip"> <div class="tip">
<img src="images/special-tip.png"> <img src="${ctx}/static/images/special-tip.png">
</div> </div>
<div class="title">图说十九大</div> <div class="title">图说十九大</div>
</div> </div>
<div class="swiper-container pic-swiper"> <div class="swiper-container pic-swiper">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<div class="swiper-slide"> <div class="swiper-slide">
<img src="images/special-pic-06.jpg"> <img src="${ctx}/static/images/special-pic-06.jpg">
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
<img src="images/special-pic-06.jpg"> <img src="${ctx}/static/images/special-pic-06.jpg">
</div> </div>
<div class="swiper-slide"> <div class="swiper-slide">
<img src="images/special-pic-06.jpg"> <img src="${ctx}/static/images/special-pic-06.jpg">
</div> </div>
</div> </div>
</div> </div>
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
<div class="about-topic"> <div class="about-topic">
<div class="special-title"> <div class="special-title">
<div class="tip"> <div class="tip">
<img src="images/special-tip.png"> <img src="${ctx}/static/images/special-tip.png">
</div> </div>
<div class="title">相关专题</div> <div class="title">相关专题</div>
</div> </div>
...@@ -310,7 +310,9 @@ ...@@ -310,7 +310,9 @@
</div> </div>
</div> </div>
<jsp:include page="/WEB-INF/jsp/include/footer.jsp"/> <jsp:include page="/WEB-INF/jsp/include/footer.jsp"/>
<script src="${ctx}/static/js/swiper.min.js"></script>
<script src="${ctx}/static/js/vis.js"></script>
<script src="${ctx}/static/js/special.js"></script>
<script> <script>
$(function () { $(function () {
......
serverside/cihai-wechat/src/main/webapp/static/js/index.js
...@@ -9,7 +9,7 @@ var $loading = $('#loading'); ...@@ -9,7 +9,7 @@ var $loading = $('#loading');
$loading.addClass('fade-out'); $loading.addClass('fade-out');
setTimeout(function () { setTimeout(function () {
$loading.remove(); $loading.remove();
},300); }, 300);
$('.search-area-inner').on('click', function () { $('.search-area-inner').on('click', function () {
wx.startRecord(); wx.startRecord();
myApp.dialog.create({ myApp.dialog.create({
...@@ -17,7 +17,7 @@ $('.search-area-inner').on('click', function () { ...@@ -17,7 +17,7 @@ $('.search-area-inner').on('click', function () {
buttons: [ buttons: [
{ {
text: '完成', text: '完成',
onClick:function () { onClick: function () {
wx.stopRecord({ wx.stopRecord({
success: function (res) { success: function (res) {
myApp.dialog.preloader(); myApp.dialog.preloader();
...@@ -27,13 +27,14 @@ $('.search-area-inner').on('click', function () { ...@@ -27,13 +27,14 @@ $('.search-area-inner').on('click', function () {
localId: localId, // 需要识别的音频的本地Id，由录音相关接口获得 localId: localId, // 需要识别的音频的本地Id，由录音相关接口获得
isShowProgressTips: 0, // 默认为1，显示进度提示 isShowProgressTips: 0, // 默认为1，显示进度提示
success: function (res) { success: function (res) {
jQuery.get("/home/search",{keyword:res.translateResult},function (data) { jQuery.get("/home/search", {keyword: res.translateResult}, function (data) {
myApp.dialog.close(); myApp.dialog.close();
if(data.code=="OK"){ if (data.code == "OK") {
myApp.view.main.router.load({ // myApp.view.main.router.load({
url:data.data // url:data.data
}); // });
}else{ location.href = data.data;
} else {
myApp.dialog.alert(data.message); myApp.dialog.alert(data.message);
$('.j_search_input').val(res.translateResult); $('.j_search_input').val(res.translateResult);
} }
...@@ -51,4 +52,30 @@ $('.search-area-inner').on('click', function () { ...@@ -51,4 +52,30 @@ $('.search-area-inner').on('click', function () {
] ]
}).open(); }).open();
}); });
$('.brand-index').on('click', function () {
wx.chooseImage({
count: 1, // 默认9
sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
success: function (res) {
var localIds = res.localIds; // 返回选定照片的本地ID列表，localId可以作为img标签的src属性显示图片
wx.getLocalImgData({
localId: localIds[0], // 图片的localID
success: function (res) {
var localData = res.localData; // localData是图片的base64数据，可以用img标签显示
alert(localData);
}
});
}
});
})
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!