Merge remote-tracking branch 'origin/dev' into dev_lww

5 years ago · ecdfd078fc
parent ceb5502af3 58399f4c69
commit ecdfd078fc
11 changed files with 76 additions and 41 deletions
--- a/Application/Admin/Controller/FileController.class.php
+++ b/Application/Admin/Controller/FileController.class.php
@ -200,6 +200,14 @@ class FileController extends AdminController
        /* 调用文件上传组件上传文件 */
        $Picture = D('Picture');
        $pic_driver = C('PICTURE_UPLOAD_DRIVER');
+
+        if (I('icon')) {
+            if ($_FILES['file']['size'] > 51200) {
+                $return = array('status' => 1001, 'info' => '图片大小不得超过50k', 'data' => '');
+                $this->ajaxReturn($return);
+            }
+        }
+
        $info = $Picture->upload(
            $_FILES,
            C('PICTURE_UPLOAD'),
--- a/Application/Admin/Model/GameModel.class.php
+++ b/Application/Admin/Model/GameModel.class.php
@ -76,12 +76,12 @@ class GameModel extends Model{
     */
    public function detail($id,$display_site=''){
        /* 获取基础数据 */
-        $map['relation_game_id']=$id;
+        $map['relation_game_id'] = $id;
        $map['game_status'] = 1;
        $map['display_site'] = ['like','%'.$display_site.'%'];
        $info = $this->field(true)->where($map)->group('relation_game_id')->select();
-        $info= game_merge($info,$map);
-        $info=reset($info);
+        $info = game_merge($info,$map);
+        $info = reset($info);
        if(!(is_array($info) || $info['game_status']!=1)){
            $this->error = '游戏被禁用或已删除！';
            return false;
--- a/Application/Admin/View/Game/edit.html
+++ b/Application/Admin/View/Game/edit.html
@ -251,7 +251,7 @@
                                                   </div>
                                               </div>
                                           </span>
-                                <span class="notice-text">尺寸不得小于512*512px，圆角半径113px，不强制要求，可直接提供512*512方图</span>
+                                <span class="notice-text">尺寸不得小于125*125px，大小不得超过50K</span>
                            </td>
                        </tr>
                        <tr class="picbox">
@ -1678,7 +1678,8 @@
        }
    
    </script>
-     <script> 
+     <script>
+         var iconInfo = {userId:"kazaff", md5:"",icon:1};   //用户会话信息
        var uploaderImgIcon = WebUploader.create({
            // 选完文件后，是否自动上传。
            auto: true,
@ -1707,7 +1708,7 @@
            thumb:true,
            compress:false,
            prepareNextFile: true,
-            formData: function(){return $.extend(true, {}, userInfo);},
+            formData: function(){return $.extend(true, {}, iconInfo);},
            chunked:false,
            duplicate: true
        });      
@ -1789,23 +1790,31 @@
            imgListIconData.push(Number(response.id));
            setIconVal();
            console.log(response)
-            $( '#'+file.id ).find('p.state').text('已上传').fadeOut(800);
-            //alert(JSON.stringify(response));
-            $('#'+file.id).find('h4.info').append('<a href="javascript:;" class="jsdelzip table_click" style="float:none;display:inline-block;margin-left:10px;">删除</a>');
-            $('#'+file.id).find('.jsdelzip').on('click',function() {
-                uploaderImgIcon.removeFile( file.id );
-                $('#'+file.id).remove();

-                $.each(imgListIconData,function(index, item) {
-                    if (response.id == item) {
-                        imgListIconData.splice(index,1);
-                        return false;
-                    }
+                $( '#'+file.id ).find('p.state').text('已上传').fadeOut(800);
+                //alert(JSON.stringify(response));
+                $('#'+file.id).find('h4.info').append('<a href="javascript:;" class="jsdelzip table_click" style="float:none;display:inline-block;margin-left:10px;">删除</a>');
+                $('#'+file.id).find('.jsdelzip').on('click',function() {
+                    uploaderImgIcon.removeFile( file.id );
+                    $('#'+file.id).remove();
+
+                    $.each(imgListIconData,function(index, item) {
+                        if (response.id == item) {
+                            imgListIconData.splice(index,1);
+                            return false;
+                        }
+                    });
+                    setIconVal();
+
+                    return false;
                });
-                setIconVal();

-                return false;
-            });
+            if (response.status==1001) {
+                alert('图片大小不得超过50k');
+                $('#icon_thelist').children().last().remove();
+                location.reload()
+            }
+
        });
        
         function setIconVal()
--- a/Application/Admin/View/Member/device_bans_list.html
+++ b/Application/Admin/View/Member/device_bans_list.html
@ -25,6 +25,10 @@
      height:26px;line-height:26px;font-size:12px;
    }
    .select2-results__option[aria-selected] {font-size:12px;}
+    .select2-dropdown {
+        z-index: 1;
+    }
+
 </style>
    <!-- 标题栏 -->
    <div class="cf main-place top_nav_list navtab_list">
@ -98,7 +102,7 @@
                            <!-- <td><input class="ids" type="checkbox" value="{$data['id']}" name="ids"></td> -->
                            <td>{$data.id}</td>
                            <td>{$data.type_name}</td>
-                            <td>{$data.tag}</td>
+                            <td style="position: relative;width: 50%"><span style="width: 200px;word-wrap: break-word;word-break: break-all;overflow: hidden;height: 100px">{$data.tag}</span></td>
                            <td>{:get_admin_nickname($data['operator_id'])}</td>
                            <td>{$data.create_time|date='Y-m-d H:i:s',###}</td>
                            <td>
--- a/Application/Media/View/default/Article/article/detail1.html
+++ b/Application/Media/View/default/Article/article/detail1.html
@ -69,7 +69,7 @@
 			<div class="list">
 				<li class="selected">监护工程概述</li>
 				<li class="" >申请服务流程</li>
-				<li class="" >监护工程概述</li>
+				<li class="" >介绍详细说明</li>
 				<li class="" >健康提示</li>
 				<li class="" >纠纷处理</li>
 			</div>
@ -120,7 +120,7 @@
 				</div>
 				<div style="display:none;">
 					<div class="content_box">
-						<div class="headline">监护工程概述</div>
+						<div class="headline">介绍详细说明</div>
 						<p>网络游戏未成年人家长监护工程”是一项由文化部指导，义乌市其豪网络科技有限公司旨在加强家长对未成年人参与网络游戏的监护，引导未成年人健康、绿色参与网络游戏，和谐家庭关系的行业自律行动。</p>
 						<p>2010年2月5日，首批试点的六家企业共同启动“监护工程”，开始了游戏企业与未成年人家长联合共同预防未成年人沉迷网络游戏的有益尝试。实践中一些成功的案例让我们看到 “监护工程”提供了一种切实可行的方法，一种家长实施监控的管道，使家长纠正部分未成年子女沉迷网游成为可能。</p>
 						<p>“监护工程”引导家长和未成年人正确面对网络游戏文化，加强相互沟通，在共同约定和认可的时间或规则下健康游戏，既保护了未成年人不受过度沉迷的伤害，也为家长指导未成年人健康游戏提供了有力的技术保障。</p>
--- a/Application/Media/View/default/Recharge/pay.html
+++ b/Application/Media/View/default/Recharge/pay.html
@ -169,9 +169,9 @@
          </div>
          <div class="way-show">
            <div>您当前选择的是：<span>支付宝</span></div>
-            <div><a href="{:U('Service/detail',['kefu'=>'pay'])}">充值遇到问题</a> ？</div>
+            <div><a href="{:U('Service/detail',['kefu'=>'pay'])}">充值遇到问题？</a> </div>
          </div>
-          <div class="recharge-btn">账户充值</div>
+          <div class="recharge-btn" style="cursor: pointer">账户充值</div>
        </div>
      </div>
    </div>
--- a/Application/Mobile/View/Index/business.html
+++ b/Application/Mobile/View/Index/business.html
@ -15,7 +15,7 @@
        <div class="business_box">
            <div class="heard_img"><img src="__IMG__/new/lunbo2.png" alt=""></div>
            <div class="heard_title">商务合作</div>
-            <div class="heard_en">Business cooperation</div>
+            <div class="heard_en">BUSINESS COOPERATION</div>
            <div class="introduce">《海南万盟天下科技有限公司》，致力于引进和传播手机游戏，我们愿与广大开发者一同成长，将快乐分享给每一个玩家。欢迎广大开发者与工作人员联系，让您的游戏为我们平台锦上添花。</div>
            <div class="bazaar">
                <div class="title">市场合作</div>
--- a/Application/Mobile/View/Ssg/login.html
+++ b/Application/Mobile/View/Ssg/login.html
@ -366,7 +366,7 @@ var PhoneObj = {
                    alert(result.ResultMsg);
                    GetVerityCode();
                } else {
-                    if (gameId) {
+                    if (gameId>0) {
                        window.location.href = "/mobile.php?s=/Ssg/pay/game_id/"+gameId+".html"
                    } else {
                        window.location.href = "/mobile.php?s=/Ssg/index.html"
--- a/Application/Mobile/View/User/userauth.html
+++ b/Application/Mobile/View/User/userauth.html
@ -39,7 +39,7 @@
                      <div>真实姓名：{$user['real_name']}</div>
                      <div>身份证号：{$user['idcard']}</div>
                  </div>
-                  <div class="save back">返回个人中心</div>
+                  <div class="save back">返回设置中心</div>
              </div>

          </if>
--- a/Public/Media/css/supervise.css
+++ b/Public/Media/css/supervise.css
@ -54,6 +54,10 @@
    background-color: #00A3E1;
    color: #fff;
 }
+
+.service_left .list li:hover{
+    cursor:pointer;
+}
 .service_left .content{
    width: 100%;
    height: 400px;
--- a/Public/Mobile/js/home.js
+++ b/Public/Mobile/js/home.js
@ -1,17 +1,27 @@
 $(function(){
    var img = $(".swiper-container .swiper-slide").length;
-    var swiper = new Swiper('.swiper-container', {
-        loop: true,
-        pagination: {
-        el: '.swiper-pagination',
-        clickable: true,
-        },
-        /*autoplay: {
-            delay: 3000,
-            stopOnLastSlide: false,
-            disableOnInteraction: false,
-        },*/
-        autoplay: img > 1,
-  });
+
+    if(img<=1){
+        var swiper = new Swiper('.swiper-container', {
+            loop: true,
+            autoplay: img > 1,
+            pagination: {
+                el: '.swiper-pagination',
+                clickable: true,
+            },
+        });
+    }else{
+        var swiper = new Swiper('.swiper-container', {
+            loop: true,
+            pagination: {
+                el: '.swiper-pagination',
+                clickable: true,
+            },
+            autoplay: {
+                stopOnLastSlide: false,
+                disableOnInteraction: false,
+            },
+        });
+    }
  
 });