Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
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
512b44fc
Commit
512b44fc
authored
Mar 23, 2020
by
xd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
注释
parent
8bb3c8b6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
15 deletions
+23
-15
3.22.doc
3.22.doc
+0
-0
package.json
ybf_admin/package.json
+1
-1
yarn.lock
ybf_admin/yarn.lock
+9
-9
home.vue
ybf_wx/src/views/home.vue
+9
-3
index.vue
ybf_wx/src/views/sideNav/discount/index.vue
+4
-2
No files found.
3.22.doc
0 → 100644
View file @
512b44fc
File added
ybf_admin/package.json
View file @
512b44fc
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
"better-scroll"
:
"^1.15.2"
,
"better-scroll"
:
"^1.15.2"
,
"core-js"
:
"^3.4.3"
,
"core-js"
:
"^3.4.3"
,
"dayjs"
:
"^1.8.17"
,
"dayjs"
:
"^1.8.17"
,
"echarts"
:
"^4.
6
.0"
,
"echarts"
:
"^4.
7
.0"
,
"el-tree-transfer"
:
"^2.2.6"
,
"el-tree-transfer"
:
"^2.2.6"
,
"element-ui"
:
"^2.13.0"
,
"element-ui"
:
"^2.13.0"
,
"flex.css"
:
"^1.1.7"
,
"flex.css"
:
"^1.1.7"
,
...
...
ybf_admin/yarn.lock
View file @
512b44fc
...
@@ -3657,12 +3657,12 @@ echarts-wordcloud@^1.1.3:
...
@@ -3657,12 +3657,12 @@ echarts-wordcloud@^1.1.3:
resolved "https://registry.yarnpkg.com/echarts-wordcloud/-/echarts-wordcloud-1.1.3.tgz#07b140c8ba76b19c317b43c310f3d5dc99289ff2"
resolved "https://registry.yarnpkg.com/echarts-wordcloud/-/echarts-wordcloud-1.1.3.tgz#07b140c8ba76b19c317b43c310f3d5dc99289ff2"
integrity sha512-Et8D5xEAoYkidmHun+hEH+2lF9dhCt6D0JJ390vlr2r/1zwhhZAbcL01CEvG93QcMcJpSvSPK8vRiGkTbMHRxg==
integrity sha512-Et8D5xEAoYkidmHun+hEH+2lF9dhCt6D0JJ390vlr2r/1zwhhZAbcL01CEvG93QcMcJpSvSPK8vRiGkTbMHRxg==
echarts@^4.
6
.0:
echarts@^4.
7
.0:
version "4.
6
.0"
version "4.
7
.0"
resolved "https://registry.
yarnpkg.com/echarts/-/echarts-4.6.0.tgz#b5a47a1046cec93ceeef954f9ee54751340558ec
"
resolved "https://registry.
npm.taobao.org/echarts/download/echarts-4.7.0.tgz#5b3875a4c2f91e3929425fabab9eace7e4098b3f
"
integrity sha
512-xKkcr6v9UVOSF+PMuj7Ngt3bnzLwN1sSXWCvpvX+jYb3mePYsZnABq7wGkPac/m0nV653uGHXoHK8DCKCprdNg=
=
integrity sha
1-Wzh1pML5HjkpQl+rq56s5+QJiz8
=
dependencies:
dependencies:
zrender "4.
2
.0"
zrender "4.
3
.0"
editorconfig@^0.15.3:
editorconfig@^0.15.3:
version "0.15.3"
version "0.15.3"
...
@@ -10594,7 +10594,7 @@ yorkie@^2.0.0:
...
@@ -10594,7 +10594,7 @@ yorkie@^2.0.0:
normalize-path "^1.0.0"
normalize-path "^1.0.0"
strip-indent "^2.0.0"
strip-indent "^2.0.0"
zrender@4.
2
.0:
zrender@4.
3
.0:
version "4.
2
.0"
version "4.
3
.0"
resolved "https://registry.
yarnpkg.com/zrender/-/zrender-4.2.0.tgz#d001302e155f28de1f9fc7fcd5c254bad28471cf
"
resolved "https://registry.
npm.taobao.org/zrender/download/zrender-4.3.0.tgz#9f056121b20bbae44414d287bf6a119ff7042661
"
integrity sha
512-YJ9hxt5uFincYYU3KK31+Ce+B6PJmYYK0Q9fQ6jOUAoC/VHbe4kCKAPkxKeT7jGTxrK5wYu18R0TLGqj2zbEOA=
=
integrity sha
1-nwVhIbILuuREFNKHv2oRn/cEJmE
=
ybf_wx/src/views/home.vue
View file @
512b44fc
<
template
>
<
template
>
<!--
<div>
<!--
<div>
<button
@
click=
"disClick"
>
discount
</button>
<button
@
click=
"disClick"
>
discount
</button>
<button
@
click=
"mainSaleClick"
>
mainSale
</button>
<button
@
click=
"mainSaleClick"
>
mainSale
</button>
但事实上所所所你吧nnnnn
</div>
-->
</div>
-->
<div
class=
"main"
>
<div
class=
"main"
>
<!--
<div
class=
"tops"
></div>
-->
<!--
<div
class=
"tops"
></div>
-->
...
@@ -86,7 +86,7 @@ export default {
...
@@ -86,7 +86,7 @@ export default {
"亿百分会员画像,通过一方消费者数据结合三方数据为营业员展示顾客特点"
,
"亿百分会员画像,通过一方消费者数据结合三方数据为营业员展示顾客特点"
,
redirect
:
"GoodPost"
,
redirect
:
"GoodPost"
,
logoUrl
:
"/mainSale/3.png"
logoUrl
:
"/mainSale/3.png"
}
}
]
]
}
}
};
};
...
@@ -102,6 +102,7 @@ export default {
...
@@ -102,6 +102,7 @@ export default {
// this.zTestGetNowUrlInfo();
// this.zTestGetNowUrlInfo();
},
},
methods
:
{
methods
:
{
// 判断是否有code
zReadyUserId
()
{
zReadyUserId
()
{
zlog
(
zlog
(
"%c--->this.zcache.code ="
,
"%c--->this.zcache.code ="
,
...
@@ -208,6 +209,7 @@ export default {
...
@@ -208,6 +209,7 @@ export default {
// )}`
// )}`
// );
// );
// this.zcache.userInfoResNew = "RESOK:" + JSON.stringify(res.data);
// this.zcache.userInfoResNew = "RESOK:" + JSON.stringify(res.data);
// 一些用户信息
this
.
zcache
.
userInfoResNew
=
"RESOK:"
+
res
.
data
.
data
.
userId
;
this
.
zcache
.
userInfoResNew
=
"RESOK:"
+
res
.
data
.
data
.
userId
;
sessionStorage
.
setItem
(
"userId"
,
String
(
res
.
data
.
data
.
userId
));
sessionStorage
.
setItem
(
"userId"
,
String
(
res
.
data
.
data
.
userId
));
this
.
zcache
.
userId
=
String
(
res
.
data
.
data
.
userId
);
this
.
zcache
.
userId
=
String
(
res
.
data
.
data
.
userId
);
...
@@ -271,7 +273,11 @@ export default {
...
@@ -271,7 +273,11 @@ export default {
this
.
$router
.
push
(
"MainSale"
);
this
.
$router
.
push
(
"MainSale"
);
},
},
testButton
(
inCode
)
{}
testButton
(
inCode
)
{},
// 获取店铺Id
getStoreId
()
{
}
}
}
};
};
</
script
>
</
script
>
...
...
ybf_wx/src/views/sideNav/discount/index.vue
View file @
512b44fc
...
@@ -209,17 +209,19 @@ export default {
...
@@ -209,17 +209,19 @@ export default {
.
then
(
res
=>
{
.
then
(
res
=>
{
// alert(`--->userInfoFromId: res = ${JSON.stringify(res.data[0])}`);
// alert(`--->userInfoFromId: res = ${JSON.stringify(res.data[0])}`);
this
.
zcache
.
userInfo
=
String
(
res
.
data
[
0
].
departmentId
);
this
.
zcache
.
userInfo
=
String
(
res
.
data
[
0
].
departmentId
);
// storeId 暂时写死
this
.
zcache
.
storeId
=
1
;
this
.
zcache
.
storeId
=
1
;
// this.zcache.storeId = Number(res.data[0].stall);
// this.zcache.storeId = Number(res.data[0].stall);
this
.
zReadySetVoucherList
();
this
.
zReadySetVoucherList
();
})
})
.
catch
(
err
=>
{});
.
catch
(
err
=>
{});
},
},
// 获取优惠券列表
zReadySetVoucherList
()
{
zReadySetVoucherList
()
{
this
.
zReadyDelVoucherList
();
this
.
zReadyDelVoucherList
();
const
postData
=
{
const
postData
=
{
appCode
:
"0696"
,
appCode
:
"0696"
,
// j接口编码
mdid
:
this
.
zcache
.
storeId
mdid
:
this
.
zcache
.
storeId
};
};
// alert(`--->PostToEA: postData = ${JSON.stringify(postData)}`);
// alert(`--->PostToEA: postData = ${JSON.stringify(postData)}`);
...
...
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