修改分类名称

app/common/repositories/user/UserAssetsLogRepository.php

@@ -73,12 +73,12 @@ class UserAssetsLogRepository extends BaseRepository
     public function getChangeType()
     {
         return array(
-            self::CHANGE_TYPE_ORDER          => '个人下单',
+            self::CHANGE_TYPE_ORDER          => '个人消费',
             self::CHANGE_TYPE_SIGN           => '签到',
             self::CHANGE_TYPE_SHARE_EXCHANGE => '消费积分兑换分红点',
-            self::CHANGE_TYPE_SHARE_GET      => '分红点返佣',
-            self::CHANGE_TYPE_SPREAD_GET     => '推广返佣',
-            self::CHANGE_TYPE_CULTIVATE      => '培育奖',
+            self::CHANGE_TYPE_SHARE_GET      => '消费补贴',
+            self::CHANGE_TYPE_SPREAD_GET     => '自营收入',
+            self::CHANGE_TYPE_CULTIVATE      => '代理收入',
             self::CHANGE_TYPE_AGENT          => '区域代理奖',
             self::CHANGE_TYPE_HUITONG        => '惠通宝兑换消费积分',
             self::CHANGE_TYPE_HUITONG_SEND   => '转让他人',

view/admin/src/views/marketing/assets/index.vue

@@ -38,12 +38,12 @@
                 v-model="tableFrom.type"
                 clearable
               >
-                <el-option value="1"  label="个人下单">个人下单</el-option>
+                <el-option value="1"  label="个人消费">个人消费</el-option>
                 <el-option value="2"  label="签到">签到</el-option>
                 <el-option value="3"  label="消费积分兑换分红点">消费积分兑换分红点</el-option>
-                <el-option value="4"  label="分红点返佣">分红点返佣</el-option>
-                <el-option value="5"  label="推广返佣">推广返佣</el-option>
-                <el-option value="6"  label="培育奖">培育奖</el-option>
+                <el-option value="4"  label="消费补贴">消费补贴</el-option>
+                <el-option value="5"  label="自营收入">自营收入</el-option>
+                <el-option value="6"  label="代理收入">代理收入</el-option>
                 <el-option value="7"  label="区域代理奖">区域代理奖</el-option>
                 <el-option value="8"  label="惠通宝兑换消费积分">惠通宝兑换消费积分</el-option>
                 <el-option value="9"  label="转让他人">转让他人</el-option>