Skip to content

施宇 / icsales

Go to a project
Commit 433ea15a by 施宇
Options

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

parents b4b659dc 72ae3817
Inline Side-by-side
Showing with 182 additions and 234 deletions
.idea/workspace.xml
...@@ -2,50 +2,8 @@ ...@@ -2,50 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="abcc2269-704e-4742-961a-998c3ad58297" name="Default Changelist" comment=""> <list default="true" id="abcc2269-704e-4742-961a-998c3ad58297" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/Application/Home/Conf/config.php" 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 afterPath="$PROJECT_DIR$/Application/Home/Conf/config_url.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" />
<change afterPath="$PROJECT_DIR$/Application/Index/Conf/config.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/Index/Conf/config_url.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/Passport/Conf/config.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/Passport/Conf/config_url.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/Search/Conf/config.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/Search/Conf/config_url.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/item/Conf/config.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Application/item/Conf/config_url.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Common/Conf/config.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Common/Conf/config.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Common/Conf/config_url.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Common/Conf/config_url.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/Controller/BaseController.class.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/Controller/CmsController.class.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Account/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/Account/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Certification/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/Certification/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Chat/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/Chat/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Forget/index.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/GoodManage/bulkupload.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/GoodManage/bulkupload.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/GoodManage/gooddetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/GoodManage/gooddetail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/GoodManage/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/GoodManage/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/GoodManage/uploadresult.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/GoodManage/uploadresult.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/GoodManage/uploadsingle.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/GoodManage/uploadsingle.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Home/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/Home/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Index/index.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Index/search.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Search/View/Index/search.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Integral/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/Integral/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Login/index.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Notice/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/Notice/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/QuotePrice/inquiry.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/QuotePrice/inquiry.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/QuotePrice/inquirydetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/QuotePrice/inquirydetail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/QuotePrice/quote.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/QuotePrice/quote.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/QuotePrice/quotedetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/QuotePrice/quotedetail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/QuotePrice/releaseinquiry.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/QuotePrice/releaseinquiry.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Register/index.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/RobOrder/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/RobOrder/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/Search/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Home/View/Search/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/public/foot.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Common/View/public/foot.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/public/header.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Common/View/public/header.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/public/indexfoot.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Common/View/public/indexfoot.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/public/indexheader.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Common/View/public/indexheader.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/public/navleft.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Common/View/public/navleft.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Home/View/public/top.html" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Common/View/public/top.html" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -61,132 +19,83 @@ ...@@ -61,132 +19,83 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/View/GoodManage/bulkupload.html"> <entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325"> <state relative-caret-position="325">
<caret line="13" column="33" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="33" /> <caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#form#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#form#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#1;n#form#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#iframe#0;n#form#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/View/Chat/index.html"> <entry file="file://$PROJECT_DIR$/Application/Search/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1952"> <state relative-caret-position="400">
<caret line="81" column="32" selection-start-line="81" selection-start-column="32" selection-end-line="81" selection-end-column="32" /> <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
<folding>
<element signature="n#style#0;n#input#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/View/Certification/index.html"> <entry file="file://$PROJECT_DIR$/Application/Search/View/Index/search.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269"> <state relative-caret-position="200">
<caret line="97" column="32" selection-start-line="97" selection-start-column="32" selection-end-line="97" selection-end-column="32" /> <caret line="17" column="92" selection-start-line="17" selection-start-column="92" selection-end-line="17" selection-end-column="92" />
<folding>
<element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#form#0;n#div#0;n#div#1;n#div#3;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#form#0;n#div#0;n#div#1;n#div#3;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#1;n#form#0;n#div#0;n#div#1;n#div#3;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#2;n#form#0;n#div#0;n#div#1;n#div#3;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#iframe#0;n#form#0;n#div#0;n#div#1;n#div#3;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#0;n#div#1;n#div#3;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/View/Account/index.html"> <entry file="file://$PROJECT_DIR$/Application/Search/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102"> <state relative-caret-position="75">
<caret line="7" selection-start-line="7" selection-end-line="7" /> <caret line="3" column="49" selection-start-line="3" selection-start-column="49" selection-end-line="3" selection-end-column="49" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Index/View/Index/index.html"> <entry file="file://$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6302"> <state relative-caret-position="425">
<caret line="255" column="32" selection-start-line="255" selection-start-column="32" selection-end-line="255" selection-end-column="32" /> <caret line="17" column="35" selection-start-line="17" selection-start-column="23" selection-end-line="17" selection-end-column="35" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Index/View/Index/search.html"> <entry file="file://$PROJECT_DIR$/Application/Common/View/public/top.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor" />
<state relative-caret-position="177">
<caret line="10" column="18" selection-start-line="10" selection-start-column="18" selection-end-line="10" selection-end-column="18" />
</state>
</provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Passport/View/Forget/index.html"> <entry file="file://$PROJECT_DIR$/Application/Common/View/public/header.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor" />
<state relative-caret-position="2027">
<caret line="84" column="28" selection-start-line="84" selection-start-column="28" selection-end-line="84" selection-end-column="28" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#0;n#div#2;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#1;n#div#2;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Passport/View/Login/index.html"> <entry file="file://$PROJECT_DIR$/Application/Common/View/public/indexheader.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3127"> <state relative-caret-position="175">
<caret line="128" column="28" selection-start-line="128" selection-start-column="28" selection-end-line="128" selection-end-column="28" /> <caret line="7" column="24" lean-forward="true" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="24" />
<folding>
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#form#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Passport/View/Register/index.html"> <entry file="file://$PROJECT_DIR$/Application/Passport/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1652"> <state relative-caret-position="106">
<caret line="69" column="28" selection-start-line="69" selection-start-column="28" selection-end-line="69" selection-end-column="28" /> <caret line="6" column="34" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
<folding>
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Search/View/Index/search.html"> <entry file="file://$PROJECT_DIR$/Application/Common/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-600"> <state relative-caret-position="-100">
<caret line="18" column="24" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="24" /> <caret line="11" column="22" selection-start-line="11" selection-start-column="5" selection-end-line="11" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -216,20 +125,13 @@ ...@@ -216,20 +125,13 @@
<option value="$PROJECT_DIR$/Application/item/Conf/config_url.php" /> <option value="$PROJECT_DIR$/Application/item/Conf/config_url.php" />
<option value="$PROJECT_DIR$/Application/Search/Controller/BaseController.class.php" /> <option value="$PROJECT_DIR$/Application/Search/Controller/BaseController.class.php" />
<option value="$PROJECT_DIR$/Application/Common/Controller/CmsController.class.php" /> <option value="$PROJECT_DIR$/Application/Common/Controller/CmsController.class.php" />
<option value="$PROJECT_DIR$/Application/Passport/Conf/config_url.php" />
<option value="$PROJECT_DIR$/Application/Passport/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/Index/Conf/config_url.php" /> <option value="$PROJECT_DIR$/Application/Index/Conf/config_url.php" />
<option value="$PROJECT_DIR$/Application/Common/Conf/config_url.php" /> <option value="$PROJECT_DIR$/Application/Common/Conf/config_url.php" />
<option value="$PROJECT_DIR$/Application/Home/View/Index/index.html" /> <option value="$PROJECT_DIR$/Application/Home/View/Index/index.html" />
<option value="$PROJECT_DIR$/Application/Index/View/Home/index.html" /> <option value="$PROJECT_DIR$/Application/Index/View/Home/index.html" />
<option value="$PROJECT_DIR$/Application/Index/Controller/IndexController.class.php" /> <option value="$PROJECT_DIR$/Application/Index/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php" />
<option value="$PROJECT_DIR$/Application/Home/Conf/config.php" /> <option value="$PROJECT_DIR$/Application/Home/Conf/config.php" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/Home/Conf/config_url.php" /> <option value="$PROJECT_DIR$/Application/Home/Conf/config_url.php" />
<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/Common/Conf/config.php" />
<option value="$PROJECT_DIR$/Application/Home/View/Account/index.html" /> <option value="$PROJECT_DIR$/Application/Home/View/Account/index.html" />
<option value="$PROJECT_DIR$/Application/Home/View/Home/index.html" /> <option value="$PROJECT_DIR$/Application/Home/View/Home/index.html" />
<option value="$PROJECT_DIR$/Application/Home/View/GoodManage/bulkupload.html" /> <option value="$PROJECT_DIR$/Application/Home/View/GoodManage/bulkupload.html" />
...@@ -253,17 +155,17 @@ ...@@ -253,17 +155,17 @@
<option value="$PROJECT_DIR$/Application/Passport/View/Forget/index.html" /> <option value="$PROJECT_DIR$/Application/Passport/View/Forget/index.html" />
<option value="$PROJECT_DIR$/Application/Passport/View/Login/index.html" /> <option value="$PROJECT_DIR$/Application/Passport/View/Login/index.html" />
<option value="$PROJECT_DIR$/Application/Passport/View/Register/index.html" /> <option value="$PROJECT_DIR$/Application/Passport/View/Register/index.html" />
<option value="$PROJECT_DIR$/Application/Home/Controller/EmptyController.class.php" />
<option value="$PROJECT_DIR$/index.php" />
<option value="$PROJECT_DIR$/Application/Passport/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/Common/Conf/config.php" />
<option value="$PROJECT_DIR$/Application/Passport/Conf/config_url.php" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<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/Search/View/Index/search.html" />
</list> <option value="$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php" />
</option> <option value="$PROJECT_DIR$/Application/Common/View/public/indexheader.html" />
</component>
<component name="ProjectConfigurationFiles">
<option name="files">
<list>
<option value="$PROJECT_DIR$/.idea/ic_www.iml" />
<option value="$PROJECT_DIR$/.idea/misc.xml" />
<option value="$PROJECT_DIR$/.idea/vcs.xml" />
<option value="$PROJECT_DIR$/.idea/modules.xml" />
</list> </list>
</option> </option>
</component> </component>
...@@ -294,28 +196,22 @@ ...@@ -294,28 +196,22 @@
<item name="ic_www" type="b2602c69:ProjectViewProjectNode" /> <item name="ic_www" type="b2602c69:ProjectViewProjectNode" />
<item name="ic_www" type="462c0819:PsiDirectoryNode" /> <item name="ic_www" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" /> <item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Index" type="462c0819:PsiDirectoryNode" /> <item name="Common" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="ic_www" type="b2602c69:ProjectViewProjectNode" /> <item name="ic_www" type="b2602c69:ProjectViewProjectNode" />
<item name="ic_www" type="462c0819:PsiDirectoryNode" /> <item name="ic_www" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" /> <item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Search" 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="Search" type="462c0819:PsiDirectoryNode" />
<item name="View" type="462c0819:PsiDirectoryNode" /> <item name="View" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path> <path>
<item name="ic_www" type="b2602c69:ProjectViewProjectNode" /> <item name="ic_www" type="b2602c69:ProjectViewProjectNode" />
<item name="ic_www" type="462c0819:PsiDirectoryNode" /> <item name="ic_www" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" /> <item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Search" type="462c0819:PsiDirectoryNode" /> <item name="Common" type="462c0819:PsiDirectoryNode" />
<item name="View" type="462c0819:PsiDirectoryNode" /> <item name="View" type="462c0819:PsiDirectoryNode" />
<item name="Index" type="462c0819:PsiDirectoryNode" /> <item name="public" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
...@@ -325,10 +221,12 @@ ...@@ -325,10 +221,12 @@
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/Application/Search/View" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/Application/Search/View" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
...@@ -367,12 +265,12 @@ ...@@ -367,12 +265,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1565762421559</updated> <updated>1565762421559</updated>
<workItem from="1565762422814" duration="11233000" /> <workItem from="1565762422814" duration="17046000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="11233000" /> <option name="totallyTimeSpent" value="17046000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="68" y="-8" width="1860" height="1096" extended-state="6" /> <frame x="68" y="-8" width="1860" height="1096" extended-state="6" />
...@@ -426,23 +324,9 @@ ...@@ -426,23 +324,9 @@
<entry file="file://$PROJECT_DIR$/Application/Passport/Conf/config.php"> <entry file="file://$PROJECT_DIR$/Application/Passport/Conf/config.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Passport/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="40" selection-start-line="5" selection-start-column="40" selection-end-line="5" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Index/Conf/config.php"> <entry file="file://$PROJECT_DIR$/Application/Index/Conf/config.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Index/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" selection-start-line="3" selection-end-line="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Index/View/Home/index.html"> <entry file="file://$PROJECT_DIR$/Application/Index/View/Home/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175"> <state relative-caret-position="175">
...@@ -450,23 +334,6 @@ ...@@ -450,23 +334,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<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="5" lean-forward="true" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="36" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
<folding>
<element signature="e#333#1411#1#PHP" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Index/Controller/IndexController.class.php"> <entry file="file://$PROJECT_DIR$/Application/Index/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="300">
...@@ -474,13 +341,6 @@ ...@@ -474,13 +341,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="20" column="35" lean-forward="true" selection-start-line="20" selection-start-column="35" selection-end-line="20" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Conf/config.php"> <entry file="file://$PROJECT_DIR$/Application/Home/Conf/config.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="75">
...@@ -495,20 +355,6 @@ ...@@ -495,20 +355,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Passport/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="456">
<caret line="21" column="26" selection-start-line="21" selection-start-column="26" selection-end-line="21" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Search/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="36" selection-start-line="13" selection-start-column="30" selection-end-line="13" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Search/View/Index/index.html"> <entry file="file://$PROJECT_DIR$/Application/Search/View/Index/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625"> <state relative-caret-position="625">
...@@ -516,27 +362,6 @@ ...@@ -516,27 +362,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281">
<caret line="68" column="23" selection-start-line="68" selection-start-column="20" selection-end-line="68" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Search/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="6" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/GoodManage/gooddetail.html"> <entry file="file://$PROJECT_DIR$/Application/Home/View/GoodManage/gooddetail.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="702"> <state relative-caret-position="702">
...@@ -783,10 +608,112 @@ ...@@ -783,10 +608,112 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="15" column="51" selection-start-line="15" selection-start-column="51" selection-end-line="15" selection-end-column="51" />
</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/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="20" column="35" lean-forward="true" selection-start-line="20" selection-start-column="35" selection-end-line="20" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="27" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config_db.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-375" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Passport/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" selection-start-line="9" selection-end-line="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Index/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config_url.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Passport/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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Search/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" column="49" selection-start-line="3" selection-start-column="49" selection-end-line="3" selection-end-column="49" />
</state>
</provider>
</entry>
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Search/View/Index/search.html"> <entry file="file://$PROJECT_DIR$/Application/Search/View/Index/search.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-600"> <state relative-caret-position="200">
<caret line="18" column="24" selection-start-line="18" selection-start-column="24" selection-end-line="18" selection-end-column="24" /> <caret line="17" column="92" selection-start-line="17" selection-start-column="92" selection-end-line="17" selection-end-column="92" />
</state>
</provider>
</entry>
<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>
</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">
<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> </state>
</provider> </provider>
</entry> </entry>
......
Application/Common/Conf/config.php
...@@ -8,7 +8,8 @@ return array( ...@@ -8,7 +8,8 @@ return array(
'www' => 'Index', 'www' => 'Index',
'home' => 'Home', 'home' => 'Home',
'search'=> 'Search', 'search'=> 'Search',
'item' => 'Item' 'item' => 'Item',
'passport' => 'Passport'
), ),
'API_TOKEN' => 'zbPx8gDXDfIh3ZoJcO4EH', // api接口token 'API_TOKEN' => 'zbPx8gDXDfIh3ZoJcO4EH', // api接口token
......
Application/Common/Controller/BaseController.class.php
...@@ -13,9 +13,17 @@ class BaseController extends Controller ...@@ -13,9 +13,17 @@ class BaseController extends Controller
foreach ($datas as $k => $v) { foreach ($datas as $k => $v) {
$this->assign($k, $v['data']); $this->assign($k, $v['data']);
} }
$getInfo = I();
$this->assign('get_url_info',$getInfo);
} }
/** public function __call($method, $args)
{
$this->redirect('/login');
}
/**
* 通过bcat_id获取CMS分类数据 --- 图片、文字等 * 通过bcat_id获取CMS分类数据 --- 图片、文字等
* @param [type] $tags [标签] * @param [type] $tags [标签]
* @param [type] $where [搜索条件，用&连接，如：a=1&b=2] * @param [type] $where [搜索条件，用&连接，如：a=1&b=2]
......
Application/Common/View/public/indexheader.html
<foreach name="get_utl_info" item="v" >
<input type="hidden" id="{$key}" value="{$v}">
</foreach>
<div class="index_header"> <div class="index_header">
<div class="header_content boxsiz public_content width_1190"> <div class="header_content boxsiz public_content width_1190">
<div class="fl"> <div class="fl">
......
Application/Home/Controller/IndexController.class.php
...@@ -11,7 +11,7 @@ class IndexController extends BaseController ...@@ -11,7 +11,7 @@ class IndexController extends BaseController
{ {
parent::_initialize(); parent::_initialize();
if (!cookie('token')) { if (!cookie('token')) {
$this->redirect('/login'); redirect(C('TMPL_PARSE_STRING.passporticsales'));
} }
} }
......
Application/Passport/Conf/config_url.php
<?php <?php
return array( return array(
'URL_MAP_RULES' => array(//静态路由 'URL_MAP_RULES' => array(//静态路由
'login' => 'Home/Index/login', 'index' => 'Index/index',
'register' => 'Home/Index/register', 'login' => 'Index/login',
'forget' => 'Home/Index/forget', 'register' => 'Index/register',
'forget' => 'Index/forget',
) )
); );
Application/Passport/Controller/IndexController.class.php
...@@ -9,6 +9,14 @@ class IndexController extends BaseController ...@@ -9,6 +9,14 @@ class IndexController extends BaseController
/** /**
* 登录页面 * 登录页面
*/ */
public function index()
{
$this->display('Login/index');
}
/**
* 登录页面
*/
public function login() public function login()
{ {
$this->display('Login/index'); $this->display('Login/index');
......
Application/Search/Conf/config_url.php
<?php <?php
return array( return array(
'URL_ROUTE_RULES' => array(//动态路由 'URL_ROUTE_RULES' => array(//动态路由
'/^(\w+)_(\d+)_(\d+)$/' => 'Index/indexsearch?key=:1&type=:2&time=:3', '/^(\w+)_(\d+)_(\d+)$/' => 'Index/index?key=:1&type=:2&time=:3',
) )
); );
Application/Search/Controller/IndexController.class.php
...@@ -9,7 +9,7 @@ class IndexController extends BaseController ...@@ -9,7 +9,7 @@ class IndexController extends BaseController
/** /**
* 首页搜索结果 * 首页搜索结果
*/ */
public function indexsearch() public function index()
{ {
$this->display('Index/search'); $this->display('Index/search');
} }
......
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