Commit fd57e81a by 张恒

j

parent af40d087
......@@ -3,7 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" afterPath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/View/default/Index_share.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_share.tpl" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -43,21 +44,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<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="358">
<caret line="69" column="1" lean-forward="false" selection-start-line="69" selection-start-column="1" selection-end-line="71" selection-end-column="10" />
<state relative-caret-position="434">
<caret line="35" column="7" lean-forward="true" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IndexController.class.php" pinned="false" current-in-tab="false">
<file leaf-file-name="IndexController.class.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311">
<caret line="63" column="31" lean-forward="true" selection-start-line="63" selection-start-column="31" selection-end-line="63" selection-end-column="31" />
<state relative-caret-position="-2691">
<caret line="14" column="48" lean-forward="true" selection-start-line="14" selection-start-column="48" selection-end-line="14" selection-end-column="48" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
</folding>
......@@ -65,6 +66,16 @@
</provider>
</entry>
</file>
<file leaf-file-name="Index_share.tpl" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_share.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="722">
<caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="41" selection-end-column="74" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main.scss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
......@@ -82,8 +93,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="206" column="13" lean-forward="false" selection-start-line="206" selection-start-column="3" selection-end-line="206" selection-end-column="13" />
<state relative-caret-position="368">
<caret line="208" column="16" lean-forward="true" selection-start-line="208" selection-start-column="16" selection-end-line="208" selection-end-column="16" />
<folding />
</state>
</provider>
......@@ -122,8 +133,9 @@
<option value="$PROJECT_DIR$/Application/Common/Conf/db.php" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_share.tpl" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
</list>
</option>
</component>
......@@ -455,12 +467,12 @@
<option name="presentableId" value="Default" />
<updated>1562502557206</updated>
<workItem from="1562502558877" duration="2926000" />
<workItem from="1562505554364" duration="4192000" />
<workItem from="1562505554364" duration="4487000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="7118000" />
<option name="totallyTimeSpent" value="7413000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="817" extended-state="6" />
......@@ -590,14 +602,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<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="342">
......@@ -609,24 +613,40 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311">
<caret line="63" column="31" lean-forward="true" selection-start-line="63" selection-start-column="31" selection-end-line="63" selection-end-column="31" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="434">
<caret line="35" column="7" lean-forward="true" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="358">
<caret line="69" column="1" lean-forward="false" selection-start-line="69" selection-start-column="1" selection-end-line="71" selection-end-column="10" />
<state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_share.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="722">
<caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="41" selection-end-column="74" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2691">
<caret line="14" column="48" lean-forward="true" selection-start-line="14" selection-start-column="48" selection-end-line="14" selection-end-column="48" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
......
......@@ -10,8 +10,8 @@ use Think\Log;
class IndexController extends Controller
{
private $auth_type = OAuthHelperV3::SCOPE_BASE;
// private $auth_type = OAuthHelperV3::SCOPE_USERINFO;
// private $auth_type = OAuthHelperV3::SCOPE_BASE;
private $auth_type = OAuthHelperV3::SCOPE_USERINFO;
private $cookie_uid_key = 'mtime-laopao-v1';
private $debug = 1;
private $today;
......@@ -77,12 +77,10 @@ class IndexController extends Controller
))->count();
if ($type == 1) {
if ($c >= 10) {
continue;
}
}
$req_type[] = $type;
}
if (empty($req_type)) {
......
......@@ -33,49 +33,13 @@
</div>
</div>
<script>
window.id='{:$id}';
window.base_resource_url = '__CDN__';
</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=FhDnDjEF8Zjw52Xk"></script>
<script type="text/javascript" src="__CDN__/js/jquery-2.1.3.min.js"></script>
<
<link href="__CDN__/css/notify.css" rel="stylesheet">
<script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script>
<script>
$('.btn_home').on('click',function(){
window.location.href = '/';
});
if (/android/i.test(navigator.userAgent)) {
$('.btn_home').css('top','877px');
}
window.wx && wx.ready(function () {
var base = location.origin;
var wxFriendData = {
'link':'http://dencare-photo.izhida.cn/index/share?id='+window.id,
'imgUrl':base + '/Public/static/images/share.jpg',
'desc': '我为登康点赞,17刷新荣耀,尽享冷热酸甜想吃就吃!',
'title': '新年好口福,17喜刷刷',
trigger: function () {
},
success: function () {
}
};
var wxTimelineData = {
'link':'http://dencare-photo.izhida.cn/index/share?id='+window.id,
'imgUrl':base + '/Public/static/images/share.jpg',
'title': '#新年好口福,17喜刷刷#定制属于您的2017新年喜刷刷海报',
trigger: function () {
},
success: function () {
}
};
wx.onMenuShareAppMessage(wxFriendData);
wx.onMenuShareTimeline(wxTimelineData);
});
</script>
</body>
</html>
\ No newline at end of file
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