Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds

backendApi/modules/v1/controllers/BonusController.php

@@ -841,7 +841,7 @@ class BonusController extends BaseController {
         }
         $data = $this->_periodBonus($periodNum,false);
         if( isset($data['filterTypes']) && is_array($data['filterTypes']) ) {
-            $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> '结算期数']], $data['filterTypes']);
+            $data['filterTypes'] = array_merge(['periodNum'=>['isUserTable'=> false, 'name'=> 'Number of settlement periods']], $data['filterTypes']);
         }
 
         return static::notice($data);

backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

@@ -747,6 +747,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 'LAST_MOBILE'=> ['isUserTable'=> false, 'name'=> 'phone number'],//手机号
                 'LAST_PERIOD_AT'=> ['isUserTable'=> false, 'name'=> 'Number of joining periods'],//加入期数
                 'LAST_CREATED_AT'=> ['isUserTable'=> false, 'name'=> 'Join time', 'other'=> 'date'],//加入时间
+                'CALCULATED_AT'=> ['isUserTable'=> false, 'name'=> 'Settlement time', 'other'=> 'date'],//备份时间
                 'LAST_REC_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Pioneer No'],//开拓者编号
                 'LAST_REC_REAL_NAME'=> ['isUserTable'=> false, 'name'=> 'Pioneer name'],//开拓者姓名
                 'LAST_CON_USER_NAME'=> ['isUserTable'=> false, 'name'=> 'Superior number'],//上级编号

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

@@ -195,9 +195,9 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '120'],
                     'value' => function ($row) {
                             if($row['ORDER_TYPE']=='ZC'){
-                                $orderType = 'declaration form';
+                                $orderType = 'Welcome pack';
                             }else{
-                                $orderType = ($row['PAY_TYPE']=='cash') ? 'Cancel again': 'integral';//'重消' : '积分'
+                                $orderType = ($row['PAY_TYPE']=='cash') ? 'Reselling': 'Points';//'重消' : '积分'
                             }
                         return $orderType;
                     },

common/models/BalanceAudit.php

@@ -38,10 +38,10 @@ class BalanceAudit extends \common\components\ActiveRecord
 //            'name' => 'reconsume_points',
 //            'label' => '复消积分',
 //        ],
-        'exchange_points' => [
-            'name' => 'exchange_points',
-            'label' => '兑换积分',
-        ],
+//        'exchange_points' => [
+//            'name' => 'exchange_points',
+//            'label' => '兑换积分',
+//        ],
         'cash' => [
             'name' => 'cash',
             'label' => '会员账户余额',
@@ -54,10 +54,10 @@ class BalanceAudit extends \common\components\ActiveRecord
 //            'name' => 'lx',
 //            'label' => '领袖分红奖余额',
 //        ],
-        'tourism_points' => [
-            'name' => 'tourism_points',
-            'label' => '旅游积分',
-        ],
+//        'tourism_points' => [
+//            'name' => 'tourism_points',
+//            'label' => '旅游积分',
+//        ],
         'garage_points' => [
             'name' => 'garage_points',
             'label' => '车房积分',

frontendEle/src/views/shop/reconsume-order.vue

@@ -79,7 +79,7 @@
                     <el-form-item prop="areaSelected">
                         <template slot="label">
                             <span class="text-danger">*</span>
-                            District<!--地区-->
+                            State<!--地区-->
                         </template>
                         <el-cascader
                                 size="large"

frontendEle/src/views/user/dec.vue

@@ -209,7 +209,7 @@
                 </el-form-item>
                 <el-form-item prop="areaSelected">
                     <template slot="label">
-                        District<!-- 地区 -->
+                        State<!-- 地区 -->
                     </template>
                     <el-cascader
                             :disabled="areaDisabled"

sql/upgrade/1736.sql

@@ -0,0 +1,2 @@
+-- 修改兑换兑换积分、旅游积分配置
+UPDATE AR_DEAL_TYPE SET IS_ENABLE = 0 WHERE ID IN ('316868755701501952', '316872011148300288', '364305038266470400', '365343018452127744');