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

helper/room/tpl_group_home.php

@@ -58,7 +58,7 @@ class tpl_group_home
 
             $html .= "
                 <div class=\"group_avatar\">
-                    <img src=\"{$avartar}\" alt=\"group_avatar\">
+                    <img src=\"{$avartar}\" class='g_avatar' alt=\"group_avatar\">
                 </div>
                 <div class=\"group_name\">
                     <h3>{$name}</h3>
@@ -162,7 +162,7 @@ class tpl_group_home
                 </div>
                 <div class=\"weui-cell__ft\">
                     <img src='{$avartar}' class='g_avatar' alt=''>
-                    <input type='file' name='file' multiple id='uploader' style=\"display: none;\">
+                    <input type='file' name='file' enctype='multipart/form-data' id='uploader' style=\"display: none;\">
                 </div>
             </a>
             

mobile/control/member_talk.php

@@ -12,6 +12,7 @@ require_once(BASE_ROOT_PATH . '/helper/room/proto_type.php');
 require_once(BASE_ROOT_PATH . '/helper/room/room_info.php');
 require_once(BASE_ROOT_PATH . '/helper/room/author.php');
 require_once(BASE_ROOT_PATH . '/helper/room/util.php');
+require_once(BASE_ROOT_PATH . '/helper/FileUploader.php');
 require_once(BASE_ROOT_PATH . '/helper/room/tpl_group_home.php');
 
 class member_talkControl extends mbMemberControl
@@ -498,6 +499,7 @@ class member_talkControl extends mbMemberControl
     }
 
 
+
     public function room_avatarOp()
     {
         $roomid = intval($_POST['room_id']);
@@ -509,14 +511,12 @@ class member_talkControl extends mbMemberControl
             return self::outerr(errcode::ErrUploadFileFailed);
         }
 
-
         $file_name = $info['msg'];
-        $file_path = $upload_dir . $file_name;
+        $file_path = '/data/upload/'.$upload_dir . $file_name;
         $ret = Model("room")->edit_room(['room_id' => $roomid],['avatar' => $file_path]);
 
         if ($ret) {
-            $url = UPLOAD_SITE_URL . $file_path;
-            return self::outsuccess(['avatar' => $url]);
+            return self::outsuccess(['avatar' => $file_path]);
         } else {
             return self::outerr(errcode::ErrDB);
         }

mobile/templates/default/talk/homepage.php

@@ -97,13 +97,31 @@
             $('#uploader').on('change',function(){
                 $.showLoading();
                 $.ajaxFileUpload({
-                    url : SITEURL + '/index.php?act=store_goods_add&op=image_upload',
+                    url : '/upfile.php',
                     secureuri : false,
+                    type:'post',
                     fileElementId : 'uploader',
                     dataType : 'json',
-                    data : {name : id},
-                    success : function (data, status) {
+                    data : {
+                        room_id : talk_id
+                    },
+                    success : function (res) {
+                        if(res.code != 200){
+                            $.alert(res.message);
+                        }else{
+                            var room_avatar =  res.datas.file_path;
+                            console.log(room_avatar);
+                            if(room_avatar){
+                                const update = update_room_avatar(room_avatar);
+                                if(update){
+                                    $.hideLoading();
+                                }else{
+                                    $.alert("网络错误");
+                                }
+                            }else{
 
+                            }
+                        }
                     },
                     error : function (data, status, e) {
 
@@ -112,6 +130,30 @@
             });
 
 
+
+            var update_room_avatar = function (room_avatar) {
+                $.post('/mobile/index.php?act=member_talk&op=room_avatar',
+                    {
+                        room_id:talk_id,
+                        file_path:room_avatar,
+                        client_type:'ios'
+                    },function(res){
+                        console.log(res);
+                        var result = JSON.parse(res);
+                        if(result.code != 200) {
+                            $.alert(result.message);
+                            return false;
+                        }else{
+                            console.log(result.datas.avatar);
+                            $(".g_avatar").attr("src",result.datas.avatar);
+                            $.toast('修改成功');
+                        }
+                    });
+
+                return true;
+            };
+
+
             var getTalkInfo = function () {
                 var jsonobject = {
                     action: "talk_info",