Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
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
高淑倩
7-Eleven
Commits
ebe9d5be
Commit
ebe9d5be
authored
Sep 11, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
分享bug修复
parent
c776b947
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
40 additions
and
21 deletions
+40
-21
bottomTabs.js
src/component/bottomTabs/bottomTabs.js
+1
-1
imageSwiper.js
src/component/imageSwiper/imageSwiper.js
+1
-1
picNav.js
src/component/picNav/picNav.js
+1
-1
tabSort.js
src/component/tabSort/tabSort.js
+1
-1
extendProduct.js
src/pages/extendProduct/extendProduct.js
+2
-1
myShare.js
src/pages/myShare/myShare.js
+2
-1
productDetail.js
src/pages/productDetail/productDetail.js
+3
-1
userCenter.js
src/pages/userCenter/userCenter.js
+9
-3
wantToBuyDetail.js
src/pages/wantToBuyDetail/wantToBuyDetail.js
+6
-4
myRelease.js
src/subPackage/page/pages/myRelease/myRelease.js
+2
-1
myReleaseDetail.js
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.js
+4
-3
share.js
src/subPackage/page/pages/share/share.js
+3
-2
share.wxml
src/subPackage/page/pages/share/share.wxml
+1
-1
share.wxss
src/subPackage/page/pages/share/share.wxss
+1
-0
wxService.js
src/utils/wxService.js
+3
-0
No files found.
src/component/bottomTabs/bottomTabs.js
View file @
ebe9d5be
...
...
@@ -98,7 +98,7 @@ Component({
else
if
(
rowObj
.
type
==
7
)
{
}
else
if
(
rowObj
.
type
==
8
)
{
// 商品
wxService
.
router
(
`/pages/productDetail/productDetail?
productI
d=
${
currentClickRow
}
`
)
wxService
.
router
(
`/pages/productDetail/productDetail?
i
d=
${
currentClickRow
}
`
)
}
else
if
(
rowObj
.
type
==
9
)
{
// 分类
...
...
src/component/imageSwiper/imageSwiper.js
View file @
ebe9d5be
...
...
@@ -138,7 +138,7 @@ Component({
else
if
(
rowObj
.
type
==
7
)
{
}
else
if
(
rowObj
.
type
==
8
)
{
// 商品
wxService
.
router
(
`/pages/productDetail/productDetail?
productI
d=
${
currentClickRow
}
`
)
wxService
.
router
(
`/pages/productDetail/productDetail?
i
d=
${
currentClickRow
}
`
)
}
else
if
(
rowObj
.
type
==
9
)
{
// 分类
...
...
src/component/picNav/picNav.js
View file @
ebe9d5be
...
...
@@ -113,7 +113,7 @@ Component({
else
if
(
rowObj
.
type
==
7
)
{
}
else
if
(
rowObj
.
type
==
8
)
{
// 商品
wxService
.
router
(
`/pages/productDetail/productDetail?
productI
d=
${
currentClickRow
}
`
)
wxService
.
router
(
`/pages/productDetail/productDetail?
i
d=
${
currentClickRow
}
`
)
}
else
if
(
rowObj
.
type
==
9
)
{
// 分类
...
...
src/component/tabSort/tabSort.js
View file @
ebe9d5be
...
...
@@ -132,7 +132,7 @@ Component({
else
if
(
rowObj
.
type
==
7
)
{
}
else
if
(
rowObj
.
type
==
8
)
{
// 商品
wxService
.
router
(
`/pages/productDetail/productDetail?
productI
d=
${
currentClickRow
}
`
)
wxService
.
router
(
`/pages/productDetail/productDetail?
i
d=
${
currentClickRow
}
`
)
}
else
if
(
rowObj
.
type
==
9
)
{
// 分类
...
...
src/pages/extendProduct/extendProduct.js
View file @
ebe9d5be
...
...
@@ -346,7 +346,8 @@ wxService.page({
console
.
log
(
'id'
,
this
.
data
.
currentShareContent
.
id
)
console
.
log
(
path
)
return
{
path
:
path
path
:
path
,
imageUrl
:
this
.
data
.
proData
[
0
].
productImgUrl
,
// 可以更换分享的图片
}
}
...
...
src/pages/myShare/myShare.js
View file @
ebe9d5be
...
...
@@ -227,7 +227,8 @@ wxService.page({
var
path
=
'pages/wantToBuyDetail/wantToBuyDetail?i='
+
id
+
'&t='
+
tentacleId
;
console
.
log
(
path
)
return
{
path
:
path
path
:
path
,
imageUrl
:
this
.
data
.
cardUrl
,
// 可以更换分享的图片
}
}
...
...
src/pages/productDetail/productDetail.js
View file @
ebe9d5be
...
...
@@ -280,7 +280,8 @@ wxService.page({
var
path
=
'pages/productDetail/productDetail?i='
+
id
+
'&t='
+
tentacleId
;
console
.
log
(
path
)
return
{
path
:
path
path
:
path
,
imageUrl
:
this
.
data
.
productInfo
.
indexUrl
,
// 可以更换分享的图片
}
}
})
\ No newline at end of file
src/pages/userCenter/userCenter.js
View file @
ebe9d5be
...
...
@@ -35,7 +35,8 @@ wxService.page({
/**
* 生命周期函数--监听页面加载
*/
onLoad
()
{
onLoad
(
options
)
{
console
.
log
(
'触点-----------'
,
options
)
this
.
setData
(
{
pages
:
[],
...
...
@@ -73,8 +74,11 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow
()
{
let
tentacleInfo
=
wx
.
getStorageSync
(
'TENTACLE_CONTENT'
);
// 取会员卡号
const
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
baseUserInfo
=
wx
.
getStorageSync
(
'tentacleInfo'
)
console
.
log
(
'会员信息------------'
,
baseUserInfo
)
const
cardMember
=
wx
.
getStorageSync
(
'_cardMember'
)
// 登录接口返回err
const
reLoginErrFlag
=
wx
.
getStorageSync
(
'reLoginErr'
)
...
...
@@ -236,7 +240,9 @@ wxService.page({
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
if
(
res
&&
res
.
tentacleId
)
{
let
tentacleId
=
Integer
.
digit
(
res
.
tentacleId
,
10
,
64
);
var
path
=
`pages/userCenter/userCenter?t=
${
tentacleId
}
`
;
// var path = `pages/userCenter/userCenter?t=${tentacleId}`;
var
path
=
`pages/userCenter/userCenter?t=1`
;
console
.
log
(
path
)
return
{
path
:
path
...
...
src/pages/wantToBuyDetail/wantToBuyDetail.js
View file @
ebe9d5be
...
...
@@ -90,7 +90,7 @@ wxService.page({
this
.
setData
({
showCardModal
:
true
,
cardTitle
:
this
.
data
.
contentInfo
.
headline
,
cardUrl
:
this
.
data
.
contentInfo
.
url
,
cardUrl
:
this
.
data
.
contentInfo
.
shareShowPictureRESDTOList
[
0
].
url
,
pagePath
:
path
});
}
...
...
@@ -184,7 +184,8 @@ wxService.page({
let
tentacleId
=
Integer
.
digit
(
this
.
data
.
currentShareContent
.
tentacleId
,
10
,
64
);
var
path
=
'pages/wantToBuyDetail/wantToBuyDetail?i='
+
id
+
'&t='
+
tentacleId
;
return
{
path
:
path
path
:
path
,
imageUrl
:
this
.
data
.
cardUrl
,
// 可以更换分享的图片
}
}
...
...
@@ -192,7 +193,7 @@ wxService.page({
title
:
this
.
data
.
contentInfo
.
headline
,
id
:
this
.
data
.
contentInfo
.
id
,
article
:
this
.
data
.
contentInfo
.
article
,
url
:
this
.
data
.
contentInfo
.
url
url
:
this
.
data
.
contentInfo
.
shareShowPictureRESDTOList
[
0
].
url
}
let
tentacleInfo
=
{
content
:
JSON
.
stringify
(
content
),
...
...
@@ -208,7 +209,8 @@ wxService.page({
let
tentacleId
=
Integer
.
digit
(
res
.
tentacleId
,
10
,
64
);
var
path
=
'pages/wantToBuyDetail/wantToBuyDetail?i='
+
id
+
'&t='
+
tentacleId
;
return
{
path
:
path
path
:
path
,
imageUrl
:
this
.
data
.
cardUrl
,
// 可以更换分享的图片
}
}
});
...
...
src/subPackage/page/pages/myRelease/myRelease.js
View file @
ebe9d5be
...
...
@@ -222,7 +222,8 @@ wxService.page({
var
path
=
'pages/wantToBuyDetail/wantToBuyDetail?i='
+
id
+
'&t='
+
tentacleId
;
console
.
log
(
path
)
return
{
path
:
path
path
:
path
,
imageUrl
:
this
.
data
.
cardUrl
// 可以更换分享的图片
}
}
...
...
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.js
View file @
ebe9d5be
...
...
@@ -66,7 +66,7 @@ wxService.page({
this
.
setData
({
showCardModal
:
true
,
cardTitle
:
this
.
data
.
contentInfo
.
headline
,
cardUrl
:
this
.
data
.
contentInfo
.
url
,
cardUrl
:
this
.
data
.
contentInfo
.
sspList
[
0
].
url
,
pagePath
:
path
});
}
...
...
@@ -206,7 +206,8 @@ wxService.page({
var
path
=
'pages/wantToBuyDetail/wantToBuyDetail?i='
+
id
+
'&t='
+
tentacleId
;
console
.
log
(
path
)
return
{
path
:
path
path
:
path
,
imageUrl
:
this
.
data
.
contentInfo
.
sspList
[
0
].
url
}
}
...
...
@@ -214,7 +215,7 @@ wxService.page({
title
:
this
.
data
.
contentInfo
.
headline
,
id
:
this
.
data
.
contentInfo
.
id
,
article
:
this
.
data
.
contentInfo
.
article
,
url
:
this
.
data
.
contentInfo
.
url
url
:
this
.
data
.
contentInfo
.
sspList
[
0
].
url
}
let
tentacleInfo
=
{
content
:
JSON
.
stringify
(
content
),
...
...
src/subPackage/page/pages/share/share.js
View file @
ebe9d5be
...
...
@@ -99,10 +99,11 @@ wxService.page({
}
wxService
.
post
(
`/marketing/quickMark/getAppQrCodePicture`
,
data
).
then
(
res
=>
{
const
{
result
,
data
}
=
res
.
data
console
.
log
(
app
.
globalData
.
imageUrl
+
data
)
if
(
result
==
0
)
{
this
.
setData
({
//
codeImg: app.globalData.imageUrl + data
codeImg
:
"https://hwimagecdn.ihotwind.cn/usr/201908/miniQrCode-f00c5051fef7479395efb193431762c4.jpg"
codeImg
:
app
.
globalData
.
imageUrl
+
data
//
codeImg: "https://hwimagecdn.ihotwind.cn/usr/201908/miniQrCode-f00c5051fef7479395efb193431762c4.jpg"
},()
=>
{
this
.
setData
({
template
:
new
Card
().
palette
(
this
.
data
.
posterImgData
[
0
],
this
.
data
.
codeImg
,
member
.
memberWeixin
.
nickname
,
avatarUrl
),
...
...
src/subPackage/page/pages/share/share.wxml
View file @
ebe9d5be
...
...
@@ -44,7 +44,7 @@
bindtap="switchPoster"
>
<image class="poster-img" src="{{navItem}}" ></image>
<image class="poster-img" src="{{navItem}}"
mode="aspectFit"
></image>
<view class="select-plus" wx:if="{{idx == currentTab}}">
<view class="circle-radio theme-color">
<image class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix"></image>
...
...
src/subPackage/page/pages/share/share.wxss
View file @
ebe9d5be
...
...
@@ -100,6 +100,7 @@ swiper-item{
}
.poster-img{
width: 100%;
height: 215rpx;
}
.select-plus{
position: absolute;
...
...
src/utils/wxService.js
View file @
ebe9d5be
...
...
@@ -564,7 +564,9 @@ class WXService extends Http {
_self
.
initAppGlobalDataSync
()
//修改参数
let
pageIsFromShare
=
false
,
tentacleId
=
null
;
console
.
log
(
'args'
,
args
)
args
.
forEach
(
item
=>
{
console
.
log
(
'item==='
,
item
)
if
(
item
[
't'
])
{
pageIsFromShare
=
true
;
tentacleId
=
Integer
.
digit
(
item
[
't'
],
64
,
10
);
...
...
@@ -582,6 +584,7 @@ class WXService extends Http {
config
.
onLoad
&&
config
.
onLoad
.
apply
(
page
,
args
);
},
onShow
:
function
(...
args
)
{
console
.
log
(
'________'
,
args
)
const
page
=
this
_self
.
currentPage
=
page
config
.
onShow
&&
config
.
onShow
.
apply
(
page
,
args
)
...
...
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