Commit 4e781c72 by 施宇

Merge branch 'master' of http://119.23.72.7/shiyu/icsales

parents bcb75137 736d1dd2
/Application/Runtime
...@@ -14,7 +14,7 @@ return array( ...@@ -14,7 +14,7 @@ return array(
'szbom' => 'Bom', 'szbom' => 'Bom',
'tbom' => 'Bom', 'tbom' => 'Bom',
'szsc' => 'Sc', 'szsc' => 'Sc',
'supply'=>'Supply' 'supply' => 'Supply'
), ),
//内部调用免验证秘钥 //内部调用免验证秘钥
...@@ -24,11 +24,11 @@ return array( ...@@ -24,11 +24,11 @@ return array(
'GEE_ID' => 'afac726bf717235a47424e3f6059f524', 'GEE_ID' => 'afac726bf717235a47424e3f6059f524',
'GEE_KEY' => '52d86db9a61ae00a3e1d68fee908a248', 'GEE_KEY' => '52d86db9a61ae00a3e1d68fee908a248',
//是否显示自营搜索数据 //是否显示自营搜索数据
'ZIYING_BUTTON'=>1, 'ZIYING_BUTTON' => 1,
//爬虫token验证时间 //爬虫token验证时间
'SEARCH_TOKEN_EXPIRE_TIME' => 30, 'SEARCH_TOKEN_EXPIRE_TIME' => 30,
//搜索词过滤2个英文特殊词 //搜索词过滤2个英文特殊词
'BRAND_SEARCH_WORD'=>'FH,BL,TE,FM,CJ,ST,SK,ST,ON,TM,TP,TI,MD,EG,HF,DY,MK,M2,M4,M7,M1,A7,F7', 'BRAND_SEARCH_WORD' => 'FH,BL,TE,FM,CJ,ST,SK,ST,ON,TM,TP,TI,MD,EG,HF,DY,MK,M2,M4,M7,M1,A7,F7',
// 首页自营模块获取限时限量商品 // 首页自营模块获取限时限量商品
'HOME_SELF_ACTIVITY_GOODS' => 'http://cube.liexin.net/WebApi/HDLimitGoodsID?Token=', 'HOME_SELF_ACTIVITY_GOODS' => 'http://cube.liexin.net/WebApi/HDLimitGoodsID?Token=',
......
...@@ -9,14 +9,14 @@ return array( ...@@ -9,14 +9,14 @@ return array(
), ),
'TMPL_PARSE_STRING' =>array( 'TMPL_PARSE_STRING' => array(
'__PUBLIC__' => STATIC_DOMAIN, '__PUBLIC__' => STATIC_DOMAIN,
), ),
'URL_MAP_RULES' => array(//静态路由 'URL_MAP_RULES' => array(//静态路由
'login' => 'Home/Index/login', 'login' => 'Home/Index/login',
'home' => 'Home/Index/home' 'home' => 'Home/Index/home',
'account' => 'Home/Index/account'
), ),
); );
\ No newline at end of file
\ No newline at end of file
<?php <?php
namespace Home\Controller; namespace Home\Controller;
use Think\Controller; use Think\Controller;
class IndexController extends Controller class IndexController extends Controller
{ {
/**
* 登录页面
*/
public function login() public function login()
{ {
$this->display('Login/index'); $this->display('Login/index');
} }
/**
* 首页
*/
public function home() public function home()
{ {
$this->display('Home/index'); $this->display('Home/index');
} }
/**
* 账户设置
*/
public function account()
{
$this->display('Account/index');
}
} }
<?php
namespace Home\Controller;
use Think\Controller;
class LoginController extends Controller
{
public function index()
{
$this->display('Login/index');
}
}
<!DOCTYPE HTML>
<html lang="zh-CN">
<head>
<include file="public/header"/>
<link rel="stylesheet" type="text/css" href="__PUBLIC__/css/account.css">
</head>
<body>
<div class="wrapper">
<include file="public/navleft"/>
<div class="wrapper_right">
<include file="public/top"/>
<div class="right_content home_content">
<div class="content">
</div>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
...@@ -9,36 +9,36 @@ ...@@ -9,36 +9,36 @@
</div> </div>
<div class="nav_left_content"> <div class="nav_left_content">
<ul class="content_ul"> <ul class="content_ul">
<li class="content_ul_li active"> <li class="content_ul_li <if condition="(ACTION_NAME eq 'home')">active</if>">
<span class="li_icon icon iconfont iconjuxing4"></span> <span class="li_icon icon iconfont iconjuxing4"></span>
<span class="li_title">首页</span> <span class="li_title">首页</span>
</li> </li>
<li class="content_ul_li"> <li class="content_ul_li <if condition="(ACTION_NAME eq 'home')">active</if>">
<span class="li_icon icon iconfont iconjuxing5"></span> <span class="li_icon icon iconfont iconjuxing5"></span>
<span class="li_title">询报价</span> <span class="li_title">询报价</span>
<span class="li_right icon iconfont iconjuxing12"> <span class="li_right icon iconfont iconjuxing12">
</li> </li>
<li class="content_ul_li"> <li class="content_ul_li <if condition="(ACTION_NAME eq 'home')">active</if>">
<span class="li_icon icon iconfont iconjuxing6"></span> <span class="li_icon icon iconfont iconjuxing6"></span>
<span class="li_title">抢单专区</span> <span class="li_title">抢单专区</span>
</li> </li>
<li class="content_ul_li"> <li class="content_ul_li <if condition="(ACTION_NAME eq 'home')">active</if>">
<span class="li_icon icon iconfont iconjuxing7"></span> <span class="li_icon icon iconfont iconjuxing7"></span>
<span class="li_title">在线沟通</span> <span class="li_title">在线沟通</span>
</li> </li>
<li class="content_ul_li"> <li class="content_ul_li <if condition="(ACTION_NAME eq 'home')">active</if>">
<span class="li_icon icon iconfont iconjuxing8"></span> <span class="li_icon icon iconfont iconjuxing8"></span>
<span class="li_title">商品管理</span> <span class="li_title">商品管理</span>
</li> </li>
<li class="content_ul_li"> <li class="content_ul_li <if condition="(ACTION_NAME eq 'home')">active</if>">
<span class="li_icon icon iconfont iconjuxing9"></span> <span class="li_icon icon iconfont iconjuxing9"></span>
<span class="li_title">积分管理</span> <span class="li_title">积分管理</span>
</li> </li>
<li class="content_ul_li"> <li class="content_ul_li <if condition="(ACTION_NAME eq 'home')">active</if>">
<span class="li_icon icon iconfont iconjuxing10"></span> <span class="li_icon icon iconfont iconjuxing10"></span>
<span class="li_title">认证管理</span> <span class="li_title">认证管理</span>
</li> </li>
<li class="content_ul_li"> <li class="content_ul_li <if condition="(ACTION_NAME eq 'account')">active</if>">
<span class="li_icon icon iconfont iconjuxing11"></span> <span class="li_icon icon iconfont iconjuxing11"></span>
<span class="li_title">账户设置</span> <span class="li_title">账户设置</span>
</li> </li>
......
<?php if (!defined('THINK_PATH')) exit();?><!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=div, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
<link rel="stylesheet" href="STATIC_DOMAIN/dist/css/test.css">
</head>
<body>
<div>login</div>
</body>
</html>
\ No newline at end of file
{"msg":"require(): Failed opening required '.\/vendor\/autoload.php' (include_path='.;C:\\php\\pear')","msgCode":"000000","ts":1559704037,"dateStr":"2019-06-05 03:07:17","app":"api","serverIp":"127.0.0.1","fileName":"E:\\ic\\index.php","lineNo":41,"method":""}
{"msg":"require(): Failed opening required '.\/vendor\/autoload.php' (include_path='.;C:\\php\\pear')","msgCode":"000000","ts":1559704037,"dateStr":"2019-06-05 03:07:17","app":"api","serverIp":"127.0.0.1","fileName":"E:\\ic\\index.php","lineNo":41,"method":""}
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
<?php
//000000000000a:2:{i:0;a:2:{s:5:"login";a:2:{i:0;s:16:"Home/Index/login";i:1;a:0:{}}s:4:"home";a:2:{i:0;s:15:"Home/Index/home";i:1;a:0:{}}}i:1;a:0:{}}
?>
\ No newline at end of file
<?php
//000000000000a:2:{i:0;a:2:{s:5:"login";a:2:{i:0;s:16:"Home/Index/login";i:1;a:0:{}}s:4:"home";a:2:{i:0;s:15:"Home/Index/home";i:1;a:0:{}}}i:1;a:0:{}}
?>
\ No newline at end of file
.a {
width: 100%;
background: #f00;
}
/*# sourceMappingURL=account.css.map */
\ No newline at end of file
{"version":3,"sources":["account.less"],"names":[],"mappings":"AAAA;EACI,WAAA;EACA,gBAAA","file":"account.css"}
\ No newline at end of file
.a{
width: 100%;
background: #f00;
}
\ 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