Skip to content

施宇 / icsales

Go to a project
Commit 83112cc0 by 叶明星
Options

zc

parent 591f9d28
Inline Side-by-side
Showing with 59 additions and 100 deletions
.idea/workspace.xml
......@@ -2,8 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="abcc2269-704e-4742-961a-998c3ad58297" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Common/View/public/indexheader.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Common/View/public/indexheader.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -17,7 +17,7 @@
</execution>
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
......@@ -31,7 +31,7 @@
<entry file="file://$PROJECT_DIR$/Application/Search/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
<caret line="16" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
......@@ -39,7 +39,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Search/View/Index/search.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<state relative-caret-position="425">
<caret line="17" column="92" selection-start-line="17" selection-start-column="92" selection-end-line="17" selection-end-column="92" />
</state>
</provider>
......@@ -54,11 +54,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="17" column="35" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="35" />
<state relative-caret-position="225">
<caret line="10" column="47" lean-forward="true" selection-start-line="10" selection-start-column="47" selection-end-line="10" selection-end-column="47" />
</state>
</provider>
</entry>
......@@ -73,11 +73,11 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Common/View/public/indexheader.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="24" lean-forward="true" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
<state relative-caret-position="275">
<caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
</state>
</provider>
</entry>
......@@ -85,7 +85,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Passport/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="106">
<state relative-caret-position="150">
<caret line="6" column="34" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
</state>
</provider>
......@@ -94,7 +94,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-100">
<state relative-caret-position="275">
<caret line="11" column="22" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="22" />
</state>
</provider>
......@@ -164,8 +164,8 @@
<option value="$PROJECT_DIR$/Application/Search/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/Search/Conf/config_url.php" />
<option value="$PROJECT_DIR$/Application/Search/View/Index/search.html" />
<option value="$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php" />
<option value="$PROJECT_DIR$/Application/Common/View/public/indexheader.html" />
<option value="$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php" />
</list>
</option>
</component>
......@@ -180,6 +180,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -198,26 +199,10 @@
<item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Common" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ic_www" type="b2602c69:ProjectViewProjectNode" />
<item name="ic_www" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Common" type="462c0819:PsiDirectoryNode" />
<item name="View" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ic_www" type="b2602c69:ProjectViewProjectNode" />
<item name="ic_www" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Common" type="462c0819:PsiDirectoryNode" />
<item name="View" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -265,25 +250,23 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1565762421559</updated>
<workItem from="1565762422814" duration="17046000" />
<workItem from="1565762422814" duration="17753000" />
<workItem from="1565834074799" duration="131000" />
<workItem from="1565834220474" duration="3124000" />
<workItem from="1565840183251" duration="416000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="17046000" />
<option name="totallyTimeSpent" value="21424000" />
</component>
<component name="ToolWindowManager">
<frame x="68" y="-8" width="1860" height="1096" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26004463" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
......@@ -291,10 +274,15 @@
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Database" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Database" order="3" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -327,13 +315,7 @@
<entry file="file://$PROJECT_DIR$/Application/Index/Conf/config.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Application/Index/View/Home/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Index/View/Home/index.html" />
<entry file="file://$PROJECT_DIR$/Application/Index/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
......@@ -348,20 +330,8 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/Index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="16" column="6" selection-start-line="16" selection-start-column="6" selection-end-line="16" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Search/View/Index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="25" column="27" lean-forward="true" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/Index/index.html" />
<entry file="file://$PROJECT_DIR$/Application/Search/View/Index/index.html" />
<entry file="file://$PROJECT_DIR$/Application/Home/View/GoodManage/gooddetail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="702">
......@@ -615,13 +585,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/EmptyController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/EmptyController.class.php" />
<entry file="file://$PROJECT_DIR$/Application/Home/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
......@@ -655,24 +619,24 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config_url.php">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-100">
<caret line="11" column="22" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="22" />
<state relative-caret-position="325">
<caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Passport/Controller/IndexController.class.php">
<entry file="file://$PROJECT_DIR$/Application/Search/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="106">
<caret line="6" column="34" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
<state relative-caret-position="400">
<caret line="16" selection-start-line="16" selection-end-line="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<entry file="file://$PROJECT_DIR$/Application/Search/View/Index/search.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
<state relative-caret-position="425">
<caret line="17" column="92" selection-start-line="17" selection-start-column="92" selection-end-line="17" selection-end-column="92" />
</state>
</provider>
</entry>
......@@ -683,37 +647,37 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Search/Controller/IndexController.class.php">
<entry file="file://$PROJECT_DIR$/Application/Common/View/public/top.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/View/public/header.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/View/public/indexheader.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
<state relative-caret-position="275">
<caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Search/View/Index/search.html">
<entry file="file://$PROJECT_DIR$/Application/Passport/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="17" column="92" selection-start-line="17" selection-start-column="92" selection-end-line="17" selection-end-column="92" />
<state relative-caret-position="150">
<caret line="6" column="34" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php">
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="17" column="35" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="35" />
<state relative-caret-position="275">
<caret line="11" column="22" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/View/public/top.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/View/public/header.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/View/public/indexheader.html">
<entry file="file://$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="24" lean-forward="true" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
<state relative-caret-position="225">
<caret line="10" column="47" lean-forward="true" selection-start-line="10" selection-start-column="47" selection-end-line="10" selection-end-column="47" />
</state>
</provider>
</entry>
......
Application/Common/Controller/BaseController.class.php
......@@ -14,16 +14,11 @@ class BaseController extends Controller
$this->assign($k, $v['data']);
}
$getInfo = I();
$getInfo = I('');
// var_dump($getInfo);die;
$this->assign('get_url_info',$getInfo);
}
public function __call($method, $args)
{
$this->redirect('/login');
}
/**
* 通过bcat_id获取CMS分类数据 --- 图片、文字等
* @param [type] $tags [标签]
......
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