test

.idea/workspace.xml

@@ -2,7 +2,9 @@
 <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_3_common_header_no_nav.tpl.php" afterPath="$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -16,8 +18,8 @@
       <file leaf-file-name="3_diy_group_index.tpl.php" pinned="false" current-in-tab="false">
         <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="341">
-              <caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
+            <state relative-caret-position="264">
+              <caret line="74" column="10" lean-forward="true" selection-start-line="70" selection-start-column="4" selection-end-line="74" selection-end-column="10" />
               <folding />
             </state>
           </provider>
@@ -60,15 +62,25 @@
       <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="302">
-              <caret line="52" column="44" lean-forward="false" selection-start-line="52" selection-start-column="44" selection-end-line="52" selection-end-column="44" />
+            <state relative-caret-position="570">
+              <caret line="58" column="18" lean-forward="false" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
               <folding>
-                <marker date="1525272653386" expanded="true" signature="18440:18452" ph="..." />
+                <marker date="1525273083318" expanded="true" signature="18656:18668" ph="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="3_3_common_header_no_nav.tpl.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="725">
+              <caret line="23" column="16" lean-forward="true" selection-start-line="23" selection-start-column="12" selection-end-line="23" selection-end-column="16" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <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">
@@ -102,12 +114,12 @@
       <find>print_r</find>
       <find>sd wk_sq_sd padding15 backfff</find>
       <find>mn wk_f_mn padding15 backfff</find>
-      <find>ct2 wp cl week_ct2</find>
       <find>jquery</find>
       <find>收藏</find>
       <find>fwin_a_favorite</find>
       <find>append_parent</find>
       <find>$groupnav</find>
+      <find>ct2 wp cl week_ct2</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -119,13 +131,14 @@
         <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$/data/template/3_diy_group_index.tpl.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_index.tpl.php" />
         <option value="$PROJECT_DIR$/data/template/3_diy_group_group.tpl.php" />
       </list>
     </option>
@@ -223,12 +236,12 @@
       <workItem from="1525013350506" duration="115000" />
       <workItem from="1525013490770" duration="4105000" />
       <workItem from="1525181078381" duration="610000" />
-      <workItem from="1525227575525" duration="8556000" />
+      <workItem from="1525227575525" duration="8983000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="13386000" />
+    <option name="totallyTimeSpent" value="13813000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="7" />
@@ -271,7 +284,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="1525272653386" expanded="true" signature="18440:18452" ph="..." />
+            <marker date="1525273083318" expanded="true" signature="18656:18668" ph="..." />
           </folding>
         </state>
       </provider>
@@ -403,14 +416,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1209">
-          <caret line="22" column="69" lean-forward="false" selection-start-line="22" selection-start-column="63" selection-end-line="22" selection-end-column="69" />
-          <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">
@@ -419,14 +424,6 @@
         </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="341">
-          <caret line="11" column="26" lean-forward="true" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
-          <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">
@@ -461,12 +458,28 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/data/template/3_3_common_header_no_nav.tpl.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="725">
+          <caret line="23" column="16" lean-forward="true" selection-start-line="23" selection-start-column="12" selection-end-line="23" selection-end-column="16" />
+          <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="264">
+          <caret line="74" column="10" lean-forward="true" selection-start-line="70" selection-start-column="4" selection-end-line="74" selection-end-column="10" />
+          <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="302">
-          <caret line="52" column="44" lean-forward="false" selection-start-line="52" selection-start-column="44" selection-end-line="52" selection-end-column="44" />
+        <state relative-caret-position="570">
+          <caret line="58" column="18" lean-forward="false" selection-start-line="58" selection-start-column="18" selection-end-line="58" selection-end-column="18" />
           <folding>
-            <marker date="1525272653386" expanded="true" signature="18440:18452" ph="..." />
+            <marker date="1525273083318" expanded="true" signature="18656:18668" ph="..." />
           </folding>
         </state>
       </provider>

data/template/3_3_common_header_no_nav.tpl.php

@@ -19,6 +19,10 @@
     <meta http-equiv="MSThemeCompatible" content="Yes" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
     <base href="<?php echo $_G['siteurl'];?>" /><link rel="stylesheet" type="text/css" href="data/cache/style_3_common.css?<?php echo VERHASH;?>" /><link rel="stylesheet" type="text/css" href="data/cache/style_3_group_index.css?<?php echo VERHASH;?>" /><?php if($_G['uid'] && isset($_G['cookie']['extstyle']) && strpos($_G['cookie']['extstyle'], TPLDIR) !== false) { ?><link rel="stylesheet" id="css_extstyle" type="text/css" href="<?php echo $_G['cookie']['extstyle'];?>/style.css" /><?php } elseif($_G['style']['defaultextstyle']) { ?><link rel="stylesheet" id="css_extstyle" type="text/css" href="<?php echo $_G['style']['defaultextstyle'];?>/style.css" /><?php } ?><script type="text/javascript">var STYLEID = '<?php echo STYLEID;?>', STATICURL = '<?php echo STATICURL;?>', IMGDIR = '<?php echo IMGDIR;?>', VERHASH = '<?php echo VERHASH;?>', charset = '<?php echo CHARSET;?>', discuz_uid = '<?php echo $_G['uid'];?>', cookiepre = '<?php echo $_G['config']['cookie']['cookiepre'];?>', cookiedomain = '<?php echo $_G['config']['cookie']['cookiedomain'];?>', cookiepath = '<?php echo $_G['config']['cookie']['cookiepath'];?>', showusercard = '<?php echo $_G['setting']['showusercard'];?>', attackevasive = '<?php echo $_G['config']['security']['attackevasive'];?>', disallowfloat = '<?php echo $_G['setting']['disallowfloat'];?>', creditnotice = '<?php if($_G['setting']['creditnotice']) { ?><?php echo $_G['setting']['creditnames'];?><?php } ?>', defaultstyle = '<?php echo $_G['style']['defaultextstyle'];?>', REPORTURL = '<?php echo $_G['currenturl_encode'];?>', SITEURL = '<?php echo $_G['siteurl'];?>', JSPATH = '<?php echo $_G['setting']['jspath'];?>', CSSPATH = '<?php echo $_G['setting']['csspath'];?>', DYNAMICURL = '<?php echo $_G['dynamicurl'];?>';</script>
+    <script type="text/javascript" src="data/cache/jquery-3.3.1.min.js"></script>
+    <script type="text/javascript">
+        var $331 = $;//新的命名
+    </script
     <script src="<?php echo $_G['setting']['jspath'];?>common.js?<?php echo VERHASH;?>" type="text/javascript"></script>
     <script src="/<?php echo $_G['style']['styleimgdir'];?>/js/jquery-1.7.2.js" type="text/javascript"></script>
     <script src="/<?php echo $_G['style']['styleimgdir'];?>/js/pace.js" type="text/javascript"></script>

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/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>
@@ -51,6 +51,13 @@
     </div>
 
     <div id="ct" class="ct2 wp cl week_ct2">
+        <div class="sg-carousel">
+            <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>
+        </div>
         <div class="mn wk_f_mn padding15 backfff">
             <!--[diy=diycontenttop]--><div id="diycontenttop" class="area"></div><!--[/diy]-->
             <?php if($action != 'create') { if($_G['forum']['banner']) { ?>
@@ -1396,7 +1403,7 @@ EOF;
         }
 
         $(function () {
-            $('.sg-group-slick').slick({
+            $331('.sg-group-slick').slick({
                 autoplay: true,
                 arrows: false,
                 dots: true,

data/template/3_diy_group_index.tpl.php

@@ -4,7 +4,6 @@
     <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/slick/slick.min.js"></script>
 <style type="text/css">
     .sg-group-link {
@@ -198,7 +197,7 @@
 </div>
 <script type="text/javascript">
     $(function () {
-       $('.sg-group-slick').slick({
+       $331('.sg-group-slick').slick({
            autoplay: true,
            arrows: false,
            dots: true,