兑换券改兑换点数

backendApi/modules/v1/controllers/ShopController.php

@@ -306,6 +306,7 @@ class ShopController extends BaseController {
             'CREATED_AT'=> 'DO.CREATED_AT',
             'UPDATED_AT'=> 'DO.UPDATED_AT',
         ]);
+
         $condition = $filter['condition'];
         $params = $filter['params'];
         $condition .= ' AND DO.IS_DEL=0';

backendApi/modules/v1/models/lists/shop/DecOrderList.php

@@ -45,6 +45,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
      */
     public function getColumn(){
         $decLevelConfig = Cache::getDecLevelConfig();
+
         if(!$this->columns){
             $this->columns = [
                 'ID' => null,
@@ -82,6 +83,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                         'width' => '110',
                     ],
                     'value' => function($row) use($decLevelConfig) {
+
                         return $decLevelConfig[$row['DEC_LV']]['LEVEL_NAME'];
                     },
                     'valueOther' => [

backendEle/src/views/finance/change-balance-opt.vue

@@ -90,6 +90,9 @@
     components: {LeoExcelUploader},
     mounted() {
       network.getData('finance/change-balance-type').then(response => {
+        console.log('response',response);
+        console.log('response.type:',response.type);
+        console.log('response.dealTypes:',response.dealTypes);
         this.type = response.type
         this.dealTypes = response.dealTypes
         this.loading = false
@@ -191,4 +194,4 @@
 
 <style scoped>
 
-</style>
+</style>

backendEle/src/views/shop/dec-order-list.vue

@@ -100,6 +100,7 @@
         }).then(() => {
           return network.getData(`shop/dec-order-list-export`, this.filterModel)
         }).then(response => {
+
           this.$message({
             message: response,
             type: 'success'

common/libs/dataList/DataList.php

@@ -114,7 +114,9 @@ class DataList extends Model
      * @throws Exception
      */
     public function getList($params = null){
+
         if($params !== null) {
+
             $this->prepare($params);
         }
         // 获取数据

common/models/BalanceAudit.php

@@ -40,7 +40,7 @@ class BalanceAudit extends \common\components\ActiveRecord
         ],
         'exchange_points' => [
             'name' => 'exchange_points',
-            'label' => '兑换积分',
+            'label' => '兑换点数',
         ],
         'cash' => [
             'name' => 'cash',

common/models/ShopGoods.php

@@ -167,7 +167,7 @@ class ShopGoods extends \common\components\ActiveRecord
                 'name'=>'积分支付'
             ],
             'exchange' => [
-                'name' => '无业绩兑换券'
+                'name' => '无业绩兑换点数'
             ]
         ];
     }

frontendApi/modules/v1/controllers/BonusController.php

@@ -69,7 +69,7 @@ class BonusController extends BaseController {
         $wallet[] = ['walletType' => 'bonus', 'walletName' => '会员奖金', 'amount' => Tool::formatPrice($data['BONUS'])];
         $wallet[] = ['walletType' => 'cash', 'walletName' => '会员余额', 'amount' => Tool::formatPrice($data['CASH'])];
         $wallet[] = ['walletType' => 'point', 'walletName' => '会员积分', 'amount' => Tool::formatPrice($data['RECONSUME_POINTS'])];
-        $wallet[] = ['walletType' => 'exchange', 'walletName' => '兑换积分', 'amount' => Tool::formatPrice($data['EXCHANGE_POINTS'])];
+        $wallet[] = ['walletType' => 'exchange', 'walletName' => '兑换点数', 'amount' => Tool::formatPrice($data['EXCHANGE_POINTS'])];
 //        if ($showCFLX) {
 //            $wallet[] = ['walletType' => 'cf', 'walletName' => '福利积分一', 'amount' => Tool::formatPrice($data['CF'])];
 //            $wallet[] = ['walletType' => 'lx', 'walletName' => '福利积分二', 'amount' => Tool::formatPrice($data['LX'])];

frontendEle/src/views/bonus/index.vue

@@ -121,6 +121,7 @@
         let vueObj = this
         vueObj.loading = true
         network.getData('bonus/index').then(response => {
+          console.log(response.wallet);
           vueObj.walletData = response.wallet
           vueObj.dealSwitch = response.dealSwitch
           vueObj.loading = false
@@ -207,4 +208,4 @@
 <style>
   .dialog-footer:after{content: '';
     clear: both;display: table;}
-</style>
+</style>

frontendEle/src/views/shop/order.vue

@@ -72,7 +72,7 @@
                         <div>￥{{balance.cash}}元</div>
                     </div>
                     <div class="sum_box">
-                        <div>无业绩兑换券</div>
+                        <div>无业绩兑换点数</div>
                         <div>{{balance.exchange}}</div>
                     </div>
                 </div>