huangdong 6 年之前
父节点
当前提交
85d3917db8

+ 2 - 1
data/resource/mobile/talk/css/share_bonus.css

@@ -70,6 +70,7 @@
     box-sizing: border-box;
 }
 .rules{
+    padding-top: 3px;
     flex: 1;
 }
 
@@ -82,7 +83,7 @@
 }
 .rules a {
     color: #ffffff;
-    font-size: 11px;
+    font-size: 14px;
     text-decoration: underline;
 }
 .certification_logo {

+ 2 - 2
mobile/control/control.php

@@ -325,9 +325,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018091402";
+    return "v=2018091901";
 }
 function shop_version()
 {
-    return "v=2018091401";
+    return "v=2018091901";
 }

+ 25 - 30
mobile/templates/default/talk/homepage_room.php

@@ -145,7 +145,7 @@
                 $('html').css({"min-height":"100%",background:"#ffffff"})
             }
 
-            //上传头像 js 上传
+            //上传头像 js 上传 若开启使用 需开启 tpl_group_home 中触发
             // var ajaxFileUpload = function () {
             //     $.showLoading();
             //     $.ajaxFileUpload({
@@ -191,31 +191,31 @@
             // });
             //
             //
-            var update_room_avatar = function (room_avatar) {
-                $.post('/mobile/index.php?act=member_talk&op=change_room_avatar',
-                    {
-                        room_id: talk_id,
-                        file_path: room_avatar,
-                        client_type: 'ajax'
-                    }, 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('修改成功',1000);
-                        }
-                    });
-
-                return true;
-            };
+            // var update_room_avatar = function (room_avatar) {
+            //     $.post('/mobile/index.php?act=member_talk&op=change_room_avatar',
+            //         {
+            //             room_id: talk_id,
+            //             file_path: room_avatar,
+            //             client_type: 'ajax'
+            //         }, 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('修改成功',1000);
+            //             }
+            //         });
+            //
+            //     return true;
+            // };
 
             //上传头像 app 上传
             $('#edit_group_avatar').on('click', function (){
-                alert("使用app桥接上传");
+                // alert("使用app桥接上传");
                 $.showLoading();
                 var jsonobject = {
                     action: "select_photo",
@@ -225,9 +225,8 @@
                 };
 
                 jsBridge.call_native_handler('on_native_click', JSON.stringify(jsonobject), function (res) {
-                    $.hideLoading();
-                    // var datas = JSON.parse(res);
-                    alert(res);
+                    $.hideLoading()
+                    // alert(res);
                     var room_avatar =  res;
                     if(room_avatar) {
                         $.showLoading();
@@ -238,13 +237,11 @@
                                 client_type: 'ajax'
                             }, function (res) {
                                 $.hideLoading();
-                                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('修改成功',1000);
                                 }
@@ -257,8 +254,6 @@
                 return false;
             });
 
-
-
             var getTalkInfo = function () {
                 var jsonobject = {
                     action: "talk_info",

+ 0 - 1
mobile/templates/default/talk/share_bonus.php

@@ -54,7 +54,6 @@
                             </div>
                             <div class=\"member_content\">
                                 <p class=\"name\">$name</p>
-                                <p class=\"state\">【".$operate."】</p>
                             </div>";
                 if(empty($state)) {
                     echo    "<div class=\"bonus letter_warn\">