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

admin/templates/default/room_cert.view.php

@@ -133,7 +133,7 @@
                           <?php switch ($output['cert_info']['cstatus']){
                               case 1:echo "通过";break;
                               case 2:echo "拒绝";break;
-                              case 2:echo "撤销";break;
+                              case 3:echo "撤销";break;
                               default:"待审核";
                           }
                           ?>
@@ -149,6 +149,35 @@
                       <li style="width: 80%;">
                           <strong>理由:</strong><?php echo $output['cert_info']['remark'];?>
                       </li>
+
+                      <?php if($output['cert_info']['cstatus'] == 1) { ?>
+                          <form id="submit-form" method="post" action="index.php">
+                              <input type="hidden" name="act" value="room_manage">
+                              <input type="hidden" name="op" value="edit_certs">
+                              <input type="hidden" name="cert_id" value="<?php echo $output['cert_info']['cert_id']; ?>">
+                              <li style="width: 100%;">
+                              </li>
+                              <li style="width: 100%;">
+                              </li>
+                              <li style="width: 100%;">
+                                  <strong>操作:</strong>
+                              </li>
+                              <li style="width: 100%;">
+                                  <strong>撤销原因:</strong>
+                              </li>
+                              <li style="width: 100%;">
+                              </li>
+                              <li style="width: 100%;">
+                                  <textarea cols="100" rows="5" name="remark"></textarea>
+                              </li>
+                              <li style="width: 100%">
+                                  <a href="Javascript:void(0);" class="btn formsubmit" data-val="3"><span>撤销</span></a>
+                              </li>
+                              <li style="width: 100%;">
+                                  <input type="hidden" id="cstatus" name="cstatus">
+                              </li>
+                          </form>
+                      <?php }  ?>
                   </ul>
               </td>
           </tr>

data/resource/mobile/talk/css/homepage.css

@@ -493,11 +493,11 @@ html,body {
 }
 .fixed_bottom a {
     display: block;
-    width: 60px;
-    height: 24px;
-    line-height: 25px;
+    width: 68px;
+    height: 30px;
+    line-height: 30px;
     text-align: center;
-    font-size: 12px;
+    font-size: 14px;
     background: #FE4F4C;
     color: #fff;
     border-radius: 5px;

helper/room/tpl_group_home.php

@@ -223,13 +223,13 @@ class tpl_group_home
             }
 
             if (isset($this->participants[$this->cur_user])) {
-                $html .= "<div class=\"weui-flex__item\">
+                $html .= "<div class=\"weui-flex__item app_inshow\">
                         <img src=\"" . RESOURCE_SITE_URL . "/mobile/talk/images/add_member.png\" id=\"add_member\" alt=\"\">
                       </div>";
             }
 
             if ($this->isManager($this->cur_user)) {
-                $html .= "<div class=\"weui-flex__item\">
+                $html .= "<div class=\"weui-flex__item app_inshow\">
                         <img src=\"" . RESOURCE_SITE_URL . "/mobile/talk/images/del_member.png\" id=\"del_member\" alt=\"\">
                       </div>";
             }
@@ -406,7 +406,8 @@ class tpl_group_home
     }
 
     private function room_avatar_btn($avartar){
-        $html = "<div class=\"weui-cell weui-cell_access\" id=\"edit_group_avatar\" onclick='return false;uploader.click();'>
+        if($this->room_info->level() > 0 && !$this->isManager($this->cur_user)) {
+            $html = "<div class=\"weui-cell\">
                         <div class=\"weui-cell__bd\">
                             <p>群头像</p>
                         </div>
@@ -415,6 +416,17 @@ class tpl_group_home
                             <input type='file' name='file' enctype='multipart/form-data' id='uploader' style=\"display: none;\">
                         </div>
                 </div>";
+        }else{
+            $html = "<div class=\"weui-cell weui-cell_access app_inshow\" id=\"edit_group_avatar\" onclick='return false;uploader.click();'>
+                        <div class=\"weui-cell__bd\">
+                            <p>群头像</p>
+                        </div>
+                        <div class=\"weui-cell__ft\">
+                            <img src='{$avartar}' class='g_avatar n_g_avatar' alt=''>
+                            <input type='file' name='file' enctype='multipart/form-data' id='uploader' style=\"display: none;\">
+                        </div>
+                </div>";
+        }
         return $html;
     }
 
@@ -562,7 +574,7 @@ class tpl_group_home
                 }
             }
 
-            $html .="<div class=\"weui-cell weui-cell_switch\" href=\"javascript:;\">
+            $html .="<div class=\"weui-cell weui-cell_switch app_inshow\" href=\"javascript:;\">
                         <div class=\"weui-cell__bd\">
                             <p>置顶聊天</p>
                         </div>
@@ -573,7 +585,7 @@ class tpl_group_home
                             </label>
                         </div>
                     </div>
-                    <div class=\"weui-cell weui-cell_switch\" href=\"javascript:;\">
+                    <div class=\"weui-cell weui-cell_switch app_inshow\" href=\"javascript:;\">
                         <div class=\"weui-cell__bd\">
                                 <p>消息免打扰</p>
                         </div>
@@ -589,7 +601,7 @@ class tpl_group_home
 
         if(isset($this->participants[$this->cur_user]))
         {
-              $html.="<div class=\"weui-cells\">
+              $html.="<div class=\"weui-cells app_inshow\">
                         <a class=\"weui-cell weui-cell_access\" href=\"javascript:;\" id=\"hide_msg\">
                             <div class=\"weui-cell__bd\">
                                 <p>清空聊天记录</p>

mobile/control/control.php

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

mobile/control/member_talk.php

@@ -1009,6 +1009,12 @@ class member_talkControl extends mbMemberControl
 
         $cimage = trim($_POST['file_path']);
         $mod_room = Model('room');
+
+        $same_name = $mod_room->findCert(["short_name"=>$short_name,"cstatus"=>1]);
+        if(!empty($same_name)) {
+            return self::outerr(errcode::ErrTalk,"{$short_name}已被认证，请换一个新的认证名称");
+        }
+
         $item = $mod_room->findCert(["room_id"=>$room_id]);
         if(empty($item))
         {

mobile/templates/default/member/index.php

@@ -84,15 +84,16 @@
         }
         .fixed_bottom a {
             display: block;
-            width: 60px;
-            height: 24px;
-            line-height: 25px;
+            width: 68px;
+            height: 30px;
+            line-height: 30px;
             text-align: center;
-            font-size: 12px;
+            font-size: 14px;
             background: #FE4F4C;
             color: #fff;
             border-radius: 5px;
             margin-right: 14px;
+        }
     </style>
 </head>
 <body>
@@ -279,7 +280,7 @@
         <?php if(session_helper::isapp()) { ?>
             var jsBridge = new Bridge();
         <?php } else { ?>
-            $('body').css('padding-bottom','60px');
+            // $('body').css('padding-bottom','60px');
         <?php }?>
 
         $('#send').on('click',function()

mobile/templates/default/talk/enterprise_certs.php

@@ -15,7 +15,7 @@
 
 <div class="weui-cells weui-cells_form">
     <form action="/mobile/index.php?act=member_talk&op=commit_certs" method="post">
-        <div class="weui-cells__title">*用户名称</div>
+        <div class="weui-cells__title">*用户名称（认证后的群名）</div>
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
@@ -23,7 +23,7 @@
                 </div>
             </div>
         </div>
-        <div class="weui-cells__title">*企业名称</div>
+        <div class="weui-cells__title">*企业名称(认证后的群描述)</div>
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">

mobile/templates/default/talk/homepage_room.php

@@ -115,7 +115,8 @@
             if(is_app) {
                 var jsBridge = new Bridge();
             }else{
-                $('body').css('padding-bottom','60px');
+                $('html').css('padding-bottom','60px');
+                $('.app_inshow').hide();
             }
 
             var checkLogin = function () {
@@ -559,16 +560,20 @@
 
                             $.hideLoading();
                             $.toast('退出成功',1000);
-                            var jsonobject = {
-                                action: "talk_quit",
-                                params: {
-                                    talk_id: talk_id,
-                                    talk_type: talk_type
-                                }
-                            };
-                            jsBridge.call_native_handler('on_native_click', JSON.stringify(jsonobject),function(){
-                                $.hideLoading();
-                            });
+                            if(is_app) {
+                                var jsonobject = {
+                                    action: "talk_quit",
+                                    params: {
+                                        talk_id: talk_id,
+                                        talk_type: talk_type
+                                    }
+                                };
+                                jsBridge.call_native_handler('on_native_click', JSON.stringify(jsonobject),function(){
+                                    $.hideLoading();
+                                });
+                            } else {
+                                WeixinJSBridge.call('closeWindow');
+                            }
                         });
                     },
                     onCancel: function () {

mobile/templates/default/talk/school_certs.php

@@ -15,7 +15,7 @@
 
 <div class="weui-cells weui-cells_form">
     <form action="/mobile/index.php?act=member_talk&op=commit_certs" method="post">
-        <div class="weui-cells__title">*用户名称</div>
+        <div class="weui-cells__title">*用户名称（认证后的群名）</div>
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
@@ -23,7 +23,7 @@
                 </div>
             </div>
         </div>
-        <div class="weui-cells__title">*机构全称</div>
+        <div class="weui-cells__title">*机构全称(认证后的群描述)</div>
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">