隐藏积分

common/models/ShopGoods.php

@@ -143,9 +143,9 @@ class ShopGoods extends \common\components\ActiveRecord
             'cash'=>[
                 'name'=>'余额支付'
             ],
-            'point'=>[
-                'name'=>'积分支付'
-            ],
+            // 'point'=>[
+            //     'name'=>'积分支付'
+            // ],
         ];
     }
 

frontendApi/config/menu.php

@@ -50,18 +50,18 @@ return [
             //['name'=>'报单管理', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec', 'routePath'=>'user/dec', 'show'=>1,'allow'=>'declarer',],
         ]
     ],
-    'atlas'=>[
-        'name'=>'网络图谱',
-        'class' => '',
-        'icon'=>'el-icon-data-line',
-        'controller'=>'atlas',
-        'action'=>'',
-        'routePath'=>'atlas',
-        'show'=>1,
-        'child'=>[
-            ['name'=>'安置网络图', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>1,],
-        ]
-    ],
+    // 'atlas'=>[
+    //     'name'=>'网络图谱',
+    //     'class' => '',
+    //     'icon'=>'el-icon-data-line',
+    //     'controller'=>'atlas',
+    //     'action'=>'',
+    //     'routePath'=>'atlas',
+    //     'show'=>1,
+    //     'child'=>[
+    //         ['name'=>'安置网络图', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>1,],
+    //     ]
+    // ],
     'bonus'=>[
         'name'=>'奖金管理',
         'class' => '',

frontendApi/modules/v1/controllers/BonusController.php

@@ -208,12 +208,13 @@ class BonusController extends BaseController {
      */
     private function _periodBonus($periodNum) {
         $period = Period::instance();
-        $yearMonth = $period->getYearMonth($periodNum);
+        $yearMonth = $period->getYearMonth($periodNum); // 返回类似202110
         if(!$calcBonus = CalcBonus::find()->yearMonth($yearMonth)->where('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM',[':USER_ID'=>\Yii::$app->user->id,':PERIOD_NUM'=>$periodNum])->asArray()->one()){
             return [
 
             ];
         }
+        //$t = CalcBonus::find()->yearMonth($yearMonth)->where('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM',[':USER_ID'=>\Yii::$app->user->id,':PERIOD_NUM'=>$periodNum])->createCommand()->getRawSql();
         $sysConfig = Cache::getSystemConfig();
         $data[]=['name'=>'期数','value'=>$periodNum];
         $data[]=['name'=>'级别','value'=>Cache::getDecLevelConfig()[$calcBonus['LAST_DEC_LV']]['LEVEL_NAME']];

frontendApi/modules/v1/controllers/DashboardController.php

@@ -60,7 +60,7 @@ class DashboardController extends BaseController
         //期数显示
         $period = Period::instance();
         $periodNum = $period->getNowPeriodNum();
-        //
+        
         $curYM = Period::find()->select("CALC_YEAR,CALC_MONTH")->where('PERIOD_NUM=:PERIOD_NUM', [':PERIOD_NUM'=>$periodNum])->asArray()->one();
 
         $plist=Period::find()->select("PERIOD_NUM")->where('CALC_YEAR=:CALC_YEAR AND CALC_MONTH=:CALC_MONTH', [':CALC_YEAR'=>$curYM['CALC_YEAR'],':CALC_MONTH'=>$curYM['CALC_MONTH']])->orderBy('PERIOD_NUM ASC')->asArray()->all();

frontendApi/modules/v1/controllers/ShopController.php

@@ -75,9 +75,9 @@ class ShopController extends BaseController {
             'points' => 0,
             'cash' => 0
         ];
-        if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
-            $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
-        }
+        // if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
+        //     $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
+        // }
         if ($userCashResult = UserWallet::findOneAsArray(['USER_ID' => $userId])) {
             $userBalance['cash'] = $userCashResult['CASH'];
         }

frontendEle/src/router/index.js

@@ -198,25 +198,25 @@ export const constantRouterMap = [
       },
     ]
   },
-    {
-        path: '/atlas',
-        component: layout,
-        redirect: '/atlas/network',
-        children: [
-            {
-                path: '/atlas/network',
-                component: _import('atlas/network'),
-                name: 'atlas_network',
-                meta: {
-                    title: '安置网络',
-                    breadcrumb: [
-                        {title: '首页', path: '/dashboard/index'},
-                        {title: '网络图谱', path: '/atlas/network'},
-                    ],
-                },
-            },
-        ]
-    },
+    // {
+    //     path: '/atlas',
+    //     component: layout,
+    //     redirect: '/atlas/network',
+    //     children: [
+    //         {
+    //             path: '/atlas/network',
+    //             component: _import('atlas/network'),
+    //             name: 'atlas_network',
+    //             meta: {
+    //                 title: '安置网络',
+    //                 breadcrumb: [
+    //                     {title: '首页', path: '/dashboard/index'},
+    //                     // {title: '网络图谱', path: '/atlas/network'},
+    //                 ],
+    //             },
+    //         },
+    //     ]
+    // },
   {
     path: '/bonus',
     component: layout,

frontendEle/src/views/dashboard/index.vue

@@ -10,12 +10,12 @@
           <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
             <el-row :gutter="10">
               <el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="12">当前系统时间：{{nowDateTime}}</el-col>
-              <el-col :xs="24" :sm="24" :md="24" :lg="4" :xl="12">聘级：{{myEmpLv['LEVEL_NAME']!='无聘级'?myEmpLv['LEVEL_NAME']:''}}<span v-if="myEmpLv['ICON_TYPE']==0">无</span><img
+              <!-- <el-col :xs="24" :sm="24" :md="24" :lg="4" :xl="12">聘级：{{myEmpLv['LEVEL_NAME']!='无聘级'?myEmpLv['LEVEL_NAME']:''}}<span v-if="myEmpLv['ICON_TYPE']==0">无</span><img
                   :src="getEmpIco(myEmpLv['ICON_TYPE'])" alt=""
                   v-for="(o,key) in parseInt(myEmpLv['ICON_NUM'])"
                   :key="key" v-if="myEmpLv['ICON_TYPE']>0">
-              </el-col>
-              <el-col :xs="24" :sm="24" :md="24" :lg="4" :xl="12">会员级别：{{decLvName}}</el-col>
+              </el-col> -->
+              <!-- <el-col :xs="24" :sm="24" :md="24" :lg="4" :xl="12">会员级别：{{decLvName}}</el-col> -->
               <!-- <el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="12">当前业绩期：{{periodNum}}</el-col> -->
             </el-row>
           </el-col>
@@ -77,10 +77,10 @@
     },
     mounted() {
       network.getData(`dashboard/index`).then(response => {
-        this.myEmpLv.ID = this.baseEmpLevels[response.empLv]['ID']
-        this.myEmpLv.LEVEL_NAME = this.baseEmpLevels[response.empLv]['LEVEL_NAME']
-        this.myEmpLv.ICON_TYPE = this.baseEmpLevels[response.empLv]['ICON_TYPE']
-        this.myEmpLv.ICON_NUM = this.baseEmpLevels[response.empLv]['ICON_NUM']
+        // this.myEmpLv.ID = this.baseEmpLevels[response.empLv]['ID']
+        // this.myEmpLv.LEVEL_NAME = this.baseEmpLevels[response.empLv]['LEVEL_NAME']
+        // this.myEmpLv.ICON_TYPE = this.baseEmpLevels[response.empLv]['ICON_TYPE']
+        // this.myEmpLv.ICON_NUM = this.baseEmpLevels[response.empLv]['ICON_NUM']
         this.slides = response.slides
         this.news = response.news
         this.periodNum = response.periodNum

frontendEle/src/views/shop/order.vue

@@ -63,10 +63,10 @@
                         <div>实付金额</div>
                         <div>￥{{payType=="cash"?cashSum:pointsSum}}元</div>
                     </div>
-                    <div class="sum_box">
+                    <!-- <div class="sum_box">
                         <div>账户积分</div>
                         <div>{{balance.points}}</div>
-                    </div>
+                    </div> -->
                     <div class="sum_box">
                         <div>账户余额</div>
                         <div>￥{{balance.cash}}元</div>