lifangxu / menhu · 提交

转到一个项目

作者 wuyue
提交 9e8ba4d0ae15c367d2122016b177e2be8df27f4f 1 个父辈 e714d2ee

111

内嵌 并排对比
正在显示 17 个修改的文件 包含 580 行增加 和 134 行删除
... ... @@ -2,98 +2,24 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f0d9b964-cf91-4edd-b12d-273162753deb" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/application/api/controller/About.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/controller/Green.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/controller/International.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/controller/Login.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/controller/News.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/green/detail.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/green/green.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/green/list.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/index/about.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/index/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/international/detail.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/international/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/layout/default.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/login/login.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/login/password.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/login/registered.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/news/detail.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/api/view/news/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/bootstrap/bootstrap.min.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/bootstrap/bootstrap.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/css/base.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/css/index.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/css/swiper.min.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/572941314_.pic_hd.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/62952600.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/banner_img.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/bg_img.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/fujian_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/huidaodingduan_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon12.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon13.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon14.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon15.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon16.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon17.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon18.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon19.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon20.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon21.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon22.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon23.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon24.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon25.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon26.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon3.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon4.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon50.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon8.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/icon9.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/logo_img.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/qq_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/top_bg_img.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/touxiang_img.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/upImg.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/weixin_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/xiala_img.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/xiayiji_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/you_img.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/zaixianhuida_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/zaixianjiaoliu_icon.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/zuo_img.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/放大镜.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/image/门店.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/js/base.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/js/jquery.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/static/js/swiper.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/green_list/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/green_list/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/green_list/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/green_list/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/whch_list/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/whch_list/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/whch_list/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/whch_list/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/api/controller/Common.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/application/api/controller/Demo.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/application/api/controller/Ems.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/application/api/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/api/controller/Sms.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/application/api/controller/Token.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/application/api/controller/User.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/application/api/controller/Validate.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/application/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/common/controller/Frontend.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/controller/Frontend.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/controller/News.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/controller/News.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/service/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/service/Index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/green/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/green/detail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/green/green.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/green/green.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/green/list.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/green/list.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/experts/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/experts/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/experts/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/experts/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/controller/Login.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/experts/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/experts/detail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/experts/op_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/experts/op_detail.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/index/about.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/index/about.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/index/contact_me.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/index/contact_me.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/index/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/invitation/release.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/invitation/release.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/talent/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/talent/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/talent/initiate_1.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/talent/initiate_1.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/index/view/talent/initiate_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/talent/initiate_2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/statis/bootstrap/bootstrap.min.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/statis/bootstrap/bootstrap.min.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/statis/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/statis/css/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/statis/css/public.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/statis/css/public.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/statis/image/logo_icon (1).png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/public/statis/image/logo_icon.png" beforeDir="false" afterPath="$PROJECT_DIR$/public/statis/image/logo_icon.png" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -103,9 +29,6 @@
</component>
<component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
<execution>
<executable />
</execution>
</component>
<component name="DatabaseView">
<option name="SHOW_INTERMEDIATE" value="true" />
... ... @@ -121,9 +44,113 @@
<expand />
<select />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/index/view/experts/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1045">
<caret line="55" column="61" selection-start-line="55" selection-start-column="61" selection-end-line="55" selection-end-column="61" />
<folding>
<element signature="n#style#0;n#div#3;n#div#2;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/statis/css/public.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/index/view/experts/op_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="551">
<caret line="29" column="53" selection-start-line="29" selection-start-column="53" selection-end-line="29" selection-end-column="53" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/index/view/experts/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="798">
<caret line="42" column="16" selection-start-line="42" selection-start-column="16" selection-end-line="44" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>model3_Img</find>
<find>model3_mode2</find>
<find>.model3_mode2</find>
<find>model3_Txt2</find>
<find>model3_Ttx5</find>
<find>.model_Box4 ul li</find>
<find>.model4_Box h1</find>
<find>.model4_Box a</find>
<find>.model6 .model4_Box h1</find>
<find>top_itemTxt</find>
<find>.top_itemTxt a</find>
<find>model3_Box</find>
<find>.world_Txt</find>
<find>about_model</find>
<find>world_Txt2</find>
<find>model4_Box</find>
<find>.release_file input</find>
<find>.experts_opTxt</find>
<find>experts_opTxt</find>
<find>.release_op</find>
<find>.model5_List ul li</find>
<find>.model3_Box2 ul li:hover .model3_Txt2</find>
<find>.news_Txt2</find>
<find>.model4_right</find>
<find>.experts_right</find>
<find>experts_Con</find>
<find>form</find>
<find>model_List</find>
<find>不存在</find>
<find>5701</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/statis/css/base.css" />
<option value="$PROJECT_DIR$/application/index/view/login/login.html" />
<option value="$PROJECT_DIR$/application/index/view/index/index.html" />
<option value="$PROJECT_DIR$/application/index/view/layout/default.html" />
<option value="$PROJECT_DIR$/application/index/view/experts/op.html" />
<option value="$PROJECT_DIR$/application/index/view/news/index.html" />
<option value="$PROJECT_DIR$/application/index/view/experts/index.html" />
<option value="$PROJECT_DIR$/public/statis/css/index.css" />
<option value="$PROJECT_DIR$/application/index/controller/Login.php" />
<option value="$PROJECT_DIR$/application/index/view/index/about.html" />
<option value="$PROJECT_DIR$/application/index/view/index/contact_me.html" />
<option value="$PROJECT_DIR$/application/index/view/talent/index.html" />
<option value="$PROJECT_DIR$/application/index/view/talent/initiate_1.html" />
<option value="$PROJECT_DIR$/application/index/view/talent/initiate_2.html" />
<option value="$PROJECT_DIR$/application/index/view/invitation/release.html" />
<option value="$PROJECT_DIR$/public/statis/bootstrap/bootstrap.min.css" />
<option value="$PROJECT_DIR$/application/index/view/experts/detail.html" />
<option value="$PROJECT_DIR$/application/admin/view/experts/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/experts/edit.html" />
<option value="$PROJECT_DIR$/application/index/view/experts/op_detail.html" />
<option value="$PROJECT_DIR$/public/statis/css/public.css" />
</list>
</option>
</component>
<component name="PhpWorkspaceProjectConfiguration">
<include_path>
<path value="$PROJECT_DIR$/vendor/paragonie/random_compat" />
... ... @@ -158,9 +185,158 @@
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php70" />
</include_path>
</component>
<component name="ProjectId" id="1VGwP2qw4cNb9bceTh3bRCwKRZw" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="423" />
<option name="y" value="8" />
<option name="width" value="1400" />
<option name="height" value="1000" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="experts" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="international" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="invitation" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="login" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="news" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="online" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="talent" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="statis" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="statis" type="462c0819:PsiDirectoryNode" />
<item name="bootstrap" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="menhu" type="b2602c69:ProjectViewProjectNode" />
<item name="menhu" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="statis" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="true" />
... ... @@ -169,17 +345,13 @@
<property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/application/api/controller" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="vcs.Git" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="F:\lfx\menhu\application\api\controller" />
<recent name="F:\lfx\menhu\application\api\view" />
<recent name="F:\lfx\menhu\application\api\view\login" />
<recent name="F:\lfx\menhu\application\api\view\index" />
<recent name="F:\lfx\menhu\application\api\view\defalut" />
<recent name="C:\Users\LIAO\Desktop\menhu\public\statis\image" />
</key>
</component>
<component name="RunDashboard">
... ... @@ -215,22 +387,254 @@
<workItem from="1576819038313" duration="2796000" />
<workItem from="1576824832251" duration="30000" />
<workItem from="1576829924857" duration="52000" />
<workItem from="1576892718822" duration="19228000" />
<workItem from="1576892485047" duration="107000" />
<workItem from="1576899485072" duration="7000" />
<workItem from="1576899592666" duration="25000" />
<workItem from="1576899687678" duration="1247000" />
<workItem from="1577080362681" duration="2639000" />
<workItem from="1577087211645" duration="2569000" />
<workItem from="1577147681086" duration="1221000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="26202000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.29744136" />
<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="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="File Transfer" order="9" visible="true" weight="0.3286334" />
<window_info anchor="bottom" id="Database Changes" order="10" />
<window_info anchor="bottom" id="Terminal" order="11" />
<window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="3" visible="true" weight="0.23987207" />
<window_info anchor="right" id="Database" order="4" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/index/view/common/sidenav.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/common/script.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/common/meta.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/new/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="21" column="7" selection-start-line="21" selection-start-column="7" selection-end-line="21" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/statis/css/base.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-323">
<caret line="89" selection-start-line="89" selection-end-line="89" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../99999/application/index/view/international/index.html" />
<entry file="file://$PROJECT_DIR$/../99999/application/index/view/invitation/release.html" />
<entry file="file://$PROJECT_DIR$/application/index/view/layout/default.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282">
<caret line="33" column="81" selection-start-line="33" selection-start-column="81" selection-end-line="33" selection-end-column="81" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="931">
<caret line="49" column="79" selection-start-line="49" selection-start-column="50" selection-end-line="49" selection-end-column="79" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/experts/op.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
<caret line="34" column="61" selection-start-line="34" selection-start-column="61" selection-end-line="34" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/online/index.html">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="30" selection-start-column="30" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/invitation/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/statis/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5928">
<caret line="312" column="32" selection-start-line="312" selection-start-column="32" selection-end-line="312" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/index/contact_me.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="604">
<caret line="34" column="67" selection-start-line="34" selection-start-column="67" selection-end-line="34" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/index/about.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="603">
<caret line="41" column="63" selection-start-line="41" selection-start-column="3" selection-end-line="41" selection-end-column="63" />
<folding>
<element signature="n#style#0;n#h1#0;n#div#2;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/statis/image/logo_icon.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/application/index/controller/Login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="71" column="13" selection-start-line="71" selection-start-column="13" selection-end-line="71" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/login/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19">
<caret line="58" column="31" selection-start-line="58" selection-start-column="31" selection-end-line="58" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/international/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="18" column="76" selection-start-line="18" selection-start-column="65" selection-end-line="18" selection-end-column="76" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/news/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="817">
<caret line="43" column="14" selection-start-line="43" selection-start-column="14" selection-end-line="43" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/talent/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="551">
<caret line="29" column="72" selection-start-line="29" selection-start-column="72" selection-end-line="29" selection-end-column="72" />
</state>
</provider>
</entry>
<entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.webworker.d.ts">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="196">
<caret line="739" column="4" selection-start-line="739" selection-start-column="4" selection-end-line="739" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/talent/initiate_1.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319">
<caret line="70" column="18" lean-forward="true" selection-start-line="64" selection-start-column="12" selection-end-line="70" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/talent/initiate_2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="490">
<caret line="71" column="18" lean-forward="true" selection-start-line="65" selection-start-column="11" selection-end-line="71" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/invitation/release.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="68" column="9" lean-forward="true" selection-start-line="68" selection-start-column="9" selection-end-line="68" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/statis/bootstrap/bootstrap.min.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="160">
<caret line="5705" column="25" selection-start-line="5705" selection-start-column="25" selection-end-line="5705" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/experts/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="17" column="122" selection-start-line="17" selection-start-column="122" selection-end-line="17" selection-end-column="122" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/experts/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/experts/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" selection-start-line="14" selection-end-line="19" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/experts/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1045">
<caret line="55" column="61" selection-start-line="55" selection-start-column="61" selection-end-line="55" selection-end-column="61" />
<folding>
<element signature="n#style#0;n#div#3;n#div#2;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/experts/op_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="551">
<caret line="29" column="53" selection-start-line="29" selection-start-column="53" selection-end-line="29" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/view/experts/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="798">
<caret line="42" column="16" selection-start-line="42" selection-start-column="16" selection-end-line="44" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../新建文本文档(1).txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1026" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/statis/css/public.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -13,6 +13,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('专家的名字')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-experts_name" class="form-control" name="row[experts_name]" type="text">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
<div class="col-xs-12 col-sm-8">
<textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50"></textarea>
... ...
... ... @@ -13,6 +13,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('专家的名字')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-experts_name" class="form-control" name="row[experts_name]" type="text" value="{$row.experts_name|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
<div class="col-xs-12 col-sm-8">
<textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea>
... ...
... ... @@ -30,7 +30,7 @@ class Login extends Frontend
}
//手机号码已被绑定
}else{
return self::$model::js("该手机号吗不存在",500);
return self::$model::js("该手机号码不存在",500);
}
}
$this->assign("title","登录");
... ...
... ... @@ -54,9 +54,9 @@
<p class="experts_Txt2">在线问答</p>
</div>
<div class="experts_Img2"><img src="{$news.image}" alt=""></div>
<div class="world_DBox">
<div class="swiper-container">
<div class="swiper-wrapper">
<div class="world_DBox" style="{$news['images']!=null?'display:block':'display:none'}">
<div class="swiper-container" >
<div class="swiper-wrapper" >
{foreach(:explode(",",$news['images']) as $image)}
<div class="swiper-slide">
<div class="world_Dimg"><img src="{$image}" alt=""></div>
... ...
... ... @@ -27,7 +27,7 @@
<div class="experts_opDBox">
<h1 class="news_DTit">{$news.name}</h1>
<p class="news_DTime">{$news.createtime}</p>
<p class="news_DTime">{$news.experts_name}</p>
<div class="news_Dtext">
{$news.content}
... ...
... ... @@ -39,7 +39,7 @@
<script>
// 百度地图API功能
var map = new BMap.Map("allmap");
var point = new BMap.Point(113.006141, 25.763101); // 创建点坐标
var point = new BMap.Point(116.530101, 39.800225); // 创建点坐标
map.enableScrollWheelZoom();
map.centerAndZoom(point, 15);
var marker = new BMap.Marker(point); // 创建标注
... ...
... ... @@ -32,7 +32,7 @@
<script>
// 百度地图API功能
var map = new BMap.Map("allmap2");
var point = new BMap.Point(113.006141, 25.763101); // 创建点坐标
var point = new BMap.Point(116.530101, 39.800225); // 创建点坐标
map.enableScrollWheelZoom();
map.centerAndZoom(point, 15);
var marker = new BMap.Marker(point); // 创建标注
... ...
... ... @@ -56,9 +56,17 @@
}
$(".release_btn").on("click",function () {
var data=$("#form").serialize();
ajax("/index/invitation/release",data,"post",function (res) {
w(res.msg);
},"");
if($(".release_op option:selected").text() == '请选择类型'){
w('请选择类型');
}else if($('.release_input').val() == ''){
w('请输入标题');
}else if($('.release_textarea').val() ==''){
w('请输入内容');
}else{
ajax("/index/invitation/release",data,"post",function (res) {
w(res.msg);
},"");
}
})
</script>
{/block}
\ No newline at end of file
... ...
... ... @@ -27,7 +27,7 @@
{foreach $left as $le}
<a href="/index/talent/index?pid={$le.id}">
<li class="clearfix">
<p class="news_Txt2 one-txt-cut">招聘信息</p>
<p class="news_Txt2 one-txt-cut">{$le.title}</p>
</li>
</a>
{/foreach}
... ...
... ... @@ -2,7 +2,7 @@
{block name="title"}发起招聘{/block}
{block name="content"}
<div class="tender_rCon">
<h1 class="tender_rTxt">发起招聘</h1>
<h1 class="tender_rTxt">发起求职</h1>
<div class="tender_rBox">
<div class="release_Li clearfix">
... ... @@ -62,9 +62,17 @@
}
$(".release_btn").on("click",function () {
var data=$("#form").serialize();
ajax("/index/talent/initiate_1",data,"post",function (res) {
w(res.msg);
},"");
if($(".release_op option:selected").text() == '请选择类型'){
w('请选择人才类型');
}else if($('.release_input').val() == ''){
w('请输入标题');
}else if($('.release_textarea').val() ==''){
w('请输入内容');
}else{
ajax("/index/talent/initiate_1",data,"post",function (res) {
w(res.msg);
},"");
}
})
</script>
{/block}
\ No newline at end of file
... ...
... ... @@ -3,7 +3,7 @@
{block name="content"}
<div class="tender_rCon">
<h1 class="tender_rTxt">发起求职</h1>
<h1 class="tender_rTxt">发起招聘</h1>
<div class="tender_rBox">
<form id="form">
<input type="hidden" name="style" value="49">
... ... @@ -63,9 +63,17 @@
}
$(".release_btn").on("click",function () {
var data=$("#form").serialize();
ajax("/index/talent/initiate_2",data,"post",function (res) {
w(res.msg);
},"");
if($(".release_op option:selected").text() == '请选择类型'){
w('请选择人才类型');
}else if($('.release_input').val() == ''){
w('请输入标题');
}else if($('.release_textarea').val() ==''){
w('请输入内容');
}else{
ajax("/index/talent/initiate_2",data,"post",function (res) {
w(res.msg);
},"");
}
})
</script>
{/block}
\ No newline at end of file
... ...
... ... @@ -5702,8 +5702,8 @@ fieldset[disabled] .navbar-inverse .btn-link:hover {
z-index: 3;
color: #fff;
cursor: default;
background-color: #337ab7;
border-color: #337ab7
background-color: #34720F;
border-color: #34720F
}
.pagination>.disabled>a,
... ...
... ... @@ -307,6 +307,10 @@
padding: 10px 36px;
line-height: 22px;
cursor: pointer;
display: flex;
align-items: center;
display: -webkit-flex;
-webkit-align-items: center;
box-sizing: border-box;
border-bottom: 1px solid #EEEEEE;
box-sizing: border-box;
... ...
... ... @@ -8,7 +8,9 @@
width: 100%;
height: 268px;
}
#allmap .anchorBL{
display: none !important;
}
#allmap img {
width: 36px;
}
... ...

7.9 KB | 宽: | 高:

9.3 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖