commit

app/admin/controller/Index.php

@@ -31,6 +31,7 @@ class Index extends AuthController
             'role_name' => SystemRole::where('id', $roles[0])->field('role_name')->find(),
             'workermanPort' => Config::get('workerman.admin.port')
         ]);
+        $this->assign('roles', $adminInfo['roles']);
         return $this->fetch();
     }
 

app/admin/view/index/index.php

@@ -145,9 +145,15 @@
             </div>
         </div>
         <!--内容展示模块-->
+        {if ($roles == 1)}
         <div class="row J_mainContent" id="content-main">
             <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>
+        {else}
+        <div class="row J_mainContent" id="content-main">
+            <iframe class="J_iframe" name="iframe_crmeb_main" width="100%" height="100%" src="" frameborder="0" data-id="{:Url('Index/main')}" seamless></iframe>
+        </div>
+        {/if}
         <!--底部版权-->
 <!--        <div class="footer"  @touchmove.prevent>-->
 <!--            <div class="pull-right">© 2017-2020 <a href="http://www.crmeb.com/" target="_blank">CRMEB</a>-->

app/admin/view/user/user/see.php

@@ -84,7 +84,7 @@
                     <div class="layui-tab layui-tab-card">
                         <ul class="layui-tab-title">
                             <li class="layui-this">消费能力</li>
-                            <li>积分明细</li>
+                            <li>阳光明细</li>
                             <li>签到记录</li>
                             <li>持有优惠劵</li>
                             <li>余额变动记录</li>

app/models/many/Many.php

@@ -84,9 +84,9 @@ class Many extends BaseModel
                             UserBill::income('种树失败返还肥料', $value['uid'], 'white_integral', 'sbfh_white_integral', $value['frozen'], 0, $user['white_integral'], '种树失败返还' . $item['name'] . '-第' . $value['stage'] . '期肥料');
                         }else{
                             $user = User::where('uid', $value['uid'])->find();
-                            $user['white_integral'] += $value['price'];// 返还
+                            $user['white_integral'] += $value['price'] * 1.01;// 返还
                             $user->save();
-                            UserBill::income('种树失败返还肥料', $value['uid'], 'white_integral', 'sbfh_white_integral', $value['price'], 0, $user['white_integral'], '种树失败返还' . $item['name'] . '-第' . $value['stage'] . '期肥料');
+                            UserBill::income('种树失败返还肥料', $value['uid'], 'white_integral', 'sbfh_white_integral', $value['price'] * 1.01, 0, $user['white_integral'], '种树失败返还' . $item['name'] . '-第' . $value['stage'] . '期肥料');
                         }
 
                     }