Skip to content

T
taote
提交 8c71ccdf authored 作者: Junlz's avatar Junlz
浏览文件
操作

合并develop

上级 6c2c1a3b
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 14509 行增加 和 278 行删除
application/index/controller/Index.php
浏览文件 @ 8c71ccdf
...@@ -5,6 +5,7 @@ namespace app\index\controller; ...@@ -5,6 +5,7 @@ namespace app\index\controller;
use app\common\controller\Frontend; use app\common\controller\Frontend;
use app\common\model\User; use app\common\model\User;
use app\common\model\Ex; use app\common\model\Ex;
use app\common\model\Material;
class Index extends Frontend class Index extends Frontend
{ {
...@@ -20,7 +21,6 @@ class Index extends Frontend ...@@ -20,7 +21,6 @@ class Index extends Frontend
if (!$this->auth->id) { if (!$this->auth->id) {
$this->success(__('您未登录请登录'), url('user/login')); $this->success(__('您未登录请登录'), url('user/login'));
} }
// echo 11;die;
$this->success(__('订单'), url('index/order')); $this->success(__('订单'), url('index/order'));
// $this->order(); // $this->order();
// return $this->view->fetch(); // return $this->view->fetch();
...@@ -28,16 +28,19 @@ class Index extends Frontend ...@@ -28,16 +28,19 @@ class Index extends Frontend
public function order() public function order()
{ {
// if (!$this->auth->id) {
// $this->success(__('您未登录请登录'), url('user/login'));
// }
$info = User::get($this->auth->id); $info = User::get($this->auth->id);
$data = Ex::Orders($info["popularize_id"]); $data = Ex::Orders($info->popularize_id);
// print_r($data);exit;
$data['popularize_id'] = $info["popularize_id"]; $data['popularize_id'] = $info["popularize_id"];
$this->view->assign('data', $data); $this->view->assign('data', $data);
return $this->view->fetch(); return $this->view->fetch();
} }
public function materialList()
{
$info = User::get($this->auth->id);
$data = Material::material($info->popularize_id,$info->nickname);
$this->view->assign('data', $data);
return $this->view->fetch();
}
} }
application/index/controller/Material.php 0 → 100644
浏览文件 @ 8c71ccdf
<?php
namespace app\api\controller;
use app\common\controller\Api;
use think\Db;
include ROOT_PATH."extend/phpqrcode/qrlib.php";
use QRcode;
/**
* 首页接口
*/
class Material extends Api
{
protected $noNeedLogin = ['*'];
protected $noNeedRight = ['*'];
/**
* 首页
*
*/
public function index()
{
$data = Db::table("fa_material")->where("is_del",0)->select();
}
}
application/index/controller/User.php
浏览文件 @ 8c71ccdf
...@@ -24,6 +24,7 @@ class User extends Frontend ...@@ -24,6 +24,7 @@ class User extends Frontend
public function _initialize() public function _initialize()
{ {
parent::_initialize(); parent::_initialize();
$auth = $this->auth; $auth = $this->auth;
...@@ -151,7 +152,7 @@ class User extends Frontend ...@@ -151,7 +152,7 @@ class User extends Frontend
{ {
$url = $this->request->request('url', '', 'trim'); $url = $this->request->request('url', '', 'trim');
if ($this->auth->id) { if ($this->auth->id) {
$this->success(__('You\'ve logged in, do not login again'), $url ? $url : url('index/index')); $this->success(__('You\'ve logged in, do not login again'), $url ? $url : url('index/order'));
// $this->success(__('You\'ve logged in, do not login again'), $url ? $url : url('user/index')); // $this->success(__('You\'ve logged in, do not login again'), $url ? $url : url('user/index'));
} }
if ($this->request->isPost()) { if ($this->request->isPost()) {
...@@ -183,7 +184,7 @@ class User extends Frontend ...@@ -183,7 +184,7 @@ class User extends Frontend
return false; return false;
} }
if ($this->auth->login($account, $password)) { if ($this->auth->login($account, $password)) {
$this->success(__('Logged in successful'), $url ? $url : url('user/index')); $this->success(__('Logged in successful'), $url ? $url : url('index/order'));
} else { } else {
$this->error($this->auth->getError(), null, ['token' => $this->request->token()]); $this->error($this->auth->getError(), null, ['token' => $this->request->token()]);
} }
......
application/index/view/index/material_list.html 0 → 100644
浏览文件 @ 8c71ccdf
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title>海报列表</title>
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<link href="__CDN__/template/mobile/css/mui.css" rel="stylesheet" />
</head>
<style>
html,body{
width:100%;
height:100%;
margin:0;
padding: 0;
background-color: #fff;
overflow: hidden;
}
ul,li{
list-style: none;
}
.mui-content{
height:100%;
overflow: hidden;
background-color: #fff;
}
.mui-content > .mui-table-view:first-child{
margin: 0;
}
.mui-grid-view.mui-grid-9 .mui-table-view-cell{
border: none;
}
.mui-table-view{
height: 100%;
overflow-y: scroll;
margin: 0;
}
.poster_bg{
width:100%;
height:5.5rem;
position: relative;
}
.big_img{
width:100%;
height: 5.5rem;
}
.ecode{
width:0.88rem;
height:0.88rem;
position: absolute;
top:3.8rem;
left: 1.85rem;
}
.ecode_p{
position: absolute;
top:0.4rem;
margin: 0;
width:100%;
text-align: center;
color: #fff;
/* background-color: green; */
font-size: 0.1rem;
}
.mui-card-header, .mui-card-footer{
display: block;
text-align: center;
}
</style>
<body>
<div class="mui-content">
<ul class="mui-table-view mui-grid-view mui-grid-9" style='background-color: #fff;'>
{foreach name="data" item="vo"}
<li class="mui-table-view-cell mui-media mui-col-xs-6 ">
<div class="poster_bg">
<img src="{$vo.image_url}" alt="" class="big_img">
<p class="ecode_p">来自{$vo.name}站长的分享</p>
<img src="{$vo.qrcode}" alt="" class="ecode">
</div>
</li>
{/foreach}
</ul>
</div>
<script src="__CDN__/template/mobile/js/mui.js"></script>
<script src="__CDN__/template/mobile/js/rem.js"></script>
<script type="text/javascript">
mui.init()
</script>
</body>
</html>
application/index/view/layout/default.html
浏览文件 @ 8c71ccdf
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
{include file="common/meta" /} <!-- <link href="__CDN__/assets/css/user.css?v={$Think.config.site.version}" rel="stylesheet">-->
<link href="__CDN__/assets/css/user.css?v={$Think.config.site.version}" rel="stylesheet">
</head> </head>
<body> <body>
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#header-navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{:url('/')}">{$site.name}</a>
</div>
<div class="collapse navbar-collapse" id="header-navbar">
<ul class="nav navbar-nav navbar-right">
<li><a href="{:url('/')}">{:__('Home')}</a></li>
<li class="dropdown">
{if $user}
<a href="{:url('user/index')}" class="dropdown-toggle" data-toggle="dropdown" style="padding-top: 10px;height: 50px;">
<span class="avatar-img"><img src="{$user.avatar|cdnurl}" alt=""></span>
</a>
{else /}
<a href="{:url('user/index')}" class="dropdown-toggle" data-toggle="dropdown">{:__('User center')} <b class="caret"></b></a>
{/if}
<ul class="dropdown-menu">
{if $user}
<li><a href="{:url('user/index')}"><i class="fa fa-user-circle fa-fw"></i>{:__('User center')}</a></li>
<li><a href="{:url('user/profile')}"><i class="fa fa-user-o fa-fw"></i>{:__('Profile')}</a></li>
<li><a href="{:url('user/changepwd')}"><i class="fa fa-key fa-fw"></i>{:__('Change password')}</a></li>
<li><a href="{:url('user/logout')}"><i class="fa fa-sign-out fa-fw"></i>{:__('Sign out')}</a></li>
{else /}
<li><a href="{:url('user/login')}"><i class="fa fa-sign-in fa-fw"></i> {:__('Sign in')}</a></li>
<li><a href="{:url('user/register')}"><i class="fa fa-user-o fa-fw"></i> {:__('Sign up')}</a></li>
{/if}
</ul>
</li>
</ul>
</div>
</div>
</nav>
<main class="content"> <!-- <main class="content">-->
{__CONTENT__} {__CONTENT__}
</main> <!-- </main>-->
<footer class="footer" style="clear:both">
<p class="copyright">Copyright&nbsp;©&nbsp;2017-2020 {$site.name} All Rights Reserved <a href="https://beian.miit.gov.cn" target="_blank">{$site.beian|htmlentities}</a></p>
</footer>
{include file="common/script" /}
</body> </body>
</html> </html>
application/index/view/user/login.html
浏览文件 @ 8c71ccdf
<div id="content-container" class="container"> <!doctype html>
<div class="user-section login-section"> <html>
<div class="logon-tab clearfix"><a class="active">{:__('Sign in')}</a> <a href="{:url('user/register')}?url={$url|urlencode}">{:__('Sign up')}</a></div>
<div class="login-main"> <head>
<form name="form" id="login-form" class="form-vertical" method="POST" action=""> <meta charset="utf-8">
<input type="hidden" name="url" value="{$url}"/> <title>欢迎登录益农社管理系统</title>
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<link href="__CDN__/template/mobile/css/mui.css" rel="stylesheet" />
</head>
<style>
html,body{
width:100%;
height:100%;
margin:0;
padding: 0;
background-color: #fff;
overflow: hidden;
}
ul,li{
list-style: none;
}
.mui-content{
height:100%;
overflow: hidden;
background-color: #fff;
}
.mui-card{
height:3.1rem;
}
.mui-card-header, .mui-card-footer{
display: block;
text-align: center;
}
.mui-input-group{
width:6rem;
margin:2rem auto 0;
}
.mui-input-group:before{
height:0;
}
.mui-input-row label{
width:20%;
}
.mui-input-row label ~ input, .mui-input-row label ~ select, .mui-input-row label ~ textarea{
width:80%;
font-size: 0.28rem;
color: #999999;
}
.mui-input-group:after{
height: 0;
}
.mui-btn-block{
width:3rem;
height:0.7rem;
line-height: 0.7rem;
padding: 0;
margin: 1.5rem auto;
}
</style>
<body>
<div class="mui-content">
<form class="mui-input-group" id="login-form" class="form-vertical" method="POST" action="{:url('user/login')}">
<!-- <input type="hidden" name="url" value="{$url}"/>-->
{:token()} {:token()}
<div class="form-group"> <div class="mui-input-row">
<label class="control-label" for="account">{:__('Account')}</label> <label><span class="mui-icon mui-icon-person"></span></label>
<div class="controls"> <input type="text" class="mui-input-clear" placeholder="请输入手机号" id="account" name="account" value="" placeholder="{:__('Email/Mobile/Username')}" autocomplete="off">
<input class="form-control input-lg" id="account" type="text" name="account" value="" data-rule="required" placeholder="{:__('Email/Mobile/Username')}" autocomplete="off">
<div class="help-block"></div>
</div> </div>
<div class="mui-input-row">
<label><span class="mui-icon mui-icon-locked"></span></label>
<input type="password" class="mui-input-password" placeholder="请输入密码" id="password" name="password" data-rule="required;password" placeholder="{:__('Password')}" autocomplete="off">
</div> </div>
<div class="form-group"> <div class="mui-button-row">
<label class="control-label" for="password">{:__('Password')}</label> <button type="submit" class="mui-btn mui-btn-blue mui-btn-block">登录</button>
<div class="controls">
<input class="form-control input-lg" id="password" type="password" name="password" data-rule="required;password" placeholder="{:__('Password')}" autocomplete="off">
</div>
</div>
<div class="form-group">
<div class="controls">
<div class="checkbox inline">
<label>
<input type="checkbox" name="keeplogin" checked="checked" value="1"> {:__('Keep login')}
</label>
</div>
<div class="pull-right"><a href="javascript:;" class="btn-forgot">{:__('Forgot password')}</a></div>
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary btn-lg btn-block">{:__('Sign in')}</button>
</div> </div>
</form> </form>
</div>
</div>
</div> </div>
<script type="text/html" id="resetpwdtpl"> <script src="__CDN__/template/mobile/js/mui.js"></script>
<form id="resetpwd-form" class="form-horizontal form-layer" method="POST" action="{:url('api/user/resetpwd')}"> <script src="__CDN__/template/mobile/js/rem.js"></script>
<div class="form-body"> <script type="text/javascript">
<input type="hidden" name="action" value="resetpwd"/> mui.init()
<div class="form-group">
<label class="control-label col-xs-12 col-sm-3">{:__('Type')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="radio">
<label for="type-email"><input id="type-email" checked="checked" name="type" data-send-url="{:url('api/ems/send')}" data-check-url="{:url('api/validate/check_ems_correct')}" type="radio" value="email"> {:__('Reset password by email')}</label>
<label for="type-mobile"><input id="type-mobile" name="type" type="radio" data-send-url="{:url('api/sms/send')}" data-check-url="{:url('api/validate/check_sms_correct')}" value="mobile"> {:__('Reset password by mobile')}</label>
</div>
</div>
</div>
<div class="form-group" data-type="email">
<label for="email" class="control-label col-xs-12 col-sm-3">{:__('Email')}:</label>
<div class="col-xs-12 col-sm-8">
<input type="text" class="form-control" id="email" name="email" value="" data-rule="required(#type-email:checked);email;remote({:url('api/validate/check_email_exist')}, event=resetpwd, id=0)" placeholder="">
<span class="msg-box"></span>
</div>
</div>
<div class="form-group hide" data-type="mobile">
<label for="mobile" class="control-label col-xs-12 col-sm-3">{:__('Mobile')}:</label>
<div class="col-xs-12 col-sm-8">
<input type="text" class="form-control" id="mobile" name="mobile" value="" data-rule="required(#type-mobile:checked);mobile;remote({:url('api/validate/check_mobile_exist')}, event=resetpwd, id=0)" placeholder="">
<span class="msg-box"></span>
</div>
</div>
<div class="form-group">
<label for="captcha" class="control-label col-xs-12 col-sm-3">{:__('Captcha')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input type="text" name="captcha" class="form-control" data-rule="required;length(4);integer[+];remote({:url('api/validate/check_ems_correct')}, event=resetpwd, email:#email)"/>
<span class="input-group-btn" style="padding:0;border:none;">
<a href="javascript:;" class="btn btn-info btn-captcha" data-url="{:url('api/ems/send')}" data-type="email" data-event="resetpwd">{:__('Send verification code')}</a>
</span>
</div>
<span class="msg-box"></span>
</div>
</div>
<div class="form-group">
<label for="newpassword" class="control-label col-xs-12 col-sm-3">{:__('New password')}:</label>
<div class="col-xs-12 col-sm-8">
<input type="password" class="form-control" id="newpassword" name="newpassword" value="" data-rule="required;password" placeholder="">
<span class="msg-box"></span>
</div>
</div>
</div>
<div class="form-group form-footer">
<label class="control-label col-xs-12 col-sm-3"></label>
<div class="col-xs-12 col-sm-8">
<button type="submit" class="btn btn-md btn-info">{:__('Ok')}</button>
</div>
</div>
</form>
</script> </script>
</body>
</html>
public/template/mobile/css/mui.css 0 → 100644
浏览文件 @ 8c71ccdf
差异被折叠。
public/template/mobile/css/mui.min.css 0 → 100644
浏览文件 @ 8c71ccdf
差异被折叠。
public/template/mobile/js/mui.js 0 → 100644
浏览文件 @ 8c71ccdf
差异被折叠。
public/template/mobile/js/mui.min.js 0 → 100644
浏览文件 @ 8c71ccdf
This source diff could not be displayed because it is too large. You can view the blob instead.
public/template/mobile/js/rem.js 0 → 100644
浏览文件 @ 8c71ccdf
(function(win) {
var tid;
function refreshRem() {
let designSize = 750; // 设计图尺寸
let html = document.documentElement;
let wW = html.clientWidth;// 窗口宽度
let rem = wW * 100 / designSize;
document.documentElement.style.fontSize = rem + 'px';
}
win.addEventListener('resize', function() {
clearTimeout(tid);
tid = setTimeout(refreshRem, 300);
}, false);
win.addEventListener('pageshow', function(e) {
if (e.persisted) {
clearTimeout(tid);
tid = setTimeout(refreshRem, 300);
}
}, false);
refreshRem();
})(window);
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论