Skip to content

S
sun
Commit 24dae774 authored by Davve's avatar Davve
Browse files
Options

增加pick

parent bd7378a8
Show whitespace changes
Inline Side-by-side
Showing with 344 additions and 73 deletions
api/pick.py
View file @ 24dae774
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
# Date: 2018/11/15 # Date: 2018/11/15
from utils.base import APIView from utils.base import APIView
from alpha_types.venus import PICK_TYPE
class PickListView(APIView): class PickListView(APIView):
...@@ -64,3 +65,36 @@ class UpdateOrCreateView(APIView): ...@@ -64,3 +65,36 @@ class UpdateOrCreateView(APIView):
return { return {
'message': '操作成功' 'message': '操作成功'
} }
class PickUserListView(APIView):
def get(self, request):
pick_id = request.GET.get('id', 0)
pick_type = int(request.GET.get('pick_type', 0))
offset = int(request.GET.get('page', 1))
limit = int(request.GET.get('limit', 10))
filters = {
'pick_id': pick_id
}
dispatch_rpc_endpoint = {
PICK_TYPE.CELEBRITY: 'venus/sun/pick/celebrity/list',
PICK_TYPE.TOPIC: 'venus/sun/pick/topic/list'
}
try:
data = self.rpc[dispatch_rpc_endpoint[pick_type]](offset=(offset - 1) * limit, limit=limit, filters=filters).unwrap()
except Exception as e:
raise e
return data
def post(self, request):
celebrity_id = request.POST.get('celebrity_id', '')
fake_pick_nums = request.POST.get('fake_pick_nums', 0)
topic_id = request.POST.get('topic_id', '')
try:
self.rpc['venus/sun/pick/add_fake_pick_nums'](celebrity_id=celebrity_id, topic_id=topic_id, pick_nums=fake_pick_nums).unwrap()
except Exception as e:
raise e
return {
'message': '操作失败'
}
\ No newline at end of file
api/search.py
View file @ 24dae774
...@@ -17,7 +17,7 @@ class GroupSearchView(APIView): ...@@ -17,7 +17,7 @@ class GroupSearchView(APIView):
return {'data': data} return {'data': data}
class RegionSearchView(APIView): class CountrySearchView(APIView):
def get(self, request): def get(self, request):
name = request.GET.get('name') name = request.GET.get('name')
try: try:
......
api/star.py
View file @ 24dae774
...@@ -7,23 +7,23 @@ import json ...@@ -7,23 +7,23 @@ import json
from utils.base import APIView from utils.base import APIView
class StarListView(APIView): class CelebrityListView(APIView):
def get(self, request): def get(self, request):
page = int(request.GET.get('page', 0)) page = int(request.GET.get('page', 0))
limit = int(request.GET.get('limit', 10)) limit = int(request.GET.get('limit', 10))
filter = self.handle_filter(request.GET.get('filter', "")) filter = self.handle_filter(request.GET.get('filter', ""))
try: try:
data = self.rpc['venus/sun/star/list'](offset=(page-1)*limit, limit=limit, filters=filter).unwrap() data = self.rpc['venus/sun/celebrity/list'](offset=(page-1)*limit, limit=limit, filters=filter).unwrap()
except Exception as e: except Exception as e:
raise e raise e
return data return data
class StarUpdateOrCreate(APIView): class CelebrityUpdateOrCreate(APIView):
def get(self, request): def get(self, request):
id = request.GET.get('id') id = request.GET.get('id')
try: try:
data = self.rpc['venus/sun/star/get'](id=id).unwrap() data = self.rpc['venus/sun/celebrity/get'](id=id).unwrap()
except Exception as e: except Exception as e:
raise e raise e
return {'data': data} return {'data': data}
...@@ -41,7 +41,7 @@ class StarUpdateOrCreate(APIView): ...@@ -41,7 +41,7 @@ class StarUpdateOrCreate(APIView):
} }
print(json.loads(request.POST.get('group_ids', []))) print(json.loads(request.POST.get('group_ids', [])))
try: try:
self.rpc['venus/sun/star/edit'](id=id, data=data).unwrap() self.rpc['venus/sun/celebrity/edit'](id=id, data=data).unwrap()
except Exception as e: except Exception as e:
raise e raise e
...@@ -50,7 +50,7 @@ class StarUpdateOrCreate(APIView): ...@@ -50,7 +50,7 @@ class StarUpdateOrCreate(APIView):
} }
class StarRelatedGroup(APIView): class CelebrityRelatedGroup(APIView):
def get(self, request): def get(self, request):
id = request.GET.get('id') id = request.GET.get('id')
offset = int(request.GET.get('page', 0)) offset = int(request.GET.get('page', 0))
......
api/urls.py
View file @ 24dae774
...@@ -51,33 +51,35 @@ urlpatterns = [ ...@@ -51,33 +51,35 @@ urlpatterns = [
url(r'^topic/reply/create$', ReplyCreate.as_view()), url(r'^topic/reply/create$', ReplyCreate.as_view()),
# star相关 # star相关
url(r'^star/list$', StarListView.as_view()), url(r'^celebrity/list$', CelebrityListView.as_view()),
url(r'^star/create$', StarUpdateOrCreate.as_view()), url(r'^celebrity/create$', CelebrityUpdateOrCreate.as_view()),
url(r'^star/detail$', StarUpdateOrCreate.as_view()), url(r'^celebrity/detail$', CelebrityUpdateOrCreate.as_view()),
url(r'^star/star_related_group_info', StarRelatedGroup.as_view()), url(r'^celebrity/celebrity_related_group_info', CelebrityRelatedGroup.as_view()),
# push相关 # push相关
url(r'push/list$', PushListView.as_view()), url(r'^push/list$', PushListView.as_view()),
url(r'push/create', PushUpdateOrCreateView.as_view()), url(r'^push/create', PushUpdateOrCreateView.as_view()),
url(r'push/detail', PushUpdateOrCreateView.as_view()), url(r'^push/detail', PushUpdateOrCreateView.as_view()),
url(r'push/effect_push', EffectPushTaskView.as_view()), url(r'^push/effect_push', EffectPushTaskView.as_view()),
# pick相关 # pick相关
url(r'pick/list$', PickListView.as_view()), url(r'^pick/list$', PickListView.as_view()),
url(r'pick/list/update$', PickListView.as_view()), url(r'^pick/list/update$', PickListView.as_view()),
url(r'pick/create$', UpdateOrCreateView.as_view()), url(r'^pick/create$', UpdateOrCreateView.as_view()),
url(r'pick/detail/', UpdateOrCreateView.as_view()), url(r'^pick/detail/', UpdateOrCreateView.as_view()),
url(r'^pick/user/list$', PickUserListView.as_view()),
url(r'^pick/add_fake_pick_nums$', PickUserListView.as_view()),
# 标签相关 # 标签相关
url(r'tag/list$', TagListView.as_view()), url(r'^tag/list$', TagListView.as_view()),
url(r'tag/list/update$', TagListView.as_view()), url(r'^tag/list/update$', TagListView.as_view()),
url(r'tag/create', TagUpdateOrCreateView.as_view()), url(r'^tag/create$', TagUpdateOrCreateView.as_view()),
url(r'tag/detail', TagUpdateOrCreateView.as_view()), url(r'^tag/detail$', TagUpdateOrCreateView.as_view()),
] ]
search_urlpatterns = [ search_urlpatterns = [
url(r'search/group$', GroupSearchView.as_view()), url(r'search/group$', GroupSearchView.as_view()),
url(r'search/region', RegionSearchView.as_view()), url(r'search/country', CountrySearchView.as_view()),
url(r'search/user', UserSearchView.as_view()), url(r'search/user', UserSearchView.as_view()),
url(r'search/tag', TagSearchView.as_view()), url(r'search/tag', TagSearchView.as_view()),
url(r'search/star', StarSearchView.as_view()), url(r'search/star', StarSearchView.as_view()),
......
api/user.py
View file @ 24dae774
...@@ -35,7 +35,7 @@ class UserUpdateOrCreate(APIView): ...@@ -35,7 +35,7 @@ class UserUpdateOrCreate(APIView):
def post(self, request): def post(self, request):
user_id = request.POST.get('id', '') user_id = request.POST.get('id', '')
show_time = analysis_time(request.POST.get('show_time', 0)) # show_time = analysis_time(request.POST.get('show_time', 0))
tag_ids = list(set(request.POST.get('tag_ids').split(','))) tag_ids = list(set(request.POST.get('tag_ids').split(',')))
if not user_id: if not user_id:
user_id = time.time() user_id = time.time()
...@@ -47,7 +47,7 @@ class UserUpdateOrCreate(APIView): ...@@ -47,7 +47,7 @@ class UserUpdateOrCreate(APIView):
'tag_ids': list(filter(lambda x: x, tag_ids)), 'tag_ids': list(filter(lambda x: x, tag_ids)),
'is_puppet': request.POST.get('is_puppet'), 'is_puppet': request.POST.get('is_puppet'),
'city_id': request.POST.get('city'), 'city_id': request.POST.get('city'),
'show_time': show_time, # 'show_time': show_time,
'phone': request.POST.get('phone'), 'phone': request.POST.get('phone'),
'email': request.POST.get('email'), 'email': request.POST.get('email'),
'gender': request.POST.get('gender'), 'gender': request.POST.get('gender'),
......
requirements.txt
View file @ 24dae774
...@@ -11,3 +11,4 @@ git+ssh://git@git.wanmeizhensuo.com/backend/gm-config.git@v0.1.3 ...@@ -11,3 +11,4 @@ git+ssh://git@git.wanmeizhensuo.com/backend/gm-config.git@v0.1.3
git+ssh://git@git.wanmeizhensuo.com/backend/gm-logging.git@v0.7.8 git+ssh://git@git.wanmeizhensuo.com/backend/gm-logging.git@v0.7.8
git+ssh://git@git.wanmeizhensuo.com/backend/gm-dataquery.git@v0.2.10 git+ssh://git@git.wanmeizhensuo.com/backend/gm-dataquery.git@v0.2.10
git+ssh://git@git.wanmeizhensuo.com/system/gm-tracer.git@v0.1.2 git+ssh://git@git.wanmeizhensuo.com/system/gm-tracer.git@v0.1.2
git+ssh://git@git.wanmeizhensuo.com/alpha/alpha-types.git@dev
\ No newline at end of file
vu/src/api/pick.js
View file @ 24dae774
...@@ -32,3 +32,19 @@ export function fetchPickDetail(id) { ...@@ -32,3 +32,19 @@ export function fetchPickDetail(id) {
params: { id } params: { id }
}) })
} }
export function fetchPickUserList(query) {
return request({
url: '/api/pick/user/list',
method: 'get',
params: query
})
}
export function AddFakePickNums(data) {
return request({
url: '/api/pick/add_fake_pick_nums',
method: 'post',
data
})
}
vu/src/api/remoteSearch.js
View file @ 24dae774
...@@ -16,9 +16,9 @@ export function groupSearch(name) { ...@@ -16,9 +16,9 @@ export function groupSearch(name) {
}) })
} }
export function regionSearch(name) { export function countrySearch(name) {
return request({ return request({
url: '/api/search/region', url: '/api/search/country',
method: 'get', method: 'get',
params: { name } params: { name }
}) })
......
vu/src/api/star.js
View file @ 24dae774
...@@ -2,7 +2,7 @@ import request from '@/utils/request' ...@@ -2,7 +2,7 @@ import request from '@/utils/request'
export function fetchList(query) { export function fetchList(query) {
return request({ return request({
url: '/api/star/list', url: '/api/celebrity/list',
method: 'get', method: 'get',
params: query params: query
}) })
...@@ -10,7 +10,7 @@ export function fetchList(query) { ...@@ -10,7 +10,7 @@ export function fetchList(query) {
export function starCreate(data) { export function starCreate(data) {
return request({ return request({
url: '/api/star/create', url: '/api/celebrity/create',
method: 'post', method: 'post',
data data
}) })
...@@ -18,7 +18,7 @@ export function starCreate(data) { ...@@ -18,7 +18,7 @@ export function starCreate(data) {
export function starDetail(id) { export function starDetail(id) {
return request({ return request({
url: '/api/star/detail', url: '/api/celebrity/detail',
method: 'get', method: 'get',
params: { id } params: { id }
}) })
...@@ -26,7 +26,7 @@ export function starDetail(id) { ...@@ -26,7 +26,7 @@ export function starDetail(id) {
export function OffLineOrOnLine(data) { export function OffLineOrOnLine(data) {
return request({ return request({
url: '/api/star/update_or_create', url: '/api/celebrity/update_or_create',
method: 'post', method: 'post',
data data
}) })
...@@ -34,7 +34,7 @@ export function OffLineOrOnLine(data) { ...@@ -34,7 +34,7 @@ export function OffLineOrOnLine(data) {
export function fetchStarRelatedGroup(id) { export function fetchStarRelatedGroup(id) {
return request({ return request({
url: '/api/star/star_related_group_info', url: '/api/celebrity/celebrity_related_group_info',
method: 'get', method: 'get',
params: { id } params: { id }
}) })
......
vu/src/views/group/components/GroupDetail.vue
View file @ 24dae774
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
<span v-show="contentShortLength" class="word-counter">{{ contentShortLength }}字</span> <span v-show="contentShortLength" class="word-counter">{{ contentShortLength }}字</span>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-row> </el-row>
......
vu/src/views/pick/components/PickDetail.vue
View file @ 24dae774
...@@ -8,6 +8,11 @@ ...@@ -8,6 +8,11 @@
</sticky> </sticky>
<div class="createPost-main-container"> <div class="createPost-main-container">
<el-row :gutter="20">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>pick相关</span>
</div>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item style="margin-bottom: 40px;" prop="name"> <el-form-item style="margin-bottom: 40px;" prop="name">
...@@ -19,7 +24,8 @@ ...@@ -19,7 +24,8 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label-width="45px" label="性别:" class="postInfo-container-item"> <el-form-item label-width="45px" label="性别:" class="postInfo-container-item">
<el-select v-model="postForm.gender" :placeholder="'性别:'" clearable class="postInfo-container-item" <el-select v-model="postForm.gender" :placeholder="'性别:'" clearable
class="postInfo-container-item"
style="width: 120px"> style="width: 120px">
<el-option v-for="item in GenderTypeOptions" :key="item.key" :label="item.display_name" <el-option v-for="item in GenderTypeOptions" :key="item.key" :label="item.display_name"
:value="item.key"/> :value="item.key"/>
...@@ -51,19 +57,22 @@ ...@@ -51,19 +57,22 @@
<div class="postInfo-container"> <div class="postInfo-container">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item style="margin-bottom: 40px;" label-width="45px" label="pickid:" prop="id" v-if="isEdit"> <el-form-item style="margin-bottom: 40px;" label-width="45px" label="pickid:" prop="id"
v-if="isEdit">
<el-input :rows="1" v-model="postForm.id" type="number" class="article-textarea" <el-input :rows="1" v-model="postForm.id" type="number" class="article-textarea"
style="width: 120px" disabled/> style="width: 120px" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item style="margin-bottom: 40px;" label-width="75px" label="pick用户:" prop="user_nums" v-if="isEdit"> <el-form-item style="margin-bottom: 40px;" label-width="75px" label="pick用户:" prop="user_nums"
v-if="isEdit">
<el-input :rows="1" v-model="postForm.user_nums" type="number" class="article-textarea" <el-input :rows="1" v-model="postForm.user_nums" type="number" class="article-textarea"
style="width: 120px" disabled/> style="width: 120px" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item style="margin-bottom: 40px;" label-width="85px" label="创建时间:" prop="create_time" v-if="isEdit"> <el-form-item style="margin-bottom: 40px;" label-width="85px" label="创建时间:" prop="create_time"
v-if="isEdit">
<el-input :rows="1" v-model="postForm.create_time" type="text" class="article-textarea" <el-input :rows="1" v-model="postForm.create_time" type="text" class="article-textarea"
style="width: 170px" disabled/> style="width: 170px" disabled/>
</el-form-item> </el-form-item>
...@@ -75,9 +84,11 @@ ...@@ -75,9 +84,11 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label-width="45px" label="地区:" class="postInfo-container-item"> <el-form-item label-width="45px" label="地区:" class="postInfo-container-item">
<el-select v-model="postForm.region" :remote-method="getRemoteCityList" filterable remote multiple value-key="id" <el-select v-model="postForm.region" :remote-method="getRemoteCityList" filterable remote multiple
value-key="id"
placeholder="搜索地区" style="width: 100%"> placeholder="搜索地区" style="width: 100%">
<el-option v-for="(item,index) in regionListOptions" :key="item+index" :label="item.name" :value="item.id"/> <el-option v-for="(item,index) in regionListOptions" :key="item+index" :label="item.name"
:value="item.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -96,7 +107,8 @@ ...@@ -96,7 +107,8 @@
:loading="loading" :loading="loading"
value-key="id" value-key="id"
> >
<el-option v-for="(item, index) in groupListOptions" :key="item+index" :label="item.name" :value="item.id"/> <el-option v-for="(item, index) in groupListOptions" :key="item+index" :label="item.name"
:value="item.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -112,6 +124,138 @@ ...@@ -112,6 +124,138 @@
<el-radio :label="0">否</el-radio> <el-radio :label="0">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-card>
</el-row>
<el-row :gutter="20" style="margin-top:50px;" v-if="isEdit">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span v-if="">pick明星相关</span>
</div>
<div style="margin-bottom:50px;">
<div class="filter-container">
</div>
<el-table :data="list" border fit highlight-current-row style="width: 100%"
ref="multipleTable" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center"></el-table-column>
<el-table-column align="center" label="明星ID">
<template slot-scope="scope">
<span>{{ scope.row.celebrity_id }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="明星名称">
<template slot-scope="scope">
<span>{{ scope.row.celebrity_name }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pick值">
<template slot-scope="scope">
<span>{{ scope.row.pick_nums }}</span>
</template>
</el-table-column>
<el-table-column align="center" min-width="100" label="添加pick值">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.fake_pick_nums" type="number" class="edit-input" size="small"/>
<el-button class="cancel-btn" size="small" icon="el-icon-refresh" type="warning"
@click="cancelEdit(scope.row)">取消
</el-button>
</template>
<span v-else>{{ scope.row.fake_pick_nums }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="120">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" icon="el-icon-circle-check-outline"
@click="confirmEdit(scope.row)">确认
</el-button>
<el-button v-else type="primary" size="small" icon="el-icon-edit"
@click="scope.row.edit=!scope.row.edit">添加
</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit"
style="margin-left: 150px;" @pagination="getList"/>
</div>
</el-card>
</el-row>
<el-row :gutter="20" style="margin-top:50px;" v-if="isEdit">
<el-card class="box-card">
<div slot="header" class="clearfix">
<span v-if="">pick帖子相关</span>
</div>
<div style="margin-bottom:50px;">
<div class="filter-container">
</div>
<el-table :data="list" border fit highlight-current-row style="width: 100%"
ref="multipleTable" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center"></el-table-column>
<el-table-column align="center" label="帖子ID">
<template slot-scope="scope">
<span>{{ scope.row.topic_id }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="帖子名称">
<template slot-scope="scope">
<span>{{ scope.row.topic_name }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="pick值">
<template slot-scope="scope">
<span>{{ scope.row.pick_nums }}</span>
</template>
</el-table-column>
<el-table-column align="center" min-width="100" label="添加pick值">
<template slot-scope="scope">
<template v-if="scope.row.edit">
<el-input v-model="scope.row.fake_pick_nums" type="number" class="edit-input" size="small"/>
<el-button class="cancel-btn" size="small" icon="el-icon-refresh" type="warning"
@click="cancelEdit(scope.row)">取消
</el-button>
</template>
<span v-else>{{ scope.row.fake_pick_nums }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="120">
<template slot-scope="scope">
<el-button v-if="scope.row.edit" type="success" size="small" icon="el-icon-circle-check-outline"
@click="confirmEdit(scope.row)">确认
</el-button>
<el-button v-else type="primary" size="small" icon="el-icon-edit"
@click="scope.row.edit=!scope.row.edit">添加
</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total>0" :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit"
style="margin-left: 150px;" @pagination="getList"/>
</div>
</el-card>
</el-row>
</div> </div>
</el-form> </el-form>
...@@ -121,14 +265,15 @@ ...@@ -121,14 +265,15 @@
<script> <script>
import MDinput from '@/components/MDinput' import MDinput from '@/components/MDinput'
import Sticky from '@/components/Sticky' // 粘性header组件 import Sticky from '@/components/Sticky' // 粘性header组件
import {fetchPickDetail, CreatePick} from '@/api/pick' import Pagination from '@/components/Pagination'
import {groupSearch, regionSearch, citySearch} from '@/api/remoteSearch' import {fetchPickDetail, CreatePick, fetchPickUserList, AddFakePickNums} from '@/api/pick'
import { isInArray, removeByvale} from "@/utils"; import {groupSearch, citySearch} from '@/api/remoteSearch'
import {isInArray, removeByvale} from "@/utils";
function Assembledata(target, source) { function Assembledata(target, source) {
var region_data = [] var region_data = []
for (var i=0;i<target.length;i++){ for (var i = 0; i < target.length; i++) {
if (isInArray(source, target[i]['name'])){ if (isInArray(source, target[i]['name'])) {
region_data.push(target[i]['id']) region_data.push(target[i]['id'])
removeByvale(source, target[i]['name']); removeByvale(source, target[i]['name']);
} }
...@@ -151,7 +296,7 @@ ...@@ -151,7 +296,7 @@
export default { export default {
name: 'PickDetail', name: 'PickDetail',
components: {MDinput, Sticky}, components: {MDinput, Sticky, Pagination},
props: { props: {
isEdit: { isEdit: {
type: Boolean, type: Boolean,
...@@ -173,6 +318,7 @@ ...@@ -173,6 +318,7 @@
return { return {
postForm: Object.assign({}, defaultForm), postForm: Object.assign({}, defaultForm),
loading: false, loading: false,
pick_type: '',
regionListOptions: [], regionListOptions: [],
groupListOptions: [], groupListOptions: [],
GenderTypeOptions: [ GenderTypeOptions: [
...@@ -181,8 +327,8 @@ ...@@ -181,8 +327,8 @@
{'key': 1, 'display_name': '女'}, {'key': 1, 'display_name': '女'},
], ],
PickTypeOptions: [ PickTypeOptions: [
{'key': 1, 'display_name': '明星打榜'}, {'key': 1, 'display_name': 'PICK明星'},
{'key': 0, 'display_name': '用戶打榜'}, {'key': 0, 'display_name': 'PICK帖子'},
], ],
rules: { rules: {
name: [{validator: validateRequire, trigger: 'blur'}], name: [{validator: validateRequire, trigger: 'blur'}],
...@@ -190,10 +336,21 @@ ...@@ -190,10 +336,21 @@
position: [{validator: validateRequire, trigger: 'blur'}], position: [{validator: validateRequire, trigger: 'blur'}],
}, },
tempRoute: {}, tempRoute: {},
temparray:{ temparray: {
'region':[], 'region': [],
'pick_group': [], 'pick_group': [],
} },
listQuery: {
id: '',
pick_type: '',
page: 0,
limit: 10,
filter: {
},
},
list: null,
total: 1,
listLoading: true,
} }
}, },
computed: { computed: {
...@@ -205,6 +362,7 @@ ...@@ -205,6 +362,7 @@
if (this.isEdit) { if (this.isEdit) {
const id = this.$route.params && this.$route.params.id const id = this.$route.params && this.$route.params.id
this.fetchData(id) this.fetchData(id)
this.getList()
} else { } else {
this.postForm = Object.assign({}, defaultForm) this.postForm = Object.assign({}, defaultForm)
} }
...@@ -218,17 +376,18 @@ ...@@ -218,17 +376,18 @@
let rep = response.data.data.data; let rep = response.data.data.data;
let pick_temp = [] let pick_temp = []
let region_temp = [] let region_temp = []
for (let i=0;i<rep.pick_group.length;i++){ for (let i = 0; i < rep.pick_group.length; i++) {
pick_temp.push(rep.pick_group[i]['name']); pick_temp.push(rep.pick_group[i]['name']);
this.temparray['pick_group'].push(rep.pick_group[i]) this.temparray['pick_group'].push(rep.pick_group[i])
} }
for (let i=0;i<rep.region.length;i++){ for (let i = 0; i < rep.region.length; i++) {
region_temp.push(rep.region[i]['name']); region_temp.push(rep.region[i]['name']);
this.temparray['region'].push(rep.region[i]) this.temparray['region'].push(rep.region[i])
} }
rep.region = region_temp rep.region = region_temp
rep.pick_group = pick_temp rep.pick_group = pick_temp
this.postForm = rep this.postForm = rep
this.pick_type = rep.pick_type;
}).catch(err => { }).catch(err => {
console.log(err) console.log(err)
}) })
...@@ -237,10 +396,10 @@ ...@@ -237,10 +396,10 @@
this.$refs.postForm.validate(valid => { this.$refs.postForm.validate(valid => {
if (valid) { if (valid) {
this.loading = true; this.loading = true;
if (this.isEdit){ if (this.isEdit) {
this.postForm.region = Assembledata(this.temparray['region'], this.postForm.region); this.postForm.region = Assembledata(this.temparray['region'], this.postForm.region);
this.postForm.pick_group = Assembledata(this.temparray['pick_group'], this.postForm.pick_group); this.postForm.pick_group = Assembledata(this.temparray['pick_group'], this.postForm.pick_group);
}else{ } else {
this.postForm.region = this.postForm.region.join(',') this.postForm.region = this.postForm.region.join(',')
this.postForm.pick_group = this.postForm.pick_group.join(',') this.postForm.pick_group = this.postForm.pick_group.join(',')
} }
...@@ -285,6 +444,51 @@ ...@@ -285,6 +444,51 @@
this.groupListOptions = response.data.data.data this.groupListOptions = response.data.data.data
}) })
}, },
// 分页相关
handleSelectionChange(val) {
this.multipleSelection = val;
},
reply() {
},
getList() {
this.listLoading = true
this.listQuery.id = this.$route.params && this.$route.params.id
this.listQuery.pick_type = this.pick_type
fetchPickUserList(this.listQuery).then(response => {
const items = response.data.data.data
this.list = items.map(v => {
this.$set(v, 'edit', false)
v.original_fake_pick_nums = v.fake_pick_nums
return v
})
this.total = response.data.data.total
this.listLoading = false;
})
},
cancelEdit(row) {
row.fake_pick_nums = row.original_fake_pick_nums
row.edit = false
this.$message({
message: '取消成功',
type: 'warning'
})
},
confirmEdit(row) {
row.edit = false
row.original_fake_pick_nums = row.fake_pick_nums
this.$message({
message: '添加成功',
type: 'success'
})
AddFakePickNums(row).then(response => {
}).catch(err => {
})
}
} }
} }
</script> </script>
...@@ -323,4 +527,12 @@ ...@@ -323,4 +527,12 @@
top: 0px; top: 0px;
} }
} }
.edit-input {
padding-right: 100px;
}
.cancel-btn {
position: absolute;
right: 15px;
top: 10px;
}
</style> </style>
vu/src/views/push/components/PushDetail.vue
View file @ 24dae774
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
userListOptions: [], userListOptions: [],
expireTimeOption: { expireTimeOption: {
disabledDate(date){ disabledDate(date){
return date.getTime() <= Date.now(); return date.getTime() <= Date.now() ;
} }
}, },
rules: { rules: {
......
vu/src/views/push/list.vue
View file @ 24dae774
...@@ -79,6 +79,7 @@ export default { ...@@ -79,6 +79,7 @@ export default {
}, },
SearchTypeOptions:[ SearchTypeOptions:[
{'key': 'id', 'display_name': '推送ID'}, {'key': 'id', 'display_name': '推送ID'},
{'key': 'title', 'display_name': '推送标题'},
{'key': 'content', 'display_name': '推送内容'}, {'key': 'content', 'display_name': '推送内容'},
] ]
} }
......
vu/src/views/star/components/StarDetail.vue
View file @ 24dae774
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
id: '', id: '',
gender: '', gender: '',
city: '', city: '',
is_online: undefined, is_online: 0,
description: '', description: '',
avatar: '', avatar: '',
} }
......
vu/src/views/star/list.vue
View file @ 24dae774
...@@ -166,7 +166,7 @@ export default { ...@@ -166,7 +166,7 @@ export default {
this.getList() this.getList()
}, },
handleCreate() { handleCreate() {
this.$router.push('/pick/create') this.$router.push('/star/create')
} }
} }
} }
......
vu/src/views/topic/components/TopicDetail.vue
View file @ 24dae774
...@@ -301,14 +301,14 @@ ...@@ -301,14 +301,14 @@
posting_time: '', posting_time: '',
content: '', content: '',
topic_ids: [], topic_ids: [],
content_level: '', content_level: 0,
group_name: '', group_name: '',
reported_time: '', reported_time: '',
user_name: '', user_name: '',
star_name: '', star_name: '',
is_puppet: '', is_puppet: '',
tag_ids: [], tag_ids: [],
is_online: '', is_online: 0,
} }
export default { export default {
...@@ -377,6 +377,7 @@ ...@@ -377,6 +377,7 @@
tempRoute: {}, tempRoute: {},
TopicLevelOptions: [ TopicLevelOptions: [
{'key': 0, 'display_name': '未审核'},
{'key': 1, 'display_name': '1星'}, {'key': 1, 'display_name': '1星'},
{'key': 2, 'display_name': '2星'}, {'key': 2, 'display_name': '2星'},
{'key': 3, 'display_name': '3星'}, {'key': 3, 'display_name': '3星'},
......
vu/src/views/topic/list.vue
View file @ 24dae774
...@@ -148,6 +148,7 @@ export default { ...@@ -148,6 +148,7 @@ export default {
{'key': 'content', 'display_name': '帖子内容'}, {'key': 'content', 'display_name': '帖子内容'},
], ],
ContentLevelTypeOptions:[ ContentLevelTypeOptions:[
{'key': 0, 'display_name': '未审核'},
{'key': 1, 'display_name': '星级一'}, {'key': 1, 'display_name': '星级一'},
{'key': 2, 'display_name': '星级二'}, {'key': 2, 'display_name': '星级二'},
{'key': 3, 'display_name': '星级三'}, {'key': 3, 'display_name': '星级三'},
......
vu/src/views/user/components/UserDetail.vue
View file @ 24dae774
...@@ -49,12 +49,12 @@ ...@@ -49,12 +49,12 @@
<el-input v-model="postForm.nick_name" type="text" style="width: 230px"/> <el-input v-model="postForm.nick_name" type="text" style="width: 230px"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!--<el-col :span="12">-->
<el-form-item label-width="75px" label="展示时间:" class="postInfo-container-item"> <!--<el-form-item label-width="75px" label="展示时间:" class="postInfo-container-item">-->
<el-date-picker v-model="postForm.show_time " type="datetime" format="yyyy-MM-dd HH:mm:ss" <!--<el-date-picker v-model="postForm.show_time " type="datetime" format="yyyy-MM-dd HH:mm:ss"-->
placeholder="选择日期时间" :picker-options="expireTimeOption" style="width: 230px"/> <!--placeholder="选择日期时间" :picker-options="expireTimeOption" style="width: 230px"/>-->
</el-form-item> <!--</el-form-item>-->
</el-col> <!--</el-col>-->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
import {validateURL} from '@/utils/validate' import {validateURL} from '@/utils/validate'
import {UserDetail, fetchGroupUser, userCreate} from '@/api/user' import {UserDetail, fetchGroupUser, userCreate} from '@/api/user'
import { GroupDetail } from '@/api/group' import { GroupDetail } from '@/api/group'
import {regionSearch, tagSearch, groupSearch, citySearch} from '@/api/remoteSearch' import { tagSearch, groupSearch, citySearch} from '@/api/remoteSearch'
import { isInArray, removeByvale} from "@/utils"; import { isInArray, removeByvale} from "@/utils";
function Assembledata(target, source) { function Assembledata(target, source) {
...@@ -280,11 +280,11 @@ ...@@ -280,11 +280,11 @@
content: [{validator: validateRequire}], content: [{validator: validateRequire}],
source_uri: [{validator: validateSourceUri, trigger: 'blur'}] source_uri: [{validator: validateSourceUri, trigger: 'blur'}]
}, },
expireTimeOption: { // expireTimeOption: {
disabledDate(date){ // disabledDate(date){
return date.getTime() <= Date.now(); // return date.getTime() <= Date.now();
} // }
}, // },
tempRoute: {}, tempRoute: {},
listQuery: { listQuery: {
page: 1, page: 1,
......
vu/src/views/user/list.vue
View file @ 24dae774
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
this.getList() this.getList()
}, },
handleCreate() { handleCreate() {
this.$router.push('/pick/create') this.$router.push('/user/create')
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment