commit

app/admin/view/index/index.php

@@ -149,10 +149,10 @@
             <iframe class="J_iframe" name="iframe_crmeb_main" width="100%" height="100%" src="{:Url('Index/main')}" frameborder="0" data-id="{:Url('Index/main')}" seamless></iframe>
         </div>
         <!--底部版权-->
-        <div class="footer"  @touchmove.prevent>
-            <div class="pull-right">© 2017-2020 <a href="http://www.crmeb.com/" target="_blank">CRMEB</a>
-            </div>
-        </div>
+<!--        <div class="footer"  @touchmove.prevent>-->
+<!--            <div class="pull-right">© 2017-2020 <a href="http://www.crmeb.com/" target="_blank">CRMEB</a>-->
+<!--            </div>-->
+<!--        </div>-->
     </div>
     <!--右侧部分结束-->
     <!--右侧边栏开始-->

app/admin/view/login/index.php

@@ -21,7 +21,7 @@
 <div class="middle-box text-center loginscreen  animated fadeInDown">
     <div class="login-group">
         <h3 class="login-logo">
-            <img src="{__ADMIN_PATH}images/logo.png">
+<!--            <img src="{__ADMIN_PATH}images/logo.png">-->
         </h3>
         <form role="form" action="{:url('verify')}" method="post" id="form" onsubmit="return false">
             <div class="form-group">

app/admin/view/store/store_product/create.php

@@ -848,7 +848,7 @@
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">热卖单品</label>
+                                                <label class="layui-form-label">猜你喜欢</label>
                                                 <div class="layui-input-block">
                                                     <input type="radio" name="is_hot" lay-filter="is_hot" value="1"
                                                            title="开启"
@@ -860,25 +860,25 @@
                                             </div>
                                         </div>
                                     </div>
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">促销单品</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_benefit" lay-filter="is_benefit"-->
+<!--                                                           value="1" title="开启"-->
+<!--                                                           :checked="formData.is_benefit == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_benefit" lay-filter="is_benefit"-->
+<!--                                                           value="0" title="关闭"-->
+<!--                                                           :checked="formData.is_benefit == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">促销单品</label>
-                                                <div class="layui-input-block">
-                                                    <input type="radio" name="is_benefit" lay-filter="is_benefit"
-                                                           value="1" title="开启"
-                                                           :checked="formData.is_benefit == 1 ? true : false">
-                                                    <input type="radio" name="is_benefit" lay-filter="is_benefit"
-                                                           value="0" title="关闭"
-                                                           :checked="formData.is_benefit == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">精品推荐</label>
+                                                <label class="layui-form-label">热销推荐</label>
                                                 <div class="layui-input-block">
                                                     <input type="radio" name="is_best" lay-filter="is_best" value="1"
                                                            title="开启"
@@ -890,36 +890,36 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">首发新品</label>
-                                                <div class="layui-input-block">
-                                                    <input type="radio" name="is_new" lay-filter="is_new" value="1"
-                                                           title="开启"
-                                                           :checked="formData.is_new == 1 ? true : false">
-                                                    <input type="radio" name="is_new" lay-filter="is_new" value="0"
-                                                           title="关闭"
-                                                           :checked="formData.is_new == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">优品推荐</label>
-                                                <div class="layui-input-block">
-                                                    <input type="radio" name="is_good" lay-filter="is_good" value="1"
-                                                           title="开启"
-                                                           :checked="formData.is_good == 1 ? true : false">
-                                                    <input type="radio" name="is_good" lay-filter="is_good" value="0"
-                                                           title="关闭"
-                                                           :checked="formData.is_good == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">首发新品</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_new" lay-filter="is_new" value="1"-->
+<!--                                                           title="开启"-->
+<!--                                                           :checked="formData.is_new == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_new" lay-filter="is_new" value="0"-->
+<!--                                                           title="关闭"-->
+<!--                                                           :checked="formData.is_new == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">优品推荐</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_good" lay-filter="is_good" value="1"-->
+<!--                                                           title="开启"-->
+<!--                                                           :checked="formData.is_good == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_good" lay-filter="is_good" value="0"-->
+<!--                                                           title="关闭"-->
+<!--                                                           :checked="formData.is_good == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                     <div class="layui-row layui-col-space15">
                                         <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
                                             <div class="grid-demo grid-demo-bg1">

app/api/controller/user/UserController.php

@@ -60,6 +60,7 @@ class UserController
         $info['commissionCount'] = bcsub($info['brokerage_price'], $info['broken_commission'], 2);
         if ($info['commissionCount'] < 0)
             $info['commissionCount'] = 0;
+        $info['level_name'] = $info['level'] == 1? '白银会员': $info['level'] == 2? '黄金会员' : $info['level'] == 3 ? '钻石会员' : '粉丝';
         return app('json')->success($info);
     }
 

app/models/user/User.php

@@ -849,8 +849,8 @@ class User extends BaseModel
 
             }
             if ($product['id'] == 1){
-                $divide = ($product['price'] * 0.1)/$silver; // 200礼包的百分之十白银会员平分
-                $diamonds_divide = ($product['price'] * 0.03)/$diamonds;//钻石会员200礼包的百分之3
+                $divide = $silver == 0 ? 0 :($product['price'] * 0.1)/$silver; // 200礼包的百分之十白银会员平分
+                $diamonds_divide = $silver == 0 ? 0:($product['price'] * 0.03)/$diamonds;//钻石会员200礼包的百分之3
                 if ($silver_user){
                     foreach ($silver_user as &$value){
                         if ($value['brokerage_price']+$divide > 200){
@@ -874,7 +874,7 @@ class User extends BaseModel
                 }
             }elseif ($product['id'] == 2){
                 //1991礼包 白银会员和黄金会员分百分之十的金额
-                $divide = ($product['price'] * 0.1)/($silver+$gold);
+                $divide = $silver+$gold == 0? 0 : ($product['price'] * 0.1)/($silver+$gold);
                 $user = array_merge($silver_user, $gold_user);
 
                 $top_user  = getParent($order['uid']); // 获取到上级所有钻石用户