Skip to content

Y
ybf
Commit 200d61da authored by xd's avatar xd
Browse files
Options

Merge branch 'master' of http://114.67.93.201/xulili/ybf

parents 917e9561 fbba3f2c
Hide whitespace changes
Inline Side-by-side
Showing with 404 additions and 436 deletions
ybf_admin/.eslintrc.js
View file @ 200d61da
......@@ -8,10 +8,10 @@ module.exports = {
// '@vue/standard'
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-unused-vars': 'off',
"quotes": [1, "single"],//引号类型 `` "" ''
// 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
// 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
// 'no-unused-vars': 'off',
// "quotes": [1, "single"],//引号类型 `` "" ''
},
parserOptions: {
parser: 'babel-eslint'
......
ybf_admin/src/api/task/main.js → ybf_admin/src/api/login/main.js
View file @ 200d61da
import request from '@/utils/request'
import qs from 'qs'
export function ApiTestGet() {
return request({
......@@ -6,14 +7,10 @@ export function ApiTestGet() {
method: 'get'
})
}
export function ApiTestPost(inData) {
let postData = {
appCode: "0611",
args: inData
}
export function ApiLoginSubmit(inData) {
return request({
url: '/admin/common/findLoginType',
url: '/admin/common/login',
method: 'post',
data: postData
data: qs.stringify(inData)
})
}
ybf_admin/src/pages/task/bar/index.vue
View file @ 200d61da
......@@ -46,8 +46,8 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width:200px;">
</el-date-picker>
style="width:200px;"
></el-date-picker>
</el-form-item>
<el-form-item label="状态">
<el-select
......@@ -74,7 +74,6 @@
</el-form-item>
</el-form>
<el-button type="primary" size="small" @click="searchsSearch">搜 索</el-button>
</div>
</div>
......@@ -101,19 +100,24 @@
<el-table-column label="操作" align="center" fixed="right" width="240">
<template slot-scope="scope">
<el-button v-if="scope.row.taskStatus === 'Top'" class="buttonTextNormal" type="text"
@click="listsUntopClick(scope.row.id)">已置顶
</el-button>
<el-button v-if="scope.row.taskStatus !== 'Top'" class="buttonTextNormal" type="text"
@click="listsTopClick(scope.row.id)">置顶
</el-button>
<el-button
v-if="scope.row.taskStatus === 'Top'"
class="buttonTextNormal"
type="text"
@click="listsUntopClick(scope.row.id)"
>已置顶</el-button>
<el-button
v-if="scope.row.taskStatus !== 'Top'"
class="buttonTextNormal"
type="text"
@click="listsTopClick(scope.row.id)"
>置顶</el-button>
<el-button class="buttonTextNormal" type="text" @click="listsSeeClick(scope.row.id)">详情</el-button>
<el-button class="buttonTextNormal" type="text" @click="listsEditClick(scope.row.id)">编辑</el-button>
<el-button class="buttonTextWarning" type="text" @click="listsDelClick(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="ztask-pages">
<el-pagination
......@@ -193,8 +197,7 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width:100%;"
>
</el-date-picker>
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
......@@ -230,31 +233,48 @@
<el-row>
<el-col :span="24">
<el-form-item label="任务名称：" prop="taskName">
<el-input :disabled="true" v-model="data.see.taskName" autocomplete="off"
placeholder="任务名称为空"></el-input>
<el-input
:disabled="true"
v-model="data.see.taskName"
autocomplete="off"
placeholder="任务名称为空"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="任务类型：" prop="taskType">
<el-input :disabled="true" v-model="data.see.taskType" autocomplete="off"
placeholder="任务类型为空"></el-input>
<el-input
:disabled="true"
v-model="data.see.taskType"
autocomplete="off"
placeholder="任务类型为空"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="柜组：" prop="bar">
<el-input :disabled="true" v-model="data.see.bar" autocomplete="off" placeholder="柜组为空"></el-input>
<el-input
:disabled="true"
v-model="data.see.bar"
autocomplete="off"
placeholder="柜组为空"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="任务期限：" prop="taskTime">
<el-input :disabled="true" v-model="data.see.taskTime" autocomplete="off"
placeholder="任务期限为空"></el-input>
<el-input
:disabled="true"
v-model="data.see.taskTime"
autocomplete="off"
placeholder="任务期限为空"
></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -282,373 +302,373 @@
</div>
</template>
<script>
export default {
components: {},
data() {
return {
cache: {
status: {
createDialog: false,
seeDialog: false,
},
list: {
bar: [
{
id: "0",
name: "全部"
},
{
id: "1",
name: "柜组1"
}
],
taskType: [
{
id: "0",
name: "全部"
},
{
id: "1",
name: "测试"
}
],
status: [
{
id: "0",
name: "全部"
},
{
id: "1",
name: "已发布"
}
],
}
import { ApiLoginSubmit } from "@api/login/main";
export default {
components: {},
data() {
return {
cache: {
status: {
createDialog: false,
seeDialog: false
},
list: {
main: [
{
id: '1001',
taskName: 'TaskComAlice',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComAliceDetail',
taskStatus: 'send'
},
{
id: '1002',
taskName: 'TaskComBob',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComBobDetail',
taskStatus: 'nosend'
},
{
id: '1003',
taskName: 'TaskComClid',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComClidDetail',
taskStatus: 'nosend'
},
{
id: '1004',
taskName: 'TaskComDive',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComDiveDetail',
taskStatus: 'nosend'
},
{
id: '1005',
taskName: 'TaskComEmma',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComEmmaDetail',
taskStatus: 'nosend'
},
{
id: '1006',
taskName: 'TaskComFaker',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComFakerDetail',
taskStatus: 'nosend'
},
bar: [
{
id: '1007',
taskName: 'TaskComGlass',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComGlassDetail',
taskStatus: 'nosend'
id: "0",
name: "全部"
},
{
id: '1008',
taskName: 'TaskComHardy',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComHardyDetail',
taskStatus: 'nosend'
},
id: "1",
name: "柜组1"
}
],
taskType: [
{
id: '1009',
taskName: 'TaskComIda',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComIdaDetail',
taskStatus: 'nosend'
id: "0",
name: "全部"
},
{
id: '1010',
taskName: 'TaskComJoke',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComJokeDetail',
taskStatus: 'nosend'
},
id: "1",
name: "测试"
}
],
status: [
{
id: '1011',
taskName: 'TaskComKey',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComKeyDetail',
taskStatus: 'nosend'
id: "0",
name: "全部"
},
{
id: '1012',
taskName: 'TaskComLux',
taskType: '拉新',
bar: '男装',
createTime: '2020-01-01',
taskDate: '2020-01-01 至 2020-01-01',
taskDetail: 'TaskComLuxDetail',
taskStatus: 'nosend'
},
id: "1",
name: "已发布"
}
]
},
data: {
search: {
bar: '',
taskType: '',
taskDate: '',
status: '',
keys: '',
}
},
list: {
main: [
{
id: "1001",
taskName: "TaskComAlice",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComAliceDetail",
taskStatus: "send"
},
page: {
nowPageNum: 1,
{
id: "1002",
taskName: "TaskComBob",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComBobDetail",
taskStatus: "nosend"
},
create: {
taskName: '',
taskType: '',
bar: '',
taskTime: '',
taskDetail: '',
{
id: "1003",
taskName: "TaskComClid",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComClidDetail",
taskStatus: "nosend"
},
createDefault: {
taskName: '',
taskType: '',
bar: '',
taskTime: '',
taskDetail: '',
{
id: "1004",
taskName: "TaskComDive",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComDiveDetail",
taskStatus: "nosend"
},
see: {
taskName: 'taskName',
taskType: 'taskType',
bar: 'bar',
taskTime: 'taskTime',
taskDetail: 'taskDetail',
{
id: "1005",
taskName: "TaskComEmma",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComEmmaDetail",
taskStatus: "nosend"
},
seeDefault: {
taskName: '',
taskType: '',
bar: '',
taskTime: '',
taskDetail: '',
{
id: "1006",
taskName: "TaskComFaker",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComFakerDetail",
taskStatus: "nosend"
},
},
rule: {
create: {
taskName: [{required: true, message: '任务名称不能为空', trigger: 'change'}],
taskType: [{required: true, message: '任务类型不能为空', trigger: 'change'}],
bar: [{required: true, message: '柜组不能为空', trigger: 'change'}],
taskTime: [{required: true, message: '任务周期不能为空', trigger: 'change'}],
taskDetail: [{required: true, message: '任务详情不能为空', trigger: 'change'}],
{
id: "1007",
taskName: "TaskComGlass",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComGlassDetail",
taskStatus: "nosend"
},
see: {},
}
};
},
created() {
},
methods: {
searchsCreate() {
this.cache.status.createDialog = true
},
searchsSend() {
},
searchsDels() {
},
searchsSearch() {
},
listsSelectChange() {
},
listsUntopClick() {
},
listsTopClick() {
},
listsSeeClick(inData) {
this.cache.status.seeDialog = true
{
id: "1008",
taskName: "TaskComHardy",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComHardyDetail",
taskStatus: "nosend"
},
{
id: "1009",
taskName: "TaskComIda",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComIdaDetail",
taskStatus: "nosend"
},
{
id: "1010",
taskName: "TaskComJoke",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComJokeDetail",
taskStatus: "nosend"
},
{
id: "1011",
taskName: "TaskComKey",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComKeyDetail",
taskStatus: "nosend"
},
{
id: "1012",
taskName: "TaskComLux",
taskType: "拉新",
bar: "男装",
createTime: "2020-01-01",
taskDate: "2020-01-01 至 2020-01-01",
taskDetail: "TaskComLuxDetail",
taskStatus: "nosend"
}
]
},
listsEditClick() {
this.cache.status.createDialog = true
this.data.create = {
taskName: 'change',
taskType: 'taskType',
bar: 'bar',
taskTime: '',
taskDetail: '',
data: {
search: {
bar: "",
taskType: "",
taskDate: "",
status: "",
keys: ""
},
page: {
nowPageNum: 1
},
create: {
taskName: "",
taskType: "",
bar: "",
taskTime: "",
taskDetail: ""
},
createDefault: {
taskName: "",
taskType: "",
bar: "",
taskTime: "",
taskDetail: ""
},
see: {
taskName: "taskName",
taskType: "taskType",
bar: "bar",
taskTime: "taskTime",
taskDetail: "taskDetail"
},
seeDefault: {
taskName: "",
taskType: "",
bar: "",
taskTime: "",
taskDetail: ""
}
},
listsDelClick() {
},
pagesSizeChange() {
},
pagesNowPageChange() {
},
rule: {
create: {
taskName: [
{ required: true, message: "任务名称不能为空", trigger: "change" }
],
taskType: [
{ required: true, message: "任务类型不能为空", trigger: "change" }
],
bar: [{ required: true, message: "柜组不能为空", trigger: "change" }],
taskTime: [
{ required: true, message: "任务周期不能为空", trigger: "change" }
],
taskDetail: [
{ required: true, message: "任务详情不能为空", trigger: "change" }
]
},
see: {}
}
};
},
created() {},
methods: {
searchsCreate() {
this.cache.status.createDialog = true;
},
searchsSend() {},
searchsDels() {
let postData = {
loginName: 'Alice',
loginPwd: 'AlicePwd'
};
dialogCreateTaskTypeChange() {
},
dialogCreateBarChange() {
},
dialogCreateBeforeClose() {
this.cache.status.createDialog = false
},
dialogCreateCancel() {
this.data.create = JSON.parse(JSON.stringify(this.data.createDefault))
this.cache.status.createDialog = false
},
dialogCreateSubmit(inForm) {
this.$refs[inForm].validate(valid => {
if (valid) {
ApiLoginSubmit(postData).then(res => {
} else {
return false
}
})
},
dialogCreateSubmitSend() {
this.$refs[inForm].validate(valid => {
if (valid) {
});
},
searchsSearch() {},
} else {
return false
}
})
},
listsSelectChange() {},
listsUntopClick() {},
listsTopClick() {},
listsSeeClick(inData) {
this.cache.status.seeDialog = true;
},
listsEditClick() {
this.cache.status.createDialog = true;
this.data.create = {
taskName: "change",
taskType: "taskType",
bar: "bar",
taskTime: "",
taskDetail: ""
};
},
listsDelClick() {},
dialogSeeBeforeClose() {
this.cache.status.seeDialog = false
},
dialogSeeCancel() {
this.data.see = JSON.parse(JSON.stringify(this.data.seeDefault))
this.cache.status.seeDialog = false
},
dialogSeeSubmitSend() {
},
pagesSizeChange() {},
pagesNowPageChange() {},
dialogCreateTaskTypeChange() {},
dialogCreateBarChange() {},
dialogCreateBeforeClose() {
this.cache.status.createDialog = false;
},
dialogCreateCancel() {
this.data.create = JSON.parse(JSON.stringify(this.data.createDefault));
this.cache.status.createDialog = false;
},
dialogCreateSubmit(inForm) {
this.$refs[inForm].validate(valid => {
if (valid) {
} else {
return false;
}
});
},
dialogCreateSubmitSend() {
this.$refs[inForm].validate(valid => {
if (valid) {
} else {
return false;
}
});
},
}
};
dialogSeeBeforeClose() {
this.cache.status.seeDialog = false;
},
dialogSeeCancel() {
this.data.see = JSON.parse(JSON.stringify(this.data.seeDefault));
this.cache.status.seeDialog = false;
},
dialogSeeSubmitSend() {}
}
};
</script>
<style lang="scss" scoped>
.ztask-bars {
/*border: 2px solid cyan;*/
height: calc((100vh - 220px) * 1.0);
}
.ztask-searchs {
/*border: 2px solid #0ea4c5;*/
height: 70px;
display: flex;
flex-direction: row;
justify-content: space-between;
}
.ztask-searchs-items {
/*border: 2px solid #00c561;*/
margin: 17px 0px 20px 0px;
width: auto;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
.ztask-searchs-forms {
/*border: 2px solid #f900ff;*/
height: 30px;
margin-bottom: 10px;
}
.ztask-lists {
/*border: 2px solid #0dc50e;*/
height: calc((100vh - 338px) * 1.0);
overflow: auto;
}
.ztask-pages {
/*border: 2px solid red;*/
/*height: 56px;*/
height: 42px;
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: flex-end;
}
.ztask-page {
/*border: 2px solid red;*/
position: relative;
margin-right: 0;
}
.buttonTextNormal {
color: #666666;
}
.buttonTextWarning {
color: #D0021B;
}
.ztask-bars {
/*border: 2px solid cyan;*/
height: calc((100vh - 220px) * 1);
}
.ztask-searchs {
/*border: 2px solid #0ea4c5;*/
height: 70px;
display: flex;
flex-direction: row;
justify-content: space-between;
}
.ztask-searchs-items {
/*border: 2px solid #00c561;*/
margin: 17px 0px 20px 0px;
width: auto;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
.ztask-searchs-forms {
/*border: 2px solid #f900ff;*/
height: 30px;
margin-bottom: 10px;
}
.ztask-lists {
/*border: 2px solid #0dc50e;*/
height: calc((100vh - 338px) * 1);
overflow: auto;
}
.ztask-pages {
/*border: 2px solid red;*/
/*height: 56px;*/
height: 42px;
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: flex-end;
}
.ztask-page {
/*border: 2px solid red;*/
position: relative;
margin-right: 0;
}
.buttonTextNormal {
color: #666666;
}
.buttonTextWarning {
color: #d0021b;
}
</style>
ybf_admin/src/pages/task/main/index.vue
View file @ 200d61da
......@@ -43,9 +43,9 @@ export default {
updateType: "dec",
vipId: 1
};
ApiTestPost(postData).then(res => {
log("--->Api: Post: res =", res);
});
// ApiTestPost(postData).then(res => {
// log("--->Api: Post: res =", res);
// });
},
methods:{
ztabsClick(){},
......
ybf_admin/src/plugin/error/index.js
View file @ 200d61da
......@@ -16,13 +16,13 @@ export default {
})
// 只在开发模式下打印 log
if (process.env.NODE_ENV === 'development') {
util.log.capsule('D2Admin', 'ErrorHandler', 'danger')
util.log.danger('>>>>>> 错误信息 >>>>>>')
console.log(info)
util.log.danger('>>>>>> Vue 实例 >>>>>>')
console.log(instance)
util.log.danger('>>>>>> Error >>>>>>')
console.log(error)
// util.log.capsule('D2Admin', 'ErrorHandler', 'danger')
// util.log.danger('>>>>>> 错误信息 >>>>>>')
// console.log(info)
// util.log.danger('>>>>>> Vue 实例 >>>>>>')
// console.log(instance)
// util.log.danger('>>>>>> Error >>>>>>')
// console.log(error)
}
})
}
......
ybf_admin/src/store/modules/d2admin/modules/releases.js
View file @ 200d61da
......@@ -8,11 +8,11 @@ export default {
* @param {Object} state state
*/
versionShow () {
util.log.capsule('D2Admin', `v${process.env.VUE_APP_VERSION}`)
console.log('D2 Admin https://github.com/d2-projects/d2-admin')
console.log('D2 Crud https://github.com/d2-projects/d2-crud')
console.log('Document https://d2.pub/zh/doc/d2-admin')
console.log('请不要吝啬您的 star，谢谢 ~')
// util.log.capsule('D2Admin', `v${process.env.VUE_APP_VERSION}`)
// console.log('D2 Admin https://github.com/d2-projects/d2-admin')
// console.log('D2 Crud https://github.com/d2-projects/d2-crud')
// console.log('Document https://d2.pub/zh/doc/d2-admin')
// console.log('请不要吝啬您的 star，谢谢 ~')
}
}
}
ybf_admin/src/utils/request.js
View file @ 200d61da
import axios from 'axios'
import md5 from "js-md5"
let BASE_API = "https://gd.chfatech.com/guangdian"
let BASE_API = "http://139.155.48.151:8084"
const log = console.log.bind(console)
// URL 编码与拼接
const createSign = (inPostData, inAppSecret) => {
let appUser = inPostData.appUser
let appCode = inPostData.appCode
let ts = inPostData.ts
let args = JSON.parse(JSON.stringify(inPostData.args));
let appSecret = inAppSecret
let res = "";
// URL 编码
for (let key in args) {
res += encodeURIComponent(key) + "%3d" + encodeURIComponent(args[key]).toLowerCase() + "%26";
}
res = res.slice(0, -3);
// URL 拼接
res += `&appUser=${appUser}&appCode=${appCode}&${ts} ${appSecret}`
return res;
};
// Basic Info
let basicInfo = {
appUser: "user001",
ver: "v1.0",
appSecret: "JeC0mmE2ZjZmOfdmTGImYzU5Yjg1AYU2M3F="
}
// 创建 axios 实例
const service = axios.create({
......@@ -41,29 +13,8 @@ const service = axios.create({
// request 拦截器
service.interceptors.request.use(
res => {
log('--->axios: res.data:', res.data)
let oldPostData = JSON.parse(JSON.stringify(res.data))
let newPostData = {
appUser: basicInfo.appUser,
appCode: oldPostData.appCode,
ts: String(Date.parse(new Date())),
ver: basicInfo.ver,
args: oldPostData.args
}
let postData = {
appUser: newPostData.appUser,
appCode: newPostData.appCode,
ts: newPostData.ts,
sign: md5(createSign(newPostData, basicInfo.appSecret)),
ver: newPostData.ver,
args: newPostData.args
}
res.data = postData
return res
request => {
return request
},
error => {
Promise.reject(error)
......
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