|
@@ -27,26 +27,6 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
|
|
|
- <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/index.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="425">
|
|
|
- <caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="ROrderController.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/controllers/ROrderController.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="392">
|
|
|
- <caret line="462" column="76" selection-start-line="462" selection-start-column="76" selection-end-line="462" selection-end-column="76" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
<file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/www/protected/views/product/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -109,51 +89,69 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="main.php" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="main.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="603">
|
|
|
- <caret line="130" column="26" selection-start-line="130" selection-start-column="26" selection-end-line="130" selection-end-column="26" />
|
|
|
+ <state relative-caret-position="403">
|
|
|
+ <caret line="122" column="35" selection-start-line="122" selection-start-column="35" selection-end-line="122" selection-end-column="35" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/views/master/index.php">
|
|
|
+ <file leaf-file-name="console.php" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/console.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="292">
|
|
|
- <caret line="366" column="112" selection-start-line="366" selection-start-column="112" selection-end-line="366" selection-end-column="112" />
|
|
|
- <folding>
|
|
|
- <marker date="1474452054432" expanded="true" signature="19744:19775" ph="..." />
|
|
|
- <marker date="1474452054432" expanded="true" signature="19807:19824" ph="..." />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="578">
|
|
|
+ <caret line="320" column="30" selection-start-line="320" selection-start-column="30" selection-end-line="320" selection-end-column="30" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="qiniu_upload_single.js" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/js/qiniu_upload_single.js">
|
|
|
+ <file leaf-file-name="develop.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/develop.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="550">
|
|
|
- <caret line="22" column="148" selection-start-line="22" selection-start-column="92" selection-end-line="22" selection-end-column="148" />
|
|
|
- <folding>
|
|
|
- <marker date="1474450530027" expanded="true" signature="3529:3641" ph="..." />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="578">
|
|
|
+ <caret line="55" column="30" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="JSXTransformer.js" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/webapp/framework/react-0.13.1/build/JSXTransformer.js">
|
|
|
+ <file leaf-file-name="yiguanjia_const.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/yiguanjia_const.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="292">
|
|
|
- <caret line="8978" column="18" selection-start-line="8978" selection-start-column="18" selection-end-line="8978" selection-end-column="18" />
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="test.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/test.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="353">
|
|
|
+ <caret line="54" column="30" selection-start-line="54" selection-start-column="30" selection-end-line="54" selection-end-column="30" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/views/master/index.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="292">
|
|
|
+ <caret line="366" column="112" selection-start-line="366" selection-start-column="112" selection-end-line="366" selection-end-column="112" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1474452054432" expanded="true" signature="19744:19775" ph="..." />
|
|
|
+ <marker date="1474452054432" expanded="true" signature="19807:19824" ph="..." />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
@@ -198,10 +196,7 @@
|
|
|
<option value="$PROJECT_DIR$/www/protected/modules/o2o/controllers/OrderController.php" />
|
|
|
<option value="$PROJECT_DIR$/www/protected/modules/o2o/models/ROrder.php" />
|
|
|
<option value="$PROJECT_DIR$/www/protected/views/rOrder/index.php" />
|
|
|
- <option value="$PROJECT_DIR$/www/protected/config/develop.php" />
|
|
|
<option value="$PROJECT_DIR$/www/protected/vendors/qiniu/conf.php" />
|
|
|
- <option value="$PROJECT_DIR$/www/protected/config/test.php" />
|
|
|
- <option value="$PROJECT_DIR$/www/protected/config/console.php" />
|
|
|
<option value="$PROJECT_DIR$/www/protected/modules/o2o/views/techHome/index.php" />
|
|
|
<option value="$PROJECT_DIR$/www/protected/vendor/qiniu/php-sdk/examples/auth.php" />
|
|
|
<option value="$PROJECT_DIR$/www/js/qiniu_upload_single.js" />
|
|
@@ -219,6 +214,9 @@
|
|
|
<option value="$PROJECT_DIR$/www/protected/views/rUser/index.php" />
|
|
|
<option value="$PROJECT_DIR$/www/protected/modules/o2o/views/tech/index.php" />
|
|
|
<option value="$PROJECT_DIR$/www/protected/config/main.php" />
|
|
|
+ <option value="$PROJECT_DIR$/www/protected/config/console.php" />
|
|
|
+ <option value="$PROJECT_DIR$/www/protected/config/develop.php" />
|
|
|
+ <option value="$PROJECT_DIR$/www/protected/config/test.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -448,12 +446,12 @@
|
|
|
<workItem from="1474271619805" duration="5210000" />
|
|
|
<workItem from="1474335695854" duration="27867000" />
|
|
|
<workItem from="1474419504100" duration="12299000" />
|
|
|
- <workItem from="1474436874642" duration="15372000" />
|
|
|
+ <workItem from="1474436874642" duration="15556000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="60748000" />
|
|
|
+ <option name="totallyTimeSpent" value="60932000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -506,14 +504,6 @@
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/modules/o2o/controllers/OrderController.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="266">
|
|
|
- <caret line="700" column="36" selection-start-line="700" selection-start-column="33" selection-end-line="700" selection-end-column="36" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/www/protected/views/rOrder/index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="36225">
|
|
@@ -687,22 +677,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/config/develop.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="428">
|
|
|
- <caret line="49" column="67" selection-start-line="49" selection-start-column="67" selection-end-line="49" selection-end-column="67" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/config/console.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="291">
|
|
|
- <caret line="384" column="67" selection-start-line="384" selection-start-column="67" selection-end-line="384" selection-end-column="67" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/www/protected/config/WoZhua_Const.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="608">
|
|
@@ -711,14 +685,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/www/protected/config/test.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="328">
|
|
|
- <caret line="53" column="67" selection-start-line="53" selection-start-column="67" selection-end-line="53" selection-end-column="67" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/www/protected/models/data/Booking.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="200">
|
|
@@ -938,10 +904,42 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/yiguanjia_const.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/test.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="353">
|
|
|
+ <caret line="54" column="30" selection-start-line="54" selection-start-column="30" selection-end-line="54" selection-end-column="30" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="603">
|
|
|
- <caret line="130" column="26" selection-start-line="130" selection-start-column="26" selection-end-line="130" selection-end-column="26" />
|
|
|
+ <state relative-caret-position="403">
|
|
|
+ <caret line="122" column="35" selection-start-line="122" selection-start-column="35" selection-end-line="122" selection-end-column="35" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/develop.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="578">
|
|
|
+ <caret line="55" column="30" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/www/protected/config/console.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="578">
|
|
|
+ <caret line="320" column="30" selection-start-line="320" selection-start-column="30" selection-end-line="320" selection-end-column="30" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|