diff --git a/app/common/repositories/user/UserAssetsLogRepository.php b/app/common/repositories/user/UserAssetsLogRepository.php
index 5d4ed09..dd47c58 100644
--- a/app/common/repositories/user/UserAssetsLogRepository.php
+++ b/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 => '转让他人',
diff --git a/public/system.html b/public/system.html
index 028ceb7..c8ddf26 100644
--- a/public/system.html
+++ b/public/system.html
@@ -1,3 +1,3 @@
-加载中...
\ No newline at end of file
diff --git a/view/admin/src/views/marketing/assets/index.vue b/view/admin/src/views/marketing/assets/index.vue
index 6317934..643c0a7 100644
--- a/view/admin/src/views/marketing/assets/index.vue
+++ b/view/admin/src/views/marketing/assets/index.vue
@@ -38,12 +38,12 @@
v-model="tableFrom.type"
clearable
>
- 个人下单
+ 个人消费
签到
消费积分兑换分红点
- 分红点返佣
- 推广返佣
- 培育奖
+ 消费补贴
+ 自营收入
+ 代理收入
区域代理奖
惠通宝兑换消费积分
转让他人