...
|
...
|
@@ -2,6 +2,10 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
|
|
<change afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" afterDir="false" />
|
|
|
<change afterPath="$PROJECT_DIR$/application/home/view/goods/content_detail.html" afterDir="false" />
|
|
|
<change afterPath="$PROJECT_DIR$/application/home/view/goods/video_detail.html" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
...
|
...
|
@@ -37,10 +41,19 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="content_detail.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="323">
|
|
|
<caret line="19" column="91" selection-start-line="19" selection-start-column="91" selection-end-line="19" selection-end-column="91" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="300">
|
|
|
<state relative-caret-position="493">
|
|
|
<caret line="149" column="46" selection-start-line="149" selection-start-column="35" selection-end-line="149" selection-end-column="46" />
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -49,8 +62,8 @@ |
|
|
<file leaf-file-name="WechatBase.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="708">
|
|
|
<caret line="86" column="46" selection-start-line="86" selection-start-column="46" selection-end-line="86" selection-end-column="46" />
|
|
|
<state relative-caret-position="623">
|
|
|
<caret line="81" column="14" selection-start-line="81" selection-start-column="14" selection-end-line="81" selection-end-column="14" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -67,8 +80,8 @@ |
|
|
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="306">
|
|
|
<caret line="26" column="30" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
|
|
|
<state relative-caret-position="657">
|
|
|
<caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -100,15 +113,6 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="nav.html" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="51">
|
|
|
<caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="49" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="FileTemplateManagerImpl">
|
...
|
...
|
@@ -127,7 +131,11 @@ |
|
|
<find>row</find>
|
|
|
<find>statusList</find>
|
|
|
<find>money</find>
|
|
|
<find>target_url</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace />
|
|
|
</replaceStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
...
|
...
|
@@ -135,7 +143,6 @@ |
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/pay_view/index.html" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/user_money_log/index.html" />
|
...
|
...
|
@@ -183,8 +190,9 @@ |
|
|
<option value="$PROJECT_DIR$/application/home/view/public/head.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
|
|
|
<option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/User.php" />
|
|
|
<option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
|
|
</list>
|
|
|
</option>
|
...
|
...
|
@@ -276,35 +284,21 @@ |
|
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="advertising" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="advertising" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="advertising" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="index" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="home" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="advertising" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="home" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="advertising" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="home" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
...
|
...
|
@@ -312,6 +306,7 @@ |
|
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="home" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="goods" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
...
|
...
|
@@ -401,11 +396,11 @@ |
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
<recent name="D:\wamp\www\advertising\application\home\view\goods" />
|
|
|
<recent name="D:\wamp\www\advertising\application\home\view\user" />
|
|
|
<recent name="D:\wamp\www\advertising\application\home\view\public" />
|
|
|
<recent name="D:\wamp\www\advertising\application\home\view\index" />
|
|
|
<recent name="D:\wamp\www\advertising\public\assets\advertising" />
|
|
|
<recent name="D:\wamp\www\advertising\public\assets\img" />
|
|
|
</key>
|
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
|
<recent name="D:\wamp\www\advertising\public\assets\js\backend" />
|
...
|
...
|
@@ -448,28 +443,7 @@ |
|
|
<workItem from="1572223206994" duration="28857000" />
|
|
|
<workItem from="1572309778506" duration="26117000" />
|
|
|
<workItem from="1572395935540" duration="28313000" />
|
|
|
<workItem from="1572483209367" duration="14299000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00005" summary="调试授权">
|
|
|
<created>1571975758832</created>
|
|
|
<option name="number" value="00005" />
|
|
|
<option name="presentableId" value="LOCAL-00005" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571975758832</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00006" summary="调试授权">
|
|
|
<created>1571975940473</created>
|
|
|
<option name="number" value="00006" />
|
|
|
<option name="presentableId" value="LOCAL-00006" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571975940473</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00007" summary="调试授权">
|
|
|
<created>1571975978410</created>
|
|
|
<option name="number" value="00007" />
|
|
|
<option name="presentableId" value="LOCAL-00007" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571975978410</updated>
|
|
|
<workItem from="1572483209367" duration="16126000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00008" summary="调试授权">
|
|
|
<created>1571976018612</created>
|
...
|
...
|
@@ -793,27 +767,48 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572505172092</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="54" />
|
|
|
<task id="LOCAL-00054" summary="调试授权登录">
|
|
|
<created>1572505198570</created>
|
|
|
<option name="number" value="00054" />
|
|
|
<option name="presentableId" value="LOCAL-00054" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572505198570</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00055" summary="调试授权登录">
|
|
|
<created>1572505235631</created>
|
|
|
<option name="number" value="00055" />
|
|
|
<option name="presentableId" value="LOCAL-00055" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572505235631</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00056" summary="调试授权登录">
|
|
|
<created>1572505562274</created>
|
|
|
<option name="number" value="00056" />
|
|
|
<option name="presentableId" value="LOCAL-00056" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572505562274</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="57" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="227837000" />
|
|
|
<option name="totallyTimeSpent" value="229664000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1380597" />
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
<window_info anchor="bottom" id="调试" order="7" />
|
|
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
|
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32997763" />
|
|
|
<window_info anchor="right" id="Database" order="3" />
|
|
|
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
|
|
|
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
|
|
|
<window_info anchor="bottom" id="运行" order="7" />
|
|
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1380597" />
|
|
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
|
<window_info anchor="right" id="Database" order="3" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
|
<window_info anchor="bottom" id="找到" order="8" weight="0.32997763" />
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
...
|
...
|
@@ -870,33 +865,6 @@ |
|
|
<option name="LAST_COMMIT_MESSAGE" value="调试授权登录" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/goods_audit.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="408">
|
|
|
<caret line="129" column="75" selection-start-line="129" selection-start-column="75" selection-end-line="129" selection-end-column="75" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/GoodsAudit.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="340">
|
|
|
<caret line="20" column="31" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="104" />
|
|
|
<folding>
|
|
|
<element signature="e#40#74#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="340">
|
|
|
<caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="43" />
|
|
|
<folding>
|
|
|
<element signature="e#40#74#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/merchant_goods.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="-408">
|
...
|
...
|
@@ -1195,13 +1163,30 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/thinkphp/library/traits/controller/Jump.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="341">
|
|
|
<caret line="142" column="45" selection-start-line="142" selection-start-column="38" selection-end-line="142" selection-end-column="45" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/vendor/overtrue/socialite/src/Providers/AbstractProvider.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="289">
|
|
|
<caret line="160" column="20" selection-start-line="160" selection-start-column="20" selection-end-line="160" selection-end-column="20" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="708">
|
|
|
<caret line="86" column="46" selection-start-line="86" selection-start-column="46" selection-end-line="86" selection-end-column="46" />
|
|
|
<state relative-caret-position="623">
|
|
|
<caret line="81" column="14" selection-start-line="81" selection-start-column="14" selection-end-line="81" selection-end-column="14" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="238">
|
...
|
...
|
@@ -1212,31 +1197,31 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/thinkphp/library/traits/controller/Jump.php">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="341">
|
|
|
<caret line="142" column="45" selection-start-line="142" selection-start-column="38" selection-end-line="142" selection-end-column="45" />
|
|
|
<state relative-caret-position="323">
|
|
|
<caret line="19" column="91" selection-start-line="19" selection-start-column="91" selection-end-line="19" selection-end-column="91" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="300">
|
|
|
<caret line="149" column="46" selection-start-line="149" selection-start-column="35" selection-end-line="149" selection-end-column="46" />
|
|
|
<state relative-caret-position="334">
|
|
|
<caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="334">
|
|
|
<caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
|
|
<state relative-caret-position="493">
|
|
|
<caret line="149" column="46" selection-start-line="149" selection-start-column="35" selection-end-line="149" selection-end-column="46" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="306">
|
|
|
<caret line="26" column="30" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
|
|
|
<state relative-caret-position="657">
|
|
|
<caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|