lifangxu / menhu · 提交

转到一个项目

作者 sgj
提交 c66c9e2f88b15f96126620841453de9266a103a3 1 个父辈 9c0352c2

1

内嵌 并排对比
正在显示 37 个修改的文件 包含 1088 行增加 和 132 行删除
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 - <component name="PublishConfigData" autoUpload="Always" serverName="menhu"> 3 + <component name="PublishConfigData" autoUpload="Always" serverName="7">
4 <serverData> 4 <serverData>
5 - <paths name="menhu"> 5 + <paths name="6">
6 <serverdata> 6 <serverdata>
7 <mappings> 7 <mappings>
8 - <mapping deploy="/" local="$PROJECT_DIR$" web="/" /> 8 + <mapping local="$PROJECT_DIR$" web="/" />
  9 + </mappings>
  10 + </serverdata>
  11 + </paths>
  12 + <paths name="7">
  13 + <serverdata>
  14 + <mappings>
  15 + <mapping deploy="/alidata/www/fast/menhu" local="$PROJECT_DIR$" web="/" />
  16 + </mappings>
  17 + </serverdata>
  18 + </paths>
  19 + <paths name="7 (project level)">
  20 + <serverdata>
  21 + <mappings>
  22 + <mapping deploy="/alidata/www/fast/menhu" local="$PROJECT_DIR$" web="/" />
  23 + </mappings>
  24 + </serverdata>
  25 + </paths>
  26 + <paths name="8">
  27 + <serverdata>
  28 + <mappings>
  29 + <mapping local="$PROJECT_DIR$" web="/" />
  30 + </mappings>
  31 + </serverdata>
  32 + </paths>
  33 + <paths name="Upinonline">
  34 + <serverdata>
  35 + <mappings>
  36 + <mapping local="$PROJECT_DIR$" web="/" />
  37 + </mappings>
  38 + </serverdata>
  39 + </paths>
  40 + <paths name="Upinonline (1)">
  41 + <serverdata>
  42 + <mappings>
  43 + <mapping local="$PROJECT_DIR$" web="/" />
  44 + </mappings>
  45 + </serverdata>
  46 + </paths>
  47 + <paths name="U聘宝塔">
  48 + <serverdata>
  49 + <mappings>
  50 + <mapping local="$PROJECT_DIR$" web="/" />
  51 + </mappings>
  52 + </serverdata>
  53 + </paths>
  54 + <paths name="bo">
  55 + <serverdata>
  56 + <mappings>
  57 + <mapping local="$PROJECT_DIR$" web="/" />
  58 + </mappings>
  59 + </serverdata>
  60 + </paths>
  61 + <paths name="cijie">
  62 + <serverdata>
  63 + <mappings>
  64 + <mapping local="$PROJECT_DIR$" web="/" />
  65 + </mappings>
  66 + </serverdata>
  67 + </paths>
  68 + <paths name="foyuan">
  69 + <serverdata>
  70 + <mappings>
  71 + <mapping local="$PROJECT_DIR$" web="/" />
  72 + </mappings>
  73 + </serverdata>
  74 + </paths>
  75 + <paths name="fresh">
  76 + <serverdata>
  77 + <mappings>
  78 + <mapping local="$PROJECT_DIR$" web="/" />
  79 + </mappings>
  80 + </serverdata>
  81 + </paths>
  82 + <paths name="ftptest">
  83 + <serverdata>
  84 + <mappings>
  85 + <mapping local="$PROJECT_DIR$" web="/" />
  86 + </mappings>
  87 + </serverdata>
  88 + </paths>
  89 + <paths name="grouppay">
  90 + <serverdata>
  91 + <mappings>
  92 + <mapping local="$PROJECT_DIR$" web="/" />
  93 + </mappings>
  94 + </serverdata>
  95 + </paths>
  96 + <paths name="hongkong">
  97 + <serverdata>
  98 + <mappings>
  99 + <mapping local="$PROJECT_DIR$" web="/" />
  100 + </mappings>
  101 + </serverdata>
  102 + </paths>
  103 + <paths name="live">
  104 + <serverdata>
  105 + <mappings>
  106 + <mapping local="$PROJECT_DIR$" web="/" />
  107 + </mappings>
  108 + </serverdata>
  109 + </paths>
  110 + <paths name="live7">
  111 + <serverdata>
  112 + <mappings>
  113 + <mapping local="$PROJECT_DIR$" web="/" />
  114 + </mappings>
  115 + </serverdata>
  116 + </paths>
  117 + <paths name="tutor">
  118 + <serverdata>
  119 + <mappings>
  120 + <mapping local="$PROJECT_DIR$" web="/" />
  121 + </mappings>
  122 + </serverdata>
  123 + </paths>
  124 + <paths name="tx">
  125 + <serverdata>
  126 + <mappings>
  127 + <mapping local="$PROJECT_DIR$" web="/" />
  128 + </mappings>
  129 + </serverdata>
  130 + </paths>
  131 + <paths name="tzfl_test">
  132 + <serverdata>
  133 + <mappings>
  134 + <mapping local="$PROJECT_DIR$" web="/" />
  135 + </mappings>
  136 + </serverdata>
  137 + </paths>
  138 + <paths name="zhuocheng">
  139 + <serverdata>
  140 + <mappings>
  141 + <mapping local="$PROJECT_DIR$" web="/" />
  142 + </mappings>
  143 + </serverdata>
  144 + </paths>
  145 + <paths name="多用户商城">
  146 + <serverdata>
  147 + <mappings>
  148 + <mapping local="$PROJECT_DIR$" web="/" />
  149 + </mappings>
  150 + </serverdata>
  151 + </paths>
  152 + <paths name="奇遇">
  153 + <serverdata>
  154 + <mappings>
  155 + <mapping local="$PROJECT_DIR$" web="/" />
  156 + </mappings>
  157 + </serverdata>
  158 + </paths>
  159 + <paths name="民族街">
  160 + <serverdata>
  161 + <mappings>
  162 + <mapping local="$PROJECT_DIR$" web="/" />
  163 + </mappings>
  164 + </serverdata>
  165 + </paths>
  166 + <paths name="直播">
  167 + <serverdata>
  168 + <mappings>
  169 + <mapping local="$PROJECT_DIR$" web="/" />
  170 + </mappings>
  171 + </serverdata>
  172 + </paths>
  173 + <paths name="腾讯云">
  174 + <serverdata>
  175 + <mappings>
  176 + <mapping local="$PROJECT_DIR$" web="/" />
9 </mappings> 177 </mappings>
10 </serverdata> 178 </serverdata>
11 </paths> 179 </paths>
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<project version="4">  
3 - <component name="Encoding" addBOMForNewFiles="with NO BOM" />  
4 -</project>  
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 - <component name="JSHintConfiguration" version="2.9.6" use-config-file="true" use-custom-config-file="true" custom-config-file-path="$PROJECT_DIR$/public/assets/libs/jquery/src/.jshintrc"> 3 + <component name="JSHintConfiguration" version="2.9.5" use-config-file="true" use-custom-config-file="true" custom-config-file-path="$PROJECT_DIR$/public/assets/libs/jquery/src/.jshintrc">
4 <option bitwise="true" /> 4 <option bitwise="true" />
5 <option browser="true" /> 5 <option browser="true" />
6 <option curly="true" /> 6 <option curly="true" />
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <module type="WEB_MODULE" version="4"> 2 <module type="WEB_MODULE" version="4">
3 <component name="NewModuleRootManager"> 3 <component name="NewModuleRootManager">
4 - <content url="file://$MODULE_DIR$">  
5 - <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />  
6 - <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/cache" />  
7 - <excludeFolder url="file://$MODULE_DIR$/vendor/endroid/qr-code" />  
8 - <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/guzzle" />  
9 - <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/promises" />  
10 - <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/psr7" />  
11 - <excludeFolder url="file://$MODULE_DIR$/vendor/karsonzhang/fastadmin-addons" />  
12 - <excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/complex" />  
13 - <excludeFolder url="file://$MODULE_DIR$/vendor/markbaker/matrix" />  
14 - <excludeFolder url="file://$MODULE_DIR$/vendor/monolog/monolog" />  
15 - <excludeFolder url="file://$MODULE_DIR$/vendor/mtdowling/cron-expression" />  
16 - <excludeFolder url="file://$MODULE_DIR$/vendor/overtrue/pinyin" />  
17 - <excludeFolder url="file://$MODULE_DIR$/vendor/overtrue/socialite" />  
18 - <excludeFolder url="file://$MODULE_DIR$/vendor/overtrue/wechat" />  
19 - <excludeFolder url="file://$MODULE_DIR$/vendor/paragonie/random_compat" />  
20 - <excludeFolder url="file://$MODULE_DIR$/vendor/phpmailer/phpmailer" />  
21 - <excludeFolder url="file://$MODULE_DIR$/vendor/phpoffice/phpspreadsheet" />  
22 - <excludeFolder url="file://$MODULE_DIR$/vendor/pimple/pimple" />  
23 - <excludeFolder url="file://$MODULE_DIR$/vendor/psr/container" />  
24 - <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-message" />  
25 - <excludeFolder url="file://$MODULE_DIR$/vendor/psr/log" />  
26 - <excludeFolder url="file://$MODULE_DIR$/vendor/psr/simple-cache" />  
27 - <excludeFolder url="file://$MODULE_DIR$/vendor/ralouphie/getallheaders" />  
28 - <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-foundation" />  
29 - <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/options-resolver" />  
30 - <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-mbstring" />  
31 - <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php70" />  
32 - <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/psr-http-message-bridge" />  
33 - <excludeFolder url="file://$MODULE_DIR$/vendor/topthink/think-captcha" />  
34 - <excludeFolder url="file://$MODULE_DIR$/vendor/topthink/think-installer" />  
35 - </content> 4 + <content url="file://$MODULE_DIR$" />
36 <orderEntry type="inheritedJdk" /> 5 <orderEntry type="inheritedJdk" />
37 <orderEntry type="sourceFolder" forTests="false" /> 6 <orderEntry type="sourceFolder" forTests="false" />
38 </component> 7 </component>
@@ -2,12 +2,12 @@ @@ -2,12 +2,12 @@
2 <project version="4"> 2 <project version="4">
3 <component name="WebServers"> 3 <component name="WebServers">
4 <option name="servers"> 4 <option name="servers">
5 - <webServer id="f54b81a1-2589-4a46-9adc-d08c7ab7baf7" name="menhu" url="http://47.103.26.35">  
6 - <fileTransfer host="47.103.26.35" port="21"> 5 + <webServer id="cb8d78ba-99ca-40e9-b801-3f064fc674ed" name="7 (project level)" url="http://114.215.223.17">
  6 + <fileTransfer host="114.215.223.17" port="9001" accessType="SFTP">
7 <advancedOptions> 7 <advancedOptions>
8 <advancedOptions dataProtectionLevel="Private" shareSSLContext="true" /> 8 <advancedOptions dataProtectionLevel="Private" shareSSLContext="true" />
9 </advancedOptions> 9 </advancedOptions>
10 - <option name="port" value="21" /> 10 + <option name="port" value="9001" />
11 </fileTransfer> 11 </fileTransfer>
12 </webServer> 12 </webServer>
13 </option> 13 </option>
@@ -2,9 +2,76 @@ @@ -2,9 +2,76 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="f0d9b964-cf91-4edd-b12d-273162753deb" name="Default Changelist" comment=""> 4 <list default="true" id="f0d9b964-cf91-4edd-b12d-273162753deb" name="Default Changelist" comment="">
  5 + <change afterPath="$PROJECT_DIR$/application/index/view/common/1.html" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/.idea/jsLinters/jshint.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jsLinters/jshint.xml" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/.idea/menhu.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/menhu.iml" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" />
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 12 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/application/database.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/database.php" afterDir="false" /> 13 + <change beforePath="$PROJECT_DIR$/application/admin/controller/News.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/News.php" afterDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/application/admin/view/news/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/news/add.html" afterDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/application/admin/view/news/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/news/edit.html" afterDir="false" />
  16 + <change beforePath="$PROJECT_DIR$/application/admin/view/talent/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/talent/edit.html" afterDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/application/api/view/standard/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/view/standard/detail.html" afterDir="false" />
  18 + <change beforePath="$PROJECT_DIR$/application/api/view/talent/initiate_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/view/talent/initiate_2.html" afterDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/application/common/controller/Frontend.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/controller/Frontend.php" afterDir="false" />
  20 + <change beforePath="$PROJECT_DIR$/application/config.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/config.php" afterDir="false" />
  21 + <change beforePath="$PROJECT_DIR$/application/extra/upload.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/extra/upload.php" afterDir="false" />
  22 + <change beforePath="$PROJECT_DIR$/application/index/controller/Gg.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/controller/Gg.php" afterDir="false" />
  23 + <change beforePath="$PROJECT_DIR$/application/index/controller/Green.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/controller/Green.php" afterDir="false" />
  24 + <change beforePath="$PROJECT_DIR$/application/index/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/controller/Index.php" afterDir="false" />
  25 + <change beforePath="$PROJECT_DIR$/application/index/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/controller/Login.php" afterDir="false" />
  26 + <change beforePath="$PROJECT_DIR$/application/index/service/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/service/Index.php" afterDir="false" />
  27 + <change beforePath="$PROJECT_DIR$/application/index/view/experts/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/experts/detail.html" afterDir="false" />
  28 + <change beforePath="$PROJECT_DIR$/application/index/view/experts/op.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/experts/op.html" afterDir="false" />
  29 + <change beforePath="$PROJECT_DIR$/application/index/view/green/green.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/green/green.html" afterDir="false" />
  30 + <change beforePath="$PROJECT_DIR$/application/index/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/index/index.html" afterDir="false" />
  31 + <change beforePath="$PROJECT_DIR$/application/index/view/layout/default.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/layout/default.html" afterDir="false" />
  32 + <change beforePath="$PROJECT_DIR$/application/index/view/login/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/login/login.html" afterDir="false" />
  33 + <change beforePath="$PROJECT_DIR$/application/index/view/news/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/news/detail.html" afterDir="false" />
  34 + <change beforePath="$PROJECT_DIR$/application/index/view/news/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/news/index.html" afterDir="false" />
  35 + <change beforePath="$PROJECT_DIR$/application/index/view/standard/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/standard/detail.html" afterDir="false" />
  36 + <change beforePath="$PROJECT_DIR$/application/index/view/talent/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/talent/detail.html" afterDir="false" />
  37 + <change beforePath="$PROJECT_DIR$/application/index/view/talent/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/view/talent/index.html" afterDir="false" />
  38 + <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" />
  39 + <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" />
  40 + <change beforePath="$PROJECT_DIR$/public/assets/js/backend/news.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/news.js" afterDir="false" />
  41 + <change beforePath="$PROJECT_DIR$/public/statis/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/statis/css/index.css" afterDir="false" />
  42 + <change beforePath="$PROJECT_DIR$/public/statis/css/public.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/statis/css/public.css" afterDir="false" />
7 </list> 43 </list>
  44 + <ignored path="$PROJECT_DIR$/vendor/composer/" />
  45 + <ignored path="$PROJECT_DIR$/vendor/doctrine/cache/" />
  46 + <ignored path="$PROJECT_DIR$/vendor/endroid/qr-code/" />
  47 + <ignored path="$PROJECT_DIR$/vendor/guzzlehttp/guzzle/" />
  48 + <ignored path="$PROJECT_DIR$/vendor/guzzlehttp/promises/" />
  49 + <ignored path="$PROJECT_DIR$/vendor/guzzlehttp/psr7/" />
  50 + <ignored path="$PROJECT_DIR$/vendor/karsonzhang/fastadmin-addons/" />
  51 + <ignored path="$PROJECT_DIR$/vendor/markbaker/complex/" />
  52 + <ignored path="$PROJECT_DIR$/vendor/markbaker/matrix/" />
  53 + <ignored path="$PROJECT_DIR$/vendor/monolog/monolog/" />
  54 + <ignored path="$PROJECT_DIR$/vendor/mtdowling/cron-expression/" />
  55 + <ignored path="$PROJECT_DIR$/vendor/overtrue/pinyin/" />
  56 + <ignored path="$PROJECT_DIR$/vendor/overtrue/socialite/" />
  57 + <ignored path="$PROJECT_DIR$/vendor/overtrue/wechat/" />
  58 + <ignored path="$PROJECT_DIR$/vendor/paragonie/random_compat/" />
  59 + <ignored path="$PROJECT_DIR$/vendor/phpmailer/phpmailer/" />
  60 + <ignored path="$PROJECT_DIR$/vendor/phpoffice/phpspreadsheet/" />
  61 + <ignored path="$PROJECT_DIR$/vendor/pimple/pimple/" />
  62 + <ignored path="$PROJECT_DIR$/vendor/psr/container/" />
  63 + <ignored path="$PROJECT_DIR$/vendor/psr/http-message/" />
  64 + <ignored path="$PROJECT_DIR$/vendor/psr/log/" />
  65 + <ignored path="$PROJECT_DIR$/vendor/psr/simple-cache/" />
  66 + <ignored path="$PROJECT_DIR$/vendor/ralouphie/getallheaders/" />
  67 + <ignored path="$PROJECT_DIR$/vendor/symfony/http-foundation/" />
  68 + <ignored path="$PROJECT_DIR$/vendor/symfony/options-resolver/" />
  69 + <ignored path="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring/" />
  70 + <ignored path="$PROJECT_DIR$/vendor/symfony/polyfill-php70/" />
  71 + <ignored path="$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/" />
  72 + <ignored path="$PROJECT_DIR$/vendor/topthink/think-captcha/" />
  73 + <ignored path="$PROJECT_DIR$/vendor/topthink/think-installer/" />
  74 + <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="SHOW_DIALOG" value="false" /> 75 <option name="SHOW_DIALOG" value="false" />
9 <option name="HIGHLIGHT_CONFLICTS" value="true" /> 76 <option name="HIGHLIGHT_CONFLICTS" value="true" />
10 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 77 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -12,9 +79,6 @@ @@ -12,9 +79,6 @@
12 </component> 79 </component>
13 <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE"> 80 <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
14 <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath> 81 <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
15 - <execution>  
16 - <executable />  
17 - </execution>  
18 </component> 82 </component>
19 <component name="DatabaseView"> 83 <component name="DatabaseView">
20 <option name="SHOW_INTERMEDIATE" value="true" /> 84 <option name="SHOW_INTERMEDIATE" value="true" />
@@ -30,9 +94,162 @@ @@ -30,9 +94,162 @@
30 <expand /> 94 <expand />
31 <select /> 95 <select />
32 </component> 96 </component>
  97 + <component name="FUSProjectUsageTrigger">
  98 + <session id="1312833474">
  99 + <usages-collector id="statistics.lifecycle.project">
  100 + <counts>
  101 + <entry key="project.closed" value="12" />
  102 + <entry key="project.open.time.0" value="7" />
  103 + <entry key="project.open.time.1" value="5" />
  104 + <entry key="project.open.time.2" value="1" />
  105 + <entry key="project.open.time.4" value="1" />
  106 + <entry key="project.open.time.6" value="1" />
  107 + <entry key="project.open.time.9" value="1" />
  108 + <entry key="project.opened" value="16" />
  109 + </counts>
  110 + </usages-collector>
  111 + <usages-collector id="statistics.file.extensions.open">
  112 + <counts>
  113 + <entry key="css" value="5" />
  114 + <entry key="htm" value="2" />
  115 + <entry key="html" value="47" />
  116 + <entry key="js" value="1" />
  117 + <entry key="php" value="27" />
  118 + </counts>
  119 + </usages-collector>
  120 + <usages-collector id="statistics.file.types.open">
  121 + <counts>
  122 + <entry key="CSS" value="5" />
  123 + <entry key="HTML" value="49" />
  124 + <entry key="JavaScript" value="1" />
  125 + <entry key="PHP" value="26" />
  126 + <entry key="PLAIN_TEXT" value="1" />
  127 + </counts>
  128 + </usages-collector>
  129 + <usages-collector id="statistics.file.extensions.edit">
  130 + <counts>
  131 + <entry key="css" value="77" />
  132 + <entry key="htm" value="33" />
  133 + <entry key="html" value="1184" />
  134 + <entry key="js" value="1" />
  135 + <entry key="php" value="737" />
  136 + </counts>
  137 + </usages-collector>
  138 + <usages-collector id="statistics.file.types.edit">
  139 + <counts>
  140 + <entry key="CSS" value="77" />
  141 + <entry key="HTML" value="1217" />
  142 + <entry key="JavaScript" value="1" />
  143 + <entry key="PHP" value="723" />
  144 + <entry key="PLAIN_TEXT" value="14" />
  145 + </counts>
  146 + </usages-collector>
  147 + </session>
  148 + </component>
  149 + <component name="FileEditorManager">
  150 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
  151 + </component>
  152 + <component name="FileTemplateManagerImpl">
  153 + <option name="RECENT_TEMPLATES">
  154 + <list>
  155 + <option value="HTML File" />
  156 + </list>
  157 + </option>
  158 + </component>
  159 + <component name="FindInProjectRecents">
  160 + <findStrings>
  161 + <find>model3_Txt2</find>
  162 + <find>experts_opTxt</find>
  163 + <find>experts_op</find>
  164 + <find>green_Img2</find>
  165 + <find>$advice</find>
  166 + <find>model6_Img</find>
  167 + <find>model5_List</find>
  168 + <find>news_Dfj clearfix</find>
  169 + <find>model4_posi</find>
  170 + <find>model3_Txt1</find>
  171 + <find>_blank</find>
  172 + <find>.model3</find>
  173 + <find>.top_item2Img</find>
  174 + <find>&lt;!-- 模块二 列表 --&gt;</find>
  175 + <find>green_modelR</find>
  176 + <find>advice</find>
  177 + <find>.model3_Img3</find>
  178 + <find>green</find>
  179 + <find>ifream</find>
  180 + <find>ifre</find>
  181 + </findStrings>
  182 + </component>
33 <component name="Git.Settings"> 183 <component name="Git.Settings">
34 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> 184 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
35 </component> 185 </component>
  186 + <component name="IdeDocumentHistory">
  187 + <option name="CHANGED_PATHS">
  188 + <list>
  189 + <option value="$PROJECT_DIR$/application/extra/upload.php" />
  190 + <option value="$PROJECT_DIR$/public/assets/js/backend/news.js" />
  191 + <option value="$PROJECT_DIR$/application/admin/view/news/edit.html" />
  192 + <option value="$PROJECT_DIR$/application/admin/view/news/add.html" />
  193 + <option value="$PROJECT_DIR$/application/index/view/experts/op.html" />
  194 + <option value="$PROJECT_DIR$/application/api/view/standard/detail.html" />
  195 + <option value="$PROJECT_DIR$/application/index/view/news/detail.html" />
  196 + <option value="$PROJECT_DIR$/public/statis/css/public.css" />
  197 + <option value="$PROJECT_DIR$/application/api/view/talent/initiate_2.html" />
  198 + <option value="$PROJECT_DIR$/application/index/view/talent/index.html" />
  199 + <option value="$PROJECT_DIR$/application/index/view/talent/detail.html" />
  200 + <option value="$PROJECT_DIR$/application/index/view/login/login.html" />
  201 + <option value="$PROJECT_DIR$/application/index/controller/Login.php" />
  202 + <option value="$PROJECT_DIR$/application/index/service/Index.php" />
  203 + <option value="$PROJECT_DIR$/application/index/controller/Gg.php" />
  204 + <option value="$PROJECT_DIR$/application/index/view/standard/detail.html" />
  205 + <option value="$PROJECT_DIR$/application/index/view/experts/detail.html" />
  206 + <option value="$PROJECT_DIR$/application/index/view/talent/initiate_1.html" />
  207 + <option value="$PROJECT_DIR$/application/index/view/talent/initiate_2.html" />
  208 + <option value="$PROJECT_DIR$/application/admin/controller/News.php" />
  209 + <option value="$PROJECT_DIR$/application/admin/view/talent/edit.html" />
  210 + <option value="$PROJECT_DIR$/application/index/view/index/index.html" />
  211 + <option value="$PROJECT_DIR$/application/index/view/news/index.html" />
  212 + <option value="$PROJECT_DIR$/application/config.php" />
  213 + <option value="$PROJECT_DIR$/application/index/view/green/green.html" />
  214 + <option value="$PROJECT_DIR$/application/index/controller/Green.php" />
  215 + <option value="$PROJECT_DIR$/public/statis/css/index.css" />
  216 + <option value="$PROJECT_DIR$/application/index/controller/Index.php" />
  217 + <option value="$PROJECT_DIR$/application/common/controller/Frontend.php" />
  218 + <option value="$PROJECT_DIR$/application/index/view/layout/default.html" />
  219 + <option value="$PROJECT_DIR$/application/index/view/common/1.html" />
  220 + <option value="&lt;c7a14725-66d0-4e95-8a12-dcda09bfa10c&gt;/alidata/www/online/chinastemcell.com/member/templets/mxvfei.htm" />
  221 + <option value="&lt;eea64366-b7c6-4364-b1dc-a9914a058845&gt;/alidata/www/w/knm/public/themes/simpleboot3/public/footer.html" />
  222 + <option value="&lt;eea64366-b7c6-4364-b1dc-a9914a058845&gt;/alidata/www/w/knm/public/themes/simplemobile/public/footer.html" />
  223 + <option value="&lt;c7a14725-66d0-4e95-8a12-dcda09bfa10c&gt;/alidata/www/wx/lpb/themes/simplebootx_mobile/Public/scripts.html" />
  224 + </list>
  225 + </option>
  226 + </component>
  227 + <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
  228 + <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
  229 + <component name="JsGulpfileManager">
  230 + <detection-done>true</detection-done>
  231 + <sorting>DEFINITION_ORDER</sorting>
  232 + </component>
  233 + <component name="NodePackageJsonFileManager">
  234 + <packageJsonPaths>
  235 + <path value="$PROJECT_DIR$/public/assets/libs/Sortable/package.json" />
  236 + <path value="$PROJECT_DIR$/public/assets/libs/art-template/loader/package.json" />
  237 + <path value="$PROJECT_DIR$/public/assets/libs/art-template/package.json" />
  238 + <path value="$PROJECT_DIR$/public/assets/libs/bootstrap-daterangepicker/package.json" />
  239 + <path value="$PROJECT_DIR$/public/assets/libs/bootstrap-table/package.json" />
  240 + <path value="$PROJECT_DIR$/public/assets/libs/bootstrap/package.json" />
  241 + <path value="$PROJECT_DIR$/public/assets/libs/eonasdan-bootstrap-datetimepicker/package.json" />
  242 + <path value="$PROJECT_DIR$/public/assets/libs/fastadmin-citypicker/package.json" />
  243 + <path value="$PROJECT_DIR$/public/assets/libs/fastadmin-cxselect/package.json" />
  244 + <path value="$PROJECT_DIR$/public/assets/libs/fastadmin-layer/package.json" />
  245 + <path value="$PROJECT_DIR$/public/assets/libs/jcrop/package.json" />
  246 + <path value="$PROJECT_DIR$/public/assets/libs/jquery-slimscroll/package.json" />
  247 + <path value="$PROJECT_DIR$/public/assets/libs/require-css/package.json" />
  248 + </packageJsonPaths>
  249 + </component>
  250 + <component name="PhpServers">
  251 + <servers />
  252 + </component>
36 <component name="PhpWorkspaceProjectConfiguration"> 253 <component name="PhpWorkspaceProjectConfiguration">
37 <include_path> 254 <include_path>
38 <path value="$PROJECT_DIR$/vendor/paragonie/random_compat" /> 255 <path value="$PROJECT_DIR$/vendor/paragonie/random_compat" />
@@ -67,16 +284,98 @@ @@ -67,16 +284,98 @@
67 <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php70" /> 284 <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php70" />
68 </include_path> 285 </include_path>
69 </component> 286 </component>
  287 + <component name="ProjectFrameBounds" extendedState="6">
  288 + <option name="x" value="231" />
  289 + <option name="y" value="-25" />
  290 + <option name="width" value="1396" />
  291 + <option name="height" value="834" />
  292 + </component>
70 <component name="ProjectId" id="1VPu7jpu3u6b4OFQ4v0sMyvg8M5" /> 293 <component name="ProjectId" id="1VPu7jpu3u6b4OFQ4v0sMyvg8M5" />
71 <component name="ProjectLevelVcsManager" settingsEditedManually="true"> 294 <component name="ProjectLevelVcsManager" settingsEditedManually="true">
72 <ConfirmationsSetting value="2" id="Add" /> 295 <ConfirmationsSetting value="2" id="Add" />
73 </component> 296 </component>
  297 + <component name="ProjectView">
  298 + <navigator proportions="" version="1">
  299 + <foldersAlwaysOnTop value="true" />
  300 + </navigator>
  301 + <panes>
  302 + <pane id="ProjectPane">
  303 + <subPane>
  304 + <expand>
  305 + <path>
  306 + <item name="menhu" type="b2602c69:ProjectViewProjectNode" />
  307 + <item name="menhu" type="462c0819:PsiDirectoryNode" />
  308 + </path>
  309 + <path>
  310 + <item name="menhu" type="b2602c69:ProjectViewProjectNode" />
  311 + <item name="menhu" type="462c0819:PsiDirectoryNode" />
  312 + <item name="application" type="462c0819:PsiDirectoryNode" />
  313 + </path>
  314 + <path>
  315 + <item name="menhu" type="b2602c69:ProjectViewProjectNode" />
  316 + <item name="menhu" type="462c0819:PsiDirectoryNode" />
  317 + <item name="application" type="462c0819:PsiDirectoryNode" />
  318 + <item name="index" type="462c0819:PsiDirectoryNode" />
  319 + </path>
  320 + <path>
  321 + <item name="menhu" type="b2602c69:ProjectViewProjectNode" />
  322 + <item name="menhu" type="462c0819:PsiDirectoryNode" />
  323 + <item name="application" type="462c0819:PsiDirectoryNode" />
  324 + <item name="index" type="462c0819:PsiDirectoryNode" />
  325 + <item name="view" type="462c0819:PsiDirectoryNode" />
  326 + </path>
  327 + <path>
  328 + <item name="menhu" type="b2602c69:ProjectViewProjectNode" />
  329 + <item name="menhu" type="462c0819:PsiDirectoryNode" />
  330 + <item name="application" type="462c0819:PsiDirectoryNode" />
  331 + <item name="index" type="462c0819:PsiDirectoryNode" />
  332 + <item name="view" type="462c0819:PsiDirectoryNode" />
  333 + <item name="common" type="462c0819:PsiDirectoryNode" />
  334 + </path>
  335 + <path>
  336 + <item name="menhu" type="b2602c69:ProjectViewProjectNode" />
  337 + <item name="menhu" type="462c0819:PsiDirectoryNode" />
  338 + <item name="public" type="462c0819:PsiDirectoryNode" />
  339 + </path>
  340 + <path>
  341 + <item name="menhu" type="b2602c69:ProjectViewProjectNode" />
  342 + <item name="menhu" type="462c0819:PsiDirectoryNode" />
  343 + <item name="public" type="462c0819:PsiDirectoryNode" />
  344 + <item name="assets" type="462c0819:PsiDirectoryNode" />
  345 + </path>
  346 + <path>
  347 + <item name="menhu" type="b2602c69:ProjectViewProjectNode" />
  348 + <item name="menhu" type="462c0819:PsiDirectoryNode" />
  349 + <item name="public" type="462c0819:PsiDirectoryNode" />
  350 + <item name="static" type="462c0819:PsiDirectoryNode" />
  351 + </path>
  352 + <path>
  353 + <item name="menhu" type="b2602c69:ProjectViewProjectNode" />
  354 + <item name="menhu" type="462c0819:PsiDirectoryNode" />
  355 + <item name="public" type="462c0819:PsiDirectoryNode" />
  356 + <item name="statis" type="462c0819:PsiDirectoryNode" />
  357 + </path>
  358 + <path>
  359 + <item name="menhu" type="b2602c69:ProjectViewProjectNode" />
  360 + <item name="menhu" type="462c0819:PsiDirectoryNode" />
  361 + <item name="public" type="462c0819:PsiDirectoryNode" />
  362 + <item name="statis" type="462c0819:PsiDirectoryNode" />
  363 + <item name="css" type="462c0819:PsiDirectoryNode" />
  364 + </path>
  365 + </expand>
  366 + <select />
  367 + </subPane>
  368 + </pane>
  369 + <pane id="Scope" />
  370 + </panes>
  371 + </component>
74 <component name="ProjectViewState"> 372 <component name="ProjectViewState">
75 <option name="hideEmptyMiddlePackages" value="true" /> 373 <option name="hideEmptyMiddlePackages" value="true" />
76 <option name="showExcludedFiles" value="true" /> 374 <option name="showExcludedFiles" value="true" />
77 <option name="showLibraryContents" value="true" /> 375 <option name="showLibraryContents" value="true" />
78 </component> 376 </component>
79 <component name="PropertiesComponent"> 377 <component name="PropertiesComponent">
  378 + <property name="DefaultHtmlFileTemplate" value="HTML File" />
80 <property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> 379 <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
81 <property name="WebServerToolWindowFactoryState" value="true" /> 380 <property name="WebServerToolWindowFactoryState" value="true" />
82 <property name="WebServerToolWindowPanel.toolwindow.highlight.mappings" value="true" /> 381 <property name="WebServerToolWindowPanel.toolwindow.highlight.mappings" value="true" />
@@ -104,6 +403,18 @@ @@ -104,6 +403,18 @@
104 <recent name="F:\lfx\menhu\application\api\view\experts" /> 403 <recent name="F:\lfx\menhu\application\api\view\experts" />
105 </key> 404 </key>
106 </component> 405 </component>
  406 + <component name="RunDashboard">
  407 + <option name="ruleStates">
  408 + <list>
  409 + <RuleState>
  410 + <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
  411 + </RuleState>
  412 + <RuleState>
  413 + <option name="name" value="StatusDashboardGroupingRule" />
  414 + </RuleState>
  415 + </list>
  416 + </option>
  417 + </component>
107 <component name="ServiceViewManager"> 418 <component name="ServiceViewManager">
108 <option name="viewStates"> 419 <option name="viewStates">
109 <list> 420 <list>
@@ -166,9 +477,54 @@ @@ -166,9 +477,54 @@
166 <workItem from="1578378521492" duration="3015000" /> 477 <workItem from="1578378521492" duration="3015000" />
167 <workItem from="1578382617975" duration="1447000" /> 478 <workItem from="1578382617975" duration="1447000" />
168 <workItem from="1578389378811" duration="320000" /> 479 <workItem from="1578389378811" duration="320000" />
  480 + <workItem from="1585557617026" duration="594000" />
  481 + <workItem from="1585619843649" duration="29000" />
  482 + <workItem from="1585793059831" duration="1294000" />
  483 + <workItem from="1585795803121" duration="485000" />
  484 + <workItem from="1585796295556" duration="270000" />
  485 + <workItem from="1585796578809" duration="7325000" />
  486 + <workItem from="1586776285962" duration="4565000" />
  487 + <workItem from="1586825434275" duration="16000" />
  488 + <workItem from="1586830986269" duration="5374000" />
  489 + <workItem from="1587004475626" duration="3101000" />
  490 + <workItem from="1591948018025" duration="2783000" />
  491 + <workItem from="1592613694035" duration="1940000" />
  492 + <workItem from="1592624725815" duration="2870000" />
  493 + <workItem from="1594708227366" duration="1857000" />
  494 + <workItem from="1594789722280" duration="4000" />
  495 + <workItem from="1596172157757" duration="13187000" />
169 </task> 496 </task>
170 <servers /> 497 <servers />
171 </component> 498 </component>
  499 + <component name="TimeTrackingManager">
  500 + <option name="totallyTimeSpent" value="45694000" />
  501 + </component>
  502 + <component name="ToolWindowManager">
  503 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
  504 + <layout>
  505 + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1716418" />
  506 + <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  507 + <window_info id="Favorites" order="2" side_tool="true" />
  508 + <window_info anchor="bottom" id="Message" order="0" />
  509 + <window_info anchor="bottom" id="Find" order="1" />
  510 + <window_info anchor="bottom" id="Run" order="2" />
  511 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  512 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  513 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  514 + <window_info anchor="bottom" id="TODO" order="6" />
  515 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  516 + <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
  517 + <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
  518 + <window_info anchor="bottom" id="Terminal" order="10" />
  519 + <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
  520 + <window_info anchor="bottom" id="File Transfer" order="12" weight="0.32790446" />
  521 + <window_info anchor="right" id="Commander" order="0" weight="0.4" />
  522 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  523 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  524 + <window_info active="true" anchor="right" id="Remote Host" order="3" visible="true" weight="0.30383795" />
  525 + <window_info anchor="right" id="Database" order="4" />
  526 + </layout>
  527 + </component>
172 <component name="TypeScriptGeneratedFilesManager"> 528 <component name="TypeScriptGeneratedFilesManager">
173 <option name="version" value="1" /> 529 <option name="version" value="1" />
174 </component> 530 </component>
@@ -178,26 +534,21 @@ @@ -178,26 +534,21 @@
178 <entry key="MAIN"> 534 <entry key="MAIN">
179 <value> 535 <value>
180 <State> 536 <State>
  537 + <option name="RECENTLY_FILTERED_USER_GROUPS">
  538 + <collection />
  539 + </option>
  540 + <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
  541 + <collection />
  542 + </option>
181 <option name="COLUMN_ORDER" /> 543 <option name="COLUMN_ORDER" />
182 </State> 544 </State>
183 </value> 545 </value>
184 </entry> 546 </entry>
185 </map> 547 </map>
186 </option> 548 </option>
187 - <option name="RECENT_FILTERS">  
188 - <map>  
189 - <entry key="Branch">  
190 - <value>  
191 - <list />  
192 - </value>  
193 - </entry>  
194 - <entry key="User">  
195 - <value>  
196 - <list />  
197 - </value>  
198 - </entry>  
199 - </map>  
200 - </option> 549 + </component>
  550 + <component name="VcsContentAnnotationSettings">
  551 + <option name="myLimit" value="2678400000" />
201 </component> 552 </component>
202 <component name="WindowStateProjectService"> 553 <component name="WindowStateProjectService">
203 <state x="552" y="182" key="#Deployment" timestamp="1578389466045"> 554 <state x="552" y="182" key="#Deployment" timestamp="1578389466045">
@@ -232,4 +583,319 @@ @@ -232,4 +583,319 @@
232 <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1578379384206" /> 583 <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040/1920.0.1920.1040@0.0.1920.1040" timestamp="1578379384206" />
233 <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1578364632003" /> 584 <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1578364632003" />
234 </component> 585 </component>
  586 + <component name="editorHistoryManager">
  587 + <entry file="file://$PROJECT_DIR$/application/extra/upload.php">
  588 + <provider selected="true" editor-type-id="text-editor">
  589 + <state relative-caret-position="571">
  590 + <caret line="23" column="87" selection-start-line="23" selection-start-column="87" selection-end-line="23" selection-end-column="87" />
  591 + </state>
  592 + </provider>
  593 + </entry>
  594 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/news.js">
  595 + <provider selected="true" editor-type-id="text-editor">
  596 + <state relative-caret-position="575">
  597 + <caret line="23" column="26" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
  598 + </state>
  599 + </provider>
  600 + </entry>
  601 + <entry file="file://$PROJECT_DIR$/application/admin/view/experts/index.html">
  602 + <provider selected="true" editor-type-id="text-editor" />
  603 + </entry>
  604 + <entry file="file://$PROJECT_DIR$/application/index/view/experts/index.html">
  605 + <provider selected="true" editor-type-id="text-editor">
  606 + <state relative-caret-position="225">
  607 + <caret line="9" column="42" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="42" />
  608 + </state>
  609 + </provider>
  610 + </entry>
  611 + <entry file="file://$PROJECT_DIR$/application/admin/view/news/index.html">
  612 + <provider selected="true" editor-type-id="text-editor" />
  613 + </entry>
  614 + <entry file="file://$PROJECT_DIR$/application/admin/view/news/edit.html">
  615 + <provider selected="true" editor-type-id="text-editor">
  616 + <state relative-caret-position="1450">
  617 + <caret line="58" column="10" selection-start-line="53" selection-start-column="3" selection-end-line="58" selection-end-column="10" />
  618 + </state>
  619 + </provider>
  620 + </entry>
  621 + <entry file="file://$PROJECT_DIR$/application/index/view/experts/op.html">
  622 + <provider selected="true" editor-type-id="text-editor">
  623 + <state relative-caret-position="800">
  624 + <caret line="32" column="18" lean-forward="true" selection-start-line="32" selection-start-column="18" selection-end-line="32" selection-end-column="18" />
  625 + </state>
  626 + </provider>
  627 + </entry>
  628 + <entry file="file://$PROJECT_DIR$/application/api/view/standard/detail.html">
  629 + <provider selected="true" editor-type-id="text-editor">
  630 + <state relative-caret-position="425">
  631 + <caret line="17" column="8" lean-forward="true" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="8" />
  632 + </state>
  633 + </provider>
  634 + </entry>
  635 + <entry file="file://$PROJECT_DIR$/public/statis/css/public.css">
  636 + <provider selected="true" editor-type-id="text-editor">
  637 + <state relative-caret-position="550">
  638 + <caret line="22" column="1" lean-forward="true" selection-start-line="22" selection-start-column="1" selection-end-line="22" selection-end-column="1" />
  639 + </state>
  640 + </provider>
  641 + </entry>
  642 + <entry file="file://$PROJECT_DIR$/application/api/controller/Talent.php">
  643 + <provider selected="true" editor-type-id="text-editor">
  644 + <state relative-caret-position="445">
  645 + <caret line="47" column="20" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="20" />
  646 + </state>
  647 + </provider>
  648 + </entry>
  649 + <entry file="file://$PROJECT_DIR$/application/api/view/talent/initiate_2.html">
  650 + <provider selected="true" editor-type-id="text-editor">
  651 + <state relative-caret-position="407">
  652 + <caret line="33" column="40" selection-start-line="33" selection-start-column="40" selection-end-line="33" selection-end-column="40" />
  653 + </state>
  654 + </provider>
  655 + </entry>
  656 + <entry file="file://$PROJECT_DIR$/application/index/view/talent/detail.html">
  657 + <provider selected="true" editor-type-id="text-editor">
  658 + <state relative-caret-position="475">
  659 + <caret line="19" column="32" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
  660 + </state>
  661 + </provider>
  662 + </entry>
  663 + <entry file="file://$PROJECT_DIR$/application/index/controller/Login.php">
  664 + <provider selected="true" editor-type-id="text-editor">
  665 + <state relative-caret-position="750">
  666 + <caret line="33" column="10" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="10" />
  667 + </state>
  668 + </provider>
  669 + </entry>
  670 + <entry file="file://$PROJECT_DIR$/application/index/view/login/login.html">
  671 + <provider selected="true" editor-type-id="text-editor">
  672 + <state relative-caret-position="4350">
  673 + <caret line="174" column="20" selection-start-line="174" selection-start-column="20" selection-end-line="174" selection-end-column="20" />
  674 + </state>
  675 + </provider>
  676 + </entry>
  677 + <entry file="file://$PROJECT_DIR$/application/index/controller/Gg.php">
  678 + <provider selected="true" editor-type-id="text-editor">
  679 + <state relative-caret-position="525">
  680 + <caret line="22" column="22" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
  681 + </state>
  682 + </provider>
  683 + </entry>
  684 + <entry file="file://$USER_HOME$/AppData/Local/Temp/360zip$Temp/360$4/database.php" />
  685 + <entry file="file://$USER_HOME$/AppData/Local/Temp/360zip$Temp/360$5/database.php" />
  686 + <entry file="file://$PROJECT_DIR$/public/static/css/index.css">
  687 + <provider selected="true" editor-type-id="text-editor">
  688 + <state relative-caret-position="641">
  689 + <caret line="376" column="1" selection-start-line="376" selection-start-column="1" selection-end-line="376" selection-end-column="1" />
  690 + </state>
  691 + </provider>
  692 + </entry>
  693 + <entry file="file://$PROJECT_DIR$/public/statis/css/base.css">
  694 + <provider selected="true" editor-type-id="text-editor">
  695 + <state relative-caret-position="1650">
  696 + <caret line="66" column="2" selection-start-line="66" selection-start-column="2" selection-end-line="66" selection-end-column="2" />
  697 + </state>
  698 + </provider>
  699 + </entry>
  700 + <entry file="file://$PROJECT_DIR$/application/index/view/news/detail.html">
  701 + <provider selected="true" editor-type-id="text-editor">
  702 + <state relative-caret-position="475">
  703 + <caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="22" selection-end-column="16" />
  704 + </state>
  705 + </provider>
  706 + </entry>
  707 + <entry file="file://$PROJECT_DIR$/application/admin/controller/News.php">
  708 + <provider selected="true" editor-type-id="text-editor">
  709 + <state relative-caret-position="4575">
  710 + <caret line="187" column="22" selection-start-line="187" selection-start-column="22" selection-end-line="187" selection-end-column="22" />
  711 + </state>
  712 + </provider>
  713 + </entry>
  714 + <entry file="file://$PROJECT_DIR$/application/database.php">
  715 + <provider selected="true" editor-type-id="text-editor" />
  716 + </entry>
  717 + <entry file="file://$PROJECT_DIR$/application/admin/view/news/add.html">
  718 + <provider selected="true" editor-type-id="text-editor">
  719 + <state relative-caret-position="1125">
  720 + <caret line="45" column="10" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" />
  721 + </state>
  722 + </provider>
  723 + </entry>
  724 + <entry file="file://$PROJECT_DIR$/application/index/view/standard/detail.html">
  725 + <provider selected="true" editor-type-id="text-editor">
  726 + <state relative-caret-position="625">
  727 + <caret line="25" column="7" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
  728 + </state>
  729 + </provider>
  730 + </entry>
  731 + <entry file="file://$PROJECT_DIR$/application/index/view/experts/detail.html">
  732 + <provider selected="true" editor-type-id="text-editor">
  733 + <state relative-caret-position="1375">
  734 + <caret line="55" column="50" selection-start-line="55" selection-start-column="50" selection-end-line="55" selection-end-column="50" />
  735 + </state>
  736 + </provider>
  737 + </entry>
  738 + <entry file="file://$PROJECT_DIR$/application/admin/view/talent/edit.html">
  739 + <provider selected="true" editor-type-id="text-editor">
  740 + <state relative-caret-position="558">
  741 + <caret line="31" column="14" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
  742 + </state>
  743 + </provider>
  744 + </entry>
  745 + <entry file="file://$PROJECT_DIR$/application/index/view/talent/index.html">
  746 + <provider selected="true" editor-type-id="text-editor">
  747 + <state relative-caret-position="702">
  748 + <caret line="39" column="89" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="89" />
  749 + </state>
  750 + </provider>
  751 + </entry>
  752 + <entry file="file://$PROJECT_DIR$/thinkphp/library/think/View.php">
  753 + <provider selected="true" editor-type-id="text-editor">
  754 + <state relative-caret-position="2502">
  755 + <caret line="147" column="20" selection-start-line="147" selection-start-column="20" selection-end-line="147" selection-end-column="20" />
  756 + </state>
  757 + </provider>
  758 + </entry>
  759 + <entry file="file://$PROJECT_DIR$/application/index/view/talent/initiate_2.html">
  760 + <provider selected="true" editor-type-id="text-editor">
  761 + <state relative-caret-position="72">
  762 + <caret line="4" selection-start-line="4" selection-end-line="4" />
  763 + </state>
  764 + </provider>
  765 + </entry>
  766 + <entry file="file://$PROJECT_DIR$/application/index/controller/News.php">
  767 + <provider selected="true" editor-type-id="text-editor">
  768 + <state relative-caret-position="378">
  769 + <caret line="22" column="33" selection-start-line="22" selection-start-column="28" selection-end-line="22" selection-end-column="33" />
  770 + </state>
  771 + </provider>
  772 + </entry>
  773 + <entry file="file://$PROJECT_DIR$/application/index/view/new/gg.html">
  774 + <provider selected="true" editor-type-id="text-editor">
  775 + <state relative-caret-position="666">
  776 + <caret line="37" column="34" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="34" />
  777 + </state>
  778 + </provider>
  779 + </entry>
  780 + <entry file="file://$PROJECT_DIR$/application/index/view/new/detail.html">
  781 + <provider selected="true" editor-type-id="text-editor" />
  782 + </entry>
  783 + <entry file="file://$PROJECT_DIR$/application/index/view/news/index.html">
  784 + <provider selected="true" editor-type-id="text-editor">
  785 + <state relative-caret-position="947">
  786 + <caret line="63" column="64" lean-forward="true" selection-start-line="63" selection-start-column="64" selection-end-line="63" selection-end-column="64" />
  787 + </state>
  788 + </provider>
  789 + </entry>
  790 + <entry file="file://$PROJECT_DIR$/public/index.php">
  791 + <provider selected="true" editor-type-id="text-editor" />
  792 + </entry>
  793 + <entry file="file://$PROJECT_DIR$/application/config.php">
  794 + <provider selected="true" editor-type-id="text-editor">
  795 + <state relative-caret-position="360">
  796 + <caret line="20" column="60" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
  797 + </state>
  798 + </provider>
  799 + </entry>
  800 + <entry file="file://$PROJECT_DIR$/public/OJDwvfBa9F.php">
  801 + <provider selected="true" editor-type-id="text-editor">
  802 + <state relative-caret-position="468">
  803 + <caret line="38" lean-forward="true" selection-start-line="38" selection-end-line="38" />
  804 + </state>
  805 + </provider>
  806 + </entry>
  807 + <entry file="file://$PROJECT_DIR$/application/index/view/talent/initiate_1.html">
  808 + <provider selected="true" editor-type-id="text-editor">
  809 + <state relative-caret-position="18">
  810 + <caret line="1" column="24" selection-start-line="1" selection-start-column="24" selection-end-line="1" selection-end-column="24" />
  811 + </state>
  812 + </provider>
  813 + </entry>
  814 + <entry file="file://$PROJECT_DIR$/application/api/controller/Index.php">
  815 + <provider selected="true" editor-type-id="text-editor">
  816 + <state relative-caret-position="-162" />
  817 + </provider>
  818 + </entry>
  819 + <entry file="file://$PROJECT_DIR$/runtime/temp/067cf5b6af77356b9e749da2f87e56ee.php">
  820 + <provider selected="true" editor-type-id="text-editor">
  821 + <state relative-caret-position="298">
  822 + <caret line="142" column="8" selection-start-line="142" selection-start-column="8" selection-end-line="142" selection-end-column="8" />
  823 + </state>
  824 + </provider>
  825 + </entry>
  826 + <entry file="file://$PROJECT_DIR$/application/index/view/green/green.html">
  827 + <provider selected="true" editor-type-id="text-editor">
  828 + <state relative-caret-position="450">
  829 + <caret line="25" column="26" selection-start-line="25" selection-start-column="22" selection-end-line="25" selection-end-column="26" />
  830 + </state>
  831 + </provider>
  832 + </entry>
  833 + <entry file="file://$PROJECT_DIR$/application/index/controller/Green.php">
  834 + <provider selected="true" editor-type-id="text-editor">
  835 + <state relative-caret-position="480">
  836 + <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
  837 + </state>
  838 + </provider>
  839 + </entry>
  840 + <entry file="file://$PROJECT_DIR$/public/statis/css/index.css">
  841 + <provider selected="true" editor-type-id="text-editor">
  842 + <state relative-caret-position="1810">
  843 + <caret line="570" column="17" lean-forward="true" selection-start-line="570" selection-start-column="17" selection-end-line="570" selection-end-column="17" />
  844 + </state>
  845 + </provider>
  846 + </entry>
  847 + <entry file="file://$PROJECT_DIR$/application/index/service/Index.php">
  848 + <provider selected="true" editor-type-id="text-editor">
  849 + <state relative-caret-position="1522">
  850 + <caret line="371" column="32" selection-start-line="371" selection-start-column="27" selection-end-line="371" selection-end-column="32" />
  851 + </state>
  852 + </provider>
  853 + </entry>
  854 + <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
  855 + <provider selected="true" editor-type-id="text-editor">
  856 + <state relative-caret-position="342">
  857 + <caret line="21" selection-start-line="21" selection-end-line="21" />
  858 + </state>
  859 + </provider>
  860 + </entry>
  861 + <entry file="file://$PROJECT_DIR$/application/common/controller/Frontend.php">
  862 + <provider selected="true" editor-type-id="text-editor">
  863 + <state relative-caret-position="414">
  864 + <caret line="96" selection-start-line="96" selection-end-line="96" />
  865 + </state>
  866 + </provider>
  867 + </entry>
  868 + <entry file="file://$PROJECT_DIR$/application/index/view/index/index.html">
  869 + <provider selected="true" editor-type-id="text-editor">
  870 + <state relative-caret-position="18">
  871 + <caret line="1" column="33" selection-start-line="1" selection-start-column="33" selection-end-line="1" selection-end-column="33" />
  872 + <folding>
  873 + <element signature="n#style#0;n#h1#0;n#div#0;n#a#1;n#li#0;n#ul#0;n#div#1;n#div#0;n#div#3;n#!!top" expanded="true" />
  874 + <element signature="n#style#0;n#p#0;n#div#0;n#a#1;n#li#0;n#ul#0;n#div#1;n#div#0;n#div#3;n#!!top" expanded="true" />
  875 + <element signature="n#style#0;n#font#0;n#div#0;n#a#1;n#li#0;n#ul#0;n#div#1;n#div#0;n#div#3;n#!!top" expanded="true" />
  876 + <element signature="n#style#0;n#a#0;n#ul#0;n#div#1;n#div#1;n#div#4;n#!!top" expanded="true" />
  877 + <element signature="n#style#0;n#p#0;n#li#0;n#a#0;n#ul#0;n#div#1;n#div#1;n#div#4;n#!!top" expanded="true" />
  878 + <element signature="n#style#0;n#a#0;n#li#0;n#ul#0;n#div#1;n#div#0;n#div#6;n#!!top" expanded="true" />
  879 + <element signature="n#style#0;n#a#0;n#li#0;n#ul#0;n#div#1;n#div#1;n#div#6;n#!!top" expanded="true" />
  880 + <element signature="n#style#0;n#a#0;n#li#0;n#ul#0;n#div#1;n#div#0;n#div#7;n#!!top" expanded="true" />
  881 + <element signature="n#style#0;n#a#0;n#li#0;n#ul#0;n#div#1;n#div#1;n#div#7;n#!!top" expanded="true" />
  882 + </folding>
  883 + </state>
  884 + </provider>
  885 + </entry>
  886 + <entry file="file://$PROJECT_DIR$/application/index/view/layout/default.html">
  887 + <provider selected="true" editor-type-id="text-editor">
  888 + <state relative-caret-position="378">
  889 + <caret line="45" column="62" selection-start-line="45" selection-start-column="62" selection-end-line="45" selection-end-column="62" />
  890 + </state>
  891 + </provider>
  892 + </entry>
  893 + <entry file="file://$PROJECT_DIR$/application/index/view/common/1.html">
  894 + <provider selected="true" editor-type-id="text-editor">
  895 + <state>
  896 + <caret column="6" lean-forward="true" selection-end-column="15" />
  897 + </state>
  898 + </provider>
  899 + </entry>
  900 + </component>
235 </project> 901 </project>
@@ -118,13 +118,15 @@ class News extends Backend @@ -118,13 +118,15 @@ class News extends Backend
118 } 118 }
119 //这个的子类 119 //这个的子类
120 $style=\app\index\service\Index::menu(6); 120 $style=\app\index\service\Index::menu(6);
121 - $array=[];  
122 - foreach ($style as $sty){  
123 - $arr=\app\index\service\Index::menu($sty['id']);  
124 - foreach ($arr as $a){  
125 - array_push($array,$a);  
126 - }  
127 - } 121 + $array=$style;
  122 +// $array=[];
  123 +// foreach ($style as $sty){
  124 +// $arr=\app\index\service\Index::menu($sty['id']);
  125 +// foreach ($arr as $a){
  126 +// array_push($array,$a);
  127 +// }
  128 +// }
  129 +// dump($array);
128 $this->assign("style",$array); 130 $this->assign("style",$array);
129 return $this->view->fetch(); 131 return $this->view->fetch();
130 } 132 }
@@ -183,13 +185,14 @@ class News extends Backend @@ -183,13 +185,14 @@ class News extends Backend
183 $this->view->assign("row", $row); 185 $this->view->assign("row", $row);
184 //这个的子类 186 //这个的子类
185 $style=\app\index\service\Index::menu(6); 187 $style=\app\index\service\Index::menu(6);
186 - $array=[];  
187 - foreach ($style as $sty){  
188 - $arr=\app\index\service\Index::menu($sty['id']);  
189 - foreach ($arr as $a){  
190 - array_push($array,$a);  
191 - }  
192 - } 188 + $array=$style;
  189 +// $array=[];
  190 +// foreach ($style as $sty){
  191 +// $arr=\app\index\service\Index::menu($sty['id']);
  192 +// foreach ($arr as $a){
  193 +// array_push($array,$a);
  194 +// }
  195 +// }
193 $this->assign("style",$array); 196 $this->assign("style",$array);
194 return $this->view->fetch(); 197 return $this->view->fetch();
195 } 198 }
@@ -51,6 +51,13 @@ @@ -51,6 +51,13 @@
51 </div> 51 </div>
52 </div> 52 </div>
53 <div class="form-group"> 53 <div class="form-group">
  54 + <label class="control-label col-xs-12 col-sm-2">权重:</label>
  55 + <div class="col-xs-12 col-sm-8">
  56 + <input id="c-weigh" class="form-control" name="row[weigh]" type="int" >
  57 + </div>
  58 + </div>
  59 +
  60 + <div class="form-group">
54 <label class="control-label col-xs-12 col-sm-2">{:__('Downfile')}:</label> 61 <label class="control-label col-xs-12 col-sm-2">{:__('Downfile')}:</label>
55 <div class="col-xs-12 col-sm-8"> 62 <div class="col-xs-12 col-sm-8">
56 <div class="input-group"> 63 <div class="input-group">
@@ -50,6 +50,16 @@ @@ -50,6 +50,16 @@
50 <input id="c-title" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}"> 50 <input id="c-title" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
51 </div> 51 </div>
52 </div> 52 </div>
  53 +
  54 + <div class="form-group">
  55 + <label class="control-label col-xs-12 col-sm-2">权重:</label>
  56 + <div class="col-xs-12 col-sm-8">
  57 + <input id="c-weigh" class="form-control" name="row[weigh]" type="int" value="{$row.weigh|htmlentities}">
  58 + </div>
  59 + </div>
  60 +
  61 +
  62 +
53 <div class="form-group"> 63 <div class="form-group">
54 <label class="control-label col-xs-12 col-sm-2">{:__('Downfile')}:</label> 64 <label class="control-label col-xs-12 col-sm-2">{:__('Downfile')}:</label>
55 <div class="col-xs-12 col-sm-8"> 65 <div class="col-xs-12 col-sm-8">
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <div class="form-group"> 28 <div class="form-group">
29 <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label> 29 <label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
30 <div class="col-xs-12 col-sm-8"> 30 <div class="col-xs-12 col-sm-8">
31 - <textarea id="c-content" class="form-control editor" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea> 31 + <textarea id="c-content" class="form-control" rows="5" name="row[content]" cols="50">{$row.content|htmlentities}</textarea>
32 </div> 32 </div>
33 </div> 33 </div>
34 34
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <div class="list_Dtext"> 8 <div class="list_Dtext">
9 {$news.content} 9 {$news.content}
10 </div> 10 </div>
11 - <a href="/index/news/down?url={$news.downfile}" class="list_downLoad"> 11 + <a href="/index/news/down?url={$news.downfile}" target="_blank" class="list_downLoad">
12 <div class="list_downLoadBox"> 12 <div class="list_downLoadBox">
13 <div class="list_downLoadImg"><img src="/static/image/fujian_icon.png" alt=""></div> 13 <div class="list_downLoadImg"><img src="/static/image/fujian_icon.png" alt=""></div>
14 <p class="list_downLoadTxt">附件下载</p> 14 <p class="list_downLoadTxt">附件下载</p>
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 22
23 <div class="release_Li clearfix"> 23 <div class="release_Li clearfix">
24 <label for=""><span>*</span>岗位类型</label> 24 <label for=""><span>*</span>岗位类型</label>
25 - <input type="hidden" name="style" value="49"> 25 + <input type="hidden" name="style" value="48">
26 <select name="pid" id="pid" class="release_op"> 26 <select name="pid" id="pid" class="release_op">
27 <option value="">请选择类型</option> 27 <option value="">请选择类型</option>
28 {foreach($style as $p)} 28 {foreach($style as $p)}
@@ -91,6 +91,11 @@ class Frontend extends Controller @@ -91,6 +91,11 @@ class Frontend extends Controller
91 } 91 }
92 } 92 }
93 93
  94 +
  95 + $logo=config('site.logo');
  96 + $this->assign('logo',cdnurl($logo,true));
  97 +
  98 +
94 $this->view->assign('user', $this->auth->getUser()); 99 $this->view->assign('user', $this->auth->getUser());
95 100
96 // 语言检测 101 // 语言检测
@@ -203,6 +208,7 @@ class Frontend extends Controller @@ -203,6 +208,7 @@ class Frontend extends Controller
203 } 208 }
204 $menuSub['status']="1"; 209 $menuSub['status']="1";
205 $this->assign('title', $menuSub); 210 $this->assign('title', $menuSub);
  211 +
206 } 212 }
207 } 213 }
208 214
@@ -20,7 +20,7 @@ return [ @@ -20,7 +20,7 @@ return [
20 // 应用调试模式 20 // 应用调试模式
21 'app_debug' => Env::get('app.debug', true), 21 'app_debug' => Env::get('app.debug', true),
22 // 应用Trace 22 // 应用Trace
23 - 'app_trace' => Env::get('app.trace', true), 23 + 'app_trace' => Env::get('app.trace', false),
24 // 应用模式状态 24 // 应用模式状态
25 'app_status' => '', 25 'app_status' => '',
26 // 是否支持多模块 26 // 是否支持多模块
@@ -21,7 +21,7 @@ return [ @@ -21,7 +21,7 @@ return [
21 /** 21 /**
22 * 可上传的文件类型 22 * 可上传的文件类型
23 */ 23 */
24 - 'mimetype' => 'jpg,png,bmp,jpeg,gif,zip,rar,xls,xlsx', 24 + 'mimetype' => 'jpg,png,bmp,jpeg,gif,zip,rar,xls,xlsx,docx,doc,xls,txt,ppt,pptx,pdf',
25 /** 25 /**
26 * 是否支持批量上传 26 * 是否支持批量上传
27 */ 27 */
@@ -19,10 +19,13 @@ class Gg extends Frontend @@ -19,10 +19,13 @@ class Gg extends Frontend
19 $param['style']=1; 19 $param['style']=1;
20 } 20 }
21 $list=self::$model::gg($param['style'],$page=12); 21 $list=self::$model::gg($param['style'],$page=12);
  22 +// dump(self::$model);
  23 +// dump($list);
22 $this->assign("news",$list); 24 $this->assign("news",$list);
23 $this->assign("style", $param['style']); 25 $this->assign("style", $param['style']);
24 return view("new/gg"); 26 return view("new/gg");
25 } 27 }
  28 +
26 public function detail(){ 29 public function detail(){
27 $param=Request::instance()->param(); 30 $param=Request::instance()->param();
28 $list=self::$model::gg_detail($param); 31 $list=self::$model::gg_detail($param);
@@ -19,18 +19,26 @@ class Green extends Frontend @@ -19,18 +19,26 @@ class Green extends Frontend
19 //查出最新的 19 //查出最新的
20 $param=Request::instance()->param(); 20 $param=Request::instance()->param();
21 $list=self::$model::green($param['pid'],$param,1); 21 $list=self::$model::green($param['pid'],$param,1);
  22 +
22 if($list && $param['pid']==13){ 23 if($list && $param['pid']==13){
  24 + if (empty($list[0])){
  25 + $this->error('相关内容还在补充，敬请关注');
  26 + }
23 $res=$list[0]; 27 $res=$list[0];
24 $list2=GreenList::where("green_id",$res['id'])->select(); 28 $list2=GreenList::where("green_id",$res['id'])->select();
  29 +
25 $advice=self::$model::advice(0,2,2); 30 $advice=self::$model::advice(0,2,2);
26 31
  32 +
27 }else{ 33 }else{
28 $res=$list[0]; 34 $res=$list[0];
29 $list2=\app\admin\model\WhchList::where("green_id",$res['id'])->select(); 35 $list2=\app\admin\model\WhchList::where("green_id",$res['id'])->select();
30 $advice=self::$model::advice(0,2,3); 36 $advice=self::$model::advice(0,2,3);
31 } 37 }
  38 +
32 $this->assign("list",$list2); 39 $this->assign("list",$list2);
33 $list1=self::$model::green($param['pid'],[],10); 40 $list1=self::$model::green($param['pid'],[],10);
  41 +
34 $this->assign("list1",$list1); 42 $this->assign("list1",$list1);
35 $this->assign("pid",$param['pid']); 43 $this->assign("pid",$param['pid']);
36 $this->assign("advice",$advice); 44 $this->assign("advice",$advice);
@@ -19,6 +19,7 @@ class Index extends Frontend @@ -19,6 +19,7 @@ class Index extends Frontend
19 $newWhere=[ 19 $newWhere=[
20 'is_banner'=>'1' 20 'is_banner'=>'1'
21 ]; 21 ];
  22 +
22 $banner=self::$model::banner($newWhere); 23 $banner=self::$model::banner($newWhere);
23 $newsMenu=self::$model::indexMenu(6); 24 $newsMenu=self::$model::indexMenu(6);
24 $newsList=self::$model::news(6,7); 25 $newsList=self::$model::news(6,7);
@@ -18,6 +18,14 @@ class Login extends Frontend @@ -18,6 +18,14 @@ class Login extends Frontend
18 public function login(){ 18 public function login(){
19 if(Request::instance()->isPost()){ 19 if(Request::instance()->isPost()){
20 $param=Request::instance()->param(); 20 $param=Request::instance()->param();
  21 + if (empty($param['tel'])){
  22 + return self::$model::js("手机号不能为空!",200);
  23 + }
  24 + if (empty($param['user_password'])){
  25 + return self::$model::js("密码不能为空!",200);
  26 + }
  27 +
  28 +
21 $user=self::$model::checkTel($param['tel']); 29 $user=self::$model::checkTel($param['tel']);
22 if($user){ 30 if($user){
23 if($user['user_password']==$param["user_password"]){ 31 if($user['user_password']==$param["user_password"]){
@@ -183,11 +183,17 @@ class Index @@ -183,11 +183,17 @@ class Index
183 } 183 }
184 public static function down(){ 184 public static function down(){
185 $param = Request::instance()->param(); 185 $param = Request::instance()->param();
186 - $url = "/www/wwwroot/menhu/public".$param['url']; 186 + $online_url=Request::instance()->domain().$param['url'];
  187 + header("location:$online_url");
  188 + exit();
  189 + $url = ROOT_PATH."public".$param['url'];
  190 + dump($url);
  191 + exit();
187 $last = strrpos($url, "/"); 192 $last = strrpos($url, "/");
188 $url1 = substr($url, $last); 193 $url1 = substr($url, $last);
189 $file_name =$url1; //下载文件名 194 $file_name =$url1; //下载文件名
190 //打开文件 195 //打开文件
  196 +
191 $file = fopen($url , "r"); 197 $file = fopen($url , "r");
192 //输入文件标签 198 //输入文件标签
193 Header("Content-type: application/octet-stream"); 199 Header("Content-type: application/octet-stream");
@@ -204,9 +210,10 @@ class Index @@ -204,9 +210,10 @@ class Index
204 * 新闻 210 * 新闻
205 */ 211 */
206 public static function banner($where){ 212 public static function banner($where){
207 - $list=News::where($where)->order("id desc")->limit("0,6")->select(); 213 + $list=News::where($where)->limit("0,6")->order('weigh','desc')->select();
208 return $list; 214 return $list;
209 } 215 }
  216 +
210 /** 217 /**
211 * 首页栏目 218 * 首页栏目
212 */ 219 */
@@ -286,6 +293,7 @@ class Index @@ -286,6 +293,7 @@ class Index
286 } 293 }
287 }else{ 294 }else{
288 if($login){ 295 if($login){
  296 +
289 $list=\app\admin\model\QuestionTall::where("user_id",$user['id'])->order("id desc")->paginate($page); 297 $list=\app\admin\model\QuestionTall::where("user_id",$user['id'])->order("id desc")->paginate($page);
290 foreach ($list as &$l) { 298 foreach ($list as &$l) {
291 $l['isread'] = true; 299 $l['isread'] = true;
  1 +<!DOCTYPE html>
  2 +<html lang="en">
  3 +<head>
  4 + <meta charset="UTF-8">
  5 + <title>Title</title>
  6 +</head>
  7 +<body>
  8 + <div >
  9 + <iframe id="info" src="">
  10 +
  11 + </iframe>
  12 + </div>
  13 +</body>
  14 +<script src="http://vlan.w.bronet.cn//Public/lib/jquery-2.2.2.min.js"></script>
  15 + <script type="application/javascript">
  16 + var info=['http://baidu.com',''];
  17 + var url=info[Math.floor((Math.random()*info.length))];
  18 + $('#info').attr('src',url);
  19 + </script>
  20 +
  21 +</html>
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 <div class="experts_Img"><img src="/statis/image/zaixianhuida_icon.png" alt=""></div> 53 <div class="experts_Img"><img src="/statis/image/zaixianhuida_icon.png" alt=""></div>
54 <p class="experts_Txt2">在线问答</p> 54 <p class="experts_Txt2">在线问答</p>
55 </div> 55 </div>
56 - <div class="experts_Img2"><img src="{$news.image}" alt=""></div> 56 + <div style="width: 420px;height: auto" class="experts_Img2"><img src="{$news.image}" alt=""></div>
57 <div class="world_DBox" style="{$news['images']!=null?'display:block':'display:none'}"> 57 <div class="world_DBox" style="{$news['images']!=null?'display:block':'display:none'}">
58 <div class="swiper-container" > 58 <div class="swiper-container" >
59 <div class="swiper-wrapper" > 59 <div class="swiper-wrapper" >
1 {extend name="layout/default"} 1 {extend name="layout/default"}
2 {block name='title'}专家观点{/block} 2 {block name='title'}专家观点{/block}
3 {block name="content"} 3 {block name="content"}
  4 +<style>
  5 + .experts_opTxt{
  6 + width:750px;
  7 + }
  8 +</style>
4 <div class="max-width"> 9 <div class="max-width">
5 <!-- 当前位置 --> 10 <!-- 当前位置 -->
6 <div class="current"> 11 <div class="current">
@@ -15,7 +20,6 @@ @@ -15,7 +20,6 @@
15 {if($le.id==$pid)} 20 {if($le.id==$pid)}
16 <h1 class="news_Txt">{$le.title}</h1> 21 <h1 class="news_Txt">{$le.title}</h1>
17 {/if} 22 {/if}
18 -  
19 {/foreach} 23 {/foreach}
20 <ul> 24 <ul>
21 {foreach $left as $le} 25 {foreach $left as $le}
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <!-- 模块一 --> 25 <!-- 模块一 -->
26 {volist name="list" id="news" offset="0" length='1'} 26 {volist name="list" id="news" offset="0" length='1'}
27 <div class="green_model"> 27 <div class="green_model">
28 - {$news.content} 28 + {$news.content}
29 </div> 29 </div>
30 {/volist} 30 {/volist}
31 <!-- 模块二 列表 --> 31 <!-- 模块二 列表 -->
@@ -8,6 +8,19 @@ @@ -8,6 +8,19 @@
8 background-size: 100% 100%; 8 background-size: 100% 100%;
9 background-image: url('/statis/image/bg_img.png') 9 background-image: url('/statis/image/bg_img.png')
10 } 10 }
  11 + .model3_Txt2{
  12 + width: 410px;
  13 + }
  14 + .model3_Ttx5{
  15 + width:300px;
  16 +
  17 + }
  18 + .mul-txt-cut{
  19 + display: -webkit-box;
  20 + -webkit-box-orient: vertical;
  21 + -webkit-line-clamp: 3;
  22 + verflow: hidden;
  23 + }
11 24
12 .model8 .swiper-button-next { 25 .model8 .swiper-button-next {
13 width: 12px; 26 width: 12px;
@@ -31,12 +44,23 @@ @@ -31,12 +44,23 @@
31 background-size: 15px 30px; 44 background-size: 15px 30px;
32 background-image: url(/statis/image/you_img.png); 45 background-image: url(/statis/image/you_img.png);
33 } 46 }
  47 + .model5_List ul li a {
  48 + font-size: 14px;
  49 + float: right;
  50 + color: rgba(76, 160, 26, 1);
  51 + }
34 </style> 52 </style>
35 {/block} 53 {/block}
36 {block name="content"} 54 {block name="content"}
37 <!-- 内容 模块一 --> 55 <!-- 内容 模块一 -->
38 <div class="model clearfix"> 56 <div class="model clearfix">
39 - <div class="model_img"><img src="/statis/image/icon.png" alt=""></div> 57 + <div class="model_img">
  58 + {volist name="banner" id="b" key="k"}
  59 + {if condition="$k eq 1"}
  60 + <img src="{$b.image}" alt="">
  61 + {/if}
  62 + {/volist}
  63 + </div>
40 <div class="model_List"> 64 <div class="model_List">
41 <ul> 65 <ul>
42 {foreach $banner as $b} 66 {foreach $banner as $b}
@@ -63,10 +87,15 @@ @@ -63,10 +87,15 @@
63 <!-- 横图 --> 87 <!-- 横图 -->
64 <div class="green_model3 clearfix"> 88 <div class="green_model3 clearfix">
65 {if(count($advice)>0)} 89 {if(count($advice)>0)}
66 - <div class="green_Img2"><img src="{$advice[0]['image']}" alt=""></div> 90 + <a href="{$advice[0]['url']}">
  91 + <div class="green_Img2"><img src="{$advice[0]['image']}" alt=""></div>
  92 + </a>
  93 +
67 {/if} 94 {/if}
68 {if(count($advice)>1)} 95 {if(count($advice)>1)}
69 - <div class="green_Img3"><img src="{$advice[1]['image']}" alt=""></div> 96 + <a href="{$advice[0]['url']}">
  97 + <div class="green_Img3"><img src="{$advice[1]['image']}" alt=""></div>
  98 + </a>
70 {/if} 99 {/if}
71 </div> 100 </div>
72 <!-- 模块3 --> 101 <!-- 模块3 -->
@@ -88,9 +117,10 @@ @@ -88,9 +117,10 @@
88 {foreach($newsList as $news)} 117 {foreach($newsList as $news)}
89 <li class="clearfix"> 118 <li class="clearfix">
90 <div class="model3_Imgs"><img src="{$news.image}" alt=""></div> 119 <div class="model3_Imgs"><img src="{$news.image}" alt=""></div>
91 - <div class="model3_Ttx5 one-txt-cut">{$news.title}</div> 120 + <div class="model3_Ttx5 txt-cut">{$news.title}</div>
  121 + <!-- <div class="model3_Ttx5 one-txt-cut">{$news.desc}</div>-->
92 <div class="model3_mode2 clearfix"> 122 <div class="model3_mode2 clearfix">
93 - <div class="model3_Txt2 txt-cut"><span>></span>{$news.desc}</div> 123 + <div class="model3_Txt2 one-txt-cut"><span>{$news.title}</span></div>
94 <a href="/index/news/detail?id={$news.id}">[详情]</a> 124 <a href="/index/news/detail?id={$news.id}">[详情]</a>
95 </div> 125 </div>
96 </li> 126 </li>
@@ -114,11 +144,13 @@ @@ -114,11 +144,13 @@
114 <div class="model3_List"> 144 <div class="model3_List">
115 <ul class="clearfix"> 145 <ul class="clearfix">
116 {foreach($internationalList as $news)} 146 {foreach($internationalList as $news)}
117 - <li>  
118 - <div class="model3_Img3"><img src="{$news.image}" alt=""></div>  
119 - <p class="model3_Txt3 txt-cut">{$news.title}</p>  
120 - <a href="/index/international/detail?id={$news.id}" class="model3_Txt4">[详情]</a>  
121 - </li> 147 + <a href="/index/international/detail?id={$news.id}" class="model3_Txt4">
  148 + <li>
  149 + <div class="model3_Img3"><img src="{$news.image}" alt=""></div>
  150 + <p class="model3_Txt3 txt-cut">{$news.title}</p>
  151 + <a href="/index/international/detail?id={$news.id}" class="model3_Txt4">[详情]</a>
  152 + </li>
  153 + </a>
122 {/foreach} 154 {/foreach}
123 </ul> 155 </ul>
124 </div> 156 </div>
@@ -142,22 +174,30 @@ @@ -142,22 +174,30 @@
142 <ul> 174 <ul>
143 {volist name="onlineList" id="news" offset="1"} 175 {volist name="onlineList" id="news" offset="1"}
144 <li class="clearfix"> 176 <li class="clearfix">
145 - <div class="model4_Img"><img src="{$news.image}" alt=""></div>  
146 - <div class="model4_Box">  
147 - <h1 class="one-txt-cut">{$news.title}</h1>  
148 - <p class="txt-cut">{$news.desc}</p>  
149 - <a href="/index/online/detail?id={$news.id}">[详情]</a>  
150 - </div> 177 + <a href="/index/online/detail?id={$news.id}">
  178 + <div class="model4_Img">
  179 + <img src="{$news.image}" alt="">
  180 + </div>
  181 + </a>
  182 + <a href="/index/online/detail?id={$news.id}">
  183 + <div class="model4_Box">
  184 + <h1 style="font-size: 18px;font-weight: 400;cursor: pointer;color: rgba(0, 0, 0, 1);" class="one-txt-cut">{$news.title}</h1>
  185 + <p style="width: 485px;font-size: 14px;font-weight: 400;line-height: 20px;float: left; margin-top: 10px; -webkit-line-clamp: 2;color: rgba(61, 68, 77, 1);" class="txt-cut">{$news.desc}</p>
  186 + <font style="font-size: 14px;float: right;color: rgba(76, 160, 26, 1);">[详情]</font>
  187 + </div>
  188 + </a>
151 </li> 189 </li>
152 {/volist} 190 {/volist}
153 </ul> 191 </ul>
154 </div> 192 </div>
155 </div> 193 </div>
156 {volist name="onlineList" id="news" offset="0" length='1'} 194 {volist name="onlineList" id="news" offset="0" length='1'}
157 - <div class="model4_right">  
158 - <img src="{$news.image}" alt="">  
159 - <div class="model4_posi"><div class="model4_Txt">{$news.title}</div></div>  
160 - </div> 195 + <a href="/index/online/detail?id={$news.id}">
  196 + <div class="model4_right">
  197 + <img src="{$news.image}" alt="">
  198 + <div class="model4_posi"><div class="model4_Txt">{$news.title}</div></div>
  199 + </div>
  200 + </a>
161 {/volist} 201 {/volist}
162 </div> 202 </div>
163 <!-- 模块5 --> 203 <!-- 模块5 -->
@@ -165,7 +205,7 @@ @@ -165,7 +205,7 @@
165 <div class="model5_left"> 205 <div class="model5_left">
166 <div class="model3_leftTop clearfix"> 206 <div class="model3_leftTop clearfix">
167 207
168 - <div class="model3_Txt1">{$expertsMenu.first.title}</div> 208 + <div class="model3_Txt1"> <a href="/index/experts/index?pid={$expertsMenu.first.id}">{$expertsMenu.first.title}</a></div>
169 <div class="model3_Box"> 209 <div class="model3_Box">
170 <a href="{$expertsMenu['two'][0]['url']}">{$expertsMenu["two"][0]["title"]}</a> 210 <a href="{$expertsMenu['two'][0]['url']}">{$expertsMenu["two"][0]["title"]}</a>
171 </div> 211 </div>
@@ -202,10 +242,12 @@ @@ -202,10 +242,12 @@
202 <div class="model5_List"> 242 <div class="model5_List">
203 <ul> 243 <ul>
204 {foreach($experts2List as $news)} 244 {foreach($experts2List as $news)}
205 - <li class="clearfix">  
206 - <p class="one-txt-cut">{$news.name}:{$news.desc}</p>  
207 - <a href="/index/experts/detail?id={$news.id}">[详情]</a>  
208 - </li> 245 + <a style="float: left" href="/index/experts/detail?id={$news.id}">
  246 + <li class="clearfix">
  247 + <p style="float: left" class="one-txt-cut"> {$news.name}:{$news.desc}</p>
  248 + <a href="/index/experts/detail?id={$news.id}">[详情]</a>
  249 + </li>
  250 + </a>
209 {/foreach} 251 {/foreach}
210 </ul> 252 </ul>
211 </div> 253 </div>
@@ -214,10 +256,14 @@ @@ -214,10 +256,14 @@
214 <!-- 横图 --> 256 <!-- 横图 -->
215 <div class="green_model3 clearfix"> 257 <div class="green_model3 clearfix">
216 {if(count($advice)>2)} 258 {if(count($advice)>2)}
  259 + <a href="{$advice[2]['url']}">
217 <div class="green_Img2"><img src="{$advice[2]['image']}" alt=""></div> 260 <div class="green_Img2"><img src="{$advice[2]['image']}" alt=""></div>
  261 + </a>
218 {/if} 262 {/if}
219 {if(count($advice)>3)} 263 {if(count($advice)>3)}
220 - <div class="green_Img3"><img src="{$advice[3]['image']}" alt=""></div> 264 + <a href="{$advice[3]['url']}">
  265 + <div class="green_Img3"><img src="{$advice[3]['image']}" alt=""></div>
  266 + </a>
221 {/if} 267 {/if}
222 </div> 268 </div>
223 <!-- 模块6 --> 269 <!-- 模块6 -->
@@ -238,12 +284,15 @@ @@ -238,12 +284,15 @@
238 <ul> 284 <ul>
239 {volist name="invitationList" id="news"} 285 {volist name="invitationList" id="news"}
240 <li class="clearfix"> 286 <li class="clearfix">
241 - <div class="model6_Img"><img src="{$news.image}" alt=""></div>  
242 - <div class="model4_Box">  
243 - <h1 class="txt-cut">{$news.title}</h1>  
244 - <p class="txt-cut">{$news.desc}</p>  
245 - <a href="/index/invitation/detail?id={$news.id}">[详情]</a>  
246 - </div> 287 + <a style="float: left" href="/index/invitation/detail?id={$news.id}">
  288 + <div class="model6_Img"><img src="{$news.image}" alt=""></div>
  289 + <div class="model4_Box">
  290 + <h1 style="height: 38px;-webkit-line-clamp: 2;" class="txt-cut"> {$news.title}</h1>
  291 + <p class="txt-cut">{$news.desc} </p>
  292 + <a href="/index/invitation/detail?id={$news.id}">[详情]</a>
  293 + </div>
  294 + </a>
  295 +
247 </li> 296 </li>
248 {/volist} 297 {/volist}
249 </ul> 298 </ul>
@@ -265,7 +314,7 @@ @@ -265,7 +314,7 @@
265 <ul> 314 <ul>
266 {volist name="talentList" id="news"} 315 {volist name="talentList" id="news"}
267 <li class="clearfix"> 316 <li class="clearfix">
268 - <p class="one-txt-cut">{$news.title}</p> 317 + <a style="float: left" href="/index/talent/detail?id={$news.id}"> <p class="one-txt-cut">{$news.title}</p></a>
269 <a href="/index/talent/detail?id={$news.id}">[查看简历]</a> 318 <a href="/index/talent/detail?id={$news.id}">[查看简历]</a>
270 </li> 319 </li>
271 {/volist} 320 {/volist}
@@ -291,7 +340,7 @@ @@ -291,7 +340,7 @@
291 <ul> 340 <ul>
292 {foreach($standardList as $news)} 341 {foreach($standardList as $news)}
293 <li class="clearfix"> 342 <li class="clearfix">
294 - <p class="one-txt-cut">{$news.title}</p> 343 + <a style="float: left" href="/index/standard/detail?id={$news.id}"> <p class="one-txt-cut">{$news.title}</p></a>
295 <a href="/index/news/down?url={$news.downfile}"> [点击下载]</a> 344 <a href="/index/news/down?url={$news.downfile}"> [点击下载]</a>
296 </li> 345 </li>
297 {/foreach} 346 {/foreach}
@@ -314,7 +363,9 @@ @@ -314,7 +363,9 @@
314 <ul> 363 <ul>
315 {volist name="huiyuanList" id="news"} 364 {volist name="huiyuanList" id="news"}
316 <li class="clearfix"> 365 <li class="clearfix">
317 - <p class="one-txt-cut">{$news.title}</p> 366 + <a style="float: left" href="/index/huiyuan/detail?id={$news.id}">
  367 + <p class="one-txt-cut">{$news.title}</p>
  368 + </a>
318 <a href="/index/huiyuan/detail?id={$news.id}">[详情]</a> 369 <a href="/index/huiyuan/detail?id={$news.id}">[详情]</a>
319 </li> 370 </li>
320 {/volist} 371 {/volist}
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <div class="top_item2 clearfix"> 43 <div class="top_item2 clearfix">
44 <div class="top_item2L clearfix"> 44 <div class="top_item2L clearfix">
45 <!-- logo --> 45 <!-- logo -->
46 - <div class="top_item2Img"><img src="/statis/image/logo_icon.png" alt=""></div> 46 + <div class="top_item2Img"><img src="{$logo}" alt=""></div>
47 <div class="top_item2Box"> 47 <div class="top_item2Box">
48 <h2>中关村国联绿色产业服务创新联盟</h2> 48 <h2>中关村国联绿色产业服务创新联盟</h2>
49 <p>Zhongguancun Green Industry Alliance</p> 49 <p>Zhongguancun Green Industry Alliance</p>
@@ -308,6 +308,7 @@ @@ -308,6 +308,7 @@
308 },"false"); 308 },"false");
309 } 309 }
310 }) 310 })
  311 +
311 $("#phone1").on("click",function () { 312 $("#phone1").on("click",function () {
312 var data=$("#formNex").serialize(); 313 var data=$("#formNex").serialize();
313 ajax("/index/login/next",data,"post",function (res) { 314 ajax("/index/login/next",data,"post",function (res) {
@@ -319,6 +320,7 @@ @@ -319,6 +320,7 @@
319 } 320 }
320 },"false"); 321 },"false");
321 }) 322 })
  323 +
322 function setCode(data) { 324 function setCode(data) {
323 console.log(data); 325 console.log(data);
324 ajax("/index/login/getCode",data,"post",function (res) { 326 ajax("/index/login/getCode",data,"post",function (res) {
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <div class="news_Dtext"> 17 <div class="news_Dtext">
18 {$news.content} 18 {$news.content}
19 </div> 19 </div>
20 - <a href="/index/news/down?url={$news.downfile}" class="news_Dfj clearfix"> 20 + <a href="/index/news/down?url={$news.downfile}" target="_blank" class="news_Dfj clearfix">
21 <div class="news_DImg"><img src="/statis/image/fujian_icon.png" alt=""></div> 21 <div class="news_DImg"><img src="/statis/image/fujian_icon.png" alt=""></div>
22 <p class="news_DTxt">附件下载</p> 22 <p class="news_DTxt">附件下载</p>
23 </a> 23 </a>
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <ul> 14 <ul>
15 {foreach $left as $v} 15 {foreach $left as $v}
16 <li class="clearfix" > 16 <li class="clearfix" >
17 - <p class="news_Txt2 one-txt-cut" onmouseover="move1('{$v.id}',this)">{$v.title}</p> 17 + <p class="news_Txt2 one-txt-cut" onclick="enter('{$v.id}')" onmouseover="move1('{$v.id}',this)">{$v.title}</p>
18 <span class="news_Txt3">></span> 18 <span class="news_Txt3">></span>
19 <div class="news_side"> 19 <div class="news_side">
20 </div> 20 </div>
@@ -46,6 +46,8 @@ @@ -46,6 +46,8 @@
46 <script> 46 <script>
47 function move1(id,e) { 47 function move1(id,e) {
48 var data={'id':id}; 48 var data={'id':id};
  49 + console.log(id);
  50 + console.log(3);
49 ajax("/index/index/menu",data,"post",function (res) { 51 ajax("/index/index/menu",data,"post",function (res) {
50 if(res.msg!=""){ 52 if(res.msg!=""){
51 var msg=res.msg; 53 var msg=res.msg;
@@ -58,5 +60,8 @@ @@ -58,5 +60,8 @@
58 } 60 }
59 },"false"); 61 },"false");
60 } 62 }
  63 + function enter(id) {
  64 + window.location.href="/index/news/index"+"?pid="+id;
  65 + }
61 </script> 66 </script>
62 {/block} 67 {/block}
@@ -17,10 +17,15 @@ @@ -17,10 +17,15 @@
17 <div class="news_Dtext"> 17 <div class="news_Dtext">
18 {$news.content} 18 {$news.content}
19 </div> 19 </div>
20 - <a href="/index/news/down?url={$news.downfile}" class="news_Dfj clearfix"> 20 + <a href="/index/news/down?url={$news.downfile}" target="_blank" class="news_Dfj clearfix">
21 <div class="news_DImg"><img src="/statis/image/fujian_icon.png" alt=""></div> 21 <div class="news_DImg"><img src="/statis/image/fujian_icon.png" alt=""></div>
22 <p class="news_DTxt">附件下载</p> 22 <p class="news_DTxt">附件下载</p>
23 </a> 23 </a>
24 </div> 24 </div>
25 </div> 25 </div>
26 -{/block}  
  26 +<style>
  27 + img{
  28 + display:initial;
  29 + }
  30 +</style>
  31 +{/block}
@@ -17,6 +17,12 @@ @@ -17,6 +17,12 @@
17 <div class="news_Dtext"> 17 <div class="news_Dtext">
18 {$news.content} 18 {$news.content}
19 </div> 19 </div>
  20 + {if condition="$news.image"}
  21 + <a href="/index/news/down?url={$news.image}" target="_blank" class="news_Dfj clearfix">
  22 + <div class="news_DImg"><img src="/statis/image/fujian_icon.png" alt=""></div>
  23 + <p class="news_DTxt">附件下载</p>
  24 + </a>
  25 + {/if}
20 <div class="fu_Img"> 26 <div class="fu_Img">
21 <img src="{$news.image}" alt=""> 27 <img src="{$news.image}" alt="">
22 </div> 28 </div>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <ul> 37 <ul>
38 {foreach($list as $l) } 38 {foreach($list as $l) }
39 <li class="clearfix"> 39 <li class="clearfix">
40 - <div class="news_Img"><img src="{$l.image}" alt=""></div> 40 + <!--<div class="news_Img"><img src="{$l.image}" alt=""></div>-->
41 <div class="news_Box2"> 41 <div class="news_Box2">
42 <p class="news_Txt5 tender_Txt txt-cut">{$l.title}</p> 42 <p class="news_Txt5 tender_Txt txt-cut">{$l.title}</p>
43 </div> 43 </div>
1 {extend name="layout/default"} 1 {extend name="layout/default"}
2 -{block name="title"}发起招聘{/block} 2 +{block name="title"}发起求职{/block}
3 3
4 {block name="content"} 4 {block name="content"}
5 <div class="tender_rCon"> 5 <div class="tender_rCon">
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <div class="tender_rBox"> 7 <div class="tender_rBox">
8 <div class="release_Li clearfix"> 8 <div class="release_Li clearfix">
9 <form id="form"> 9 <form id="form">
10 - <input type="hidden" name="style" value="48"> 10 + <input type="hidden" name="style" value="49">
11 <label for=""><span>*</span>人才类型</label> 11 <label for=""><span>*</span>人才类型</label>
12 <select name="pid" id="pid" class="release_op"> 12 <select name="pid" id="pid" class="release_op">
13 <option value="">请选择类型</option> 13 <option value="">请选择类型</option>
1 {extend name="layout/default"} 1 {extend name="layout/default"}
2 -{block name="title"}发起求职{/block} 2 +{block name="title"}发起招聘{/block}
3 {block name="title1"}{/block} 3 {block name="title1"}{/block}
4 {block name="content"} 4 {block name="content"}
5 5
@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
28 {field: 'style', title: __('Style'), operate:false}, 28 {field: 'style', title: __('Style'), operate:false},
29 {field: 'image', title: __('Image'), operate:false, events: Table.api.events.image, formatter: Table.api.formatter.image}, 29 {field: 'image', title: __('Image'), operate:false, events: Table.api.events.image, formatter: Table.api.formatter.image},
30 {field: 'title', title: __('Title')}, 30 {field: 'title', title: __('Title')},
  31 + {field: 'weigh', title: __('Weigh')},
31 {field: 'createtime', title: __('Createtime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 32 {field: 'createtime', title: __('Createtime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
32 {field: 'downfile', title: __('Downfile'), operate:false}, 33 {field: 'downfile', title: __('Downfile'), operate:false},
33 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 34 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 } 5 }
6 6
7 .top_item { 7 .top_item {
8 - margin-top: 37px; 8 + margin-top: 10px;
9 } 9 }
10 10
11 .top_itemImg { 11 .top_itemImg {
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 66
67 .top_item2Img { 67 .top_item2Img {
68 width: 112px; 68 width: 112px;
69 - height: 93px; 69 + /*height: 93px;*/
70 float: left; 70 float: left;
71 } 71 }
72 72
@@ -372,6 +372,7 @@ @@ -372,6 +372,7 @@
372 .model3 { 372 .model3 {
373 margin: 0 auto; 373 margin: 0 auto;
374 width: 1200px; 374 width: 1200px;
  375 + min-height: 360px;
375 } 376 }
376 377
377 .model3_left { 378 .model3_left {
@@ -565,6 +566,12 @@ @@ -565,6 +566,12 @@
565 .model3_Img3 { 566 .model3_Img3 {
566 width: 204px; 567 width: 204px;
567 height: 136px; 568 height: 136px;
  569 + overflow: hidden;
  570 +}
  571 +.model3_Img3 img{
  572 + width:100%;
  573 + overflow: hidden;
  574 + height: auto;
568 } 575 }
569 576
570 .model3_Txt3 { 577 .model3_Txt3 {
1 .max-width { 1 .max-width {
2 width: 1200px; 2 width: 1200px;
3 margin: 28px auto 0px; 3 margin: 28px auto 0px;
4 - padding-bottom: 220px; 4 + /*padding-bottom: 220px;*/
  5 + padding-bottom: 40px;
5 } 6 }
6 7
7 #allmap { 8 #allmap {