Skip to content

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

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

parents d7d42149 57d3fd25
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 119 deletions
ybf_admin/src/api/in/store.js 0 → 100644
View file @ cb324385
import request from '@/utils/request'
import qs from 'qs'
export function ApiStoreGetMainList(inData) {
return request({
url: '/admin/auth/stall/stallPage',
method: 'get',
params: inData
})
}
ybf_admin/src/api/task/bar.js 0 → 100644
View file @ cb324385
import request from '@/utils/request'
import qs from 'qs'
export function ApiContactSync(inData) {
return request({
url: '/admin/auth/addressbook/synchronization',
method: 'get',
params: inData
})
}
ybf_admin/src/menu/header.js
View file @ cb324385
......@@ -11,11 +11,11 @@ export default [
// { path: '/page-demo', title: '新建示例' }
// ]
// },
{
path: '/home/main',
title: '首页',
icon: ''
},
// {
// path: '/home/main',
// title: '首页',
// icon: ''
// },
{
path: '/in/contact',
title: '进件管理',
......
ybf_admin/src/pages/in/contact/store.vue
View file @ cb324385
......@@ -8,12 +8,7 @@
</div>
<!-- 搜索区 -->
<el-form
class="searchzone"
:inline="true"
:model="data.search"
label-width="auto"
>
<el-form class="searchzone" :inline="true" :model="data.search" label-width="auto">
<el-form-item label="关键词">
<el-input
size="small"
......@@ -22,98 +17,81 @@
placeholder="请输入关键词"
/>
</el-form-item>
<el-button
class="button buttondark"
size="small"
style="margin-top:4px;"
>搜索</el-button
>
<el-button class="button buttondark" size="small" style="margin-top:4px;">搜索</el-button>
</el-form>
</div>
<div class="lists">
<!-- <el-table
stripe
class="list"
ref="multipleTable"
:data="list.main"
tooltip-effect="dark"
style="width: 100%"
@selection-change="listPick"
height="calc(100vh - 360px)"
>
<el-table-column type="selection" width="60"></el-table-column>
<el-table-column prop="taskName" label="门店名称" align="center"></el-table-column>
<el-table-column prop="taskType" label="门店类型" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="门店负责人" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="所属柜组" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="位置" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="门牌号" align="center" width="120"></el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200">
<template slot-scope="scope">
<el-button type="text" class="btn" @click="handleDetail(scope.row)">详情</el-button>
<el-button type="text" class="btn" @click="testButtonClick(scope.row)">编辑</el-button>
<el-button type="text" @click="testButtonClick(scope.row)" class="listButtonRed">删除</el-button>
</template>
</el-table-column>
</el-table>-->
<el-table
stripe
class="list"
ref="multipleTable"
:data="list.main"
tooltip-effect="dark"
style="width: 100%"
style="width: 100%"
@selection-change="listPick"
height="calc(100vh - 360px)"
>
<el-table-column type="selection" width="60"></el-table-column>
<el-table-column
prop="taskName"
label="门店名称"
align="center"
></el-table-column>
<el-table-column
prop="taskType"
label="门店类型"
align="center"
width="120"
></el-table-column>
<el-table-column
prop="bar"
label="门店负责人"
align="center"
width="120"
></el-table-column>
<el-table-column
prop="bar"
label="所属柜组"
align="center"
width="120"
></el-table-column>
<el-table-column
prop="bar"
label="位置"
align="center"
width="120"
></el-table-column>
<el-table-column
prop="bar"
label="门牌号"
align="center"
width="120"
></el-table-column>
<el-table-column prop="taskName" label="门店名称" align="center"></el-table-column>
<el-table-column prop="taskType" label="门店类型" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="门店负责人" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="所属柜组" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="位置" align="center" width="120"></el-table-column>
<el-table-column prop="bar" label="门牌号" align="center" width="120"></el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="200">
<template slot-scope="scope">
<el-button type="text" class="btn" @click="handleDetail(scope.row)"
>详情</el-button
>
<el-button type="text" class="btn" @click="testButtonClick(scope.row)"
>编辑</el-button
>
<el-button
type="text"
@click="testButtonClick(scope.row)"
class="listButtonRed"
>删除</el-button
>
<el-button type="text" class="btn" @click="handleDetail(scope.row)">详情</el-button>
<el-button type="text" class="btn" @click="testButtonClick(scope.row)">编辑</el-button>
<el-button type="text" @click="testButtonClick(scope.row)" class="listButtonRed">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
<el-pagination
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.size"
layout="total, prev, pager, next, jumper"
:total="page.total">
</el-pagination>
@current-change="handleCurrentChange"
:current-page="page.currentPage"
:page-size="page.size"
layout="total, prev, pager, next, jumper"
:total="page.total"
></el-pagination>
</div>
<add-store ref="addStore"></add-store>
<store-detail ref="storeDetail" ></store-detail>
<store-detail ref="storeDetail"></store-detail>
</div>
</template>
<script>
import AddStore from './components/addStore'
import StoreDetail from './components/storeDetail'
import AddStore from "./components/addStore";
import StoreDetail from "./components/storeDetail";
import { ApiStoreGetMainList } from "@api/in/store";
export default {
components: {
AddStore,
......@@ -121,10 +99,10 @@ export default {
},
data() {
return {
page:{
currentPage:1,
size:20,
total:100
page: {
currentPage: 1,
size: 20,
total: 100
},
list: {
main: [
......@@ -160,7 +138,7 @@ export default {
taskContent: "任务内容任务内容任务内容...",
sendDate: "2019/02/08"
},
{
{
id: "1003",
taskName: "2019年男装销售任务",
taskType: "拉新",
......@@ -208,7 +186,7 @@ export default {
]
}
},
tableHeight: window.innerHeight * 0.5 ,
tableHeight: window.innerHeight * 0.5,
data: {
search: {
bar: "",
......@@ -222,8 +200,16 @@ export default {
}
};
},
created() {},
created() {
this.ApiStoreGetMainList();
},
methods: {
storeGetMainList() {
ApiGetStoreList().then(res => {
this.list.main = res.data.adminStalls;
});
},
listPick() {},
testButtonClick() {},
pagesSizeChange() {},
......@@ -232,26 +218,26 @@ export default {
if (rowIndex === 0) {
return "background-color: #0B0F32; border-right: 1px solid white;color: white;";
} else {
return ""
return "";
}
},
addStore() {
this.$refs.addStore.addStoreDialog = true
this.$refs.addStore.addStoreDialog = true;
},
handleDetail() {
this.$refs.storeDetail.detailDialog = true
this.$refs.storeDetail.detailDialog = true;
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
},
}
}
};
</script>
<style lang="scss" scoped>
.btn {
font-size:14px;
font-weight:bold;
color:rgba(102,102,102,1);
font-size: 14px;
font-weight: bold;
color: rgba(102, 102, 102, 1);
}
.main {
position: relative;
......@@ -299,7 +285,7 @@ export default {
margin-top: 20px;
}
.listButtonRed {
color: #D0021B;
color: #d0021b;
font-weight: bold;
}
.pages {
......
ybf_admin/src/pages/task/bar/index.vue
View file @ cb324385
......@@ -327,7 +327,7 @@
</div>
</template>
<script>
import { ApiLoginSubmit } from "@api/login/main";
import { ApiContactSync } from "@api/task/bar";
import md5 from "js-md5";
export default {
......@@ -567,12 +567,7 @@ export default {
},
searchsSend() {},
searchsDels() {
let postData = {
loginName: "Alice",
loginPwd: "AlicePwd"
};
ApiLoginSubmit(postData).then(res => {});
ApiContactSync().then(res => {});
},
searchsSearch() {},
......
ybf_admin/src/router/routes.js
View file @ cb324385
......@@ -9,7 +9,8 @@ const frameIn = [
{
path: '/',
// redirect: { name: 'index' },
redirect: { name: 'homeMain' },
// redirect: { name: 'homeMain' },
redirect: { name: 'inContact' },
component: layoutHeaderAside,
children: [
// 首页
......@@ -22,15 +23,15 @@ const frameIn = [
component: _import('system/index')
},
// Z-首页-首页
{
path: '/home/main',
name: 'homeMain',
component: () => import('@/pages/home/main'),
meta: {
auth: true,
title: '首页'
}
},
// {
// path: '/home/main',
// name: 'homeMain',
// component: () => import('@/pages/home/main'),
// meta: {
// auth: true,
// title: '首页'
// }
// },
// Z-进件管理-通讯录管理
{
path: '/in/contact',
......
ybf_admin/src/views/system/login/page.vue
View file @ cb324385
......@@ -158,9 +158,8 @@ export default {
})
.then(() => {
// 重定向对象不存在则返回顶层路径
// this.$router.replace(this.$route.query.redirect || '/homeMain')
// this.$router.replace(this.$route.query.redirect || '/homeMain')
this.$router.replace(this.$route.query.redirect || '/home/main')
// this.$router.replace(this.$route.query.redirect || '/home/main')
this.$router.replace(this.$route.query.redirect || '/in/contact')
})
} else {
// 登录表单校验失败
......
ybf_wx/src/views/home.vue
View file @ cb324385
......@@ -17,8 +17,8 @@
</div>
</div>
</div>
<button class="testButton">Test0606</button>
<button class="testButton">Test0606</button>
<!-- <button class="testButton">Test0606</button> -->
<!-- <button class="testButton">Test0606</button> -->
</div>
......
ybf_wx/src/views/sideNav/discount/index.vue
View file @ cb324385
......@@ -82,24 +82,36 @@ export default {
methods: {
// testEaPost() {
// let postData = {
// appCode: "0606",
// crmActionDate: "2020-01-10"
// appCode: '0603',
// condType: 1,
// condValue: '138069094',
// };
// ApiEaPost(postData).then(res => {
// console.log(res);
// });
// },
testEaPost() {
let postData = {
appCode: '0603',
condType: 1,
condValue: '138069094',
appCode: '0606',
crmActionDate: '2019-12-12'
};
ApiEaPost(postData).then(res => {
console.log(res);
// console.log(res);
});
},
// testEaPost() {
// let postData = {
// appCode: '0608',
// content: 'text',
// phone: '18801342762',
// };
// ApiEaPost(postData).then(res => {
// // console.log(res);
// });
// },
buttonSingleMarketingClick() {
// this.$router.push("");
},
......
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