Skip to content

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

部分样式修改

parent eff81297
Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 110 deletions
ybf_admin/src/api/jinjian.js 0 → 100644
View file @ 5bc479f3
import request from '@/utils/request'
// 进件管理
//通讯录管理---表格
export function getMailList(data) {
return request({
url: '',
method: 'post',
data: data
})
}
//通讯录管理---组织架构
export function getOrgTree(data) {
return request({
url: '',
method: 'post',
data: data
})
}
\ No newline at end of file
ybf_admin/src/pages/in/contact/components/addStore.vue
View file @ 5bc479f3
......@@ -161,6 +161,16 @@ export default {
name: "李四"
}
],
counter: [
{
id: "1",
name: "张三"
},
{
id: "2",
name: "李四"
}
],
rules: {
name: [{ required: true, message: "请输入柜组名称", trigger: "blur" }],
people: [
......@@ -198,14 +208,14 @@ export default {
},
watch:{
addStoreDialog(){
if(this.addStoreDialog){
if(this.$refs.addStore){
this.$refs.addStore.resetFields();
}
addStoreDialog(){
if(this.addStoreDialog){
if(this.$refs.addStore){
this.$refs.addStore.resetFields();
}
}
}
}
};
</script>
......
ybf_admin/src/pages/in/contact/components/history.vue
View file @ 5bc479f3
......@@ -154,6 +154,7 @@ export default {
color:rgba(102,102,102,1);
}
.main {
width: 100%;
position: relative;
background-color: #fff;
box-sizing: border-box;
......
ybf_admin/src/pages/in/contact/components/storeDetail.vue
View file @ 5bc479f3
......@@ -144,6 +144,16 @@ export default {
name: "李四"
}
],
counter: [
{
id: "1",
name: "张三"
},
{
id: "2",
name: "李四"
}
],
tableData: [],
detailDialog: false
};
......
ybf_admin/src/pages/in/contact/counter.vue
View file @ 5bc479f3
......@@ -90,14 +90,12 @@
</div>
<div class="pages">
<el-pagination
@size-change="pagesSizeChange"
@current-change="pagesNowPageChange"
:current-page="currentPage4"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
layout="prev, pager, next, sizes, jumper"
:total="400"
></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-counter ref="addCounter"></add-counter>
<counter-detail ref="counterDetail" ></counter-detail>
......@@ -201,6 +199,11 @@ export default {
detailDialog: false,
counterDialog: false,
tableHeight: window.innerHeight * 0.5 ,
page:{
currentPage:1,
size:20,
total:100
}
};
},
created() {},
......@@ -217,7 +220,10 @@ export default {
},
addCounterFinish() {
this.counterDialog = false
}
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
},
},
/* mounted() {
this.$nextTick(() => {
......
ybf_admin/src/pages/in/contact/index.vue
View file @ 5bc479f3
......@@ -13,7 +13,7 @@
<span slot="title">通讯录管理</span>
</el-menu-item>
<el-menu-item index="2" @click="handleMenuChange('2')">
<span class="circle"><d2-icon-svg name="counter"/></span>
<span class="circle"><d2-icon-svg name="counters"/></span>
<span slot="title">柜组管理</span>
</el-menu-item>
<el-menu-item index="3" @click="handleMenuChange('3')">
......
ybf_admin/src/pages/in/contact/mail.vue
View file @ 5bc479f3
......@@ -42,13 +42,10 @@
</div>
</div>
</div>
<!-- <div class="run"> -->
<div class="end">
<span class="add-l" @click="addCounter">添加柜组</span>
<span class="add-r" @click="addStore">添加门店/专柜</span>
</div>
<!-- </div> -->
</div>
<div class="right">
<!-- <div class="right-c"> -->
......@@ -160,6 +157,7 @@
import MoveDialog from "./components/move";
import AddCounter from "./components/addCounter";
import AddStore from "./components/addStore";
import { getMailList } from "@/api/jinjian"
export default {
data() {
const data1 = [
......@@ -224,49 +222,7 @@ export default {
label: "二级 3-2"
}
]
},
{
id: 9,
label: "一级 3",
children: [
{
id: 10,
label: "二级 3-1"
},
{
id: 11,
label: "二级 3-2"
}
]
},
/* {
id: 9,
label: "一级 3",
children: [
{
id: 10,
label: "二级 3-1"
},
{
id: 11,
label: "二级 3-2"
}
]
},*/
{
id: 9,
label: "一级 3",
children: [
{
id: 10,
label: "二级 3-1"
},
{
id: 11,
label: "二级 3-2"
}
]
}
}
];
return {
data1: JSON.parse(JSON.stringify(data1)),
......@@ -381,6 +337,9 @@ export default {
AddCounter,
AddStore
},
created() {
this.getMailList()
},
methods: {
append(data) {
const newChild = { id: id++, label: "testtest", children: [] };
......@@ -411,12 +370,21 @@ export default {
removeFinish() {
this.moveDialogShow = false;
},
currentPage() {},
handleCurrentChange() {},
addCounter() {
this.$refs.addCounter.counterDialog = true;
},
addStore() {
this.$refs.addStore.addStoreDialog = true;
},
getMailList() {
let data = {
}
getMailList(data).then(res => {
console.log(res,"通讯录表格数据");
})
}
}
};
......@@ -555,7 +523,6 @@ export default {
color: red;
}
.pages {
/* // border: 2px solid steelblue; */
height: 40px;
width: 100%;
display: flex;
......
ybf_admin/src/pages/in/contact/store.vue
View file @ 5bc479f3
......@@ -99,14 +99,12 @@
</div>
<div class="pages">
<el-pagination
@size-change="pagesSizeChange"
@current-change="pagesNowPageChange"
:current-page="currentPage4"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
layout="prev, pager, next, sizes, jumper"
:total="400"
></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>
......@@ -123,6 +121,11 @@ export default {
},
data() {
return {
page:{
currentPage:1,
size:20,
total:100
},
list: {
main: [
{
......@@ -237,7 +240,10 @@ export default {
},
handleDetail() {
this.$refs.storeDetail.detailDialog = true
}
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
},
}
};
</script>
......
ybf_admin/src/router/routes.js
View file @ 5bc479f3
......@@ -38,7 +38,7 @@ const frameIn = [
component: () => import('@/pages/in/contact'),
meta: {
auth: true,
title: '通讯录管理'
title: '进件管理'
}
},
// // Z-进件管理-通讯录管理
......
ybf_wx/src/api/test/active.js 0 → 100644
View file @ 5bc479f3
import request from '@/utils/request'
// 案例
export function getCaseList(data) {
return request({
url: '/admin/common/findLoginType',
method: 'post',
data: data
})
}
export function getCaseDetail(data) {
return request({
url: '',
method: 'post',
data: data
})
}
// 收益列表
// 优惠券核销列表
export function getProfitList(data) {
return request({
url: '',
method: 'post',
data: data
})
}
// 商品购买列表
export function getGoodsList(data) {
return request({
url: '',
method: 'post',
data: data
})
}
// 拉新会员
export function getNewMemberList(data) {
return request({
url: '',
method: 'post',
data: data
})
}
\ No newline at end of file
ybf_wx/src/api/test/main.js
View file @ 5bc479f3
......@@ -16,4 +16,5 @@ export function ApiTestPost(inData) {
method: 'post',
data: postData
})
}
\ No newline at end of file
}
ybf_wx/src/views/active/createBigWheelActive.vue
View file @ 5bc479f3
......@@ -14,26 +14,28 @@
</van-cell>
<van-cell title="活动开始时间" style="font-size:14px;">
<template slot="default">
<van-field
class="right"
v-model="basicInfo.startTime1"
placeholder="选择活动开始时间"
readonly="readonly"
@click="basicInfo.startShow = true"
/>
<van-popup
v-model="basicInfo.startShow"
position="bottom"
:overlay="true"
>
<van-datetime-picker
v-model="basicInfo.startTime"
type="date"
@cancel="basicInfo.startShow = false"
@confirm="basicInfo.startShow = false"
@change="startTimeChange"
<div class="nobr">
<van-field
class="right"
v-model="basicInfo.startTime1"
placeholder="选择活动开始时间"
readonly="readonly"
@click="basicInfo.startShow = true"
/>
</van-popup>
<van-popup
v-model="basicInfo.startShow"
position="bottom"
:overlay="true"
>
<van-datetime-picker
v-model="basicInfo.startTime"
type="date"
@cancel="basicInfo.startShow = false"
@confirm="basicInfo.startShow = false"
@change="startTimeChange"
/>
</van-popup>
</div>
</template>
</van-cell>
<van-cell title="活动结束时间" style="font-size:14px;">
......@@ -62,8 +64,10 @@
</van-cell>
<van-cell title="领券条件" style="font-size:14px;">
<template slot="default">
<span class="phone">手机号必填</span>
<van-switch v-model="condition" size="20px" />
<div class="condition">
<span class="phone">手机号必填</span>
<van-switch v-model="condition" size="20px" />
</div>
</template>
</van-cell>
</van-cell-group>
......@@ -154,19 +158,19 @@
<span class="small">（点击“增加次数”按钮增加几次次数）</span>
</template>
<template slot="default">
<div class="jpsl">
<div>
<van-field
class="right noborder"
readonly
clickable
:value="LuckyDraw.winningNumber"
:value="LuckyDraw.addNumber"
placeholder="请输入次数"
@touchstart.native.stop="LuckyDraw.show2 = true"
@touchstart.native.stop="LuckyDraw.show3 = true"
/>
<van-number-keyboard
v-model="LuckyDraw.winningNumber"
:show="LuckyDraw.show2"
@blur="LuckyDraw.show2 = false"
v-model="LuckyDraw.addNumber"
:show="LuckyDraw.show3"
@blur="LuckyDraw.show3 = false"
/>
</div>
</template>
......@@ -572,7 +576,7 @@ export default {
}
.phone {
float: left;
margin-right: 10px;
}
.title {
background-color: #f8f8f8;
......@@ -589,6 +593,9 @@ export default {
.right {
padding: 0;
}
.nobr >>> .van-cell:not(:last-child)::after {
display: none !important;
}
.right >>> .van-cell:not(:last-child)::after {
display: none !important;
}
......@@ -617,7 +624,7 @@ export default {
color: #2d476a !important;
}
.type {
height: 92px;
height: 84px;
}
.mj {
width: 90%;
......@@ -679,4 +686,9 @@ export default {
z-index: 999;
top: 0;
}
.condition {
display: flex;
justify-content: flex-end;
align-items: center;
}
</style>
ybf_wx/src/views/active/turntableDetail.vue
View file @ 5bc479f3
......@@ -112,10 +112,12 @@ p {
color: rgba(45, 71, 106, 1);
width: 88px;
text-align: center;
align-items: center;
}
.tb img {
width: 12px;
height: 12px;
vertical-align: middle;
}
.content {
margin: 36px 16px 16px;
......
ybf_wx/src/views/case/caseDetail.vue
View file @ 5bc479f3
......@@ -28,7 +28,25 @@
</template>
<script>
export default {};
import { getCaseDetail } from '@/api/test/active'
export default {
data() {
return {
}
},
methods: {
getDeatil() {
let data = {
}
getCaseDetail(data).then(res => {
console.log(res,"案例详情");
})
}
},
};
</script>
<style scoped>
......
ybf_wx/src/views/case/index.vue
View file @ 5bc479f3
......@@ -44,6 +44,7 @@
</template>
<script>
import { getCaseList } from '@/api/test/active'
export default {
data() {
return {
......@@ -86,8 +87,17 @@ export default {
},
created() {
this.checkNowMenuBar();
this.getList()
},
methods: {
getList() {
let data = {
}
getCaseList(data).then( res => {
console.log(res,"案例列表")
})
},
handleDetail() {
this.$router.push({
path:'caseDetail'
......
ybf_wx/src/views/profit/index.vue
View file @ 5bc479f3
......@@ -45,7 +45,7 @@
class="tab"
background="#F8F8F8"
>
<van-tab title="优惠券核销">
<van-tab title="优惠券核销" @click="getList">
<van-list v-model="writeOff" :finished="finished" @load="onLoad">
<van-cell
:value="item.action"
......@@ -60,12 +60,12 @@
</van-cell>
</van-list>
</van-tab>
<van-tab title="商品购买">
<van-tab title="商品购买" @click="getGoodsList">
<van-list v-model="writeOff" :finished="finished" @load="onLoad">
<van-cell
:value="item.action"
class="content"
v-for="(item, index) in writeOffList"
v-for="(item, index) in ShoppingList"
:key="index"
>
<template slot="title">
......@@ -75,12 +75,12 @@
</van-cell>
</van-list>
</van-tab>
<van-tab title="拉新会员">
<van-tab title="拉新会员" @click="getNewMemberList">
<van-list v-model="writeOff" :finished="finished" @load="onLoad">
<van-cell
:value="item.action"
class="content"
v-for="(item, index) in writeOffList"
v-for="(item, index) in newMemberList"
:key="index"
>
<template slot="title">
......@@ -118,6 +118,7 @@
</template>
<script>
import { getProfitList,getGoodsList,getNewMemberList } from '@/api/test/active'
export default {
data() {
return {
......@@ -187,14 +188,39 @@ export default {
},
created() {
this.checkNowMenuBar();
this.getList()
},
methods: {
getList() {
let data = {
}
getProfitList(data).then(res => {
console.log(res,"收益列表");
})
},
getGoodsList() {
let data = {
}
getGoodsList(data).then(res => {
console.log(res,"商品购买列表");
})
},
getNewMemberList() {
let data = {
}
getNewMemberList(data).then(res => {
console.log(res,"拉新会员列表");
})
},
onSearch() {},
timeFormat(time) {
let year = time.getFullYear();
let month = time.getMonth() + 1;
let day = time.getDate();
return year + " " + "/" + " " + month + " " + "/" + " " + day;
return year + " " + "-" + " " + month + " " + "-" + " " + day;
},
timeChange(e) {
let newTime = e.getValues();
......@@ -232,6 +258,8 @@ export default {
},
mounted() {
this.time = this.timeFormat(this.time);
console.log(this.time,"时间");
}
};
</script>
......
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