郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 7dd8f76f3dc2405c95770213c2ee6aae53de2fa4 1 个父辈 9b38401c
1 个管道 的构建 通过 耗费 10 秒

修改家政公司服务类目

内嵌 并排对比
正在显示 10 个修改的文件 包含 505 行增加 和 304 行删除
... ... @@ -2,8 +2,16 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/SeverController.php" afterPath="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -25,86 +33,65 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<file leaf-file-name="ShoporderController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="982">
<caret line="803" column="23" lean-forward="false" selection-start-line="803" selection-start-column="12" selection-end-line="803" selection-end-column="23" />
<state relative-caret-position="28">
<caret line="58" column="40" lean-forward="false" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
<folding>
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
<element signature="e#1470#1699#0#PHP" expanded="false" />
<element signature="e#1704#3337#0#PHP" expanded="false" />
<element signature="e#3343#3583#0#PHP" expanded="false" />
<element signature="e#3588#3836#0#PHP" expanded="false" />
<element signature="e#3842#4189#0#PHP" expanded="false" />
<element signature="e#4194#4640#0#PHP" expanded="false" />
<element signature="e#4646#4906#0#PHP" expanded="false" />
<element signature="e#4911#5112#0#PHP" expanded="false" />
<element signature="e#5118#5380#0#PHP" expanded="false" />
<element signature="e#5385#5590#0#PHP" expanded="false" />
<element signature="e#5596#6038#0#PHP" expanded="false" />
<element signature="e#6043#7271#0#PHP" expanded="false" />
<element signature="e#7294#7839#0#PHP" expanded="false" />
<element signature="e#7845#8126#0#PHP" expanded="false" />
<element signature="e#8131#8523#0#PHP" expanded="false" />
<element signature="e#8529#9078#0#PHP" expanded="false" />
<element signature="e#9083#10282#0#PHP" expanded="false" />
<element signature="e#10288#10745#0#PHP" expanded="false" />
<element signature="e#10750#12013#0#PHP" expanded="false" />
<element signature="e#12036#12388#0#PHP" expanded="false" />
<element signature="e#12394#13078#0#PHP" expanded="false" />
<element signature="e#13083#14342#0#PHP" expanded="false" />
<element signature="e#14348#14810#0#PHP" expanded="false" />
<element signature="e#14815#17020#0#PHP" expanded="false" />
<element signature="e#17026#17635#0#PHP" expanded="false" />
<element signature="e#17640#18973#0#PHP" expanded="false" />
<element signature="e#18979#19336#0#PHP" expanded="false" />
<element signature="e#19341#20222#0#PHP" expanded="false" />
<element signature="e#20228#20580#0#PHP" expanded="false" />
<element signature="e#20585#21662#0#PHP" expanded="false" />
<element signature="e#21668#22023#0#PHP" expanded="false" />
<element signature="e#22028#23108#0#PHP" expanded="false" />
<element signature="e#23114#23538#0#PHP" expanded="false" />
<element signature="e#23543#24154#0#PHP" expanded="false" />
<element signature="e#26229#27093#0#PHP" expanded="false" />
<element signature="e#27120#27520#0#PHP" expanded="false" />
<element signature="e#27544#28117#0#PHP" expanded="false" />
<element signature="e#28140#28950#0#PHP" expanded="false" />
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#2662#3553#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
<caret line="319" column="54" lean-forward="true" selection-start-line="319" selection-start-column="54" selection-end-line="319" selection-end-column="54" />
<state relative-caret-position="1114">
<caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="703">
<caret line="144" column="23" lean-forward="false" selection-start-line="144" selection-start-column="23" selection-end-line="144" selection-end-column="23" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1329#0#PHP" expanded="false" />
<element signature="e#1334#2102#0#PHP" expanded="false" />
<element signature="e#2108#2326#0#PHP" expanded="false" />
<element signature="e#2331#2539#0#PHP" expanded="false" />
<element signature="e#2545#3052#0#PHP" expanded="false" />
<element signature="e#3057#3575#0#PHP" expanded="false" />
<element signature="e#3581#4093#0#PHP" expanded="false" />
<element signature="e#4098#4661#0#PHP" expanded="false" />
<element signature="e#4667#5257#0#PHP" expanded="false" />
<element signature="e#5262#6260#0#PHP" expanded="false" />
<element signature="e#6266#6584#0#PHP" expanded="false" />
<element signature="e#6589#6965#0#PHP" expanded="false" />
<element signature="e#6971#7326#0#PHP" expanded="false" />
<element signature="e#7331#7740#0#PHP" expanded="false" />
<element signature="e#7746#8131#0#PHP" expanded="false" />
<element signature="e#8136#8807#0#PHP" expanded="false" />
<element signature="e#9264#10115#0#PHP" expanded="false" />
<element signature="e#10121#10391#0#PHP" expanded="false" />
<element signature="e#10396#10872#0#PHP" expanded="false" />
<element signature="e#10878#11508#0#PHP" expanded="false" />
<element signature="e#11513#12865#0#PHP" expanded="false" />
<element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="353">
<caret line="82" column="7" lean-forward="true" selection-start-line="82" selection-start-column="7" selection-end-line="82" selection-end-column="7" />
<folding>
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#2126#2608#0#PHP" expanded="false" />
<element signature="e#2613#3118#0#PHP" expanded="false" />
<element signature="e#3124#3625#0#PHP" expanded="false" />
<element signature="e#3630#4459#0#PHP" expanded="false" />
<element signature="e#4465#4778#0#PHP" expanded="false" />
<element signature="e#4783#5158#0#PHP" expanded="false" />
<element signature="e#5164#5521#0#PHP" expanded="false" />
<element signature="e#5526#5934#0#PHP" expanded="false" />
<element signature="e#5940#6322#0#PHP" expanded="false" />
<element signature="e#6327#6997#0#PHP" expanded="false" />
<element signature="e#7003#7446#0#PHP" expanded="false" />
<element signature="e#7451#8301#0#PHP" expanded="false" />
<element signature="e#8307#8574#0#PHP" expanded="false" />
<element signature="e#8579#9054#0#PHP" expanded="false" />
<element signature="e#9060#9560#0#PHP" expanded="false" />
<element signature="e#9565#10354#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -130,10 +117,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
<option value="$PROJECT_DIR$/app/extra/wechat.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ProjectController.php" />
... ... @@ -162,14 +145,10 @@
<option value="$PROJECT_DIR$/api/index/model/HomeModel.php" />
<option value="$PROJECT_DIR$/api/config.php" />
<option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" />
... ... @@ -179,8 +158,16 @@
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
<option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
</list>
</option>
</component>
... ... @@ -199,10 +186,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="255" />
<option name="y" value="92" />
<option name="x" value="11" />
<option name="y" value="119" />
<option name="width" value="1582" />
<option name="height" value="969" />
<option name="height" value="965" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -231,19 +218,19 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
... ... @@ -255,7 +242,40 @@
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="upload" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="sever" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="shopgoods" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -265,7 +285,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../areial" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -353,15 +373,15 @@
<workItem from="1575016153150" duration="3315000" />
<workItem from="1575246616478" duration="21722000" />
<workItem from="1575278769037" duration="7395000" />
<workItem from="1575332430854" duration="9615000" />
<workItem from="1575332430854" duration="20170000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="420073000" />
<option name="totallyTimeSpent" value="430628000" />
</component>
<component name="ToolWindowManager">
<frame x="255" y="92" width="1582" height="969" extended-state="1" />
<frame x="11" y="119" width="1582" height="965" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19513798" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -415,76 +435,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/admin/controller/PicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="107">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="19" column="20" lean-forward="false" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/wechat/cert/apiclient_key.pem">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/wechat/cert/apiclient_cert.pem">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShoppicModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="16" column="40" lean-forward="false" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="20" column="12" lean-forward="false" selection-start-line="20" selection-start-column="12" selection-end-line="20" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1300">
<caret line="52" column="21" lean-forward="false" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-600">
<caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="52" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="686">
<caret line="75" column="17" lean-forward="false" selection-start-line="75" selection-start-column="17" selection-end-line="75" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
... ... @@ -534,20 +484,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117">
<caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="118">
<caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/extend/nsms/nsms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
... ... @@ -562,13 +498,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="160" column="7" lean-forward="true" selection-start-line="160" selection-start-column="7" selection-end-line="160" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/lib/phpstorm.jar!/resources/html5-schema/html5/tables.rnc">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
... ... @@ -580,6 +509,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -608,6 +538,16 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
<folding>
<element signature="e#264#877#0#PHP" expanded="false" />
<element signature="e#891#1678#0#PHP" expanded="false" />
<element signature="e#1692#2973#0#PHP" expanded="false" />
<element signature="e#2987#3712#0#PHP" expanded="false" />
<element signature="e#3731#4694#0#PHP" expanded="false" />
<element signature="e#4711#5355#0#PHP" expanded="false" />
<element signature="e#5372#6399#0#PHP" expanded="false" />
<element signature="e#6416#7236#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -632,13 +572,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="70" column="35" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="181" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shop_pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
... ... @@ -646,13 +579,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="639">
<caret line="108" column="17" lean-forward="true" selection-start-line="108" selection-start-column="17" selection-end-line="108" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
... ... @@ -678,20 +604,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="17" column="4" lean-forward="true" selection-start-line="17" selection-start-column="4" selection-end-line="99" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="46" column="38" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="69" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
... ... @@ -722,6 +635,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="51" column="12" lean-forward="false" selection-start-line="51" selection-start-column="12" selection-end-line="54" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
... ... @@ -733,36 +647,33 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-194">
<caret line="37" column="28" lean-forward="false" selection-start-line="37" selection-start-column="28" selection-end-line="37" selection-end-column="28" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="556">
<caret line="43" column="37" lean-forward="true" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20191129/e4893ecf9ae4fb70b9485ae0a5732120.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117">
<caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="407">
<caret line="167" column="8" lean-forward="false" selection-start-line="167" selection-start-column="8" selection-end-line="173" selection-end-column="11" />
<caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
... ... @@ -770,71 +681,15 @@
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556">
<caret line="43" column="37" lean-forward="true" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="982">
<caret line="803" column="23" lean-forward="false" selection-start-line="803" selection-start-column="12" selection-end-line="803" selection-end-column="23" />
<folding>
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
<element signature="e#1470#1699#0#PHP" expanded="false" />
<element signature="e#1704#3337#0#PHP" expanded="false" />
<element signature="e#3343#3583#0#PHP" expanded="false" />
<element signature="e#3588#3836#0#PHP" expanded="false" />
<element signature="e#3842#4189#0#PHP" expanded="false" />
<element signature="e#4194#4640#0#PHP" expanded="false" />
<element signature="e#4646#4906#0#PHP" expanded="false" />
<element signature="e#4911#5112#0#PHP" expanded="false" />
<element signature="e#5118#5380#0#PHP" expanded="false" />
<element signature="e#5385#5590#0#PHP" expanded="false" />
<element signature="e#5596#6038#0#PHP" expanded="false" />
<element signature="e#6043#7271#0#PHP" expanded="false" />
<element signature="e#7294#7839#0#PHP" expanded="false" />
<element signature="e#7845#8126#0#PHP" expanded="false" />
<element signature="e#8131#8523#0#PHP" expanded="false" />
<element signature="e#8529#9078#0#PHP" expanded="false" />
<element signature="e#9083#10282#0#PHP" expanded="false" />
<element signature="e#10288#10745#0#PHP" expanded="false" />
<element signature="e#10750#12013#0#PHP" expanded="false" />
<element signature="e#12036#12388#0#PHP" expanded="false" />
<element signature="e#12394#13078#0#PHP" expanded="false" />
<element signature="e#13083#14342#0#PHP" expanded="false" />
<element signature="e#14348#14810#0#PHP" expanded="false" />
<element signature="e#14815#17020#0#PHP" expanded="false" />
<element signature="e#17026#17635#0#PHP" expanded="false" />
<element signature="e#17640#18973#0#PHP" expanded="false" />
<element signature="e#18979#19336#0#PHP" expanded="false" />
<element signature="e#19341#20222#0#PHP" expanded="false" />
<element signature="e#20228#20580#0#PHP" expanded="false" />
<element signature="e#20585#21662#0#PHP" expanded="false" />
<element signature="e#21668#22023#0#PHP" expanded="false" />
<element signature="e#22028#23108#0#PHP" expanded="false" />
<element signature="e#23114#23538#0#PHP" expanded="false" />
<element signature="e#23543#24154#0#PHP" expanded="false" />
<element signature="e#26229#27093#0#PHP" expanded="false" />
<element signature="e#27120#27520#0#PHP" expanded="false" />
<element signature="e#27544#28117#0#PHP" expanded="false" />
<element signature="e#28140#28950#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
<caret line="319" column="54" lean-forward="true" selection-start-line="319" selection-start-column="54" selection-end-line="319" selection-end-column="54" />
<state relative-caret-position="525">
<caret line="307" column="7" lean-forward="false" selection-start-line="307" selection-start-column="7" selection-end-line="307" selection-end-column="7" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
... ... @@ -854,6 +709,7 @@
<element signature="e#7331#7740#0#PHP" expanded="false" />
<element signature="e#7746#8131#0#PHP" expanded="false" />
<element signature="e#8136#8807#0#PHP" expanded="false" />
<element signature="e#8813#9259#0#PHP" expanded="false" />
<element signature="e#9264#10115#0#PHP" expanded="false" />
<element signature="e#10121#10391#0#PHP" expanded="false" />
<element signature="e#10396#10872#0#PHP" expanded="false" />
... ... @@ -863,5 +719,247 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2045">
<caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
<caret line="28" column="20" lean-forward="false" selection-start-line="28" selection-start-column="20" selection-end-line="28" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_9.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335">
<caret line="488" column="120" lean-forward="true" selection-start-line="488" selection-start-column="16" selection-end-line="488" selection-end-column="120" />
<folding>
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
<element signature="e#5390#5845#0#PHP" expanded="false" />
<element signature="e#5850#6416#0#PHP" expanded="false" />
<element signature="e#6422#6765#0#PHP" expanded="false" />
<element signature="e#6770#7251#0#PHP" expanded="false" />
<element signature="e#7257#7548#0#PHP" expanded="false" />
<element signature="e#7553#7904#0#PHP" expanded="false" />
<element signature="e#7910#8263#0#PHP" expanded="false" />
<element signature="e#8268#8673#0#PHP" expanded="false" />
<element signature="e#8679#9062#0#PHP" expanded="false" />
<element signature="e#9067#9734#0#PHP" expanded="false" />
<element signature="e#9740#10184#0#PHP" expanded="false" />
<element signature="e#10189#11036#0#PHP" expanded="false" />
<element signature="e#11042#11310#0#PHP" expanded="false" />
<element signature="e#11315#11787#0#PHP" expanded="false" />
<element signature="e#11793#12099#0#PHP" expanded="false" />
<element signature="e#13768#14087#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="59">
<caret line="792" column="7" lean-forward="true" selection-start-line="792" selection-start-column="7" selection-end-line="792" selection-end-column="7" />
<folding>
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#1725#3358#0#PHP" expanded="false" />
<element signature="e#3364#3604#0#PHP" expanded="false" />
<element signature="e#3609#3857#0#PHP" expanded="false" />
<element signature="e#3863#4210#0#PHP" expanded="false" />
<element signature="e#4215#4661#0#PHP" expanded="false" />
<element signature="e#4667#4927#0#PHP" expanded="false" />
<element signature="e#4932#5133#0#PHP" expanded="false" />
<element signature="e#5139#5401#0#PHP" expanded="false" />
<element signature="e#5406#5611#0#PHP" expanded="false" />
<element signature="e#5617#6059#0#PHP" expanded="false" />
<element signature="e#6064#7292#0#PHP" expanded="false" />
<element signature="e#7315#7860#0#PHP" expanded="false" />
<element signature="e#7866#8147#0#PHP" expanded="false" />
<element signature="e#8152#8544#0#PHP" expanded="false" />
<element signature="e#8550#9099#0#PHP" expanded="false" />
<element signature="e#9104#10303#0#PHP" expanded="false" />
<element signature="e#10309#10766#0#PHP" expanded="false" />
<element signature="e#10771#12034#0#PHP" expanded="false" />
<element signature="e#12057#12409#0#PHP" expanded="false" />
<element signature="e#12415#13099#0#PHP" expanded="false" />
<element signature="e#13104#14363#0#PHP" expanded="false" />
<element signature="e#14369#14831#0#PHP" expanded="false" />
<element signature="e#14836#17041#0#PHP" expanded="false" />
<element signature="e#17047#17656#0#PHP" expanded="false" />
<element signature="e#17661#18994#0#PHP" expanded="false" />
<element signature="e#19000#19357#0#PHP" expanded="false" />
<element signature="e#19362#20243#0#PHP" expanded="false" />
<element signature="e#20249#20601#0#PHP" expanded="false" />
<element signature="e#20606#21683#0#PHP" expanded="false" />
<element signature="e#21689#22044#0#PHP" expanded="false" />
<element signature="e#22049#23129#0#PHP" expanded="false" />
<element signature="e#23135#23559#0#PHP" expanded="false" />
<element signature="e#23564#24175#0#PHP" expanded="false" />
<element signature="e#25069#25388#0#PHP" expanded="false" />
<element signature="e#25394#25802#0#PHP" expanded="false" />
<element signature="e#25808#26567#0#PHP" expanded="false" />
<element signature="e#26587#27451#0#PHP" expanded="false" />
<element signature="e#27478#27878#0#PHP" expanded="false" />
<element signature="e#27902#28475#0#PHP" expanded="false" />
<element signature="e#28498#29308#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1114">
<caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="28">
<caret line="58" column="40" lean-forward="false" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#2662#3553#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="703">
<caret line="144" column="23" lean-forward="false" selection-start-line="144" selection-start-column="23" selection-end-line="144" selection-end-column="23" />
<folding>
<element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-450">
<caret line="0" column="0" lean-forward="false" 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$/public/themes/admin_simpleboot3/admin/shopgoods/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="31" column="16" lean-forward="true" selection-start-line="31" selection-start-column="16" selection-end-line="44" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="36" column="20" lean-forward="true" selection-start-line="36" selection-start-column="20" selection-end-line="43" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750">
<caret line="30" column="20" lean-forward="true" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="178">
<caret line="29" column="20" lean-forward="true" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
<folding>
<element signature="n#style#0;n#div#0;n#td#0;n#tr#1;n#table#0;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="31" column="12" lean-forward="false" selection-start-line="31" selection-start-column="12" selection-end-line="51" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="78">
<caret line="24" column="20" lean-forward="true" selection-start-line="24" selection-start-column="20" selection-end-line="24" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/SeverController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="603">
<caret line="73" column="27" lean-forward="false" selection-start-line="73" selection-start-column="27" selection-end-line="73" selection-end-column="27" />
<folding>
<element signature="e#1001#1862#0#PHP" expanded="false" />
<element signature="e#1877#3304#0#PHP" expanded="false" />
<element signature="e#3319#3787#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="353">
<caret line="82" column="7" lean-forward="true" selection-start-line="82" selection-start-column="7" selection-end-line="82" selection-end-column="7" />
<folding>
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#2126#2608#0#PHP" expanded="false" />
<element signature="e#2613#3118#0#PHP" expanded="false" />
<element signature="e#3124#3625#0#PHP" expanded="false" />
<element signature="e#3630#4459#0#PHP" expanded="false" />
<element signature="e#4465#4778#0#PHP" expanded="false" />
<element signature="e#4783#5158#0#PHP" expanded="false" />
<element signature="e#5164#5521#0#PHP" expanded="false" />
<element signature="e#5526#5934#0#PHP" expanded="false" />
<element signature="e#5940#6322#0#PHP" expanded="false" />
<element signature="e#6327#6997#0#PHP" expanded="false" />
<element signature="e#7003#7446#0#PHP" expanded="false" />
<element signature="e#7451#8301#0#PHP" expanded="false" />
<element signature="e#8307#8574#0#PHP" expanded="false" />
<element signature="e#8579#9054#0#PHP" expanded="false" />
<element signature="e#9060#9560#0#PHP" expanded="false" />
<element signature="e#9565#10354#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -70,6 +70,32 @@ class HomeController extends RestBaseController
}
/**
* @title 家政服务列表
* @description
* @author GuoSheng
* @url /index/Home/sever
* @method GET
*
* @return id:ID
* @return sever_name:服务名称
* @return thumbnail:缩略图
*
*/
public function sever(){
$where['delete_time'] = ['eq',0];
$data = Db::name('service')
->where($where)
->field('id,sever_name,thumbnail')
->order('id desc')
->select();
foreach ($data as &$v){
$v['thumbnail'] = cmf_get_image_url($v['thumbnail']);
}
$this->success('SUCCESS',$data);
}
/**
* @title 家政公司详情
* @description 家政公司详情
* @author GuoSheng
... ...
... ... @@ -14,6 +14,7 @@ use think\Cache;
use think\cache\driver\Redis;
use think\Validate;
use think\Db;
use cmf\lib\Storage;
/**
* @title 个人中心
... ... @@ -806,6 +807,21 @@ class UserController extends RestBaseController
}else{
$code = "qrcode/code_$user_id.jpg";
}
$this->success('SUCCESS',$code);
}
//判断当前操作系统
public function getOperateSys(){
$os_name = php_uname('s');
//判断
if(strpos($os_name,"Linux")!==false){
$os_str="Linux";
}else if(strpos($os_name,"Windows")!==false){
$os_str="Windows";
}else{
$os_str='';
}
return $os_str;
}
public function getusercode($user_id,$url){
... ... @@ -824,7 +840,6 @@ class UserController extends RestBaseController
$url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=".$access_token;
$post['path'] = $path;
$post['width'] = 280;
$post['is_hyaline'] = true;
$result = $this->curl($url, json_encode($post));
$array = json_decode($result, true);
if($array['errmsg']) {
... ... @@ -834,7 +849,7 @@ class UserController extends RestBaseController
if (!file_exists(ROOT_PATH . 'public' . DS . 'upload/qrcode/')) {
mkdir(ROOT_PATH . 'public' . DS . 'upload/qrcode/', 0777, true);
}
$filename = "code_".$user_id."_$job_id.jpg";
$filename = "code_".$user_id.".jpg";
$furl = ROOT_PATH . 'public' . DS . 'upload/qrcode/'.$filename;
file_put_contents($furl, $result);
return "qrcode/".$filename;
... ...
... ... @@ -48,10 +48,12 @@ class SeverController extends AdminBaseController
$validate = new Validate([
'sever_name'=>'require',
'home_id'=>'require',
'thumbnail'=>'require',
'price'=>'require',
]);
$validate->message([
'sever_name'=>'服务类目名称不能为空',
'thumbnail'=>'缩略图不能为空',
'home_id'=>'所属公司不能为空',
'price'=>'所需积分不能为空',
]);
... ... @@ -75,11 +77,13 @@ class SeverController extends AdminBaseController
$param=$this->request->param();
$validate = new Validate([
'sever_name'=>'require',
'thumbnail'=>'require',
'home_id'=>'require',
'price'=>'require',
]);
$validate->message([
'sever_name'=>'服务类目名称不能为空',
'thumbnail'=>'缩略图不能为空',
'home_id'=>'所属公司不能为空',
'price'=>'所需积分不能为空',
]);
... ...
... ... @@ -55,10 +55,8 @@ class ShoporderController extends AdminBaseController
$id = $this->request->param('id');
if($this->request->isPost()){
$param = $this->request->param();
if($param['status'] == 2){
if(empty($param['express_num'])){
$this->error('请填写快递单号');
}
if($param['status'] == 2 && empty($param['express_num'])){
$this->error('请填写快递单号');
}
if(!empty($param['express_num'])){
if(empty($param['status'] == 1)){
... ... @@ -88,7 +86,7 @@ class ShoporderController extends AdminBaseController
->field('a.*,r.goods_name,r.price,r.freight,u.user_nickname')
->where('a.id',$id)
->find();
$address = Db::name('shoprecycle')->where('id',$data['recycle_id'])->find();
$address = Db::name('shoprecycle')->where('id',$data['shoprecycle_id'])->find();
$data['name'] = $address['name'];
$data['phone'] = $address['phone'];
$data['address'] = $address['address'];
... ...
... ... @@ -28,6 +28,20 @@
</td>
</tr>
<tr>
<th>缩略图</th>
<td>
<div style="text-align: center;">
<input type="hidden" name="thumbnail" id="thumbnail" value="">
<a href="javascript:uploadOneImage('图片上传','#thumbnail');">
<img src="__TMPL__/public/assets/images/default-thumbnail.png"
id="thumbnail-preview"
width="135" style="cursor: pointer"/>
</a>
<input type="button" class="btn btn-sm btn-cancel-thumbnail" value="取消图片">
</div>
</td>
</tr>
<tr>
<th width="100">所属家政公司</th>
<td>
<input class="form-control" type="text" style="width:400px;"
... ...
... ... @@ -29,6 +29,27 @@
</td>
</tr>
<tr>
<td>缩略图</td>
<td>
<input type="hidden" name="id" value="{$data.id}">
<input type="hidden" name="thumbnail" id="thumbnail"
value="{$data.thumbnail|default=''}">
<a href="javascript:uploadOneImage('image upload','#thumbnail');">
<if condition="empty($data['thumbnail'])">
<img src="__TMPL__/public/assets/images/default-thumbnail.png"
id="thumbnail-preview"
width="135" style="cursor: pointer"/>
<else/>
<img src="{:cmf_get_image_url($data.thumbnail)}"
id="thumbnail-preview"
width="135" style="cursor: pointer"/>
</if>
</a>
<input type="button" class="btn btn-sm btn-cancel-thumbnail"
value="取消图片">
</td>
</tr>
<tr>
<th width="100">所属家政公司</th>
<td>
<input class="form-control" type="text" style="width:400px;"
... ...
... ... @@ -23,6 +23,7 @@
<tr>
<th>ID</th>
<th>服务类型名称</th>
<th>缩略图</th>
<th>所属公司</th>
<th>所需积分</th>
<th>操作</th>
... ... @@ -33,6 +34,14 @@
<tr>
<td>{$vo.id}</td>
<td>{$vo.sever_name}</td>
<td>
<notempty name="$vo.thumbnail">
<img id="photo2-{$key}-preview"
src="{:cmf_get_image_preview_url($vo['thumbnail'])}"
style="height:36px;width: 36px;"
onclick="parent.imagePreviewDialog(this.src);">
</notempty>
</td>
<td>{$vo.home_name}</td>
<td>{$vo.price}</td>
<td>
... ...
... ... @@ -94,12 +94,12 @@
<label><input type="radio" class="status" name="status" value="1" id="status"
<eq name="$data.status" value="1">checked</eq>
/>未发货</label>
<label><input type="radio" class="status" name="status" value="0" id="status"
<label><input type="radio" class="status" name="status" value="2" id="status"
<eq name="$data.status" value="2">checked</eq>
/>已发货 </label>
</td>
</tr>
<tr>
<tr class="status" style="<if condition='$data.status neq 1'>display: none;</if>">
<th width="100">快递单号<span class="form-required">*</span></th>
<td>
<input class="form-control" type="text" name="express_num"
... ... @@ -136,6 +136,22 @@
<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.config.js"></script>
<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.all.min.js"></script>
<script type="text/javascript">
status();
$('.status').click(function () {
status();
});
function status() {
var status = $('.status:radio:checked').val();
if (status == '2') {
$('.status').show();
} else {
$('.status').hide();
}
}
$(function () {
editorcontent = new baidu.editor.ui.Editor();
... ...
... ... @@ -56,7 +56,7 @@
<td>已取消</td>
</if>
<td>
<a href='{:url("shoporder/edit",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>|
<a href='{:url("shoporder/edit",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>
</td>
</tr>
</foreach>
... ...