Skip to content

Commit

Permalink
增加主题升级自动切换移动端主题,
Browse files Browse the repository at this point in the history
更新导航栏搜索按钮颜色,
更新主题默认配置文件,
修复短连接网址打不开的问题,
修复自动切换验证码错误的问题,
修复主题导航设置无效的问题
  • Loading branch information
amujie committed Aug 6, 2020
1 parent 6814139 commit 0a8e779
Show file tree
Hide file tree
Showing 13 changed files with 85 additions and 53 deletions.
8 changes: 8 additions & 0 deletions about/changelog.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"1.1.5": [
"增加主题升级自动切换移动端主题",
"更新导航栏搜索按钮颜色",
"更新主题默认配置文件",
"修复短连接网址打不开的问题",
"修复自动切换验证码错误的问题",
"修复主题导航设置无效的问题"
],
"1.1.4": [
"修复后台管理员无权限报错问题",
"修复SEO首页地图页地址错误问题",
Expand Down
1 change: 0 additions & 1 deletion asset/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,6 @@ input:-webkit-autofill:focus {background-clip: content-box !important;}
.mo-word-info iframe {max-width: 100%;}
@media(min-width:768px) {
/* 组件 */
.mo-part-slip {overflow-x: hidden}
.mo-part-left {left: 0 !important}
.mo-part-round {box-shadow: 0 0 1px rgba(0, 0, 0, 0.1)}
.mo-situ-pics:hover .mo-situ-play {opacity: 1;z-index: 1}
Expand Down
22 changes: 18 additions & 4 deletions asset/exc/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
array (
'name' => '基本设置',
'status' => '1',
'loadon' => '0',
'typing' => '0',
'search' => '1',
),
'logo' =>
Expand All @@ -15,6 +15,7 @@
'link' => '/',
'type' => 'logo',
'desktop' => 'on',
'mobile' => '0',
),
'home' =>
array (
Expand All @@ -33,6 +34,8 @@
'name' => '辣品',
'link' => '/index.php/label/index.html',
'type' => 'mid',
'desktop' => '0',
'mobile' => '0',
),
'level' =>
array (
Expand Down Expand Up @@ -60,6 +63,7 @@
'link' => '/index.php/vod/type/id/2.html',
'type' => 'cat',
'desktop' => 'on',
'mobile' => '0',
),
'variety' =>
array (
Expand All @@ -69,6 +73,7 @@
'link' => '/index.php/vod/type/id/3.html',
'type' => 'cat',
'desktop' => 'on',
'mobile' => '0',
),
'comic' =>
array (
Expand All @@ -78,6 +83,7 @@
'link' => '/index.php/vod/type/id/4.html',
'type' => 'cat',
'desktop' => 'on',
'mobile' => '0',
),
'music' =>
array (
Expand All @@ -86,6 +92,8 @@
'name' => '',
'link' => '',
'type' => 'cat',
'desktop' => '0',
'mobile' => '0',
),
'live' =>
array (
Expand All @@ -94,6 +102,8 @@
'name' => '',
'link' => '',
'type' => 'cat',
'desktop' => '0',
'mobile' => '0',
),
'art' =>
array (
Expand All @@ -113,6 +123,7 @@
'link' => '/index.php/actor/index.html',
'type' => 'mid',
'desktop' => 'on',
'mobile' => '0',
),
'topic' =>
array (
Expand All @@ -122,6 +133,7 @@
'link' => '/index.php/topic/index.html',
'type' => 'mid',
'desktop' => 'on',
'mobile' => '0',
),
'site' =>
array (
Expand All @@ -131,6 +143,7 @@
'link' => '/index.php/website/index.html',
'type' => 'mid',
'desktop' => 'on',
'mobile' => '0',
),
'gbook' =>
array (
Expand All @@ -149,6 +162,7 @@
'name' => '我的',
'link' => '/index.php/user/index.html',
'type' => 'mid',
'desktop' => '0',
'mobile' => 'on',
),
'icon' =>
Expand Down Expand Up @@ -1079,9 +1093,9 @@
array (
'name' => '静态加速',
'link' => 'https://cdn.jsdelivr.net/gh/amujie/mojia',
'local' => '1',
'debug' => '0',
'state' => '0',
'local' => '0',
'debug' => '1',
'state' => '1',
),
'demo' =>
array (
Expand Down
3 changes: 2 additions & 1 deletion asset/exc/create.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ function moJiaOptions() {
}
} elseif (isset($_POST['tpl'])) {
$option = @require (moJiaPath('path') . 'application/extra/maccms.php');
$option['site']['mob_template_dir'] = @$_POST['tpl'];
$option['site']['template_dir'] = @$_POST['tpl'];
if (file_put_contents(moJiaPath('path') . 'application/extra/maccms.php', '<?php ' . PHP_EOL . 'return ' . var_export($option, true) . ';')) {
$array = array();
Expand Down Expand Up @@ -312,7 +313,7 @@ function moJiaCommon() {
$mojia = moJiaPath('mojia');
$url = $mojia['other']['share']['host'] ? $mojia['other']['share']['host'] . parse_url(@$_POST['url'], PHP_URL_PATH) : @$_POST['url'];
preg_match_all(($mojia['other']['share']['regex'] ? $mojia['other']['share']['regex'] : '/(.*)/i'), moJiaCurlGet($mojia['other']['share']['apis'] . rawurlencode($url)), $match);
die(json_encode(array('msg' => $match[1][0])));
die(json_encode(array('msg' => str_replace('\\', '', $match[1][0]))));
} elseif (isset($_GET['pic'])) {
header('Content-Type: image/jpeg; charset=utf-8');
$time = isset($_GET['time']) ? $_GET['time'] : 5;
Expand Down
2 changes: 2 additions & 0 deletions asset/js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ layui.define(['income', 'iconfonts', 'multiple', 'sortable'], function(exports)
}
});
layui.form.on('submit(submit)', function(data) {
layer.load(2);
$.post($('.layui-form-pane').attr('action'), data.field, function(data) {
layer.closeAll();
layer.msg(data.msg, {
time: 1000
}, function() {
Expand Down
8 changes: 4 additions & 4 deletions asset/js/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ layui.define(['jquery'], function(exports) {
});
},
'mobile': function() {
return (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|EdgA|Opera\sMini/i.test(navigator.userAgent));
return (/Android|webOS|iPhone|iPod|BlackBerry|IEMobile|EdgA|Opera\sMini/i.test(navigator.userAgent));
},
'trident': function() {
return (/MSIE\s[0-9]|Trident\/[0-9]/i.test(navigator.userAgent));
Expand Down Expand Up @@ -165,8 +165,8 @@ layui.define(['jquery'], function(exports) {
});
},
'verify': function() {
var verify = $('.mo-java-verify').attr('src');
if ($('.mo-comm-critic').length || $('.mo-comm-gbform').length) {
var verify = $('.mo-java-verify').attr('src');
$('.mo-java-verify').attr('src', verify);
}
$(document).on('click', '.mo-java-verify', function() {
Expand Down Expand Up @@ -241,7 +241,7 @@ layui.define(['jquery'], function(exports) {
layui.use('qrcode', function() {
if ($('.mo-code-info').attr('data-api')) {
$.post(magic.tpl + 'asset/exc/create.php?id=url', 'url=' + encodeURIComponent(location.href), function(data) {
var url = data.msg && (data.msg.indexOf('//') != -1 || data.msg.indexOf('\\/\\/') != -1) ? data.msg : location.href;
var url = data.msg && (data.msg.indexOf('//') != -1) ? data.msg : location.href;
mojia.global.qrcode(148, url, '.mo-code-info', 'mo-code-pics')
});
} else {
Expand Down Expand Up @@ -479,7 +479,7 @@ layui.define(['jquery'], function(exports) {
success: function(layero, index) {
if (that.attr('data-api')) {
$.post(magic.tpl + 'asset/exc/create.php?id=url', 'url=' + encodeURIComponent(location.href), function(data) {
var url = data.msg && (data.msg.indexOf('//') != -1 || data.msg.indexOf('\\/\\/') != -1) ? data.msg : location.href;
var url = data.msg && (data.msg.indexOf('//') != -1) ? data.msg : location.href;
mojia.global.qrcode(200, url, '.mo-have-code', 'mo-have-pics')
mojia.button.canvas(url, index);
});
Expand Down
2 changes: 1 addition & 1 deletion asset/js/mojia.js

Large diffs are not rendered by default.

18 changes: 13 additions & 5 deletions html/admin/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
</select>
</td>
<td>
<select name="mojia[nav][base][loadon]" lay-verify="">
<option value="1"{if$mojia['nav']['base']['loadon']==1} selected{/if}>动态加载</option>
<option value="0"{if$mojia['nav']['base']['loadon']==0} selected{/if}>默认加载</option>
<select name="mojia[nav][base][typing]" lay-verify="">
<option value="1"{if$mojia['nav']['base']['typing']==1} selected{/if}>动态加载</option>
<option value="0"{if$mojia['nav']['base']['typing']==0} selected{/if}>默认加载</option>
</select>
</td>
<td>
Expand All @@ -46,6 +46,8 @@
<td><input type="input" name="mojia[nav][logo][link]" value="{$mojia['nav']['logo']['link']}" class="layui-input" placeholder="请填写链接地址"></td>
<td>
<input type="hidden" name="mojia[nav][logo][type]" value="logo" />
<input type="hidden" name="mojia[nav][logo][desktop]" value="0" />
<input type="hidden" name="mojia[nav][logo][mobile]" value="0" />
<input type="checkbox" name="mojia[nav][logo][desktop]" title="桌面端" lay-skin="primary"{if$mojia['nav']['logo']['desktop']} checked{/if}>
<input type="checkbox" name="mojia[nav][logo][mobile]" title="移动端" lay-skin="primary" disabled>
</td>
Expand All @@ -55,7 +57,7 @@
<td>
<select name="mojia[nav][{$magic}][id]" lay-filter="homeid">
<option value="">请选择</option>
<option data-name="首页" data-link="{$install}" value="0"{if$mojia['nav']['home']['id']==0} selected{/if}>首页</option>
<option data-name="首页" data-link="{$install}" value="0"{if$mojia['nav'][$magic]['id']==0} selected{/if}>首页</option>
{maccms:foreach name=":explode(',','1,2,3,5,6,7,8,9,10,11')"}
<option data-name="{$vo|mac_get_mid_text}" data-link="{:mac_url(mac_get_mid_code($vo).'/index')}" value="{$vo}"{if$mojia['nav'][$magic]['id']==$vo} selected{/if}>{$vo|mac_get_mid_text}</option>
{/maccms:foreach}
Expand All @@ -66,6 +68,8 @@
<td><input type="input" name="mojia[nav][{$magic}][link]" value="{$mojia['nav'][$magic]['link']}" class="layui-input" placeholder="请填写链接地址"></td>
<td>
<input type="hidden" name="mojia[nav][{$magic}][type]" value="mid" />
<input type="hidden" name="mojia[nav][{$magic}][desktop]" value="0" />
<input type="hidden" name="mojia[nav][{$magic}][mobile]" value="0" />
<input type="checkbox" name="mojia[nav][{$magic}][desktop]" title="桌面端" lay-skin="primary"{if$mojia['nav'][$magic]['desktop']} checked{/if}>
<input type="checkbox" name="mojia[nav][{$magic}][mobile]" title="移动端" lay-skin="primary"{if$mojia['nav'][$magic]['mobile']} checked{/if}>
</td>
Expand Down Expand Up @@ -104,6 +108,8 @@
<td><input type="input" name="mojia[nav][{$magic}][link]" value="{$mojia['nav'][$magic]['link']}" class="layui-input" placeholder="请填写链接地址"></td>
<td>
<input type="hidden" name="mojia[nav][{$magic}][type]" value="cat" />
<input type="hidden" name="mojia[nav][{$magic}][desktop]" value="0" />
<input type="hidden" name="mojia[nav][{$magic}][mobile]" value="0" />
<input type="checkbox" name="mojia[nav][{$magic}][desktop]" title="桌面端" lay-skin="primary"{if$mojia['nav'][$magic]['desktop']} checked{/if}>
<input type="checkbox" name="mojia[nav][{$magic}][mobile]" title="移动端" lay-skin="primary"{if$mojia['nav'][$magic]['mobile']} checked{/if}>
</td>
Expand All @@ -113,7 +119,7 @@
<td>
<select name="mojia[nav][{$magic}][id]" lay-filter="homeid">
<option value="">请选择</option>
<option data-name="首页" data-link="{$install}" value="0"{if$mojia['nav']['home']['id']==0} selected{/if}>首页</option>
<option data-name="首页" data-link="{$install}" value="0"{if$mojia['nav'][$magic]['id']==0} selected{/if}>首页</option>
{maccms:foreach name=":explode(',','1,2,3,5,6,7,8,9,10,11')"}
<option data-name="{$vo|mac_get_mid_text}" data-link="{:mac_url(mac_get_mid_code($vo).'/index')}" value="{$vo}"{if$mojia['nav'][$magic]['id']==$vo} selected{/if}>{$vo|mac_get_mid_text}</option>
{/maccms:foreach}
Expand All @@ -124,6 +130,8 @@
<td><input type="input" name="mojia[nav][{$magic}][link]" value="{$mojia['nav'][$magic]['link']}" class="layui-input" placeholder="请填写链接地址"></td>
<td>
<input type="hidden" name="mojia[nav][{$magic}][type]" value="mid" />
<input type="hidden" name="mojia[nav][{$magic}][desktop]" value="0" />
<input type="hidden" name="mojia[nav][{$magic}][mobile]" value="0" />
<input type="checkbox" name="mojia[nav][{$magic}][desktop]" title="桌面端" lay-skin="primary"{if$mojia['nav'][$magic]['desktop']} checked{/if}>
<input type="checkbox" name="mojia[nav][{$magic}][mobile]" title="移动端" lay-skin="primary"{if$mojia['nav'][$magic]['mobile']} checked{/if}>
</td>
Expand Down
2 changes: 1 addition & 1 deletion html/basics/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<form class="mo-navs-search mo-navs-form" data-auto="{$GLOBALS['config']['app']['search']?$mojia['nav']['base']['search']:0}" autocomplete="off" onkeydown="if(event.keyCode==13){return false}">
<a class="mo-navs-switch mo-navs-cuts mo-fsxs-14px mo-text-muted mo-java-event{if!$GLOBALS['config']['app']['search']} mo-part-bans{/if}" href="javascript:;"><span class="mo-navs-name" data-type="{:in_array([mid],array('4','5','6','7','10'))?1:mac_default([mid],'1')}" data-href="{:mac_url(mac_get_mid_code(in_array([mid],array('4','5','6','7','10'))?1:mac_default([mid],'1')).'/search')}" data-name="{[name]}">{:mac_get_mid_text(in_array([mid],array('4','5','6','7','10'))?1:mac_default([mid],'1'))}</span><span class="mo-part-move mo-edge-info mo-edge-bottom mo-bord-upper"></span></a>
<input class="mo-navs-input mo-text-input mo-bord-muted mo-bord-focus mo-back-muted mo-fsxs-14px mo-java-fixed mo-java-event" type="search"{if!$GLOBALS['config']['app']['search']} disabled placeholder="搜索功能已关闭"{else} placeholder="请输入关键字"{/if}{if [aid]==13||[aid]==23||[aid]==33||[aid]==83||[aid]==113} value="{$param.wd}"{/if} data-search="0" data-soft="{:md5($_SERVER['SERVER_ADDR'].$_SERVER['SERVER_SOFTWARE'].PHP_OS.$_SERVER['DOCUMENT_ROOT'])}" />
<a class="mo-navs-submit mo-cols-show mo-pnxs-10px mo-fsxs-20px mo-lhxs-30px mo-lhmd-36px mo-icon-font mo-icon-sousuo" data-file="{:md5_file(substr($template, strlen($install)).'asset/exc/cre'.'ate.p'.'hp')}"></a>
<a class="mo-navs-submit mo-text-muted mo-cols-show mo-pnxs-10px mo-fsxs-20px mo-lhxs-30px mo-lhmd-36px mo-icon-font mo-icon-sousuo" data-file="{:md5_file(substr($template, strlen($install)).'asset/exc/cre'.'ate.p'.'hp')}"></a>
</form>
<ul class="mo-navs-btns">
{maccms:foreach name="$mojia['nav']" id="sub"}{if$sub['type']=='icon'}
Expand Down
64 changes: 32 additions & 32 deletions html/gbook/ajax.html
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{include file="tinier/config"}
<ul class="mo-comm-info mo-cols-rows">
{maccms:gbook num="'.$GLOBALS['config']['gbook']['pagesize'].'" paging="yes" half="3" order="desc" by="id"}
{assign name="userinfo" value=":model('User')->listData(array('user_id'=>$vo['user_id']),'user_id desc',1)['list'][0]"}
<li class="mo-part-btsd mo-bord-muted mo-ptxs-5px mo-ptmd-10px mo-mtxs-5px mo-mrxs-5px mo-mlxs-5px"></li>
<li class="mo-cols-rows mo-maxs-5px mo-mamd-10px">
<img class="mo-comm-avat mo-part-peer mo-part-coin" src="{$userinfo['user_qq']?'http://q1.qlogo.cn/g?b=qq&nk='.$userinfo['user_qq'].'&s=640':str_replace($install.'static/images/touxiang.png',$cdnpath.'asset/img/avatar.png',mac_get_user_portrait($vo['user_id']))}" />
<div class="mo-comm-left">
<span class="mo-part-bold">{:mac_default($userinfo['user_nick_name'],$vo['gbook_name'])}</span>
<span class="mo-part-more mo-fsxs-12px mo-fssm-14px">{$vo.gbook_time|mac_day}</span>
</div>
<div class="mo-comm-left">
<p class="mo-pzxs-5px">{:mac_default(moJiaFace($vo['gbook_content']),'咦?发现一条空白留言')}</p>
{if$vo.gbook_reply}
<div class="mo-part-bbsd mo-bord-muted mo-ptxs-5px mo-ptmd-10px"></div>
<div class="mo-cols-rows mo-mtxs-10px mo-mtmd-20px">
<img class="mo-comm-avat mo-part-peer mo-part-coin" src="{$maccms['site_qq']&&$maccms['site_qq']!='123456'?'http://q1.qlogo.cn/g?b=qq&nk='.$maccms['site_qq'].'&s=640':mac_url_img($mojia['other']['icon']['pics'])}"/>
<div class="mo-comm-left">
<span class="mo-part-bold">管理员</span>
<span class="mo-part-more mo-fsxs-12px mo-fssm-14px">{$vo.gbook_reply_time|mac_day}</span>
</div>
<div class="mo-comm-left">
<p class="mo-pzxs-5px">{:moJiaFace($vo['gbook_reply'])}</p>
</div>
</div>
{/if}
</div>
</li>
{/maccms:gbook}{if$__PAGING__.record_total==0}
<li class="mo-coxs-center mo-paxs-5px mo-pamd-10px">还没有人留言哎!</li>
{/if}
</ul>
{include file="tinier/config"}
<ul class="mo-comm-info mo-cols-rows">
{maccms:gbook num="'.$GLOBALS['config']['gbook']['pagesize'].'" paging="yes" half="3" order="desc" by="id"}
{assign name="userinfo" value=":model('User')->listData(array('user_id'=>$vo['user_id']),'user_id desc',1)['list'][0]"}
<li class="mo-part-btsd mo-bord-muted mo-ptxs-5px mo-ptmd-10px mo-mtxs-5px mo-mrxs-5px mo-mlxs-5px"></li>
<li class="mo-cols-rows mo-maxs-5px mo-mamd-10px">
<img class="mo-comm-avat mo-part-peer mo-part-coin" src="{$userinfo['user_qq']?'http://q1.qlogo.cn/g?b=qq&nk='.$userinfo['user_qq'].'&s=640':str_replace($install.'static/images/touxiang.png',$cdnpath.'asset/img/avatar.png',mac_get_user_portrait($vo['user_id']))}" />
<div class="mo-comm-left">
<span class="mo-part-bold">{:mac_default($userinfo['user_nick_name'],$vo['gbook_name'])}</span>
<span class="mo-part-more mo-fsxs-12px mo-fssm-14px">{$vo.gbook_time|mac_day}</span>
</div>
<div class="mo-comm-left">
<p class="mo-pzxs-5px">{:mac_default(moJiaFace($vo['gbook_content']),'咦?发现一条空白留言')}</p>
{if$vo.gbook_reply}
<div class="mo-part-bbsd mo-bord-muted mo-ptxs-5px mo-ptmd-10px"></div>
<div class="mo-cols-rows mo-mtxs-10px mo-mtmd-20px">
<img class="mo-comm-avat mo-part-peer mo-part-coin" src="{$maccms['site_qq']&&$maccms['site_qq']!='123456'?'http://q1.qlogo.cn/g?b=qq&nk='.$maccms['site_qq'].'&s=640':mac_url_img($mojia['other']['icon']['pics'])}"/>
<div class="mo-comm-left">
<span class="mo-part-bold mo-text-mojia">管理员</span>
<span class="mo-part-more mo-fsxs-12px mo-fssm-14px">{$vo.gbook_reply_time|mac_day}</span>
</div>
<div class="mo-comm-left">
<p class="mo-pzxs-5px">{:moJiaFace($vo['gbook_reply'])}</p>
</div>
</div>
{/if}
</div>
</li>
{/maccms:gbook}{if$__PAGING__.record_total==0}
<li class="mo-coxs-center mo-paxs-5px mo-pamd-10px">还没有人留言哎!</li>
{/if}
</ul>
{include file="tinier/paging"}
2 changes: 1 addition & 1 deletion html/index/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{include file="public/header,index/banner,index/notice,index/latest,index/newest,index/sorted,index/friend,public/footer"}
{include file="public/header,index/banner,index/notice,index/latest,index/newest,index/sorted,index/actors,index/friend,public/footer"}
2 changes: 1 addition & 1 deletion html/public/header.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{include file="public/include"}
<div class="mo-head-info mo-back-white mo-cols-minw{if$mojia['nav']['base']['status']} mo-part-fixs{/if}">
<div class="mo-cols-case" data-load="{$mojia['nav']['base']['loadon']}" data-url="{:mac_url('label/navbar')}" data-mid="{$maccms.mid}" data-aid="{$maccms.aid}" data-tid="{$GLOBALS['type_id']}" data-pid="{$GLOBALS['type_pid']}">
<div class="mo-cols-case" data-load="{$mojia['nav']['base']['typing']}" data-url="{:mac_url('label/navbar')}" data-mid="{$maccms.mid}" data-aid="{$maccms.aid}" data-tid="{$GLOBALS['type_id']}" data-pid="{$GLOBALS['type_pid']}">
{include file="basics/navbar" mid="mac_filter_html($maccms['mid'])" aid="mac_filter_html($maccms['aid'])" name=":md5($_SERVER['SE'.'RV'.'ER_AD'.'DR'])" tid="mac_filter_html($GLOBALS['type_id'])" pid="mac_filter_html($GLOBALS['type_pid'])"}
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions info.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ webtest = https://mojia.amujie.com
qqcode = 1570457334
qqgroup = 137183109
addgroup= 51Zakp5
lastdate= 2020-08-04
version = 1.1.4
lastdate= 2020-08-06
version = 1.1.5
adsdir = about

0 comments on commit 0a8e779

Please sign in to comment.