Merge branch 'new-version' into feature/york-1468-bulechafen-new

common/models/ShopGoods.php

@@ -163,9 +163,9 @@ class ShopGoods extends \common\components\ActiveRecord
             'cash'=>[
                 'name'=>'消费点数支付'
             ],
-            // 'point'=>[
-            //     'name'=>'积分支付'
-            // ],
+            'point'=>[
+                'name'=>'复销点数支付'
+            ],
             'exchange' => [
                 'name' => '无业绩兑换点数'
             ]

frontendApi/modules/v1/controllers/ShopController.php

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

frontendEle/src/views/shop/order.vue

@@ -66,10 +66,10 @@
                         <div>实付金额</div>
                         <div>￥{{payType=="cash"?cashSum:pointsSum}}元</div>
                     </div>
-                    <!-- <div class="sum_box">
-                        <div>账户积分</div>
+                    <div class="sum_box">
+                        <div>账户复销点数</div>
                         <div>{{balance.points}}</div>
-                    </div> -->
+                    </div>
                     <div class="sum_box">
                         <div>账户消费点数</div>
                         <div>￥{{balance.cash}}元</div>