zhengxifeng
/
tyqngp
보기 1
좋아요 0
포크 0
코드 이슈 0 풀 리퀘스트 0 릴리즈 0 위키 Activity
소스 검색

Merge branch 'develop' of zhengxifeng/tyqngp into master

zhengxifeng 2 달 전
부모
34eb150f98 af42463399
커밋
eaaa6325cc
18개의 변경된 파일과 82개의 추가작업 그리고 46개의 파일을 삭제
분할 보기 변경상태 보기
  1. 1
    1
      apps/admin/model/content/LinkModel.php
  2. 1
    1
      apps/admin/model/system/CityModel.php
  3. 9
    0
      apps/admin/view/default/content/link.html
  4. 4
    2
      apps/admin/view/default/system/config.html
  5. 2
    2
      apps/admin/view/default/system/home.html
  6. 1
    1
      config/config.php
  7. 5
    1
      m/css/style_m.css
  8. 2
    2
      skin/css/style.css
  9. 6
    2
      template/dafeult/city.html
  10. 8
    10
      template/dafeult/foot.html
  11. 2
    2
      template/dafeult/foot_city.html
  12. 2
    2
      template/dafeult/top.html
  13. 2
    2
      template/dafeult/top_city.html
  14. 0
    7
      template/dafeult/wap/city.html
  15. 23
    1
      template/dafeult/wap/foot.html
  16. 5
    1
      template/dafeult/wap/foot_city.html
  17. 0
    9
      template/dafeult/wap/index.html
  18. 9
    0
      template/dafeult/wap/link.html

+ 1
- 1
apps/admin/model/content/LinkModel.php 파일 보기 

@@ -92,7 +92,7 @@ class LinkModel extends Model
92 92 
         foreach ($ids as $k=>$v){
93 93 
             $is = $is.','.$v;
94 94 
         }
95 
-        $list = parent::table('ay_city')->where("id IN(1,2,9,22) OR pid IN($is)")->order("etitle ASC")->select();;
95 
+        $list = parent::table('ay_city')->where("id IN(1,2,9,22) and id!=381 OR pid IN($is) and id!=381")->order("etitle ASC")->select();;
96 96 
         //return $list;
97 97
98 98 
         // 将结果转换为数组

+ 1
- 1
apps/admin/model/system/CityModel.php 파일 보기 

@@ -19,7 +19,7 @@ class CityModel extends Model{
19 19 
             "(select count(b.id) from ay_city b where b.pid=a.id) as count"
20 20 
         );
21 21 
         $where['pid']=$pid;
22 
-        $result = parent::table('ay_city a')->field($field)->where($where)->order('a.sorting asc')->select();
22 
+        $result = parent::table('ay_city a')->field($field)->where($where)->where('id!=381')->order('a.sorting asc')->select();
23 23 
         return $result;
24 24 
     }
25 25

+ 9
- 0
apps/admin/view/default/content/link.html 파일 보기 

@@ -75,6 +75,7 @@
75 75 
                      <div class="layui-input-block">
76 76 
                          <select name="city" id="city">
77 77 
                              <option value="0">全国</option>
78 
+                             <option value="381">城市切换站</option>
78 79 
                              {foreach $city_list(key,value)}
79 80 
                              <optgroup label="[key]">
80 81 
                              {php}
 
@@ -167,6 +168,14 @@
167 168 
                      <div class="layui-input-block">
168 169 
                          <select name="city" id="city">
169 170 
                              <option value="0">全国</option>
171 
+
172 
+
173 
+                             {if([$link->city] == '381')}
174 
+                             <option value="381" selected>城市切换站</option>
175 
+                             {else}
176 
+                             <option value="381">城市切换站</option>
177 
+                             {/if}
178 
+
170 179 
                              {foreach $city_list(key,value)}
171 180 
                              <optgroup label="[key]">
172 181 
                                  {php}

+ 4
- 2
apps/admin/view/default/system/config.html 파일 보기 

@@ -174,8 +174,10 @@
174 174
175 175 
 		                <div class="layui-form-item">
176 176 
 		                     <label class="layui-form-label">系统授权码</label>
177 
-		                     <div class="layui-input-inline">
178 
-		                     	<input type="text" name="sn"  value="{$configs.sn.value}" placeholder="请输入授权码，多个授权码用逗号隔开"  class="layui-input">
177 
+		                     <div class="layui-input-inline" style="width:600px;">
178 
+
179 
+								 <textarea name="sn" placeholder="请输入授权码，多个授权码用逗号隔开" class="layui-textarea">{$configs.sn.value}</textarea>
180 
+
179 181 
 		                     </div>
180 182 
 		                </div>
181 183

+ 2
- 2
apps/admin/view/default/system/home.html 파일 보기 

@@ -55,7 +55,7 @@
55 55 
 		 </div>
56 56 
 	 </fieldset>
57 57
58 
-	 {if(CMSNAME=='SZQFCMS')}
58 
+	 {if(CMSNAME=='RONGCMS')}
59 59 
 	 <div class="layui-row layui-col-space10">
60 60 
 	 	<div class="layui-col-xs12 layui-col-md6">
61 61 
 			<table class="layui-table table-two">
 
@@ -67,7 +67,7 @@
67 67 
 				  <tbody>
68 68 
 				     <tr>
69 69 
 				      	<th width="100">应用版本</th>
70 
-				      	<td>SZQFCMS SVIP
70 
+				      	<td>RONGCMS SVIP
71 71 
 				      	</td>
72 72 
 				     </tr>
73 73 
 				     <tr>

+ 1
- 1
config/config.php 파일 보기 

@@ -2,7 +2,7 @@
2 2 
 return array(
3 3
4 4 
     // 定义CMS名称
5 
-    'cmsname' => 'SZQFCMS',
5 
+    'cmsname' => 'RONGCMS',
6 6
7 7 
     // 授权码，多个授权码使用英文逗号隔开，如：'aaaaa,bbbbb'
8 8 
     'sn' => 'F5604F3B99',

+ 5
- 1
m/css/style_m.css 파일 보기 

@@ -300,4 +300,8 @@ body.body-top{ padding-top:2.4rem;}
300 300 
   border: 1px solid #333;
301 301 
 }
302 302 
 .pagination .st{ font-family:宋体}
303 
-.text-secondary{ text-align:center; padding:20px 0}
303 
+.text-secondary{ text-align:center; padding:20px 0}
304 
+
305 
+.fcc  a{
306 
+    line-height: 20px;
307 
+}

+ 2
- 2
skin/css/style.css 파일 보기 

@@ -486,8 +486,8 @@ body.bg-white{ background:#fff;}
486 486 
     right: 0;
487 487 
 }
488 488 
 .head-1 .welcome a{
489 
-    color: red;
489 
+    /*color: red;*/
490 490 
 }
491 491 
 .head-1 .info a{
492 
-    color: red;
492 
+   /* color: red;*/
493 493 
 }

+ 6
- 2
template/dafeult/city.html 파일 보기 

@@ -18,7 +18,11 @@
18 18 
 </head>
19 19 
 <body>
20 20 
 {include file=head_city.html}
21 
-<div><img src="/static/upload/image/20240528/1716887600211481.jpg" width="100%"></div>
21 
+<div>
22 
+
23 
+	<!--<img src="/static/upload/image/20240528/1716887600211481.jpg" width="100%">-->
24 
+
25 
+</div>
22 26 
 <div class="page-bg">
23 27 
   <div class="page-box">
24 28 
          <style>
 
@@ -69,7 +73,7 @@
69 73 
 <div class="footer" style="font-size: 16px;">
70 74 
 	<div class="footer-dh">友情链接：
71 75
72 
-		{pboot:sql sql="select * from ay_link where gid=2"}
76 
+		{pboot:sql sql="select * from ay_link where city=381"}
73 77 
 		<a href="[sql:link]" class="first-level" target="_blank" style="padding-right: 10px;"> [sql:name] </a>
74 78 
 		{/pboot:sql}
75 79

+ 8
- 10
template/dafeult/foot.html 파일 보기 

@@ -15,7 +15,6 @@
15 15 
       </div>
16 16 
       <div class="footer-message">
17 17
18 
-
19 18 
         {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
20 19 
         {pboot:if('[sql:phone]'=='')}
21 20 
         <p>咨询热线：{pboot:companyphone}</p>
 
@@ -43,13 +42,11 @@
43 42 
     <div class="right">
44 43 
       <div class="ewm">
45 44
46 
-
47 
-
48 45 
         {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
49 
-        {pboot:if('[sql:weixin]'=='')}
50 
-        <img src="{pboot:companyweixin}">
46 
+        {pboot:if('[sql:weixin]' == '')}
47 
+        <img src="{pboot:companyweixin}" />
51 48 
         {else}
52 
-        <img src="[sql:weixin]">
49 
+        <img src='[sql:weixin]' alt="微信客服" />
53 50 
         {/pboot:if}
54 51 
         {/pboot:sql}
55 52 
 
@@ -65,18 +62,18 @@
65 62 
     {pboot:if('{$temp_cityId}'==381)}
66 63
67 64 
     <a href="{pboot:sitedomain}">心理咨询</a>  Copyright  ©  2019-2024
68 
-    <a href="{pboot:sitedomain}">心理医生</a>,<a href="{pboot:sitedomain}">心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】全国高端连锁"心理咨询机构"
65 
+    <a href="{pboot:sitedomain}">心理医生</a>,<a href="{pboot:sitedomain}">心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】全国高端连锁"<a href="{pboot:sitedomain}">心理咨询机构</a>"
69 66
70 67 
     {else}
71 68
72 69 
     <a href="{pboot:httpurl}">[sql:title]心理咨询</a>  Copyright  ©  2019-2024
73 
-    <a href="{pboot:httpurl}">[sql:title]心理医生</a>,<a href="{pboot:httpurl}">[sql:title]心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】全国高端连锁"心理咨询机构"
70 
+    <a href="{pboot:httpurl}">[sql:title]心理医生</a>,<a href="{pboot:httpurl}">[sql:title]心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】全国高端连锁"<a href="{pboot:sitedomain}">心理咨询机构</a>"
74 71
75 72
76 73 
     {/pboot:if}
77 74 
     {/pboot:sql}
78 75
79 
-    {pboot:sitecopyright} <a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a> <a href="{pboot:sitedomain}/index.php/sitemap.xml" target="_blank">网站地图</a> {pboot:sitestatistical}</p>
76 
+    {pboot:sitecopyright} <a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a> <a href="{pboot:sitedomain}/sitemap.xml" target="_blank">网站地图</a> {pboot:sitestatistical}</p>
80 77 
   <p style="display:none;"></p>
81 78 
 </div>
82 79 
 <!--/页脚--> 
@@ -129,11 +126,12 @@
129 126 
         {pboot:if('[sql:weixin]'=='')}
130 127 
         <img src="{pboot:companyweixin}">
131 128 
         {else}
132 
-        <img src="[sql:weixin]">
129 
+        <img src='[sql:weixin]' />
133 130 
         {/pboot:if}
134 131
135 132 
         <p class="red">扫描二维码</p>
136 133 
         <p>添加微信客服</p>
134 
+
137 135 
       </div>
138 136 
     </li>
139 137

+ 2
- 2
template/dafeult/foot_city.html 파일 보기 

@@ -28,8 +28,8 @@
28 28 
 </div>
29 29 
 <div class="footer-copy">
30 30 
   <p>
31 
-    <a href="{label:city_url}">心理咨询</a>  Copyright  ©  2019-2024
32 
-    <a href="{label:city_url}">心理医生</a>,<a href="{label:city_url}">心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】全国高端连锁"心理咨询机构"
31 
+
32 
+    <a href="{label:city_url}">心理咨询预约</a> Copyright © 2019-2024 “<a href="{label:city_url}">心理咨询预约</a> ”就上“<a href="{pboot:sitedomain}">乐达心理</a>”全国高端连锁
33 33
34 34 
     {pboot:sitecopyright} <a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a> <a href="{pboot:sitedomain}/index.php/sitemap.xml" target="_blank">网站地图</a> {pboot:sitestatistical}</p>
35 35 
   <p style="display:none;"></p>

+ 2
- 2
template/dafeult/top.html 파일 보기 

@@ -8,7 +8,7 @@
8 8 
             <a href="{pboot:sitedomain}">心理咨询</a>,<a href="{pboot:sitedomain}">心理医生</a>,<a href="{pboot:sitedomain}">心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】
9 9 
             {else}
10 10
11 
-            <a href="{pboot:httpurl}">[sql:title]心理咨询</a>,<a href="{pboot:httpurl}">[sql:title]心理医生</a>,<a href="{pboot:httpurl}">[sql:title]心理咨询中心</a>【<a href="{pboot:sitedomain}" style="color:blue;">乐达心理</a>】
11 
+            <a href="{pboot:httpurl}">[sql:title]心理咨询</a>,<a href="{pboot:httpurl}">[sql:title]心理医生</a>,<a href="{pboot:httpurl}">[sql:title]心理咨询中心</a>【<a href="{pboot:sitedomain}" style="">乐达心理</a>】
12 12
13 13
14 14 
             {/pboot:if}
 
@@ -18,7 +18,7 @@
18 18 
             {pboot:if('{$temp_cityId}'==381)}
19 19 
             找“<a href="{pboot:sitedomain}">心理咨询机构</a>”首选“<a href="{pboot:sitedomain}">乐达心理咨询</a>”效果好！专业！
20 20 
             {else}
21 
-            找“<a href="{pboot:httpurl}">[sql:title]心理咨询机构</a>”首选“<a href="{pboot:sitedomain}" style="color:blue;">乐达心理咨询</a>”效果好！专业！
21 
+            找“<a href="{pboot:httpurl}">[sql:title]心理咨询机构</a>”首选“<a href="{pboot:sitedomain}" style="">乐达心理咨询</a>”效果好！专业！
22 22 
             {/pboot:if}
23 23 
         </div>
24 24 
         {/pboot:sql}

+ 2
- 2
template/dafeult/top_city.html 파일 보기 

@@ -2,10 +2,10 @@
2 2 
 <div class="top">
3 3 
     <div class="w1200">
4 4 
         <div class="welcome">
5 
-            <a href="{label:city_url}">心理咨询预约</a>,首选【<a href="{pboot:sitedomain}" style="color:blue;">乐达心理</a>】
5 
+            <a href="{label:city_url}">心理咨询预约</a>,首选【<a href="{pboot:sitedomain}" style="">乐达心理</a>】
6 6 
         </div>
7 7 
         <div class="info">
8 
-            <a href="{label:city_url}">心理咨询预约</a>【<a href="{pboot:sitedomain}" style="color:blue;">乐达心理</a>ledaxinli.com】全国高端连锁心理咨询机构
8 
+            <a href="{label:city_url}">心理咨询预约</a>【<a href="{pboot:sitedomain}" style="">乐达心理</a>ledaxinli.com】全国高端连锁心理咨询机构
9 9 
         </div>
10 10
11 11 
     </div>

+ 0
- 7
template/dafeult/wap/city.html 파일 보기 

@@ -67,14 +67,7 @@
67 67
68 68 
 {include file=hot.html}
69 69
70 
-<div class="footer-copy-content" style="font-size: 12px;">
71 70
72 
-	友情链接：
73 
-	{pboot:sql sql="select * from ay_link where city='{$cityId}'"}
74 
-	<a href="[sql:link]" class="first-level" target="_blank" style="padding-right: 10px;"> [sql:name] </a>
75 
-	{/pboot:sql}
76 
-
77 
-</div>
78 71
79 72 
 {include file=foot_city.html}
80 73 
 </body>

+ 23
- 1
template/dafeult/wap/foot.html 파일 보기 

@@ -5,7 +5,29 @@
5 5
6 6
7 7 
   <div class="footer-copy-content">
8 
-    <p>{pboot:sitecopyright}</p>
8 
+    <p>
9 
+
10 
+
11 
+
12 
+      {pboot:sql sql="select * from ay_city where id='{$temp_cityId}'"}
13 
+      {pboot:if('{$temp_cityId}'==381)}
14 
+
15 
+      <a href="{pboot:sitedomain}">心理咨询</a>  Copyright  ©  2019-2024
16 
+      <a href="{pboot:sitedomain}">心理医生</a>,<a href="{pboot:sitedomain}">心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】全国高端连锁"<a href="{pboot:sitedomain}">心理咨询机构</a>"
17 
+
18 
+      {else}
19 
+
20 
+      <a href="{pboot:httpurl}">[sql:title]心理咨询</a>  Copyright  ©  2019-2024
21 
+      <a href="{pboot:httpurl}">[sql:title]心理医生</a>,<a href="{pboot:httpurl}">[sql:title]心理咨询中心</a>【<a href="{pboot:sitedomain}">乐达心理</a>】全国高端连锁"<a href="{pboot:sitedomain}">心理咨询机构</a>"
22 
+
23 
+
24 
+      {/pboot:if}
25 
+      {/pboot:sql}
26 
+
27 
+
28 
+      {pboot:sitecopyright}
29 
+
30 
+    </p>
9 31 
     <p><a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a> {pboot:sitestatistical}</p>
10 32 
     <p style="display:none;"></p>
11 33 
   </div>

+ 5
- 1
template/dafeult/wap/foot_city.html 파일 보기 

@@ -5,7 +5,11 @@
5 5
6 6
7 7 
   <div class="footer-copy-content">
8 
-    <p>{pboot:sitecopyright}</p>
8 
+    <p>
9 
+
10 
+      <a href="{label:city_url}">心理咨询预约</a> Copyright © 2019-2024 “<a href="{label:city_url}">心理咨询预约</a> ”就上“<a href="{pboot:sitedomain}">乐达心理</a>”全国高端连锁
11 
+
12 
+      {pboot:sitecopyright}</p>
9 13 
     <p><a href="https://beian.miit.gov.cn/" rel="nofollow" target="_blank">{pboot:siteicp}</a> {pboot:sitestatistical}</p>
10 14 
     <p style="display:none;"></p>
11 15 
   </div>

+ 0
- 9
template/dafeult/wap/index.html 파일 보기 

@@ -260,15 +260,6 @@
260 260
261 261 
 {include file=hot.html}
262 262
263 
-<div class="footer-copy-content" style="font-size: 12px;">
264 
-
265 
-   友情链接：
266 
-  {pboot:sql sql="select * from ay_link where city='{$cityId}'"}
267 
-  <a href="[sql:link]" class="first-level" target="_blank" style="padding-right: 10px;"> [sql:name] </a>
268 
-  {/pboot:sql}
269 
-
270 
-  </div>
271 
-
272 263
273 264
274 265

+ 9
- 0
template/dafeult/wap/link.html 파일 보기 

@@ -0,0 +1,9 @@
1 
+
2 
+<div class="footer-copy-content fcc" style="font-size: 12px;">
3 
+
4 
+    友情链接：
5 
+    {pboot:sql sql="select * from ay_link where city='{$cityId}'"}
6 
+    <a href="[sql:link]" class="first-level" target="_blank" style="padding-right: 10px;"> [sql:name] </a>
7 
+    {/pboot:sql}
8 
+
9 
+</div>

Write Preview
Loading…
취소
저장