test

.idea/workspace.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <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$/static/js/common.js" afterPath="$PROJECT_DIR$/static/js/common.js" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -46,7 +47,7 @@
       <file leaf-file-name="function_group.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="584">
+            <state relative-caret-position="491">
               <caret line="161" column="19" lean-forward="false" selection-start-line="161" selection-start-column="19" selection-end-line="161" selection-end-column="19" />
               <folding>
                 <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
@@ -57,29 +58,29 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="3_diy_group_group.tpl.php" pinned="false" current-in-tab="false">
+      <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="581">
               <caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
               <folding>
-                <marker date="1525271613461" expanded="true" signature="18737:18749" ph="..." />
+                <marker date="1525272217914" expanded="true" signature="18744:18756" ph="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="common.js" pinned="false" current-in-tab="true">
+      <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/static/js/common.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="1202" column="37" lean-forward="false" selection-start-line="1202" selection-start-column="37" selection-end-line="1202" selection-end-column="37" />
+            <state relative-caret-position="221">
+              <caret line="1204" column="27" lean-forward="false" selection-start-line="1204" selection-start-column="27" selection-end-line="1204" selection-end-column="27" />
               <folding>
-                <marker date="1525272087795" expanded="true" signature="32210:32216" ph=" " />
-                <marker date="1525272087795" expanded="true" signature="32216:32222" ph=" " />
-                <marker date="1525272087795" expanded="true" signature="36389:36395" ph=" " />
-                <marker date="1525272087795" expanded="true" signature="36395:36401" ph=" " />
-                <marker date="1525272087795" expanded="true" signature="41706:41712" ph="..." />
+                <marker date="1525272208397" expanded="true" signature="32210:32216" ph=" " />
+                <marker date="1525272208397" expanded="true" signature="32216:32222" ph=" " />
+                <marker date="1525272208397" expanded="true" signature="36377:36383" ph=" " />
+                <marker date="1525272208397" expanded="true" signature="36383:36389" ph=" " />
+                <marker date="1525272208397" expanded="true" signature="41694:41700" ph="..." />
               </folding>
             </state>
           </provider>
@@ -104,9 +105,10 @@
       <find>mn wk_f_mn padding15 backfff</find>
       <find>ct2 wp cl week_ct2</find>
       <find>jquery</find>
-      <find>$groupnav</find>
       <find>收藏</find>
       <find>fwin_a_favorite</find>
+      <find>append_parent</find>
+      <find>$groupnav</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -124,8 +126,8 @@
         <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$/data/template/3_diy_group_group.tpl.php" />
         <option value="$PROJECT_DIR$/static/js/common.js" />
+        <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
       </list>
     </option>
   </component>
@@ -222,12 +224,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="7993000" />
+      <workItem from="1525227575525" duration="8122000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="12823000" />
+    <option name="totallyTimeSpent" value="12952000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -270,7 +272,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="1525271613461" expanded="true" signature="18737:18749" ph="..." />
+            <marker date="1525272217914" expanded="true" signature="18744:18756" ph="..." />
           </folding>
         </state>
       </provider>
@@ -394,18 +396,6 @@
         </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="584">
-          <caret line="161" column="19" lean-forward="false" selection-start-line="161" selection-start-column="19" selection-end-line="161" selection-end-column="19" />
-          <folding>
-            <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
-            <marker date="1525269524011" expanded="true" signature="5503:5511" ph="›" />
-            <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
-          </folding>
-        </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">
@@ -422,14 +412,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="446">
-          <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$/source/module/group/group_index.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2356">
@@ -446,26 +428,46 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php">
+    <entry file="file://$PROJECT_DIR$/source/function/function_group.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="581">
-          <caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
+        <state relative-caret-position="491">
+          <caret line="161" column="19" lean-forward="false" selection-start-line="161" selection-start-column="19" selection-end-line="161" selection-end-column="19" />
           <folding>
-            <marker date="1525271613461" expanded="true" signature="18737:18749" ph="..." />
+            <marker date="1525269524011" expanded="true" signature="5365:5373" ph="›" />
+            <marker date="1525269524011" expanded="true" signature="5503:5511" ph="›" />
+            <marker date="1525269524011" expanded="true" signature="5812:5820" ph="›" />
           </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="446">
+          <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$/static/js/common.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="1202" column="37" lean-forward="false" selection-start-line="1202" selection-start-column="37" selection-end-line="1202" selection-end-column="37" />
+        <state relative-caret-position="221">
+          <caret line="1204" column="27" lean-forward="false" selection-start-line="1204" selection-start-column="27" selection-end-line="1204" selection-end-column="27" />
+          <folding>
+            <marker date="1525272208397" expanded="true" signature="32210:32216" ph=" " />
+            <marker date="1525272208397" expanded="true" signature="32216:32222" ph=" " />
+            <marker date="1525272208397" expanded="true" signature="36377:36383" ph=" " />
+            <marker date="1525272208397" expanded="true" signature="36383:36389" ph=" " />
+            <marker date="1525272208397" expanded="true" signature="41694:41700" ph="..." />
+          </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="581">
+          <caret line="18" column="80" lean-forward="true" selection-start-line="18" selection-start-column="80" selection-end-line="18" selection-end-column="80" />
           <folding>
-            <marker date="1525272087795" expanded="true" signature="32210:32216" ph=" " />
-            <marker date="1525272087795" expanded="true" signature="32216:32222" ph=" " />
-            <marker date="1525272087795" expanded="true" signature="36389:36395" ph=" " />
-            <marker date="1525272087795" expanded="true" signature="36395:36401" ph=" " />
-            <marker date="1525272087795" expanded="true" signature="41706:41712" ph="..." />
+            <marker date="1525272217914" expanded="true" signature="18744:18756" ph="..." />
           </folding>
         </state>
       </provider>

data/template/3_diy_group_group.tpl.php

@@ -15,7 +15,7 @@
     <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"/>
     <link rel="stylesheet" type="text/css" href="data/cache/font-awesome/css/fontawesome-all.min.css"/>
-    <script type="text/javascript" src="data/cache/jquery-3.3.1.min.js"></script>
+<!--    <script type="text/javascript" src="data/cache/jquery-3.3.1.min.js"></script>-->
     <script type="text/javascript" src="data/cache/slick/slick.min.js"></script>
     <script type="text/javascript" src="/data/cache/area-select/area.js"></script>
     <script src="static/js/forum_post.js?tDV" type="text/javascript"></script>

static/js/common.js

@@ -1200,9 +1200,9 @@ function showWindow(k, url, mode, cache, menuv) {
 		}
 		showMenu(v);
 	};
-    console.log('ok', menuObj, menuid);
-	if(!menuObj) {
 
+	if(!menuObj) {
+console.log(menuObj, 'ok');
 		menuObj = document.createElement('div');
 		menuObj.id = menuid;
 		menuObj.className = 'fwinmask';