Skip to content

Commit

Permalink
修复分享模板不存在的问题,
Browse files Browse the repository at this point in the history
修复热搜搜索控制器不存在的问题,
修复淘客缓存保存位置错误的问题,
修复静态开发文件路径错误的问题
  • Loading branch information
maodajie committed Jun 22, 2021
1 parent edf2e27 commit 67467ca
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 9 deletions.
43 changes: 43 additions & 0 deletions html/special/canvas.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!DOCTYPE html>
<html>
<head>
{include file="public/include,module/include/style"}
<title>{$_GET['name']}</title>
</head>
<body>
<div class="mo-make-wrap">
<div class="mo-make-item dc-bulge dc-wane">
<div class="mo-make-head">
<div class="mo-lazy-wrap dc-row mo-back-muted dc-1by2">
<img class="mo-lazy-load mo-make-load dc-height" src="{$_GET['img']}" alt="{$_GET['name']}" />
</div>
<div class="mo-make-info dc-pa-5 dc-row">
<div class="mo-name-wrap dc-line-30 dc-pa-10 dc-font-0 dc-pb-2">
<h2 class="dc-font-14 dc-line-24 dc-clamp"><a class="mo-make-href dc-bold" href="{$_GET['href']}">{:preg_replace('/_.*/i','',$_GET['name'])}</a></h2>
</div>
<div class="dc-pn-10 dc-pb-2 dc-font-12 dc-line-20 mo-text-muted" style="height: 40px;overflow: hidden;">
{$_GET['key']}
</div>
<div class="mo-make-code dc-rbgo dc-ma-10 dc-load" data-api="{$mojia.sole.share.api?1:0}">
<img class="mo-make-icon dc-hide" src="{:mac_url_img($mojia.base.logo.pic2)}" crossorigin="anonymous" />
</div>
</div>
</div>
<ul class="mo-make-foot dc-row dc-pa-5">
<li class="dc-col-6 dc-pa-5">
<a class="mo-make-copy mo-make-text dc-bold dc-font-14 dc-center mo-edge-color dc-wane dc-show dc-clamp dc-line-40" href="javascript:;">复制链接</a>
</li>
<li class="dc-col-6 dc-pa-5">
<a class="mo-make-down mo-make-text dc-bold dc-font-14 dc-center mo-edge-color dc-wane dc-show dc-clamp dc-line-40 dc-disad" href="javascript:;">loading</a>
</li>
</ul>
</div>
</div>
{if$mojia.config.mode=='exploit'}
<script src="{$mojia.config.cdn}{$mojia.config.node}/html2canvas/dist/html2canvas.min.js?v={$mojia.config.ver}" type="text/javascript" charset="utf-8"></script>
{else}
<script src="{$mojia.config.cdn}{$mojia.config.base}/script/canvas.js?v={$mojia.config.ver}" type="text/javascript" charset="utf-8"></script>
{/if}
{include file="module/include/script"}
</body>
</html>
16 changes: 8 additions & 8 deletions html/user/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,40 +85,40 @@
</li>
</ul>
</div>
<div class="dc-layout dc-wane mo-back-white mo-info-wrap">
<div class="dc-layout dc-wane mo-back-white mo-exte-wrap">
<div class="mo-info-wrap dc-row">
<div class="mo-info-pic dc-pa-5 dc-row">
<div class="mo-lazy-wrap dc-wane dc-row mo-back-muted dc-1by1">
<div class="mo-user-code mo-user-code1 dc-rtgo dc-load dc-col-12 dc-height" data-url="{$maccms.http_type}{$_SERVER['HTTP_HOST']}{:mac_url('user/visit',['uid'=>$obj.user_id])}" data-api="{$mojia.sole.share.api?1:0}">
<img class="mo-user-icon1 dc-hide" src="https://cdn.jsdelivr.net/gh/maodajie/mojiu@main/static/image/favicon.png" crossorigin="anonymous" />
<img class="mo-user-icon1 dc-hide" src="{:mao_img_src(mao_view_user($obj,'user_avatar',1),$mojia.sole.share)}" crossorigin="anonymous" />
</div>
</div>
</div>
<dl class="mo-info-item dc-ltgo dc-pa-10 dc-pa-md15">
<dl class="mo-info-item dc-ltgo dc-pa-10">
<dt class="dc-font-16 dc-line-24 dc-clamp"><a class="dc-bold" href="">推广访问</a></dt>
<dd class="dc-font-14 dc-line-24 mo-text-muted">成功邀请1位用户访问</dd>
<dd class="dc-font-14 dc-line-24 mo-text-muted">获取{$GLOBALS['config']['user']['invite_visit_points']}积分</dd>
</dl>
<div class="mo-info-item dc-lbgo mo-info-btn dc-pa-10 dc-pa-md15 dc-font-0 dc-line-24 dc-clamp">
<div class="mo-info-item dc-lbgo mo-info-btn dc-pa-10 dc-font-0 dc-line-24 dc-clamp">
<a class="mo-user-copy1 dc-font-14 dc-line-30 dc-pn-10 dc-iblock dc-mr-10 mo-part-btns dc-wane mo-back-muted" href="javascript:;"><i class="mo-icon-font mo-icon-fuzhi dc-pr-2 dc-font-14"></i>复制链接</a>
</div>
</div>
</div>
<div class="dc-layout dc-wane mo-back-white mo-info-wrap">
<div class="dc-layout dc-wane mo-back-white mo-exte-wrap">
<div class="mo-info-wrap dc-row">
<div class="mo-info-pic dc-pa-5 dc-row">
<div class="mo-lazy-wrap dc-wane dc-row mo-back-muted dc-1by1">
<div class="mo-user-code mo-user-code2 dc-rtgo dc-load dc-col-12 dc-height" style="height: 100%;" data-url="{$maccms.http_type}{$_SERVER['HTTP_HOST']}{:mac_url('user/reg',['uid'=>$obj.user_id])}" data-api="{$mojia.sole.share.api?1:0}">
<div class="mo-user-code mo-user-code2 dc-rtgo dc-load dc-col-12 dc-height" data-url="{$maccms.http_type}{$_SERVER['HTTP_HOST']}{:mac_url('user/reg',['uid'=>$obj.user_id])}" data-api="{$mojia.sole.share.api?1:0}">
<img class="mo-user-icon2 dc-hide" src="{:mao_img_src(mao_view_user($obj,'user_avatar',1),$mojia.sole.share)}" crossorigin="anonymous" />
</div>
</div>
</div>
<dl class="mo-info-item dc-ltgo dc-pa-10 dc-pa-md15">
<dl class="mo-info-item dc-ltgo dc-pa-10">
<dt class="dc-font-16 dc-line-24 dc-clamp"><a class="dc-bold" href="">推广注册</a></dt>
<dd class="dc-font-14 dc-line-24 mo-text-muted">成功邀请1位用户注册</dd>
<dd class="dc-font-14 dc-line-24 mo-text-muted">获取{$GLOBALS['config']['user']['invite_reg_points']}积分</dd>
</dl>
<div class="mo-info-item dc-lbgo mo-info-btn dc-pa-10 dc-pa-md15 dc-font-0 dc-line-24 dc-clamp">
<div class="mo-info-item dc-lbgo mo-info-btn dc-pa-10 dc-font-0 dc-line-24 dc-clamp">
<a class="mo-user-copy2 dc-font-14 dc-line-30 dc-pn-10 dc-iblock dc-mr-10 mo-part-btns dc-wane mo-back-muted" href="javascript:;"><i class="mo-icon-font mo-icon-fuzhi dc-pr-2 dc-font-14"></i>复制链接</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"static": {
"income": "{/}https://cdn.jsdelivr.net/gh/maodajie/daima@main/",
"down": "https://cdn.jsdelivr.net/gh/maodajie/mojiu@down/",
"down": "http://192.168.31.152/template/mojiu-down/",
"main": "https://cdn.jsdelivr.net/gh/maodajie/mojiu@main/"
},
"main": "static/script/layui.js",
Expand Down
6 changes: 6 additions & 0 deletions public/include.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<?php
/*!
* @author:大橙子
* @website:https://maodajie.com
* @telegram:https://t.me/mubanqun
* @qqcode:1570457334
*/

if (!function_exists('mac_get_mid_code')) {
exit('请升级最新版苹果CMS后使用 下载地址 https://cdn.jsdelivr.net/gh/magicblack/maccms_down/');
Expand Down

0 comments on commit 67467ca

Please sign in to comment.