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
25d0a2b3
Commit
25d0a2b3
authored
Aug 31, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
分享
parent
2fc4668c
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
45 additions
and
54 deletions
+45
-54
extendProduct.js
src/pages/extendProduct/extendProduct.js
+2
-1
productDetail.js
src/pages/productDetail/productDetail.js
+9
-41
productDetail.wxml
src/pages/productDetail/productDetail.wxml
+2
-3
productDetail.wxss
src/pages/productDetail/productDetail.wxss
+3
-0
wantToBuyDetail.js
src/pages/wantToBuyDetail/wantToBuyDetail.js
+1
-1
project.config.json
src/project.config.json
+2
-2
myRelease.js
src/subPackage/page/pages/myRelease/myRelease.js
+5
-5
myReleaseDetail.js
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.js
+21
-1
No files found.
src/pages/extendProduct/extendProduct.js
View file @
25d0a2b3
...
@@ -299,7 +299,9 @@ wxService.page({
...
@@ -299,7 +299,9 @@ wxService.page({
* 用户点击右上角分享
* 用户点击右上角分享
*/
*/
onShareAppMessage
:
function
(
res
)
{
onShareAppMessage
:
function
(
res
)
{
console
.
log
(
res
)
if
(
res
.
from
!=
'menu'
)
{
if
(
res
.
from
!=
'menu'
)
{
console
.
log
(
'1111111'
)
let
id
=
Integer
.
digit
(
this
.
data
.
currentShareContent
.
id
,
10
,
64
);
let
id
=
Integer
.
digit
(
this
.
data
.
currentShareContent
.
id
,
10
,
64
);
let
tentacleId
=
Integer
.
digit
(
this
.
data
.
currentShareContent
.
tentacleId
,
10
,
64
);
let
tentacleId
=
Integer
.
digit
(
this
.
data
.
currentShareContent
.
tentacleId
,
10
,
64
);
var
path
=
'pages/extendProduct/extendProduct?i='
+
id
+
'&t='
+
tentacleId
;
var
path
=
'pages/extendProduct/extendProduct?i='
+
id
+
'&t='
+
tentacleId
;
...
@@ -317,7 +319,6 @@ wxService.page({
...
@@ -317,7 +319,6 @@ wxService.page({
};
};
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
if
(
res
&&
res
.
tentacleId
)
{
if
(
res
&&
res
.
tentacleId
)
{
this
.
data
.
currentShareContent
.
tentacleId
=
res
.
tentacleId
;
let
tentacleId
=
Integer
.
digit
(
res
.
tentacleId
,
10
,
64
);
let
tentacleId
=
Integer
.
digit
(
res
.
tentacleId
,
10
,
64
);
var
path
=
`pages/extendProduct/extendProduct?t=
${
tentacleId
}
`
;
var
path
=
`pages/extendProduct/extendProduct?t=
${
tentacleId
}
`
;
return
{
return
{
...
...
src/pages/productDetail/productDetail.js
View file @
25d0a2b3
...
@@ -61,20 +61,20 @@ wxService.page({
...
@@ -61,20 +61,20 @@ wxService.page({
// 分享
// 分享
onTapShare
()
{
onTapShare
()
{
let
content
=
{
let
content
=
{
headline
:
this
.
data
.
productInfo
.
headline
,
title
:
this
.
data
.
productInfo
.
productName
,
id
:
this
.
data
.
productInfo
.
id
,
id
:
this
.
data
.
productInfo
.
productId
,
article
:
this
.
data
.
productInfo
.
article
,
url
:
this
.
data
.
productInfo
.
indexUrl
url
:
this
.
data
.
productInfo
.
url
}
}
let
tentacleInfo
=
{
let
tentacleInfo
=
{
content
:
JSON
.
stringify
(
content
),
content
:
JSON
.
stringify
(
content
),
contentId
:
this
.
data
.
productInfo
.
i
d
,
contentId
:
this
.
data
.
productInfo
.
productI
d
,
contentType
:
2
,
//内容类型 1.文章 2.商品 3.页面
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
GOODS
,
//内容类型 1.文章 2.商品 3.页面
title
:
this
.
data
.
productInfo
.
headlin
e
,
//标题
title
:
this
.
data
.
productInfo
.
productNam
e
,
//标题
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
}
}
this
.
data
.
currentShareContent
=
this
.
data
.
productInfo
;
this
.
data
.
currentShareContent
=
this
.
data
.
productInfo
;
this
.
data
.
currentShareContent
.
id
=
this
.
data
.
productInfo
.
productId
;
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
if
(
res
&&
res
.
tentacleId
)
{
if
(
res
&&
res
.
tentacleId
)
{
...
@@ -84,8 +84,8 @@ wxService.page({
...
@@ -84,8 +84,8 @@ wxService.page({
var
path
=
'pages/productDetail/productDetail?i='
+
id
+
'&t='
+
tentacleId
;
var
path
=
'pages/productDetail/productDetail?i='
+
id
+
'&t='
+
tentacleId
;
this
.
setData
({
this
.
setData
({
showCardModal
:
true
,
showCardModal
:
true
,
cardTitle
:
this
.
data
.
productInfo
.
headlin
e
,
cardTitle
:
this
.
data
.
productInfo
.
productNam
e
,
cardUrl
:
this
.
data
.
productInfo
.
u
rl
,
cardUrl
:
this
.
data
.
productInfo
.
indexU
rl
,
pagePath
:
path
pagePath
:
path
});
});
}
}
...
@@ -146,34 +146,6 @@ wxService.page({
...
@@ -146,34 +146,6 @@ wxService.page({
})
})
},
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload
:
function
()
{
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh
:
function
()
{
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom
:
function
()
{
},
/**
* 用户点击右上角分享
*/
onShareAppMessage
:
function
()
{
},
// 页面touchstart事件
// 页面touchstart事件
pageTouchStart
:
function
(
e
)
{
pageTouchStart
:
function
(
e
)
{
if
(
this
.
data
.
showHtml
)
{
if
(
this
.
data
.
showHtml
)
{
...
@@ -299,7 +271,4 @@ wxService.page({
...
@@ -299,7 +271,4 @@ wxService.page({
path
:
path
path
:
path
}
}
}
}
})
})
\ No newline at end of file
src/pages/productDetail/productDetail.wxml
View file @
25d0a2b3
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
bindtouchstart="pageTouchStart"
bindtouchstart="pageTouchStart"
bindtouchmove="pageMove"
bindtouchmove="pageMove"
bindtouchend="pageMoveEnd"
bindtouchend="pageMoveEnd"
bindtap="handleCloseSharePopup"
>
>
<view>
<view>
<!-- <buy-image-swiper image-data="{{imageData}}"/>
<!-- <buy-image-swiper image-data="{{imageData}}"/>
...
@@ -113,10 +112,10 @@
...
@@ -113,10 +112,10 @@
report-submit
report-submit
name='home'
name='home'
>
>
<navigator class="get-formId--btn footer-icon">
<
!-- <
navigator class="get-formId--btn footer-icon">
<image src="https://hwimagecdn.ihotwind.cn/hotwind-mini/images/hotnewicon/bottom-kefu.png" mode="widthFix" />
<image src="https://hwimagecdn.ihotwind.cn/hotwind-mini/images/hotnewicon/bottom-kefu.png" mode="widthFix" />
<view class="tab-text">分享</view>
<view class="tab-text">分享</view>
</navigator>
</navigator>
-->
</form>
</form>
</view>
</view>
...
...
src/pages/productDetail/productDetail.wxss
View file @
25d0a2b3
/* pages/productDetail/productDetail.wxss */
/* pages/productDetail/productDetail.wxss */
page{
padding-bottom: 100rpx;
}
.swiper-image{
.swiper-image{
width: 100%;
width: 100%;
}
}
...
...
src/pages/wantToBuyDetail/wantToBuyDetail.js
View file @
25d0a2b3
...
@@ -51,7 +51,7 @@ wxService.page({
...
@@ -51,7 +51,7 @@ wxService.page({
let
tentacleInfo
=
{
let
tentacleInfo
=
{
content
:
JSON
.
stringify
(
content
),
content
:
JSON
.
stringify
(
content
),
contentId
:
this
.
data
.
contentInfo
.
id
,
contentId
:
this
.
data
.
contentInfo
.
id
,
contentType
:
2
,
//内容类型 1.文章 2.商品 3.页面
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
CONTENT
,
//内容类型 1.文章 2.商品 3.页面
title
:
this
.
data
.
contentInfo
.
headline
,
//标题
title
:
this
.
data
.
contentInfo
.
headline
,
//标题
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
}
}
...
...
src/project.config.json
View file @
25d0a2b3
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
"list"
:
[]
"list"
:
[]
},
},
"miniprogram"
:
{
"miniprogram"
:
{
"current"
:
1
7
,
"current"
:
1
6
,
"list"
:
[
"list"
:
[
{
{
"id"
:
-1
,
"id"
:
-1
,
...
@@ -144,7 +144,7 @@
...
@@ -144,7 +144,7 @@
"id"
:
16
,
"id"
:
16
,
"name"
:
"商品详情页"
,
"name"
:
"商品详情页"
,
"pathName"
:
"pages/productDetail/productDetail"
,
"pathName"
:
"pages/productDetail/productDetail"
,
"query"
:
"productId=100
0704
"
,
"query"
:
"productId=100
8190
"
,
"scene"
:
null
"scene"
:
null
},
},
{
{
...
...
src/subPackage/page/pages/myRelease/myRelease.js
View file @
25d0a2b3
...
@@ -150,10 +150,11 @@ wxService.page({
...
@@ -150,10 +150,11 @@ wxService.page({
// 分享
// 分享
_onTapShare
(
e
)
{
_onTapShare
(
e
)
{
console
.
log
(
e
)
let
tentacleInfo
=
{
let
tentacleInfo
=
{
content
:
JSON
.
stringify
(
e
.
detail
),
content
:
JSON
.
stringify
(
e
.
detail
),
contentId
:
e
.
detail
.
id
,
contentId
:
e
.
detail
.
id
,
contentType
:
2
,
//内容类型 1.文章 2.商品 3.页面
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
CONETNT
,
//内容类型 1.文章 2.商品 3.页面
title
:
e
.
detail
.
title
,
//标题
title
:
e
.
detail
.
title
,
//标题
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
}
}
...
@@ -213,14 +214,13 @@ wxService.page({
...
@@ -213,14 +214,13 @@ wxService.page({
}
}
let
tentacleInfo
=
{
let
tentacleInfo
=
{
content
:
this
.
route
,
content
:
'我的发布'
,
title
:
this
.
route
,
title
:
'我的发布'
,
contentType
:
3
,
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
PAGE
,
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
};
};
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
if
(
res
&&
res
.
tentacleId
)
{
if
(
res
&&
res
.
tentacleId
)
{
this
.
data
.
currentShareContent
.
tentacleId
=
res
.
tentacleId
;
let
tentacleId
=
Integer
.
digit
(
res
.
tentacleId
,
10
,
64
);
let
tentacleId
=
Integer
.
digit
(
res
.
tentacleId
,
10
,
64
);
var
path
=
`subPackage/page/pages/myRelease/myRelease?t=
${
tentacleId
}
`
;
var
path
=
`subPackage/page/pages/myRelease/myRelease?t=
${
tentacleId
}
`
;
return
{
return
{
...
...
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.js
View file @
25d0a2b3
...
@@ -49,12 +49,13 @@ wxService.page({
...
@@ -49,12 +49,13 @@ wxService.page({
let
tentacleInfo
=
{
let
tentacleInfo
=
{
content
:
JSON
.
stringify
(
content
),
content
:
JSON
.
stringify
(
content
),
contentId
:
this
.
data
.
contentInfo
.
id
,
contentId
:
this
.
data
.
contentInfo
.
id
,
contentType
:
2
,
//内容类型 1.文章 2.商品 3.页面
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
CONETNT
,
//内容类型 1.文章 2.商品 3.页面
title
:
this
.
data
.
contentInfo
.
headline
,
//标题
title
:
this
.
data
.
contentInfo
.
headline
,
//标题
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
}
}
this
.
data
.
currentShareContent
=
this
.
data
.
contentInfo
;
this
.
data
.
currentShareContent
=
this
.
data
.
contentInfo
;
console
.
log
(
this
.
data
.
contentInfo
)
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
if
(
res
&&
res
.
tentacleId
)
{
if
(
res
&&
res
.
tentacleId
)
{
...
@@ -199,6 +200,7 @@ wxService.page({
...
@@ -199,6 +200,7 @@ wxService.page({
* 用户点击右上角分享
* 用户点击右上角分享
*/
*/
onShareAppMessage
:
function
(
res
)
{
onShareAppMessage
:
function
(
res
)
{
if
(
res
.
from
!=
'menu'
)
{
let
id
=
Integer
.
digit
(
this
.
data
.
currentShareContent
.
id
,
10
,
64
);
let
id
=
Integer
.
digit
(
this
.
data
.
currentShareContent
.
id
,
10
,
64
);
let
tentacleId
=
Integer
.
digit
(
this
.
data
.
currentShareContent
.
tentacleId
,
10
,
64
);
let
tentacleId
=
Integer
.
digit
(
this
.
data
.
currentShareContent
.
tentacleId
,
10
,
64
);
var
path
=
'subPackage/page/pages/myReleaseDetail/myReleaseDetail?i='
+
id
+
'&t='
+
tentacleId
;
var
path
=
'subPackage/page/pages/myReleaseDetail/myReleaseDetail?i='
+
id
+
'&t='
+
tentacleId
;
...
@@ -206,5 +208,22 @@ wxService.page({
...
@@ -206,5 +208,22 @@ wxService.page({
return
{
return
{
path
:
path
path
:
path
}
}
}
let
tentacleInfo
=
{
content
:
'种草详情'
,
title
:
'种草详情'
,
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
PAGE
,
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
};
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
if
(
res
&&
res
.
tentacleId
)
{
let
tentacleId
=
Integer
.
digit
(
res
.
tentacleId
,
10
,
64
);
var
path
=
`subPackage/page/pages/myReleaseDetail/myReleaseDetail?t=
${
tentacleId
}
`
;
return
{
path
:
path
}
}
});
}
}
})
})
\ No newline at end of file
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