Commit 6b052254 by zhangheng

y

parent 7b2e1208
......@@ -2,8 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/ceshi.jpg" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -83,8 +83,8 @@
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="244" column="59" lean-forward="false" selection-start-line="244" selection-start-column="59" selection-end-line="244" selection-end-column="59" />
<state relative-caret-position="184">
<caret line="242" column="90" lean-forward="false" selection-start-line="242" selection-start-column="90" selection-end-line="242" selection-end-column="90" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -165,8 +165,8 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="87">
<caret line="362" column="24" lean-forward="true" selection-start-line="362" selection-start-column="24" selection-end-line="362" selection-end-column="24" />
<state relative-caret-position="163">
<caret line="393" column="61" lean-forward="false" selection-start-line="393" selection-start-column="61" selection-end-line="393" selection-end-column="61" />
<folding />
</state>
</provider>
......@@ -212,8 +212,9 @@
<find>page-lang</find>
<find>btn-next-map</find>
<find>btn-info</find>
<find>mix/</find>
<find>mergeImage_two</find>
<find>mix/</find>
<find>hasc</find>
</findStrings>
<replaceStrings>
<replace>m-</replace>
......@@ -246,8 +247,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="33" />
<option name="y" value="23" />
<option name="x" value="201" />
<option name="y" value="29" />
<option name="width" value="1440" />
<option name="height" value="817" />
</component>
......@@ -588,15 +589,15 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="50108000" />
<workItem from="1566667516612" duration="51015000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="50108000" />
<option name="totallyTimeSpent" value="51015000" />
</component>
<component name="ToolWindowManager">
<frame x="33" y="23" width="1440" height="817" extended-state="0" />
<frame x="201" y="29" width="1440" height="817" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22389127" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
......@@ -775,16 +776,16 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="87">
<caret line="362" column="24" lean-forward="true" selection-start-line="362" selection-start-column="24" selection-end-line="362" selection-end-column="24" />
<state relative-caret-position="163">
<caret line="393" column="61" lean-forward="false" selection-start-line="393" selection-start-column="61" selection-end-line="393" selection-end-column="61" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="244" column="59" lean-forward="false" selection-start-line="244" selection-start-column="59" selection-end-line="244" selection-end-column="59" />
<state relative-caret-position="184">
<caret line="242" column="90" lean-forward="false" selection-start-line="242" selection-start-column="90" selection-end-line="242" selection-end-column="90" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......
......@@ -40,7 +40,7 @@
// doc.addEventListener('DOMContentLoaded', recalc, false);
// })(document, window);
</script>
<title>酸灵</title>
<title>热酸甜八十年</title>
<link href="__CDN__/css/swiper.min.css" rel="stylesheet">
<link href="__CDN__/css/main.css" rel="stylesheet">
......@@ -239,8 +239,8 @@
</script>
<script type="text/javascript" src="__CDN__/js/konva.min.js"></script>
<script type="text/javascript" src="__CDN__/js/swiper.min.js"></script>
<!--<script type="text/javascript"-->
<!--src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all&app_stat_key=2tzKMdJxaQREJDP7"></script>-->
<script type="text/javascript"
src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=9"></script>
<link href="__CDN__/css/notify.css" rel="stylesheet">
......
......@@ -124,10 +124,11 @@ $(document).ready(function () {
});
$('.c-d').on('click',function () {
if($(this).hasClass('rotate-sate')){
$('.c-d').removeClass('rotate-sate')
document.getElementById('b-j').pause();
}else {
$('.c-d').addClass('rotate-sate')
document.getElementById('b-j').play();
}
});
$('input').on('blur',function(){
......@@ -386,14 +387,15 @@ function mergeImage_two(url) {
}
window.wx && wx.ready(function () {
document.getElementById('b-j').play();
var base = location.origin;
var wxFriendData = {
'link': base,
'imgUrl': base + '/Public/static/images/share.jpg',
'imgUrl': base + '/Public/static/images/share-two.png',
// 内容
'desc': '',
'desc': '重温八十年时代变迁,感受人生冷热酸甜迸发的力量',
// 标题
'title': '',
'title': '冷酸灵邀你“打卡”八十年的辉煌记忆',
trigger: function () {
},
success: function () {
......@@ -401,8 +403,8 @@ window.wx && wx.ready(function () {
};
var wxTimelineData = {
'link': base,
'imgUrl': base + '/Public/static/images/share.jpg',
'title': '',
'imgUrl': base + '/Public/static/images/share-two.png',
'title': '冷酸灵邀你“打卡”八十年的辉煌记忆',
trigger: function () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment