Browse Source

手机访问

SilentLittleCat 7 years ago
parent
commit
eb5a06c312
2 changed files with 19 additions and 28 deletions
  1. 17 27
      .idea/workspace.xml
  2. 2 1
      source/module/forum/forum_group.php

+ 17 - 27
.idea/workspace.xml

xqd xqd xqd xqd xqd xqd xqd
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="deb87e12-87cf-4e37-bffe-bf7390933348" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/source/module/forum/forum_forumdisplay.php" afterPath="$PROJECT_DIR$/source/module/forum/forum_forumdisplay.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,27 +13,17 @@
   </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="291">
-              <caret line="122" column="14" lean-forward="false" selection-start-line="122" selection-start-column="3" selection-end-line="122" selection-end-column="14" />
+            <state relative-caret-position="198">
+              <caret line="217" column="5" lean-forward="true" selection-start-line="217" selection-start-column="5" selection-end-line="217" selection-end-column="5" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="forum.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/forum.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1379">
-              <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>
-      </file>
-      <file leaf-file-name="forum_forumdisplay.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="forum_forumdisplay.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/source/module/forum/forum_forumdisplay.php">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="574">
@@ -111,10 +101,10 @@
       <find>明星成员</find>
       <find>groupManageUser</find>
       <find>$mtype</find>
-      <find>sg</find>
       <find>forumdisplay</find>
       <find>$action ==</find>
       <find>group_star_member_title</find>
+      <find>sg</find>
     </findStrings>
     <replaceStrings>
       <replace>领队</replace>
@@ -168,9 +158,9 @@
         <option value="$PROJECT_DIR$/template/wfdsoft_jiaohu/images/css/sg-index.css" />
         <option value="$PROJECT_DIR$/source/module/portal/portal_index.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group_sg.tpl.php" />
-        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
         <option value="$PROJECT_DIR$/source/language/group/lang_template.php" />
         <option value="$PROJECT_DIR$/source/module/forum/forum_forumdisplay.php" />
+        <option value="$PROJECT_DIR$/source/module/forum/forum_group.php" />
       </list>
     </option>
   </component>
@@ -291,12 +281,12 @@
       <workItem from="1526371942119" duration="17000" />
       <workItem from="1526393100730" duration="8566000" />
       <workItem from="1526460106398" duration="7000" />
-      <workItem from="1526480076841" duration="2278000" />
+      <workItem from="1526480076841" duration="2384000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="91715000" />
+    <option name="totallyTimeSpent" value="91821000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -662,14 +652,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="291">
-          <caret line="122" column="14" lean-forward="false" selection-start-line="122" selection-start-column="3" selection-end-line="122" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/forum.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1379">
@@ -720,5 +702,13 @@
         </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="198">
+          <caret line="217" column="5" lean-forward="true" selection-start-line="217" selection-start-column="5" selection-end-line="217" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

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

xqd
@@ -217,7 +217,8 @@ if($action == 'index') {
 		}
 	}
 
-	include template('diy:group/group:'.$_G['fid']);
+//	include template('diy:group/group:'.$_G['fid']);
+	include template('diy:group/group_sg:'.$_G['fid']);
 
 } elseif($action == 'join') {
 	$inviteuid = 0;