Merge branch 'bonus_rate' of 121.43.114.153:/home/git/repositories/shopnc into bonus_rate

data/resource/mobile/talk/js/certs.js

@@ -100,54 +100,76 @@ $(function () {
 
     var inputVerify = new InputVerify();
 
+    var jsBridge = new Bridge();
 
+    //选择凭证
+    $('#uploader').on('click', function (){
+        var jsonobject = {
+            action: "select_photo",
+            params: {
+                isCrop: true
+            }
+        };
 
-
-
-    var ajaxFileUpload = function () {
-        $.showLoading();
-        $.ajaxFileUpload({
-            url: '/upfile.php',
-            secureuri: false,
-            type: 'post',
-            fileElementId: 'uploader',
-            dataType: 'json',
-            data: {
-                room_id: talk_id
-            },
-            success: function (res) {
-                if (res.code != 200) {
-                    $.hideLoading();
-                    $.alert(res.message);
-                } else {
-                    $.hideLoading();
-                    var cimage = res.datas.file_path;
-                    var upload_bg = res.datas.file_site_path;
-                    console.log(cimage);
-                    if (cimage) {
-                        $(".uploader_bg").css({"background-image":"url("+upload_bg+")","background-size":"100% 100%"});
-                        $(".line1").remove();
-                        $('.line2').remove();
-                        $("input[name='file_path']").val(cimage);
-                    } else {
-                        $.alert("网络错误");
-                    }
-                }
-            },
-            error: function (data, status, e) {
-
+        jsBridge.call_native_handler('on_native_click', JSON.stringify(jsonobject), function (res) {
+            var room_avatar =  res;
+            if(room_avatar) {
+                $(".uploader_bg").css({"background-image":"url('"+room_avatar+"')","background-size":"100% 100%"});
+                $(".line1").remove();
+                $('.line2').remove();
+                $("input[name='file_path']").val(room_avatar);
+            } else {
+                return false;
             }
         });
-        $('#uploader').on('change', function () {
-            ajaxFileUpload();
-        });
-    };
-
-    $('#uploader').on('change', function () {
-        ajaxFileUpload();
+        return false;
     });
 
 
+    // var ajaxFileUpload = function () {
+    //     $.showLoading();
+    //     $.ajaxFileUpload({
+    //         url: '/upfile.php',
+    //         secureuri: false,
+    //         type: 'post',
+    //         fileElementId: 'uploader',
+    //         dataType: 'json',
+    //         data: {
+    //             room_id: talk_id
+    //         },
+    //         success: function (res) {
+    //             if (res.code != 200) {
+    //                 $.hideLoading();
+    //                 $.alert(res.message);
+    //             } else {
+    //                 $.hideLoading();
+    //                 var cimage = res.datas.file_path;
+    //                 var upload_bg = res.datas.file_site_path;
+    //                 console.log(cimage);
+    //                 if (cimage) {
+    //                     $(".uploader_bg").css({"background-image":"url("+upload_bg+")","background-size":"100% 100%"});
+    //                     $(".line1").remove();
+    //                     $('.line2').remove();
+    //                     $("input[name='file_path']").val(cimage);
+    //                 } else {
+    //                     $.alert("网络错误");
+    //                 }
+    //             }
+    //         },
+    //         error: function (data, status, e) {
+    //
+    //         }
+    //     });
+    //     $('#uploader').on('change', function () {
+    //         ajaxFileUpload();
+    //     });
+    // };
+    //
+    // $('#uploader').on('change', function () {
+    //     ajaxFileUpload();
+    // });
+
+
     $('.get_code').on('click',function()
     {
         var text = $(".get_code").text();

mobile/control/control.php

@@ -331,9 +331,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018092602";
+    return "v=2018092910";
 }
 function shop_version()
 {
-    return "v=2018092602";
+    return "v=2018092910";
 }

mobile/control/member_talk.php

@@ -1000,11 +1000,12 @@ class member_talkControl extends mbMemberControl
         $cname = trim($_POST['cname']);
         $cinfo = trim($_POST['cinfo']);
 
-        $cimage = $this->upload_cimage();
-        if($cimage === false){
-            return self::outerr(errcode::ErrUploadFileFailed);
-        }
+//        $cimage = $this->upload_cimage();
+//        if($cimage === false){
+//            return self::outerr(errcode::ErrUploadFileFailed);
+//        }
 
+        $cimage = trim($_POST['file_path']);
         $mod_room = Model('room');
         $item = $mod_room->findCert(["room_id"=>$room_id]);
         if(empty($item))
@@ -1188,7 +1189,7 @@ class member_talkControl extends mbMemberControl
 
                 if(isset($items[$k]['room_id']) && $items[$k]['room_id']>0)
                 {
-                    $params = $mod_room->getRoom($items[$k]['room_id']);
+                    $params = $mod_room->getroom($items[$k]['room_id']);
                     $rinfo = new room\room_info($params);
                     $items[$k]['avatar'] = $rinfo->avatar();
                 }

mobile/templates/default/talk/enterprise_certs.php

@@ -43,11 +43,10 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd uploader">
-                    <div class="uploader_bg" onclick='uploader.click()'>
+                    <div class="uploader_bg" id='uploader'>
                         <span class="line1"></span>
                         <span class="line2"></span>
                     </div>
-                    <input type='file' data-label="管理员身份证明" name='file' enctype='multipart/form-data' id='uploader' style="display: none;">
                     <?php if(!empty($output['cert']['cimage'])){
                         echo '<p class="uploader_tip">请重新上传</p>';
                     }else{
@@ -126,6 +125,8 @@
 <script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/fastclick.js?<?php echo bonus_version(); ?>"></script>
 <script src="https://cdn.bootcss.com/jquery-weui/1.2.0/js/jquery-weui.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/ajaxfileupload/ajaxfileupload.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript"
+        src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/new_bridge.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/js/certs.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript">
     $(function(){

mobile/templates/default/talk/homepage_room.php

@@ -185,8 +185,6 @@
 
             //上传头像 app 上传
             $('#edit_group_avatar').on('click', function (){
-                // alert("使用app桥接上传");
-                $.showLoading();
                 var jsonobject = {
                     action: "select_photo",
                     params: {
@@ -195,8 +193,6 @@
                 };
 
                 jsBridge.call_native_handler('on_native_click', JSON.stringify(jsonobject), function (res) {
-                    $.hideLoading()
-                    // alert(res);
                     var room_avatar =  res;
                     if(room_avatar) {
                         $.showLoading();
@@ -206,7 +202,6 @@
                                 file_path: room_avatar,
                                 client_type: 'ajax'
                             }, function (res) {
-                                $.hideLoading();
                                 var result = JSON.parse(res);
                                 if (result.code != 200) {
                                     $.alert(result.message);
@@ -219,6 +214,7 @@
                     } else {
                         return false;
                     }
+
                 });
 
                 return false;
@@ -721,12 +717,20 @@
                     actions: [{
                         text: "企业认证",
                         onClick: function() {
-                            window.location.href="/mobile/index.php?act=member_talk&op=room_certificate&ctype=2&talk_id="+talk_id;
+                            $('.weui-actionsheet__action .weui-actionsheet__cell').click();
+                            setTimeout(function () {
+                                window.location.href="/mobile/index.php?act=member_talk&op=room_certificate&ctype=2&talk_id="+talk_id;
+                            },0)
+
                         }
                     },{
                         text: "校园认证",
                         onClick: function() {
-                            window.location.href="/mobile/index.php?act=member_talk&op=room_certificate&ctype=1&talk_id="+talk_id;
+                            $('.weui-actionsheet__action .weui-actionsheet__cell').click();
+                            setTimeout(function () {
+                                window.location.href="/mobile/index.php?act=member_talk&op=room_certificate&ctype=1&talk_id="+talk_id;
+                            },0)
+
                         }
                     }]
                 });

mobile/templates/default/talk/school_certs.php

@@ -43,11 +43,10 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd uploader">
-                    <div class="uploader_bg" onclick='uploader.click()'>
+                    <div class="uploader_bg" id='uploader'>
                         <span class="line1"></span>
                         <span class="line2"></span>
                     </div>
-                    <input type='file' data-label="管理员身份证明" name='file' enctype='multipart/form-data' id='uploader' style="display: none;">
                     <?php if(!empty($output['cert']['cimage'])){
                         echo '<p class="uploader_tip">请重新上传</p>';
                     }else{
@@ -120,6 +119,8 @@
 <script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/fastclick.js?<?php echo bonus_version(); ?>"></script>
 <script src="https://cdn.bootcss.com/jquery-weui/1.2.0/js/jquery-weui.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/ajaxfileupload/ajaxfileupload.js?<?php echo bonus_version(); ?>"></script>
+<script type="text/javascript"
+        src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/new_bridge.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/js/certs.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript">
     $(function(){