Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
ybf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xulili
ybf
Commits
a9758cfa
Commit
a9758cfa
authored
Mar 10, 2020
by
Z
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EA's API 0696,0697 use ok. Admin and WxAdmin's Eslint's unused rule closed.
parent
c198c7fe
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
507 additions
and
275 deletions
+507
-275
.eslintrc.js
ybf_admin/.eslintrc.js
+1
-1
ea.js
ybf_wx/src/api/sidebar/ea.js
+24
-0
test.js
ybf_wx/src/api/test/test.js
+11
-0
index.vue
ybf_wx/src/views/sideNav/discount/index.vue
+471
-274
No files found.
ybf_admin/.eslintrc.js
View file @
a9758cfa
...
...
@@ -10,7 +10,7 @@ module.exports = {
rules
:
{
// 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
// 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
//
'no-unused-vars': 'off',
'no-unused-vars'
:
'off'
,
// "quotes": [1, "single"],//引号类型 `` "" ''
},
parserOptions
:
{
...
...
ybf_wx/src/api/sidebar/ea.js
0 → 100644
View file @
a9758cfa
import
request
from
'@/utils/bRequestEa'
export
function
getVoucherList
(
inData
)
{
let
postData
=
{
args
:
inData
}
return
request
({
url
:
''
,
method
:
'post'
,
data
:
postData
})
}
export
function
getVoucherWxUrl
(
inData
)
{
let
postData
=
{
args
:
inData
}
return
request
({
url
:
''
,
method
:
'post'
,
data
:
postData
})
}
ybf_wx/src/api/test/test.js
View file @
a9758cfa
...
...
@@ -11,3 +11,14 @@ export function ApiEaPost(inData) {
})
}
export
function
ApiEaActiveList
(
inData
)
{
let
postData
=
{
args
:
inData
}
return
request
({
url
:
''
,
method
:
'post'
,
data
:
postData
})
}
ybf_wx/src/views/sideNav/discount/index.vue
View file @
a9758cfa
<
template
>
<div
class=
"main"
>
<!--
<div
class=
"tops"
></div>
-->
<div
class=
"contents"
>
<div
v-for=
"(item, index) of test.list.main"
:key=
"index"
>
<div
class=
"content"
>
<div
class=
"content-imgs"
>
<img
class=
"imgs-img"
:src=
"item.imgUrl"
alt
/>
</div>
<div
class=
"content-infos"
>
<div
class=
"infos-mains"
>
<div
class=
"mains"
>
<div
class=
"main-usedPercent"
>
核销率
{{
item
.
usedPercent
}}
%
</div>
<div
class=
"main-money"
>
{{
item
.
money
}}
元代金券
</div>
</div>
<div
class=
"buttons"
>
<button
class=
"button-send"
@
click=
"testEaPost"
>
推送
</button>
</div>
<div
class=
"main"
>
<!--
<div
class=
"tops"
></div>
-->
<div
class=
"contents"
>
<div
v-for=
"(item, index) of test.list.main"
:key=
"index"
>
<div
class=
"content"
>
<div
class=
"content-imgs"
>
<img
class=
"imgs-img"
:src=
"item.imgUrl"
alt
/>
</div>
<div
class=
"content-infos"
>
<div
class=
"infos-mains"
>
<div
class=
"mains"
>
<div
class=
"main-usedPercent"
>
核销率
{{
item
.
usedPercent
}}
%
</div>
<div
class=
"main-money"
>
{{
item
.
money
}}
元代金券
</div>
</div>
<div
class=
"buttons"
>
<button
class=
"button-send"
@
click=
"testEaPost"
>
推送
</button>
</div>
</div>
<div
class=
"infos-tips"
>
<div
class=
"tip-shareMan"
>
最后分享:
{{
item
.
shareMan
}}
</div>
<div
class=
"tip-commision"
>
佣金:¥
{{
item
.
commision
}}
</div>
</div>
</div>
</div>
</div>
<div
class=
"infos-tips"
>
<div
class=
"tip-shareMan"
>
最后分享:
{{
item
.
shareMan
}}
</div>
<div
class=
"tip-commision"
>
佣金:¥
{{
item
.
commision
}}
</div>
<div
class=
"zListActive"
>
<div
class=
"inputs"
>
<!--
<input
class=
"input"
>
-->
<div
class=
"button"
@
click=
"zReadyDelVoucherList"
>
Clear
</div>
<div
class=
"button"
@
click=
"zReadySetVoucherList"
>
ReLoad
</div>
</div>
<div
class=
"lists"
>
<div
class=
"item"
v-for=
"item in zlist.voucher"
:key=
"item.coupon_id"
@
click=
"zVoucherPick(item.action_id, item.coupon_id)"
>
<div>
优惠券ID:
{{
item
.
coupon_id
}}
</div>
<div>
活动ID:
{{
item
.
action_id
}}
</div>
<div>
活动标题:
{{
item
.
coupon_title
}}
</div>
<div>
活动列表:
{{
item
.
coupon_link
}}
</div>
</div>
<!--
<div
class=
"item"
></div>
-->
<!--
<div
class=
"item"
></div>
-->
</div>
<div
class=
"lists"
>
<div
v-if=
"zlist.voucherUrl !== ''"
class=
"voucherUrl"
>
<div>
小程序Url:
{{
zlist
.
voucherUrl
}}
</div>
</div>
<!--
<div
class=
"item"
></div>
-->
<!--
<div
class=
"item"
></div>
-->
</div>
</div>
</div>
</div>
<div
class=
"menus"
>
<div
class=
"menu"
@
click=
"buttonMainMarketingClick"
>
精准营销
</div>
<div
class=
"menu activeMenu"
@
click=
"buttonSingleMarketingClick"
>
一对一营销侧边栏
</div>
</div>
</div>
</div>
<div
class=
"menus"
>
<div
class=
"menu"
@
click=
"buttonMainMarketingClick"
>
精准营销
</div>
<div
class=
"menu activeMenu"
@
click=
"buttonSingleMarketingClick"
>
一对一营销侧边栏
</div>
</div>
</div>
</
template
>
<
script
>
// import { ApiTestCfPost, ApiTestEaPost } from "@/api/test/main";
import
{
ApiEaPost
}
from
"@/api/test/test"
;
// const log = console.log.bind(console);
export
default
{
name
:
"discountIndex"
,
data
()
{
return
{
test
:
{
list
:
{
main
:
[
{
imgUrl
:
"/mainSale/test-city.png"
,
usedPercent
:
"10"
,
money
:
"100"
,
shareMan
:
"Alice"
,
commision
:
"11"
// import { ApiTestCfPost, ApiTestEaPost } from "@/api/test/main";
import
{
ApiEaPost
,
ApiEaActiveList
}
from
"@/api/test/test"
;
const
zlog
=
console
.
log
.
bind
(
console
);
import
*
as
APISidebarEA
from
"@/api/sidebar/ea"
;
import
Vue
from
'vue'
;
import
{
Field
}
from
'vant'
;
Vue
.
use
(
Field
);
export
default
{
name
:
"discountIndex"
,
data
()
{
return
{
zcache
:
{
storeId
:
1
,
},
zlist
:
{
voucher
:
[],
voucherUrl
:
''
},
test
:
{
list
:
{
main
:
[
{
imgUrl
:
"/mainSale/test-city.png"
,
usedPercent
:
"10"
,
money
:
"100"
,
shareMan
:
"Alice"
,
commision
:
"11"
},
{
imgUrl
:
"/mainSale/test-city.png"
,
usedPercent
:
"20"
,
money
:
"200"
,
shareMan
:
"Bob"
,
commision
:
"22"
},
// {
// imgUrl: "/mainSale/test-city.png",
// usedPercent: "30",
// money: "300",
// shareMan: "Clid",
// commision: "33"
// },
// {
// imgUrl: "/mainSale/test-city.png",
// usedPercent: "40",
// money: "400",
// shareMan: "Doke",
// commision: "44"
// }
]
}
},
dis
:
{}
};
},
created
()
{
this
.
zReadyGetVoucherList
()
},
methods
:
{
zReadySetVoucherList
()
{
this
.
zReadyDelVoucherList
()
const
postData
=
{
appCode
:
'0696'
,
mdid
:
this
.
zcache
.
storeId
};
zlog
(
'%c--->ActiveList: PD ='
,
'background: red;'
,
postData
)
APISidebarEA
.
getVoucherList
(
postData
)
.
then
(
res
=>
{
zlog
(
'%c--->ActiveList: RD ='
,
'background: green;'
,
res
)
this
.
zVoucherSet
(
res
.
result
.
coupons
)
});
},
zReadyDelVoucherList
()
{
this
.
zVoucherDel
()
this
.
zVoucherUrlDel
()
},
zVoucherPick
(
inActiveId
,
inVoucherId
)
{
this
.
zVoucherUrlDel
()
const
postData
=
{
appCode
:
'0697'
,
action_id
:
Number
(
inActiveId
),
coupon_id
:
Number
(
inVoucherId
)
};
zlog
(
'%c--->VoucherWxUrl: PD ='
,
'background: red;'
,
postData
)
APISidebarEA
.
getVoucherWxUrl
(
postData
)
.
then
(
res
=>
{
zlog
(
'%c--->VoucherWxUrl: RD ='
,
'background: green;'
,
res
)
this
.
zVoucherUrlSet
(
res
.
result
.
link
)
});
},
zVoucherSet
(
inArray
)
{
this
.
zlist
.
voucher
=
inArray
},
{
imgUrl
:
"/mainSale/test-city.png"
,
usedPercent
:
"20"
,
money
:
"200"
,
shareMan
:
"Bob"
,
commision
:
"22"
zVoucherDel
()
{
this
.
zlist
.
voucher
=
[]
},
{
imgUrl
:
"/mainSale/test-city.png"
,
usedPercent
:
"30"
,
money
:
"300"
,
shareMan
:
"Clid"
,
commision
:
"33"
zVoucherUrlSet
(
inData
)
{
this
.
zlist
.
voucherUrl
=
String
(
inData
)
},
{
imgUrl
:
"/mainSale/test-city.png"
,
usedPercent
:
"40"
,
money
:
"400"
,
shareMan
:
"Doke"
,
commision
:
"44"
zVoucherUrlDel
()
{
this
.
zlist
.
voucherUrl
=
''
},
// testEaPost() {
// let postData = {
// appCode: '0603',
// condType: 1,
// condValue: '138069094',
// };
// ApiEaPost(postData).then(res => {
// console.log(res);
// });
// },
// testEaPost() {
// let postData = {
// appCode: '0606',
// crmActionDate: '2019-12-12'
// };
// ApiEaPost(postData).then(res => {
// // console.log(res);
// });
// },
testEaPost
()
{
let
postData
=
{
appCode
:
'0696'
,
mdid
:
1
};
ApiEaActiveList
(
postData
).
then
(
res
=>
{
// console.log(res);
});
},
// testEaPost() {
// let postData = {
// appCode: '0608',
// content: 'text',
// phone: '18801342762',
// };
// ApiEaPost(postData).then(res => {
// // console.log(res);
// });
// },
buttonSingleMarketingClick
()
{
// this.$router.push("");
},
buttonMainMarketingClick
()
{
this
.
$router
.
push
(
"MainSale"
);
}
]
}
},
dis
:
{}
};
},
created
()
{},
methods
:
{
// testEaPost() {
// let postData = {
// appCode: '0603',
// condType: 1,
// condValue: '138069094',
// };
// ApiEaPost(postData).then(res => {
// console.log(res);
// });
// },
testEaPost
()
{
let
postData
=
{
appCode
:
'0606'
,
crmActionDate
:
'2019-12-12'
};
ApiEaPost
(
postData
).
then
(
res
=>
{
// console.log(res);
});
},
// testEaPost() {
// let postData = {
// appCode: '0608',
// content: 'text',
// phone: '18801342762',
// };
// ApiEaPost(postData).then(res => {
// // console.log(res);
// });
// },
buttonSingleMarketingClick
()
{
// this.$router.push("");
},
buttonMainMarketingClick
()
{
this
.
$router
.
push
(
"MainSale"
);
}
}
};
</
script
>
<
style
scoped
>
.main
{
background-color
:
white
;
width
:
100%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
start
;
}
.tops
{
border
:
2px
solid
lightblue
;
width
:
100%
;
height
:
100px
;
}
.contents
{
/* border: 2px solid lightpink; */
width
:
100%
;
height
:
100%
;
padding
:
16px
;
padding-bottom
:
40px
;
}
.content
{
border
:
0px
solid
orange
;
height
:
100px
;
width
:
100%
;
padding
:
4px
0px
;
margin-bottom
:
16px
;
border-radius
:
4px
;
box-shadow
:
0px
2px
4px
0px
rgb
(
187
,
187
,
187
);
display
:
flex
;
flex-direction
:
row
;
justify-content
:
start
;
}
.content-imgs
{
/* border: 1px solid pink; */
width
:
20%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
start
;
align-items
:
center
;
}
.imgs-img
{
width
:
50px
;
height
:
50px
;
margin-top
:
10px
;
border-radius
:
50%
;
object-fit
:
cover
;
}
.content-infos
{
/* border: 1px solid orange; */
width
:
80%
;
height
:
100%
;
}
.infos-mains
{
height
:
70%
;
width
:
100%
;
/* border: 1px solid green; */
display
:
flex
;
flex-direction
:
row
;
justify-content
:
start
;
}
.mains
{
/* border: 1px solid red; */
width
:
70%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
flex-start
;
}
.main-usedPercent
{
font-size
:
14px
;
color
:
grey
;
}
.main-money
{
/* border: 1px solid lightgreen; */
font-size
:
24px
;
}
.buttons
{
/* border: 1px solid darkorange; */
/* background-color: bisque; */
width
:
30%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
center
;
align-items
:
center
;
}
.button-send
{
border
:
0px
solid
blue
;
height
:
40px
;
width
:
60px
;
border-radius
:
4px
;
background-color
:
rgba
(
68
,
93
,
251
,
1
);
color
:
white
;
font-size
:
16px
;
}
.infos-tips
{
height
:
30%
;
width
:
100%
;
/* border: 1px solid red; */
border-top
:
1px
dashed
gray
;
padding-top
:
6px
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
start
;
align-items
:
center
;
}
.tip-shareMan
{
/* border: 1px solid orange; */
width
:
70%
;
height
:
100%
;
font-size
:
14px
;
line-height
:
16px
;
color
:
rgb
(
150
,
150
,
150
);
}
.tip-commision
{
/* border: 1px solid green; */
width
:
30%
;
height
:
100%
;
font-size
:
14px
;
line-height
:
16px
;
color
:
rgb
(
150
,
150
,
150
);
}
.menus
{
border-top
:
1px
solid
rgb
(
194
,
194
,
194
);
position
:
fixed
;
bottom
:
0px
;
left
:
0px
;
width
:
100%
;
height
:
50px
;
background-color
:
white
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
start
;
align-items
:
center
;
}
.menu
{
/* border: 1px solid red; */
height
:
50px
;
/* width: 120px; */
width
:
50%
;
line-height
:
50px
;
text-align
:
center
;
font-size
:
14px
;
color
:
black
;
}
.activeMenu
{
color
:
lightcoral
;
}
.main
{
background-color
:
white
;
width
:
100%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
start
;
}
.tops
{
border
:
2px
solid
lightblue
;
width
:
100%
;
height
:
100px
;
}
.contents
{
/* border: 2px solid lightpink; */
width
:
100%
;
height
:
100%
;
padding
:
16px
;
padding-bottom
:
40px
;
}
.content
{
border
:
0px
solid
orange
;
height
:
100px
;
width
:
100%
;
padding
:
4px
0px
;
margin-bottom
:
16px
;
border-radius
:
4px
;
box-shadow
:
0px
2px
4px
0px
rgb
(
187
,
187
,
187
);
display
:
flex
;
flex-direction
:
row
;
justify-content
:
start
;
}
.content-imgs
{
/* border: 1px solid pink; */
width
:
20%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
start
;
align-items
:
center
;
}
.imgs-img
{
width
:
50px
;
height
:
50px
;
margin-top
:
10px
;
border-radius
:
50%
;
object-fit
:
cover
;
}
.content-infos
{
/* border: 1px solid orange; */
width
:
80%
;
height
:
100%
;
}
.infos-mains
{
height
:
70%
;
width
:
100%
;
/* border: 1px solid green; */
display
:
flex
;
flex-direction
:
row
;
justify-content
:
start
;
}
.mains
{
/* border: 1px solid red; */
width
:
70%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
flex-start
;
}
.main-usedPercent
{
font-size
:
14px
;
color
:
grey
;
}
.main-money
{
/* border: 1px solid lightgreen; */
font-size
:
24px
;
}
.buttons
{
/* border: 1px solid darkorange; */
/* background-color: bisque; */
width
:
30%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
center
;
align-items
:
center
;
}
.button-send
{
border
:
0px
solid
blue
;
height
:
40px
;
width
:
60px
;
border-radius
:
4px
;
background-color
:
rgba
(
68
,
93
,
251
,
1
);
color
:
white
;
font-size
:
16px
;
}
.infos-tips
{
height
:
30%
;
width
:
100%
;
/* border: 1px solid red; */
border-top
:
1px
dashed
gray
;
padding-top
:
6px
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
start
;
align-items
:
center
;
}
.tip-shareMan
{
/* border: 1px solid orange; */
width
:
70%
;
height
:
100%
;
font-size
:
14px
;
line-height
:
16px
;
color
:
rgb
(
150
,
150
,
150
);
}
.tip-commision
{
/* border: 1px solid green; */
width
:
30%
;
height
:
100%
;
font-size
:
14px
;
line-height
:
16px
;
color
:
rgb
(
150
,
150
,
150
);
}
.menus
{
border-top
:
1px
solid
rgb
(
194
,
194
,
194
);
position
:
fixed
;
bottom
:
0px
;
left
:
0px
;
width
:
100%
;
height
:
50px
;
background-color
:
white
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
start
;
align-items
:
center
;
}
.menu
{
/* border: 1px solid red; */
height
:
50px
;
/* width: 120px; */
width
:
50%
;
line-height
:
50px
;
text-align
:
center
;
font-size
:
14px
;
color
:
black
;
}
.activeMenu
{
color
:
lightcoral
;
}
.zListActive
{
/*border: 1px solid limegreen;*/
width
:
100%
;
height
:
auto
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
flex-start
;
align-items
:
flex-start
;
}
.zListActive
>
.inputs
{
/*border: 1px solid dodgerblue;*/
width
:
100%
;
height
:
auto
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
space-between
;
align-items
:
center
;
}
.zListActive
>
.inputs
>
.input
{
/*border-bottom: 2px solid red;*/
border-color
:
dodgerblue
;
border-radius
:
4px
;
width
:
70%
;
height
:
40px
;
font-size
:
16px
;
}
.zListActive
>
.inputs
>
.button
{
border
:
1px
solid
dodgerblue
;
border-radius
:
4px
;
width
:
40%
;
height
:
40px
;
font-size
:
14px
;
line-height
:
36px
;
text-align
:
center
;
}
.zListActive
>
.lists
{
/*border: 1px solid red;*/
width
:
100%
;
height
:
auto
;
margin-top
:
8px
;
display
:
flex
;
flex-direction
:
column
;
justify-content
:
flex-start
;
align-items
:
flex-start
;
}
.zListActive
>
.lists
>
.item
{
border
:
1px
solid
red
;
width
:
100%
;
height
:
100px
;
margin-bottom
:
16px
;
padding
:
4px
4px
;
border-radius
:
4px
;
box-shadow
:
0px
2px
4px
0px
rgb
(
187
,
187
,
187
);
display
:
flex
;
flex-direction
:
column
;
justify-content
:
space-around
;
align-items
:
flex-start
;
font-size
:
14px
;
text-wrap
:
none
;
}
.zListActive
>
.lists
>
.voucherUrl
{
border
:
1px
solid
orange
;
width
:
100%
;
height
:
100px
;
margin-bottom
:
16px
;
padding
:
4px
4px
;
border-radius
:
4px
;
box-shadow
:
0px
2px
4px
0px
rgb
(
187
,
187
,
187
);
display
:
flex
;
flex-direction
:
column
;
justify-content
:
space-around
;
align-items
:
flex-start
;
font-size
:
14px
;
text-wrap
:
none
;
}
</
style
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment