Browse Source

细节优化

齐博 3 years ago
parent
commit
23cea28e8b

+ 4 - 4
application/admin/controller/Upgrade.php

@@ -258,9 +258,9 @@ class Upgrade extends AdminBase
         foreach($array AS $rs){
             $showfile = $this->format_filename($rs['file']);
             $file = ROOT_PATH.$showfile;
-            // 	        if(is_file($file.'.lock')){
-            // 	            continue;          //用户不想升级的文件
-            // 	        }
+            if (is_file($file.'.lock') && file_get_contents($file.'.lock')=='hide') {
+                continue;   //用户不想升级的文件,也不想提示升级
+            }
             $ispic = false;
             $change = false;
             $md5_size = '';
@@ -279,7 +279,7 @@ class Upgrade extends AdminBase
                     //}
                 }
             }
-            if($change){
+            if($change){                
                 $data[]=[
                     'file'=>$rs['file'],
                     'showfile'=>$showfile,

BIN
public/static/model_style/default/image.jpg


+ 1 - 19
template/member_style/default/member/index/index.htm

@@ -196,25 +196,7 @@
 
 {/if}<!--默认菜单结束标签-->
 
-		<div class="bui-panel panel-usercenter">
-            <div class="bui-panel-head bui-box-align-middle">
-                <i class="icon-money">&#xe63a;</i>
-                <div class="span1">虚拟财富</div>
-                <div class="panel-head-right a" href="{:purl('marketing/money/index')}">兑换互换<i class="icon-listright"></i></div>
-            </div>
-            <div class="bui-panel-main">
-                <ul class="bui-nav nav-list">
-{volist name=":jf_name()" id="name"}
-                    <li class="bui-btn bui-box-vertical">
-                        <span>{:get_user_money($key,$info.uid)}</span>
-                        <div class="span1">{$name}</div>
-                    </li>
-{/volist}
-                </ul>
-            </div>
-        </div>
-
-		{qb:hy name="wap_memberindex002" val="datas" type="labelmodel"  where="member_style/default/member/index/wapmodel/loginout"}
+		{qb:hy name="wap_memberindex002" val="datas" type="labelmodel"  where="member_style/default/member/index/wapmodel/alljifen,loginout"}
 		{$datas} 
 		{/qb:hy}        
     </main>

+ 18 - 0
template/member_style/default/member/index/wapmodel/alljifen.htm

@@ -0,0 +1,18 @@
+<!--虚拟财富列表-->
+		<div class="bui-panel panel-usercenter">
+            <div class="bui-panel-head bui-box-align-middle">
+                <i class="icon-money">&#xe63a;</i>
+                <div class="span1">虚拟财富</div>
+                <div class="panel-head-right a" href="{:purl('marketing/money/index')}">兑换互换<i class="icon-listright"></i></div>
+            </div>
+            <div class="bui-panel-main">
+                <ul class="bui-nav nav-list">
+{volist name=":jf_name()" id="name"}
+                    <li class="bui-btn bui-box-vertical">
+                        <span>{:get_user_money($key,$info.uid)}</span>
+                        <div class="span1">{$name}</div>
+                    </li>
+{/volist}
+                </ul>
+            </div>
+        </div>

+ 1 - 1
template/model_style/default/image.htm

@@ -1,4 +1,4 @@
 {qb:hy name="labelmodel_image" type="image"}
-<!--<img style="width:100%;" src="/public/static/images/3.jpg">-->
+<!--<img style="width:100%;" src="https://down.php168.com/other/bannerad.jpg">-->
 <a href="{$url}"><img style="width:100%;" src="{$picurl|tempdir}"></a>
 {/qb:hy}

+ 1 - 1
template/model_style/default/image.php

@@ -1,7 +1,7 @@
 <?php
 
 return [    
-    'title'=>'单张图片',
+    'title'=>'广告图片',
 	'type1'=>'', //wap 或 pc
 	'type2'=>'', //www 或 hy 
 	'type3'=>'', //这一项是为PC考虑的,WAP不需要考虑,可设置big small 或留空. big代表很宽的 small代表窄边