合并错误

frontendApi/modules/v1/controllers/ShopController.php

@@ -98,14 +98,16 @@ class ShopController extends BaseController {
             'points' => 0,
             'cash' => 0,
             'exchange' => 0,
-            'tourism_points' => 0,
-            'garage_points' => 0,
+            'travel_points' => 0,
+            'car_points' => 0,
+            'house_points' => 0,
         ];
         if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
             $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
             $userBalance['exchange'] = $userBonusResult['EXCHANGE_POINTS'];
-            $userBalance['tourism_points'] = $userBonusResult['TOURISM_POINTS'];
-            $userBalance['garage_points'] = $userBonusResult['GARAGE_POINTS'];
+            $userBalance['travel_points'] = $userBonusResult['TRAVEL_POINTS'];
+            $userBalance['car_points'] = $userBonusResult['CAR_POINTS'];
+            $userBalance['house_points'] = $userBonusResult['HOUSE_POINTS'];
         }
         if ($userCashResult = UserWallet::findOneAsArray(['USER_ID' => $userId])) {
             $userBalance['cash'] = $userCashResult['CASH'];
@@ -341,15 +343,11 @@ class ShopController extends BaseController {
             ],
             [
                 'name' => '5',
-<<<<<<< HEAD
                 'label' => 'Car Bonus Products',//名车积分商品
             ],
             [
                 'name' => '6',
                 'label' => 'House Bonus Products',//豪宅积分商品
-=======
-                'label' => '车房积分商品',
->>>>>>> origin
             ],
         ];
         return static::notice($data);

frontendEle/src/views/shop/order.vue

@@ -362,11 +362,7 @@
                         })
                     } else {
                         // 非PayStack支付
-<<<<<<< HEAD
-                        return network.postData('shop/sure-order', params).then((response) => {
-=======
                         return network.postData('shop/sure-order', params).then(() => {
->>>>>>> origin
                             this.submitButtonStat = false
 
                                 // 非PayStack支付