liuqing
/
htb_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目经理配置

Browse Source
main
fengxinyhyl 9 months ago
parent 57955edf22
commit cb95d8ed08
7 changed files with 17 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      app/common/repositories/store/order/StoreOrderCreateRepository.php
  2. 3
      app/common/repositories/user/UserGroupRepository.php
  3. 2
      app/controller/admin/user/UserGroup.php
  4. 2
      view/admin/package.json
  5. 13
      view/admin/src/views/user/group/index.vue
  6. 2
      view/mer/.env.development
  7. 2
      view/mer/package.json

4
app/common/repositories/store/order/StoreOrderCreateRepository.php
Unescape View File

@ -581,7 +581,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
}
unset($merchantCart);
//计算平台券优惠金额
/*//计算平台券优惠金额
// if ($total_true_price > 0) {
$StoreCouponUser = app()->make(StoreCouponUserRepository::class);
$platformCoupon = $StoreCouponUser->validUserPlatformCoupon($uid);
@ -728,7 +728,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
}
$usePlatformCouponId = $platformCouponRate['id'];
unset($merchantCart);
}
}*/
//积分配置
$sysIntegralConfig = systemConfig(['integral_money', 'integral_status', 'integral_order_rate']);

3
app/common/repositories/user/UserGroupRepository.php
Unescape View File

@ -79,7 +79,8 @@ class UserGroupRepository extends BaseRepository
$isCreate = is_null($id);
$action = Route::buildUrl($isCreate ? 'systemUserGroupCreate' : 'systemUserGroupUpdate', $isCreate ? [] : compact('id'))->build();
return Elm::createForm($action, [
Elm::input('group_name', '用户分组名称')->required()
Elm::input('group_name', '用户分组名称')->required(),
Elm::input('count', '培育人数')->required(),
])->setTitle($isCreate ? '添加用户分组' : '编辑用户分组')->formData($formData);
}

2
app/controller/admin/user/UserGroup.php
Unescape View File

@ -149,7 +149,7 @@ class UserGroup extends BaseController
*/
protected function checkParams(UserGroupValidate $validate)
{
$data = $this->request->params(['group_name']);
$data = $this->request->params(['group_name', 'count']);
$validate->check($data);
return $data;
}

2
view/admin/package.json
Unescape View File

@ -5,7 +5,7 @@
"author": "Pan <panfree23@gmail.com>",
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",
"dev": "vue-cli-service serve --open --inline --hot",
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",

13
view/admin/src/views/user/group/index.vue
Unescape View File

@ -2,7 +2,7 @@
<div class="divBox">
<el-card class="box-card">
<div slot="header" class="clearfix">
<el-button size="small" type="primary" @click="onAdd">{{ $route.path.indexOf('group') !== -1?'添加用户分组':'添加用户标签' }}</el-button>
<!-- <el-button size="small" type="primary" @click="onAdd">{{ // $route.path.indexOf('group') !== -1?'添加用户分组':'添加用户标签' }}</el-button>-->
</div>
<el-table
v-loading="listLoading"
@ -28,14 +28,19 @@
</template>
</el-table-column>
<el-table-column
prop="create_time"
label="创建时间"
prop="count"
label="培育人数"
min-width="150"
/>
<el-table-column
prop="update_time"
label="更新时间"
min-width="150"
/>
<el-table-column label="操作" min-width="100" fixed="right" align="center">
<template slot-scope="scope">
<el-button type="text" size="small" @click="onEdit($route.path.indexOf('group') !== -1?scope.row.group_id:scope.row.label_id)">编辑</el-button>
<el-button type="text" size="small" @click="handleDelete($route.path.indexOf('group') !== -1?scope.row.group_id:scope.row.label_id, scope.$index)">删除</el-button>
<!-- <el-button type="text" size="small" @click="handleDelete($route.path.indexOf('group') !== -1?scope.row.group_id:scope.row.label_id, scope.$index)">删除</el-button>-->
</template>
</el-table-column>
</el-table>

2
view/mer/.env.development
Unescape View File

@ -3,7 +3,7 @@ ENV = 'development'
# base api
#VUE_APP_BASE_API = 'http://192.168.3.20:8324'
VUE_APP_BASE_API = 'https://mer1.crmeb.net'
VUE_APP_BASE_API = 'https://b2.njrenzhou.com'
# socket 连接地址
#VUE_APP_WS_URL = 'ws://192.168.3.20:8324'
VUE_APP_WS_URL = 'ws://mer1.crmeb.net'

2
view/mer/package.json
Unescape View File

@ -5,7 +5,7 @@
"author": "Pan <panfree23@gmail.com>",
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",
"dev": "vue-cli-service serve --open --inline --hot",
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",

Write Preview
Loading…
Cancel
Save