...
|
...
|
@@ -36,8 +36,8 @@ |
|
|
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="337">
|
|
|
<caret line="148" column="39" selection-start-line="148" selection-start-column="39" selection-end-line="148" selection-end-column="39" />
|
|
|
<state relative-caret-position="286">
|
|
|
<caret line="149" column="62" selection-start-line="149" selection-start-column="62" selection-end-line="149" selection-end-column="62" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -96,7 +96,6 @@ |
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/public/NAV.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/home/controller/Question.php" />
|
...
|
...
|
@@ -144,6 +143,7 @@ |
|
|
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/Goods.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
|
|
|
</list>
|
|
|
</option>
|
...
|
...
|
@@ -270,7 +270,18 @@ |
|
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="home" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="view" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="merchant" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="user" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="advertising" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="advertising" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="assets" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
...
|
...
|
@@ -351,28 +362,7 @@ |
|
|
<workItem from="1573174620844" duration="32581000" />
|
|
|
<workItem from="1573259331081" duration="30435000" />
|
|
|
<workItem from="1573432217070" duration="2199000" />
|
|
|
<workItem from="1573519427130" duration="8371000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00512" summary=" 商户申请">
|
|
|
<created>1573288196317</created>
|
|
|
<option name="number" value="00512" />
|
|
|
<option name="presentableId" value="LOCAL-00512" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573288196317</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00513" summary=" 商户申请">
|
|
|
<created>1573288302207</created>
|
|
|
<option name="number" value="00513" />
|
|
|
<option name="presentableId" value="LOCAL-00513" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573288302207</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00514" summary=" 商户申请">
|
|
|
<created>1573288470067</created>
|
|
|
<option name="number" value="00514" />
|
|
|
<option name="presentableId" value="LOCAL-00514" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573288470067</updated>
|
|
|
<workItem from="1573519427130" duration="8889000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00515" summary=" 商户申请">
|
|
|
<created>1573288491057</created>
|
...
|
...
|
@@ -696,11 +686,32 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573539445903</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="561" />
|
|
|
<task id="LOCAL-00561" summary=" 商户申请">
|
|
|
<created>1573539749947</created>
|
|
|
<option name="number" value="00561" />
|
|
|
<option name="presentableId" value="LOCAL-00561" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573539749947</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00562" summary=" 商户申请">
|
|
|
<created>1573539953748</created>
|
|
|
<option name="number" value="00562" />
|
|
|
<option name="presentableId" value="LOCAL-00562" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573539953748</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00563" summary=" 商户申请">
|
|
|
<created>1573540230853</created>
|
|
|
<option name="number" value="00563" />
|
|
|
<option name="presentableId" value="LOCAL-00563" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1573540230853</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="564" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="414678000" />
|
|
|
<option name="totallyTimeSpent" value="415196000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -787,9 +798,6 @@ |
|
|
<option name="LAST_COMMIT_MESSAGE" value=" 商户申请" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/public/bg2.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/bg1.png">
|
|
|
<provider selected="true" editor-type-id="images" />
|
|
|
</entry>
|
...
|
...
|
@@ -1085,10 +1093,17 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</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="527">
|
|
|
<caret line="43" column="23" selection-start-line="43" selection-start-column="23" selection-end-line="43" selection-end-column="23" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="337">
|
|
|
<caret line="148" column="39" selection-start-line="148" selection-start-column="39" selection-end-line="148" selection-end-column="39" />
|
|
|
<state relative-caret-position="286">
|
|
|
<caret line="149" column="62" selection-start-line="149" selection-start-column="62" selection-end-line="149" selection-end-column="62" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|