SilentLittleCat 7 years ago
parent
commit
2c1e20cd1b
3 changed files with 32 additions and 32 deletions
  1. 31 30
      .idea/workspace.xml
  2. 0 1
      data/template/3_diy_group_group.tpl.php
  3. 1 1
      source/module/forum/forum_group.php

+ 31 - 30
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
       <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$/source/module/forum/forum_group.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_group.php" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -13,11 +14,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="false">
+      <file leaf-file-name="forum_group.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="353">
-              <caret line="351" column="33" lean-forward="true" selection-start-line="351" selection-start-column="33" selection-end-line="351" selection-end-column="33" />
+            <state relative-caret-position="508">
+              <caret line="366" column="58" lean-forward="true" selection-start-line="366" selection-start-column="58" selection-end-line="366" selection-end-column="58" />
               <folding />
             </state>
           </provider>
@@ -87,13 +88,13 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
         <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="625">
-              <caret line="1463" column="32" lean-forward="false" selection-start-line="1463" selection-start-column="32" selection-end-line="1463" selection-end-column="32" />
+            <state relative-caret-position="470">
+              <caret line="1462" column="57" lean-forward="false" selection-start-line="1462" selection-start-column="51" selection-end-line="1462" selection-end-column="57" />
               <folding>
-                <marker date="1525660340431" expanded="true" signature="18891:18903" ph="..." />
+                <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
               </folding>
             </state>
           </provider>
@@ -214,8 +215,8 @@
         <option value="$PROJECT_DIR$/config/config_global.php" />
         <option value="$PROJECT_DIR$/config/config_ucenter.php" />
         <option value="$PROJECT_DIR$/source/function/function_forum.php" />
-        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
+        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
       </list>
     </option>
   </component>
@@ -323,12 +324,12 @@
       <workItem from="1525227575525" duration="11054000" />
       <workItem from="1525275777043" duration="4000" />
       <workItem from="1525612433789" duration="9986000" />
-      <workItem from="1525658293907" duration="2037000" />
+      <workItem from="1525658293907" duration="2451000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="27911000" />
+    <option name="totallyTimeSpent" value="28325000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -371,7 +372,7 @@
         <state relative-caret-position="25978">
           <caret line="836" column="128" lean-forward="false" selection-start-line="836" selection-start-column="114" selection-end-line="836" selection-end-column="128" />
           <folding>
-            <marker date="1525660340431" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
@@ -468,7 +469,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="1525660340431" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
@@ -527,7 +528,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="1525660340431" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
@@ -537,7 +538,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="1525660340431" expanded="true" signature="18891:18903" ph="..." />
+            <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
           </folding>
         </state>
       </provider>
@@ -781,37 +782,37 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/config_global.php">
+    <entry file="file://$PROJECT_DIR$/data/cache/area-select/area.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="8" column="47" lean-forward="false" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="47" />
+        <state relative-caret-position="739">
+          <caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
+    <entry file="file://$PROJECT_DIR$/config/config_global.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="353">
-          <caret line="351" column="33" lean-forward="true" selection-start-line="351" selection-start-column="33" selection-end-line="351" selection-end-column="33" />
+        <state relative-caret-position="248">
+          <caret line="8" column="47" lean-forward="false" selection-start-line="8" selection-start-column="31" selection-end-line="8" selection-end-column="47" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/cache/area-select/area.js">
+    <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="739">
-          <caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
-          <folding />
+        <state relative-caret-position="470">
+          <caret line="1462" column="57" lean-forward="false" selection-start-line="1462" selection-start-column="51" selection-end-line="1462" selection-end-column="57" />
+          <folding>
+            <marker date="1525660444406" expanded="true" signature="18891:18903" ph="..." />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
+    <entry file="file://$PROJECT_DIR$/source/module/forum/forum_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="625">
-          <caret line="1463" column="32" lean-forward="false" selection-start-line="1463" selection-start-column="32" selection-end-line="1463" selection-end-column="32" />
-          <folding>
-            <marker date="1525660340431" expanded="true" signature="18891:18903" ph="..." />
-          </folding>
+        <state relative-caret-position="508">
+          <caret line="366" column="58" lean-forward="true" selection-start-line="366" selection-start-column="58" selection-end-line="366" selection-end-column="58" />
+          <folding />
         </state>
       </provider>
     </entry>

+ 0 - 1
data/template/3_diy_group_group.tpl.php

xqd
@@ -1461,7 +1461,6 @@ EOF;
             sgjQuery('#s_city option[value=' + city + ']').attr('selected', true);
             change(2);
             var county = "<?php echo $_G['forum']['county'] ?>";
-            console.log(county);
             sgjQuery('#s_county option[value=' + county + ']').attr('selected', true);
         <?php } ?>
 

+ 1 - 1
source/module/forum/forum_group.php

xqd
@@ -363,7 +363,7 @@ if($action == 'index') {
                 $banner = null;
             }
 
-			$fieldarray = array('fid' => $newfid, 'description' => $descriptionnew, 'jointype' => $jointype, 'gviewperm' => $gviewperm, 'dateline' => TIMESTAMP, 'founderuid' => $_G['uid'], 'foundername' => $_G['username'], 'membernum' => 1, 'province' => $_GET['province'], 'city' => $_GET['city'], 'icon' => $icon, 'banner' => $banner);
+			$fieldarray = array('fid' => $newfid, 'description' => $descriptionnew, 'jointype' => $jointype, 'gviewperm' => $gviewperm, 'dateline' => TIMESTAMP, 'founderuid' => $_G['uid'], 'foundername' => $_G['username'], 'membernum' => 1, 'province' => $_GET['province'], 'city' => $_GET['city'], 'county' => $_GET['county'], 'icon' => $icon, 'banner' => $banner);
 			C::t('forum_forumfield')->insert($fieldarray);
 			C::t('forum_forumfield')->update_groupnum($fup, 1);
 			C::t('forum_groupuser')->insert($newfid, $_G['uid'], $_G['username'], 1, TIMESTAMP);