test

.idea/workspace.xml

@@ -2,8 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/data/cache/area-select/area.js" afterPath="$PROJECT_DIR$/data/cache/area-select/area.js" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/template/default/group/area.htm" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/config/config_global.php" afterPath="$PROJECT_DIR$/config/config_global.php" />
+      <change beforePath="$PROJECT_DIR$/config/config_ucenter.php" afterPath="$PROJECT_DIR$/config/config_ucenter.php" />
+      <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
       <change beforePath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
+      <change beforePath="$PROJECT_DIR$/source/class/discuz/discuz_application.php" afterPath="$PROJECT_DIR$/source/class/discuz/discuz_application.php" />
+      <change beforePath="$PROJECT_DIR$/source/module/group/group_index.php" afterPath="$PROJECT_DIR$/source/module/group/group_index.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -14,38 +20,28 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="3_diy_group_index.tpl.php" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
+      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="665">
-              <caret line="218" column="52" lean-forward="false" selection-start-line="218" selection-start-column="52" selection-end-line="218" selection-end-column="52" />
+            <state relative-caret-position="-14826">
+              <caret line="251" column="205" lean-forward="false" selection-start-line="251" selection-start-column="199" selection-end-line="251" selection-end-column="205" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="area.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/data/cache/area-select/area.js">
+      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="692">
-              <caret line="38" column="212" lean-forward="false" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="212" />
+            <state relative-caret-position="663">
+              <caret line="810" column="37" lean-forward="true" selection-start-line="810" selection-start-column="37" selection-end-line="810" selection-end-column="37" />
               <folding>
-                <element signature="n#!!doc" expanded="true" />
+                <marker date="1525620688984" expanded="true" signature="18830:18842" ph="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="group_index.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="146" column="0" lean-forward="false" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -57,7 +53,6 @@
       <find>$jointype</find>
       <find>上传</find>
       <find>推荐</find>
-      <find>group_recommend</find>
       <find>create</find>
       <find>$parentid</find>
       <find>print_r</find>
@@ -70,6 +65,14 @@
       <find>$groupnav</find>
       <find>common.js</find>
       <find>ct2 wp cl week_ct2</find>
+      <find>group_recommend</find>
+      <find>$cachelist</find>
+      <find>$sgid</find>
+      <find>cachelist</find>
+      <find>所属地区</find>
+      <find>manage</find>
+      <find>加入方式</find>
+      <find>上传LOGO</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -81,16 +84,21 @@
         <option value="$PROJECT_DIR$/static/js/forum_post.js" />
         <option value="$PROJECT_DIR$/source/language/lang_message.php" />
         <option value="$PROJECT_DIR$/forum.php" />
-        <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
-        <option value="$PROJECT_DIR$/group.php" />
-        <option value="$PROJECT_DIR$/config/config_global.php" />
         <option value="$PROJECT_DIR$/source/function/function_group.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
         <option value="$PROJECT_DIR$/static/js/common.js" />
         <option value="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php" />
-        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
         <option value="$PROJECT_DIR$/data/cache/area-select/area.js" />
+        <option value="$PROJECT_DIR$/config/config_global.php" />
+        <option value="$PROJECT_DIR$/config/config_ucenter.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php" />
+        <option value="$PROJECT_DIR$/group.php" />
+        <option value="$PROJECT_DIR$/source/class/discuz/discuz_application.php" />
+        <option value="$PROJECT_DIR$/source/function/function_core.php" />
+        <option value="$PROJECT_DIR$/template/default/group/group_area.htm" />
+        <option value="$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php" />
+        <option value="$PROJECT_DIR$/source/module/group/group_index.php" />
+        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
       </list>
     </option>
   </component>
@@ -107,9 +115,11 @@
     <option name="width" value="1400" />
     <option name="height" value="990" />
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
@@ -122,12 +132,48 @@
       <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes />
+    <panes>
+      <pane id="Scope" />
+      <pane id="Scratches" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="config" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+            <path>
+              <item name="zijia" type="b2602c69:ProjectViewProjectNode" />
+              <item name="zijia" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="data" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="template" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="SearchEverywhereHistoryKey" value="gr&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;group.php&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php&#10;area.js&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/cache/area-select/area.js&#10;header.htm&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/template/default/common/header.htm&#10;header_no_nav&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;3_diy_group_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;forum_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;group_&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;forum_gro&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_3_common_showmessage&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_showmessage.tpl.php&#10;function/function_message&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/function/function_message.php&#10;forum_ajax&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php&#10;forum_grou&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_diy_group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php" />
+    <property name="SearchEverywhereHistoryKey" value="group_grou&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;foru&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;gr&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;group.php&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/group/group_index.php&#10;area.js&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/cache/area-select/area.js&#10;header.htm&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/template/default/common/header.htm&#10;header_no_nav&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_header_no_nav.tpl.php&#10;group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;3_diy_group_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_group.tpl.php&#10;forum_group&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;group_&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php&#10;forum_gro&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_3_common_showmessage&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_3_common_showmessage.tpl.php&#10;function/function_message&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/function/function_message.php&#10;forum_ajax&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_ajax.php&#10;forum_grou&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/source/module/forum/forum_group.php&#10;3_diy_group_index&#9;FILE&#9;file://D:/wamp64/www/Project/zijia/data/template/3_diy_group_index.tpl.php" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\wamp64\www\Project\zijia\data\template" />
+      <recent name="D:\wamp64\www\Project\zijia\template\default\group" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -159,12 +205,12 @@
       <workItem from="1525181078381" duration="610000" />
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
-      <workItem from="1525612433789" duration="1072000" />
+      <workItem from="1525612433789" duration="5938000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="16960000" />
+    <option name="totallyTimeSpent" value="21826000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -265,7 +311,7 @@
         <state relative-caret-position="43679">
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <folding>
-            <marker date="1525274562021" expanded="true" signature="18830:18842" ph="..." />
+            <marker date="1525620688984" expanded="true" signature="18830:18842" ph="..." />
           </folding>
         </state>
       </provider>
@@ -333,7 +379,7 @@
         <state relative-caret-position="43679">
           <caret line="1407" column="16" lean-forward="false" selection-start-line="1407" selection-start-column="8" selection-end-line="1407" selection-end-column="16" />
           <folding>
-            <marker date="1525274562021" expanded="true" signature="18830:18842" ph="..." />
+            <marker date="1525620688984" expanded="true" signature="18830:18842" ph="..." />
           </folding>
         </state>
       </provider>
@@ -343,7 +389,7 @@
         <state relative-caret-position="23901">
           <caret line="769" column="151" lean-forward="false" selection-start-line="769" selection-start-column="149" selection-end-line="769" selection-end-column="151" />
           <folding>
-            <marker date="1525274562021" expanded="true" signature="18830:18842" ph="..." />
+            <marker date="1525620688984" expanded="true" signature="18830:18842" ph="..." />
           </folding>
         </state>
       </provider>
@@ -413,38 +459,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-160">
-          <caret line="696" column="9" lean-forward="false" selection-start-line="696" selection-start-column="9" selection-end-line="696" selection-end-column="9" />
-          <folding>
-            <marker date="1524014401112" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
-            <marker date="1524014401112" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_application.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="491">
-          <caret line="686" column="43" lean-forward="false" selection-start-line="686" selection-start-column="43" selection-end-line="686" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/source/class/class_core.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="682">
-          <caret line="46" column="39" lean-forward="false" selection-start-line="46" selection-start-column="39" selection-end-line="46" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/group.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="186">
-          <caret line="14" column="15" lean-forward="true" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/forum.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="636">
@@ -452,13 +466,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/config_global.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="7" column="41" lean-forward="false" selection-start-line="7" selection-start-column="41" selection-end-line="7" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/template/wfdsoft_jiaohu/common/header_no_nav.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -466,14 +473,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="853">
-          <caret line="121" column="47" lean-forward="false" selection-start-line="121" selection-start-column="47" selection-end-line="121" selection-end-column="47" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/template/default/common/header.htm">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -481,16 +480,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="233">
-          <caret line="1406" column="0" lean-forward="true" selection-start-line="1406" selection-start-column="0" selection-end-line="1406" selection-end-column="0" />
-          <folding>
-            <marker date="1525274562021" expanded="true" signature="18830:18842" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="853">
@@ -535,21 +524,114 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/template/default/group/area.htm">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/template/default/group/group_index.htm">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4650">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/config_global.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="248">
+          <caret line="8" column="49" lean-forward="false" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="49" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/config_ucenter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="248">
+          <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="9" selection-end-column="28" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/source/module/group/group_index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="694">
+          <caret line="148" column="35" lean-forward="false" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="35" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/source/function/function_core.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3415">
+          <caret line="518" column="9" lean-forward="false" selection-start-line="518" selection-start-column="9" selection-end-line="518" selection-end-column="9" />
+          <folding>
+            <marker date="1525615190064" expanded="true" signature="58672:58732" ph="SELECT COUNT... ${DB::table($tablename)}" />
+            <marker date="1525615190064" expanded="true" signature="64451:64529" ph="SELECT table... ${DB::table('forum_attachment')}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/source/class/discuz/discuz_application.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="570">
+          <caret line="496" column="38" lean-forward="true" selection-start-line="496" selection-start-column="38" selection-end-line="496" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/source/class/class_core.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="527">
+          <caret line="46" column="47" lean-forward="false" selection-start-line="46" selection-start-column="47" selection-end-line="46" selection-end-column="47" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/group.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="233">
+          <caret line="17" column="18" lean-forward="false" selection-start-line="17" selection-start-column="9" selection-end-line="17" selection-end-column="18" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_area.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="357">
-          <caret line="146" column="0" lean-forward="false" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
+          <caret line="97" column="47" lean-forward="false" selection-start-line="97" selection-start-column="47" selection-end-line="97" selection-end-column="47" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_index.tpl.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="665">
-          <caret line="218" column="52" lean-forward="false" selection-start-line="218" selection-start-column="52" selection-end-line="218" selection-end-column="52" />
+        <state relative-caret-position="122">
+          <caret line="92" column="6" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="234" selection-end-column="49" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-14826">
+          <caret line="251" column="205" lean-forward="false" selection-start-line="251" selection-start-column="199" selection-end-line="251" selection-end-column="205" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="663">
+          <caret line="810" column="37" lean-forward="true" selection-start-line="810" selection-start-column="37" selection-end-line="810" selection-end-column="37" />
+          <folding>
+            <marker date="1525620688984" expanded="true" signature="18830:18842" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

config/config_global.php

@@ -5,10 +5,10 @@ $_config = array();
 
 // ----------------------------  CONFIG DB  ----------------------------- //
 $_config['db']['1']['dbhost'] = 'localhost';
-$_config['db']['1']['dbuser'] = 'dbuser';
-$_config['db']['1']['dbpw'] = 'BXhKw6JRxMy9FTb2';
-//$_config['db']['1']['dbuser'] = 'root';
-//$_config['db']['1']['dbpw'] = '950808';
+//$_config['db']['1']['dbuser'] = 'dbuser';
+//$_config['db']['1']['dbpw'] = 'BXhKw6JRxMy9FTb2';
+$_config['db']['1']['dbuser'] = 'root';
+$_config['db']['1']['dbpw'] = '950808';
 $_config['db']['1']['dbcharset'] = 'utf8';
 $_config['db']['1']['pconnect'] = '0';
 $_config['db']['1']['dbname'] = 'zijia';

config/config_ucenter.php

@@ -4,10 +4,10 @@
 define('UC_CONNECT', 'mysql');
 
 define('UC_DBHOST', 'localhost');
-define('UC_DBUSER', 'dbuser');
-define('UC_DBPW', 'BXhKw6JRxMy9FTb2');
-//define('UC_DBUSER', 'root');
-//define('UC_DBPW', '950808');
+//define('UC_DBUSER', 'dbuser');
+//define('UC_DBPW', 'BXhKw6JRxMy9FTb2');
+define('UC_DBUSER', 'root');
+define('UC_DBPW', '950808');
 define('UC_DBNAME', 'zijia');
 define('UC_DBCHARSET', 'utf8');
 define('UC_DBTABLEPRE', '`zijia`.pre_ucenter_');

data/template/3_diy_group_area.tpl.php

@@ -0,0 +1,230 @@
+<?php if(!defined('IN_DISCUZ')) exit('Access Denied'); hookscriptoutput('index');?>
+<?php //include template('common/header'); ?>
+<?php include template('common/header_no_nav'); ?>
+    <link rel="stylesheet" type="text/css" href="data/cache/slick/slick.css"/>
+    <link rel="stylesheet" type="text/css" href="data/cache/slick/slick-theme.css"/>
+    <script type="text/javascript" src="data/cache/jquery-3.3.1.min.js"></script>
+    <script type="text/javascript" src="data/cache/area-select/area.js"></script>
+    <script type="text/javascript">
+        var sgjQuery= jQuery.noConflict();
+    </script>
+    <link rel="stylesheet" type="text/css" href="data/cache/font-awesome/css/fontawesome-all.min.css"/>
+    <script type="text/javascript" src="data/cache/slick/slick.min.js"></script>
+    <style type="text/css">
+        .sg-group-link {
+            font-size: 2em;
+            font-weight: bold;
+            margin: 15px 0;
+        }
+        .sg-group-link a {
+            text-decoration: none;
+        }
+        .sg-create-group {
+            font-size: 2em;
+            text-align: center;
+        }
+        .sg-right-block {
+            padding: 25px 15px;
+        }
+        .sg-create-group div {
+            margin-top: 15px;
+        }
+        .sg-create-group-desp {
+            font-size: 0.6em;
+        }
+        .sg-create-group-icon {
+            font-size: 1.5em;
+        }
+        .sg-create-group-icon:hover {
+            color: red;
+        }
+        .sg-hot-post-title {
+            text-align: center;
+            font-size: 2em;
+            font-weight: bold;
+        }
+        .sg-hot-post-list {
+            font-size: 1.1em;
+            margin-top: 20px
+        }
+        .sg-hot-post-list a {
+            display: block;
+            text-decoration: none;
+        }
+        .sg-container {
+            padding: 20px 15px;
+        }
+        .sg-block-title {
+            font-size: 2em;
+        }
+        .sg-recommend-container {
+            margin-top: 15px;
+        }
+        .sg-area-container {
+            display: flex;
+            flex-wrap: wrap;
+        }
+        .sg-area-container a {
+            text-decoration: none;
+        }
+        .sg-area-item {
+            font-size: 1.3em;
+            margin: 10px;
+        }
+    </style>
+    <div id="pt" class="bm cl" style="height: auto;">
+        <div class="z sg-group-link">
+            <a href="./" title="首页">首页</a><span>-</span><a href="/group.php">俱乐部</a><span>-</span><a href="#"><?php echo $_GET['province']; ?></a>
+        </div>
+    </div><?php echo adshow("text/wp a_t");?><style id="diy_style" type="text/css"></style>
+    <div class="wp">
+        <!--[diy=diy1]--><div id="diy1" class="area"></div><!--[/diy]-->
+    </div>
+    <div id="ct" class="ct2 wp cl week_ct2">
+        <div class="mn wk_f_mn padding15 backfff">
+            <!--[diy=diycontenttop]--><div id="diycontenttop" class="area"></div><!--[/diy]-->
+            <div class="bm bmw">
+                <div class="sg-group-slick">
+                    <img src="/data/attachment/group/slick/111.png">
+                    <img src="/data/attachment/group/slick/222.png">
+                    <img src="/data/attachment/group/slick/333.png">
+                </div>
+                <!--[diy=diy5]--><div id="diy5" class="area"></div><!--[/diy]-->
+            </div>
+            <!--[diy=diycommendtop]--><div id="diycommendtop" class="area"></div><!--[/diy]-->
+            <?php if(!empty($_G['setting']['pluginhooks']['index_header'])) echo $_G['setting']['pluginhooks']['index_header'];?>
+            <div class="bm sg-container">
+                <div class="sg-block-title"><h2><?php echo $_GET['province']; ?></h2></div>
+                <div class="sg-area-container"></div>
+            </div>
+<!--            <div class="bm sg-container">-->
+<!--                <div class="sg-block-title"><h2>推荐</h2></div>-->
+<!--                <div class="sg-recommend-container">-->
+<!--                    --><?php //if(is_array(dunserialize($_G['setting']['group_recommend']))) { ?>
+<!--                        --><?php //foreach(dunserialize($_G['setting']['group_recommend']) as $val) { ?>
+<!--                            <div>-->
+<!--                                <a href="forum.php?mod=group&fid=--><?php //echo $val['fid'];?><!--">-->
+<!--                                    <img src="--><?php //echo $val['icon'];?><!--" width="48" height="48">-->
+<!--                                </a>-->
+<!--                            </div>-->
+<!--                        --><?php //} ?>
+<!--                    --><?php //} ?>
+<!--                </div>-->
+<!--            </div>-->
+            <!--<div id="g_commend" class="bm">-->
+            <!--<div class="bm_h cl">-->
+            <!--<h2>推荐--><?php //echo $_G['setting']['navs']['3']['navname'];?><!--</h2>-->
+            <!--</div>-->
+            <!--<div class="bm_c cl">--><?php //if(is_array(dunserialize($_G['setting']['group_recommend']))) foreach(dunserialize($_G['setting']['group_recommend']) as $val) { ?><!--<dl class="xld">-->
+            <!--<dd class="m"><a href="forum.php?mod=group&amp;fid=--><?php //echo $val['fid'];?><!--"><img src="--><?php //echo $val['icon'];?><!--" alt="--><?php //echo $val['name'];?><!--" width="48" height="48" /></a></dd>-->
+            <!--<dt><a href="forum.php?mod=group&amp;fid=--><?php //echo $val['fid'];?><!--">--><?php //echo $val['name'];?><!--</a></dt>-->
+            <!--<dd class="xg1">--><?php //echo $val['description'];?><!--</dd>-->
+            <!--</dl>-->
+            <?php //} ?>
+            <!--</div>-->
+            <!--</div>-->
+
+            <!--[diy=diycategorytop]--><div id="diycategorytop" class="area"></div><!--[/diy]-->
+            <?php if(!empty($_G['setting']['pluginhooks']['index_top'])) echo $_G['setting']['pluginhooks']['index_top'];?>
+            <!--<div class="bm">-->
+            <!--<div class="bm_h cl">-->
+            <!--<h2>--><?php //echo $_G['setting']['navs']['3']['navname'];?><!--分类</h2>-->
+            <!--</div>-->
+            <!--<div class="bm_c">--><?php //if(is_array($first)) foreach($first as $groupid => $group) { ?><!--<dl class="mbm pbm bbda">-->
+            <!--<dt class="pbn">-->
+            <!--<span class="y xi2">--><?php //if(is_array($group['secondlist'])) foreach($group['secondlist'] as $fid) { ?><!--<a href="group.php?sgid=--><?php //echo $fid;?><!--">--><?php //echo $second[$fid]['name'];?><!--</a> --><?php //} ?><!--<a href="group.php?gid=--><?php //echo $groupid;?><!--">更多 &rsaquo;</a></span>-->
+            <!--<strong class="xs2"><a href="group.php?gid=--><?php //echo $groupid;?><!--">--><?php //echo $group['name'];?><!--</a></strong>--><?php //if($group['groupnum']) { ?><!--<span class="xg1">(--><?php //echo $group['groupnum'];?><!--)</span>--><?php //} ?>
+            <!--</dt>-->
+            <!--<dd>--><?php //if(is_array($lastupdategroup[$groupid])) foreach($lastupdategroup[$groupid] as $val) { ?><!--<a href="forum.php?mod=group&amp;fid=--><?php //echo $val['fid'];?><!--">--><?php //echo $val['name'];?><!--</a> &nbsp;&nbsp;-->
+            <?php //} ?>
+            <!--</dd>-->
+            <!--</dl>-->
+            <?php //} ?>
+            <!--</div>-->
+            <!--</div>-->
+            <!--[diy=diycontentbottom]--><div id="diycontentbottom" class="area"></div><!--[/diy]-->
+            <?php if(!empty($_G['setting']['pluginhooks']['index_bottom'])) echo $_G['setting']['pluginhooks']['index_bottom'];?>
+        </div>
+
+        <div class="sd wk_sq_sd padding15 backfff">
+            <div class="drag">
+                <!--[diy=diysidetop]--><div id="diysidetop" class="area"></div><!--[/diy]-->
+            </div>
+            <?php if(!empty($_G['setting']['pluginhooks']['index_side_top'])) echo $_G['setting']['pluginhooks']['index_side_top'];?>
+            <div class="bm sg-create-group sg-right-block">
+                <div class="sg-create-group-title"><h2>我要创建</h2></div>
+                <div class="sg-create-group-icon">
+                    <a href="/forum.php?mod=group&action=create"><i class="fa fa-plus"></i></a>
+                </div>
+                <div class="sg-create-group-desp">创建一个属于自己的专属模块</div>
+            </div>
+
+            <div class="bm sg-hot-post-rank sg-right-block">
+                <div class="sg-hot-post-title"><h2>热帖排行</h2></div>
+                <div class="sg-hot-post-list">
+                    <a class="sg-hot-post-item" href="#">穿越四大无人区</a>
+                    <a class="sg-hot-post-item" href="#">西藏三日游</a>
+                </div>
+            </div>
+            <?php //if(helper_access::check_module('group')) { if(empty($gid) && empty($sgid)) { ?>
+            <!--<div class="bm">-->
+            <!--<div class="bm_h cl">-->
+            <!--<h2>创建--><?php //echo $_G['setting']['navs']['3']['navname'];?><!--步骤</h2>-->
+            <!--</div>-->
+            <!--<div class="bm_c">-->
+            <!--<ul id="g_guide" class="mbm">-->
+            <!--<li><label><strong class="xi1">创建--><?php //echo $_G['setting']['navs']['3']['navname'];?><!--</strong><span class="xg1">创建自己的地盘</span></label></li>-->
+            <!--<li><label><strong class="xi1">个性设置</strong><span class="xg1">精心打造--><?php //echo $_G['setting']['navs']['3']['navname'];?><!--空间</span></label></li>-->
+            <!--<li><label><strong class="xi1">邀请好友</strong><span class="xg1">邀请好友加入我的--><?php //echo $_G['setting']['navs']['3']['navname'];?><!--</span></label></li>-->
+            <!--<li><label><strong class="xi1">--><?php //echo $_G['setting']['navs']['3']['navname'];?><!--升级</strong><span class="xg1">--><?php //echo $_G['setting']['navs']['3']['navname'];?><!--积分升级赢得社区推荐</span></label></li>-->
+            <!--</ul>-->
+            <?php //if(helper_access::check_module('group')) { ?>
+            <!--<a href="forum.php?mod=group&amp;action=create" id="create_group_btn"><img src="--><?php //echo IMGDIR;?><!--/create_group.png" alt="创建--><?php //echo $_G['setting']['navs']['3']['navname'];?><!--" /></a>-->
+            <?php //} ?>
+            <!--</div>-->
+            <!--</div>-->
+            <?php //} else { ?>
+            <!--<div class="bm bw0">-->
+            <!--<div class="bm_c">-->
+            <!--<a href="forum.php?mod=group&amp;action=create&amp;fupid=--><?php //echo $fup;?><!--&amp;groupid=--><?php //echo $sgid;?><!--" id="create_group_btn"><img src="--><?php //echo IMGDIR;?><!--/create_group.png" alt="创建--><?php //echo $_G['setting']['navs']['3']['navname'];?><!--" /></a>-->
+            <!--</div>-->
+            <!--</div>-->
+            <?php //} } ?>
+            <!--<div class="drag">-->
+            <!--[diy=diysidemiddle]--><div id="diysidemiddle" class="area"></div><!--[/diy]-->
+            <!--</div>-->
+            <?php //if($topgrouplist) { ?>
+            <!--<div id="g_top" class="bm">-->
+            <!--<div class="bm_h cl">-->
+            <!--<h2>--><?php //echo $_G['setting']['navs']['3']['navname'];?><!--积分排行</h2>-->
+            <!--</div>-->
+            <!--<div class="bm_c">-->
+            <!--<ol class="xl">--><?php //if(is_array($topgrouplist)) foreach($topgrouplist as $fid => $group) { ?><!--<li class="top1"><span class="y xi2 xg1"> --><?php //echo $group['commoncredits'];?><!--</span><a href="forum.php?mod=group&amp;fid=--><?php //echo $group['fid'];?><!--" title="--><?php //echo $group['name'];?><!--">--><?php //echo $group['name'];?><!--</a></li>-->
+            <?php //} ?>
+            <!--</ol>-->
+            <!--</div>-->
+            <!--</div>-->
+            <?php //} ?>
+            <div class="drag">
+                <!--[diy=diysidebottom]--><div id="diysidebottom" class="area"></div><!--[/diy]-->
+            </div>
+            <?php if(!empty($_G['setting']['pluginhooks']['index_side_bottom'])) echo $_G['setting']['pluginhooks']['index_side_bottom'];?>
+        </div>
+    </div>
+    <script type="text/javascript">
+        sgjQuery(function () {
+            sgjQuery('.sg-group-slick').slick({
+                autoplay: true,
+                arrows: false,
+                dots: true,
+                infinite: true,
+                speed: 300,
+                slidesToShow: 1,
+                adaptiveHeight: true
+            });
+
+        });
+    </script>
+    <div class="wp mtn">
+        <!--[diy=diy4]--><div id="diy4" class="area"></div><!--[/diy]-->
+    </div><?php include template('common/footer'); ?>

data/template/3_diy_group_group.tpl.php

@@ -780,28 +780,36 @@ EOF;
                                     </div>
                             </tr>
                             <tr>
-                                <th><?php //echo $_G['setting']['navs']['3']['navname'];?>上传LOGO</th>
-                                <td>
-                                    <input type="text" name="logo" id="activityaid_url" class="px" />
-                                    <button type="button" class="pn" onclick="uploadWindow(function (aid, url){activityaid_upload(aid, url)})"><span>上传</span></button>
-                                    <div id="activityattach_image"></div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <th><strong class="rq y">*</strong>浏览权限:</th>
+                                <th><strong class="rq y">*</strong>浏览权限</th>
                                 <td>
                                     <label class="lb"><input type="radio" name="gviewperm" class="pr" tabindex="4" value="1" checked="checked" />所有人</label>
                                     <label class="lb"><input type="radio" name="gviewperm" class="pr" value="0" />仅成员</label>
                                 </td>
                             </tr>
                             <tr>
-                                <th><strong class="rq y">*</strong>加入方式:</th>
+                                <th><strong class="rq y">*</strong>加入方式</th>
                                 <td>
                                     <label class="lb"><input type="radio" name="jointype" class="pr" tabindex="5" value="0" checked="checked" />自由加入</label>
                                     <label class="lb"><input type="radio" name="jointype" class="pr" value="2" />审核加入</label>
                                     <label class="lb"><input type="radio" name="jointype" class="pr" value="1" />邀请加入</label>
                                 </td>
                             </tr>
+                            <tr>
+                                <th><?php echo $_G['setting']['navs']['3']['navname'];?>顶部图片</th>
+                                <td>
+                                    <input type="text" name="bannernew" id="bannernew_url" class="px" />
+                                    <button type="button" class="pn" onclick="uploadWindow(function (aid, url){bannernew_upload(aid, url)})"><span>上传</span></button>
+                                    <div id="bannernew_image"></div>
+                                </td>
+                            </tr>
+                            <tr>
+                                <th><?php echo $_G['setting']['navs']['3']['navname'];?>图标</th>
+                                <td>
+                                    <input type="text" name="logo" id="activityaid_url" class="px" />
+                                    <button type="button" class="pn" onclick="uploadWindow(function (aid, url){activityaid_upload(aid, url)})"><span>上传</span></button>
+                                    <div id="activityattach_image"></div>
+                                </td>
+                            </tr>
                             <tr>
                                 <th>&nbsp;</th>
                                 <td>
@@ -1405,6 +1413,11 @@ EOF;
             updatecinemaattach(aid, url, 'data/attachment/forum');
         }
 
+        function bannernew_upload(aid, url) {
+            $('bannernew_url').value = 'data/attachment/forum/' + url;
+            $('bannernew_image').innerHTML = '<img src="' + attachurl + '/' + url + '" class="spimg" />';
+        }
+
         sgjQuery(function () {
             sgjQuery('.sg-group-slick').slick({
                 autoplay: true,

data/template/3_diy_group_index.tpl.php

@@ -60,6 +60,17 @@
     .sg-recommend-container {
         margin-top: 15px;
     }
+    .sg-area-container {
+        display: flex;
+        flex-wrap: wrap;
+    }
+    .sg-area-container a {
+        text-decoration: none;
+    }
+    .sg-area-item {
+        font-size: 1.3em;
+        margin: 10px;
+    }
 </style>
 <div id="pt" class="bm cl" style="height: auto;">
 <div class="z sg-group-link">
@@ -214,7 +225,7 @@
 
         var provinces = ["北京市","天津市","上海市","重庆市","河北省","山西省","内蒙古","辽宁省","吉林省","黑龙江省","江苏省","浙江省","安徽省","福建省","江西省","山东省","河南省","湖北省","湖南省","广东省","广西","海南省","四川省","贵州省","云南省","西藏","陕西省","甘肃省","青海省","宁夏","新疆","香港","澳门","台湾省"], html = '';
         for(var i = 0; i < provinces.length; ++i) {
-            html += '<div class="sg-area-item">' + provinces[i] + '</div>';
+            html += '<a class="sg-area-item" href="/group.php?province=' + provinces[i] + '">' + provinces[i] + '</a>';
         }
         sgjQuery('.sg-area-container').append(html);
     });

source/class/discuz/discuz_application.php

@@ -62,6 +62,7 @@ class discuz_application extends discuz_base{
 
 	public function init() {
 		if(!$this->initated) {
+
 			$this->_init_db();
 			$this->_init_setting();
 			$this->_init_user();
@@ -70,6 +71,7 @@ class discuz_application extends discuz_base{
 			$this->_init_cron();
 			$this->_init_misc();
 		}
+
 		$this->initated = true;
 	}
 

source/module/group/group_index.php

@@ -146,7 +146,11 @@ if(!$metadescription) {
 }
 
 if(empty($curtype)) {
-	include template('diy:group/index');
+    if(!empty($_GET['province'])) {
+        include template('diy:group/area');
+    } else {
+        include template('diy:group/index');
+    }
 } else {
 	if(empty($sgid)) {
 		include template('diy:group/type:'.$gid);