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
6d630928
Commit
6d630928
authored
Nov 06, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
console
parent
07d75b1d
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
0 additions
and
54 deletions
+0
-54
buyImageSwiper.js
src/component/buyImageSwiper/buyImageSwiper.js
+0
-1
imageSwiper.js
src/component/imageSwiper/imageSwiper.js
+0
-1
selectRelatedGoods.js
src/component/selectRelatedGoods/selectRelatedGoods.js
+0
-1
shareModal.js
src/component/shareModal/shareModal.js
+0
-2
sharePoster.js
src/component/sharePoster/sharePoster.js
+0
-3
tabBarShop.js
src/component/tabBarShop/tabBarShop.js
+0
-1
uploadVideo.js
src/component/uploadVideo/uploadVideo.js
+0
-1
addAddress.js
src/pages/addAddress/addAddress.js
+0
-3
cart.js
src/pages/cart/cart.js
+0
-6
confirmOrder.js
src/pages/confirmOrder/confirmOrder.js
+0
-2
extendProduct.js
src/pages/extendProduct/extendProduct.js
+0
-6
my.js
src/pages/my_1/my.js
+0
-2
orderDetail.js
src/pages/orderDetail/orderDetail.js
+0
-9
productDetail.js
src/pages/productDetail/productDetail.js
+0
-4
refund.js
src/pages/refund/refund.js
+0
-3
refundDetail.js
src/pages/refundDetail/refundDetail.js
+0
-1
userCenter.js
src/pages/userCenter/userCenter.js
+0
-1
categoryPro.js
src/subPackage/page/pages/categoryPro/categoryPro.js
+0
-1
paymentStatus.js
src/subPackage/page/pages/paymentStatus/paymentStatus.js
+0
-1
scanCoupon.js
src/subPackage/page/pages/scanCoupon/scanCoupon.js
+0
-1
scanCouponStoreList.js
...age/page/pages/scanCouponStoreList/scanCouponStoreList.js
+0
-1
share.js
src/subPackage/page/pages/share/share.js
+0
-2
subPage.js
src/subPackage/page/pages/subPage/subPage.js
+0
-1
No files found.
src/component/buyImageSwiper/buyImageSwiper.js
View file @
6d630928
...
@@ -84,7 +84,6 @@ Component({
...
@@ -84,7 +84,6 @@ Component({
}
}
},
},
swiperChange
(
e
){
swiperChange
(
e
){
console
.
log
(
e
)
this
.
setData
({
this
.
setData
({
swiperCurrent
:
e
.
detail
.
current
swiperCurrent
:
e
.
detail
.
current
})
})
...
...
src/component/imageSwiper/imageSwiper.js
View file @
6d630928
...
@@ -127,7 +127,6 @@ Component({
...
@@ -127,7 +127,6 @@ Component({
//如果是在企业微信中 由于不支持observers属性方法,因此需要手动调用
//如果是在企业微信中 由于不支持observers属性方法,因此需要手动调用
const
currentEnv
=
wx
.
getStorageSync
(
'_qyWeChat'
);
const
currentEnv
=
wx
.
getStorageSync
(
'_qyWeChat'
);
if
(
currentEnv
){
if
(
currentEnv
){
// console.log('its in qiye weixin')
this
.
calMaxHeight
(
heights
);
this
.
calMaxHeight
(
heights
);
}
}
...
...
src/component/selectRelatedGoods/selectRelatedGoods.js
View file @
6d630928
...
@@ -61,7 +61,6 @@ Component({
...
@@ -61,7 +61,6 @@ Component({
})
})
},
},
_selectCoupon
(
e
){
_selectCoupon
(
e
){
console
.
log
(
e
)
this
.
setData
({
this
.
setData
({
proData
:
e
.
detail
proData
:
e
.
detail
})
})
...
...
src/component/shareModal/shareModal.js
View file @
6d630928
...
@@ -44,7 +44,6 @@ Component({
...
@@ -44,7 +44,6 @@ Component({
let
windowHeight
=
''
;
let
windowHeight
=
''
;
wx
.
getSystemInfo
({
wx
.
getSystemInfo
({
success
:
function
(
res
)
{
success
:
function
(
res
)
{
console
.
log
(
res
.
windowHeight
);
windowHeight
=
res
.
windowHeight
windowHeight
=
res
.
windowHeight
},
},
})
})
...
@@ -52,7 +51,6 @@ Component({
...
@@ -52,7 +51,6 @@ Component({
let
query
=
wx
.
createSelectorQuery
().
in
(
this
);
let
query
=
wx
.
createSelectorQuery
().
in
(
this
);
query
.
select
(
'#bottom-query'
).
boundingClientRect
(
rect
=>
{
query
.
select
(
'#bottom-query'
).
boundingClientRect
(
rect
=>
{
let
height
=
rect
.
height
;
let
height
=
rect
.
height
;
console
.
log
(
height
)
this
.
setData
({
this
.
setData
({
shareHight
:
windowHeight
-
height
+
'px'
shareHight
:
windowHeight
-
height
+
'px'
})
})
...
...
src/component/sharePoster/sharePoster.js
View file @
6d630928
...
@@ -115,7 +115,6 @@ Component({
...
@@ -115,7 +115,6 @@ Component({
success
:
function
(
res
)
{
success
:
function
(
res
)
{
wx
.
hideLoading
();
wx
.
hideLoading
();
if
(
res
.
statusCode
===
200
)
{
if
(
res
.
statusCode
===
200
)
{
console
.
log
(
'000'
,
res
.
tempFilePath
)
var
codeSrc
=
res
.
tempFilePath
;
var
codeSrc
=
res
.
tempFilePath
;
that
.
sharePosteCanvas
(
productSrc
,
codeSrc
,
imgInfo
);
that
.
sharePosteCanvas
(
productSrc
,
codeSrc
,
imgInfo
);
}
else
{
}
else
{
...
@@ -148,7 +147,6 @@ Component({
...
@@ -148,7 +147,6 @@ Component({
//canvas绘制分享海报
//canvas绘制分享海报
sharePosteCanvas
:
function
(
avaterSrc
,
codeSrc
,
imgInfo
)
{
sharePosteCanvas
:
function
(
avaterSrc
,
codeSrc
,
imgInfo
)
{
console
.
log
(
'----'
,
this
.
data
.
productDesc
)
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'生成中...'
,
title
:
'生成中...'
,
...
@@ -372,7 +370,6 @@ Component({
...
@@ -372,7 +370,6 @@ Component({
},
},
//快速分享到朋友圈
//快速分享到朋友圈
quickShare
()
{
quickShare
()
{
console
.
log
(
'222'
)
this
.
setData
({
this
.
setData
({
showpost
:
false
showpost
:
false
})
})
...
...
src/component/tabBarShop/tabBarShop.js
View file @
6d630928
...
@@ -14,7 +14,6 @@ Component({
...
@@ -14,7 +14,6 @@ Component({
}
}
},
},
attached
()
{
attached
()
{
console
.
log
(
'----'
,
this
.
data
.
tabList
)
this
.
setData
({
this
.
setData
({
categoryList
:
this
.
data
.
tabList
categoryList
:
this
.
data
.
tabList
})
})
...
...
src/component/uploadVideo/uploadVideo.js
View file @
6d630928
...
@@ -76,7 +76,6 @@ Component({
...
@@ -76,7 +76,6 @@ Component({
maxDuration
:
60
,
maxDuration
:
60
,
camera
:
'back'
,
camera
:
'back'
,
success
(
res
)
{
success
(
res
)
{
console
.
log
(
res
.
tempFilePath
)
const
video
=
res
.
tempFilePath
;
const
video
=
res
.
tempFilePath
;
that
.
setData
({
that
.
setData
({
video
:
video
video
:
video
...
...
src/pages/addAddress/addAddress.js
View file @
6d630928
...
@@ -81,8 +81,6 @@ wxService.page({
...
@@ -81,8 +81,6 @@ wxService.page({
this
.
setData
({
this
.
setData
({
citys
:
[
province
,
cityList
,
district
]
citys
:
[
province
,
cityList
,
district
]
})
})
console
.
log
(
'++++'
,
this
.
data
.
citys
)
},
},
// 通过地址id查询
// 通过地址id查询
...
@@ -141,7 +139,6 @@ wxService.page({
...
@@ -141,7 +139,6 @@ wxService.page({
},
},
bindMultiPickerColumnChange
(
e
)
{
bindMultiPickerColumnChange
(
e
)
{
console
.
log
(
'0000'
,
e
)
const
detail
=
e
.
detail
const
detail
=
e
.
detail
const
index
=
detail
.
value
const
index
=
detail
.
value
let
cityName
=
''
let
cityName
=
''
...
...
src/pages/cart/cart.js
View file @
6d630928
...
@@ -113,7 +113,6 @@ wxService.page({
...
@@ -113,7 +113,6 @@ wxService.page({
cartList
:
cartList
cartList
:
cartList
},
function
()
{
},
function
()
{
this
.
setTotalFee
()
this
.
setTotalFee
()
console
.
log
(
'减少'
,
cartList
[
e
])
this
.
inputProNumber
(
cartList
[
e
])
// update
this
.
inputProNumber
(
cartList
[
e
])
// update
// this.editOk(cartList[e]) //调用完成
// this.editOk(cartList[e]) //调用完成
})
})
...
@@ -142,7 +141,6 @@ wxService.page({
...
@@ -142,7 +141,6 @@ wxService.page({
},
function
()
{
},
function
()
{
this
.
setTotalFee
()
this
.
setTotalFee
()
console
.
log
(
'add'
,
cartList
[
e
])
this
.
inputProNumber
(
cartList
[
e
])
// update
this
.
inputProNumber
(
cartList
[
e
])
// update
// this.editOk(cartList[e]) // add调用完成
// this.editOk(cartList[e]) // add调用完成
})
})
...
@@ -163,7 +161,6 @@ wxService.page({
...
@@ -163,7 +161,6 @@ wxService.page({
cartList
:
cartList
cartList
:
cartList
},
function
()
{
},
function
()
{
this
.
setTotalFee
()
this
.
setTotalFee
()
console
.
log
(
'blur'
,
cartList
[
e
.
index
])
this
.
inputProNumber
(
cartList
[
e
.
index
])
//调用完成
this
.
inputProNumber
(
cartList
[
e
.
index
])
//调用完成
})
})
...
@@ -186,7 +183,6 @@ wxService.page({
...
@@ -186,7 +183,6 @@ wxService.page({
cartList
:
cartList
cartList
:
cartList
},
function
()
{
},
function
()
{
this
.
setTotalFee
()
this
.
setTotalFee
()
console
.
log
(
'input'
,
cartList
[
e
.
index
])
this
.
inputProNumber
(
cartList
[
e
.
index
])
//调用完成
this
.
inputProNumber
(
cartList
[
e
.
index
])
//调用完成
})
})
}
}
...
@@ -267,7 +263,6 @@ wxService.page({
...
@@ -267,7 +263,6 @@ wxService.page({
const
{
result
,
data
}
=
res
&&
res
.
data
||
res
&&
res
.
result
const
{
result
,
data
}
=
res
&&
res
.
data
||
res
&&
res
.
result
if
(
result
==
0
)
{
if
(
result
==
0
)
{
delete
data
.
appId
delete
data
.
appId
console
.
log
(
'dddd'
,
data
.
amount
)
let
amount
=
data
.
amount
||
0
let
amount
=
data
.
amount
||
0
wx
.
requestPayment
(
Object
.
assign
({
wx
.
requestPayment
(
Object
.
assign
({
success
(
res
)
{
success
(
res
)
{
...
@@ -290,7 +285,6 @@ wxService.page({
...
@@ -290,7 +285,6 @@ wxService.page({
},
},
// 调整商品 /trolley/add
// 调整商品 /trolley/add
editOk
(
cartPro
)
{
editOk
(
cartPro
)
{
console
.
log
(
'cartPro'
,
cartPro
)
// count skuId
// count skuId
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
title
:
'加载中'
...
...
src/pages/confirmOrder/confirmOrder.js
View file @
6d630928
...
@@ -507,7 +507,6 @@ console.log('sele', finCouponName, finCouponId)
...
@@ -507,7 +507,6 @@ console.log('sele', finCouponName, finCouponId)
const
{
memberId
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
{
memberId
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
wx
.
chooseAddress
({
wx
.
chooseAddress
({
success
:
(
res
)
=>
{
success
:
(
res
)
=>
{
console
.
log
(
'微信地址'
,
res
)
res
.
name
=
res
.
userName
res
.
name
=
res
.
userName
res
.
phone
=
res
.
telNumber
res
.
phone
=
res
.
telNumber
res
.
fullArea
=
res
.
provinceName
+
res
.
cityName
+
res
.
countyName
res
.
fullArea
=
res
.
provinceName
+
res
.
cityName
+
res
.
countyName
...
@@ -542,7 +541,6 @@ console.log('sele', finCouponName, finCouponId)
...
@@ -542,7 +541,6 @@ console.log('sele', finCouponName, finCouponId)
this
.
data
.
addressInfo
.
fullArea
=
this
.
data
.
addressInfo
.
provinceName
+
' '
+
this
.
data
.
addressInfo
.
fullArea
=
this
.
data
.
addressInfo
.
provinceName
+
' '
+
this
.
data
.
addressInfo
.
cityName
+
' '
+
this
.
data
.
addressInfo
.
countyName
this
.
data
.
addressInfo
.
cityName
+
' '
+
this
.
data
.
addressInfo
.
countyName
wx
.
setStorageSync
(
'_defalutAddress'
,
this
.
data
.
addressInfo
)
wx
.
setStorageSync
(
'_defalutAddress'
,
this
.
data
.
addressInfo
)
console
.
log
(
'WX---------------------'
,
this
.
data
.
addressInfo
)
},
},
fail
:
function
(
err
)
{
fail
:
function
(
err
)
{
console
.
log
(
err
)
console
.
log
(
err
)
...
...
src/pages/extendProduct/extendProduct.js
View file @
6d630928
...
@@ -177,10 +177,8 @@ wxService.page({
...
@@ -177,10 +177,8 @@ wxService.page({
title
:
this
.
data
.
proData
[
0
].
productName
,
title
:
this
.
data
.
proData
[
0
].
productName
,
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
}
}
console
.
log
(
'4444'
,
tentacleInfo
.
content
)
this
.
data
.
currentShareContent
=
data
;
this
.
data
.
currentShareContent
=
data
;
console
.
log
(
'++++++++++++++++'
,
this
.
data
.
currentShareContent
)
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
wxService
.
getTentacleContent
(
tentacleInfo
).
then
(
res
=>
{
if
(
res
&&
res
.
id
)
{
if
(
res
&&
res
.
id
)
{
...
@@ -272,7 +270,6 @@ wxService.page({
...
@@ -272,7 +270,6 @@ wxService.page({
// 获取我的推广订单列表
// 获取我的推广订单列表
getMyExtendOrderList
(
pageNum
,
pageSize
){
getMyExtendOrderList
(
pageNum
,
pageSize
){
console
.
log
(
'pageNum----'
,
pageNum
)
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
,
title
:
'加载中'
,
mask
:
true
mask
:
true
...
@@ -398,8 +395,6 @@ wxService.page({
...
@@ -398,8 +395,6 @@ wxService.page({
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/friendShareList/friendShareList?i='
+
id
+
'&t='
+
tentacleId
;
var
path
=
'subPackage/page/pages/friendShareList/friendShareList?i='
+
id
+
'&t='
+
tentacleId
;
console
.
log
(
'用户点击右上角分享'
,
this
.
data
.
currentShareContent
.
id
)
console
.
log
(
path
)
return
{
return
{
title
:
this
.
data
.
proData
[
0
].
productName
,
title
:
this
.
data
.
proData
[
0
].
productName
,
path
:
path
,
path
:
path
,
...
@@ -409,7 +404,6 @@ wxService.page({
...
@@ -409,7 +404,6 @@ wxService.page({
const
{
memberId
,
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
{
memberId
,
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
//修改为参数memberId
//修改为参数memberId
var
path
=
`pages/extendProduct/extendProduct`
;
var
path
=
`pages/extendProduct/extendProduct`
;
console
.
log
(
'推广商品memberId-----'
,
memberId
)
if
(
memberId
){
if
(
memberId
){
let
m
=
Integer
.
digit
(
memberId
,
10
,
64
);
let
m
=
Integer
.
digit
(
memberId
,
10
,
64
);
path
=
`pages/extendProduct/extendProduct?m=
${
m
}
`
;
path
=
`pages/extendProduct/extendProduct?m=
${
m
}
`
;
...
...
src/pages/my_1/my.js
View file @
6d630928
...
@@ -32,13 +32,11 @@ wxService.page({
...
@@ -32,13 +32,11 @@ wxService.page({
})
})
},
},
translate
()
{
translate
()
{
console
.
log
(
'平移变换'
)
// 平移变换
// 平移变换
this
.
animation
.
translateY
(
-
107
).
step
()
this
.
animation
.
translateY
(
-
107
).
step
()
this
.
setData
({
animation
:
this
.
animation
.
export
()})
this
.
setData
({
animation
:
this
.
animation
.
export
()})
},
},
reset
()
{
reset
()
{
console
.
log
(
'重置'
)
this
.
animation
.
translateY
(
0
)
this
.
animation
.
translateY
(
0
)
.
step
({
duration
:
0
})
.
step
({
duration
:
0
})
this
.
setData
({
animation
:
this
.
animation
.
export
()})
this
.
setData
({
animation
:
this
.
animation
.
export
()})
...
...
src/pages/orderDetail/orderDetail.js
View file @
6d630928
...
@@ -34,7 +34,6 @@ wxService.page({
...
@@ -34,7 +34,6 @@ wxService.page({
let
detailOrderList
=
wx
.
getStorageSync
(
'orderList'
)
let
detailOrderList
=
wx
.
getStorageSync
(
'orderList'
)
let
currentDetail
=
detailOrderList
.
filter
(
item
=>
item
.
id
==
id
)
let
currentDetail
=
detailOrderList
.
filter
(
item
=>
item
.
id
==
id
)
// /trade/buyer/{id} 订单详情
// /trade/buyer/{id} 订单详情
console
.
log
(
'id'
,
id
)
if
(
id
)
{
if
(
id
)
{
this
.
setData
({
this
.
setData
({
id
id
...
@@ -117,13 +116,11 @@ wxService.page({
...
@@ -117,13 +116,11 @@ wxService.page({
if
(
result
.
hour
<
10
)
result
.
hour
=
'0'
+
result
.
hour
;
if
(
result
.
hour
<
10
)
result
.
hour
=
'0'
+
result
.
hour
;
}
else
{
}
else
{
const
{
detail
,
id
}
=
this
.
data
const
{
detail
,
id
}
=
this
.
data
console
.
log
(
'status'
,
detail
.
status
)
if
(
!
this
.
getDetailLimitCount
)
{
if
(
!
this
.
getDetailLimitCount
)
{
this
.
getDetailLimitCount
=
1
this
.
getDetailLimitCount
=
1
}
else
{
}
else
{
this
.
getDetailLimitCount
++
this
.
getDetailLimitCount
++
}
}
console
.
log
(
'detail-request'
,
this
.
getDetailLimitCount
)
if
(
this
.
getDetailLimitCount
<=
1
&&
detail
.
status
==
'N'
)
{
if
(
this
.
getDetailLimitCount
<=
1
&&
detail
.
status
==
'N'
)
{
this
.
getOrderDetail
(
id
)
this
.
getOrderDetail
(
id
)
}
}
...
@@ -134,7 +131,6 @@ wxService.page({
...
@@ -134,7 +131,6 @@ wxService.page({
// 删除订单
// 删除订单
handelDelOrder
(
e
)
{
handelDelOrder
(
e
)
{
const
{
id
}
=
e
.
currentTarget
.
dataset
const
{
id
}
=
e
.
currentTarget
.
dataset
console
.
log
(
'删除订单'
,
id
)
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
,
title
:
'加载中'
,
mask
:
true
mask
:
true
...
@@ -197,7 +193,6 @@ wxService.page({
...
@@ -197,7 +193,6 @@ wxService.page({
},
},
// 取消订单
// 取消订单
handelCancelOrder
(
e
)
{
handelCancelOrder
(
e
)
{
console
.
log
(
'取消订单'
)
const
{
id
}
=
e
.
currentTarget
.
dataset
const
{
id
}
=
e
.
currentTarget
.
dataset
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
,
title
:
'加载中'
,
...
@@ -231,16 +226,13 @@ wxService.page({
...
@@ -231,16 +226,13 @@ wxService.page({
},
},
// 查看物流
// 查看物流
checkLogistics
(
e
)
{
checkLogistics
(
e
)
{
console
.
log
(
'----'
,
e
)
const
{
detail
}
=
e
.
currentTarget
.
dataset
const
{
detail
}
=
e
.
currentTarget
.
dataset
let
params
=
JSON
.
stringify
(
detail
)
let
params
=
JSON
.
stringify
(
detail
)
console
.
log
(
"params"
,
params
)
// 退款申请
// 退款申请
wxService
.
router
(
`/pages/logistics/logistics`
).
search
({
params
})
wxService
.
router
(
`/pages/logistics/logistics`
).
search
({
params
})
},
},
// 申请退款
// 申请退款
handelRequestRefund
(
e
)
{
handelRequestRefund
(
e
)
{
console
.
log
(
'----'
,
e
)
const
{
id
}
=
e
.
currentTarget
.
dataset
const
{
id
}
=
e
.
currentTarget
.
dataset
const
{
detail
}
=
e
.
currentTarget
.
dataset
const
{
detail
}
=
e
.
currentTarget
.
dataset
detail
.
id
=
this
.
data
.
id
detail
.
id
=
this
.
data
.
id
...
@@ -250,7 +242,6 @@ wxService.page({
...
@@ -250,7 +242,6 @@ wxService.page({
},
},
// 确认收货
// 确认收货
handelConfirmReceipt
(
e
)
{
handelConfirmReceipt
(
e
)
{
console
.
log
(
'----'
,
e
)
const
{
id
}
=
e
.
currentTarget
.
dataset
const
{
id
}
=
e
.
currentTarget
.
dataset
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
,
title
:
'加载中'
,
...
...
src/pages/productDetail/productDetail.js
View file @
6d630928
...
@@ -275,7 +275,6 @@ wxService.page({
...
@@ -275,7 +275,6 @@ wxService.page({
// 加入购物车
// 加入购物车
this
.
getPutCart
(
trolleySku
)
this
.
getPutCart
(
trolleySku
)
}
else
if
(
this
.
data
.
showSkuPopupType
==
'buy'
)
{
}
else
if
(
this
.
data
.
showSkuPopupType
==
'buy'
)
{
console
.
log
(
'buy'
)
// 关闭弹框
// 关闭弹框
this
.
setData
({
this
.
setData
({
showSkuPopup
:
false
showSkuPopup
:
false
...
@@ -329,7 +328,6 @@ wxService.page({
...
@@ -329,7 +328,6 @@ wxService.page({
// 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/productDetail/productDetail?i=' + id + '&t=' + tentacleId;
// var path = 'pages/productDetail/productDetail?i=' + id + '&t=' + tentacleId;
// console.log(path)
// return {
// return {
// path: path,
// path: path,
// imageUrl: this.data.productInfo.indexUrl, // 可以更换分享的图片
// imageUrl: this.data.productInfo.indexUrl, // 可以更换分享的图片
...
@@ -338,7 +336,6 @@ wxService.page({
...
@@ -338,7 +336,6 @@ wxService.page({
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/productDetail/productDetail?i='
+
id
+
'&t='
+
tentacleId
;
var
path
=
'pages/productDetail/productDetail?i='
+
id
+
'&t='
+
tentacleId
;
console
.
log
(
path
)
return
{
return
{
title
:
this
.
data
.
productInfo
.
productName
,
title
:
this
.
data
.
productInfo
.
productName
,
path
:
path
,
path
:
path
,
...
@@ -348,7 +345,6 @@ wxService.page({
...
@@ -348,7 +345,6 @@ wxService.page({
//修改为参数memberId
//修改为参数memberId
var
path
=
`pages/productDetail/productDetail`
;
var
path
=
`pages/productDetail/productDetail`
;
const
{
memberId
,
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
{
memberId
,
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
console
.
log
(
'--------------------memberId-=---'
,
memberId
)
if
(
memberId
)
{
if
(
memberId
)
{
let
m
=
Integer
.
digit
(
memberId
,
10
,
64
);
let
m
=
Integer
.
digit
(
memberId
,
10
,
64
);
let
contentId
=
Integer
.
digit
(
this
.
data
.
productInfo
.
productId
,
10
,
64
);
let
contentId
=
Integer
.
digit
(
this
.
data
.
productInfo
.
productId
,
10
,
64
);
...
...
src/pages/refund/refund.js
View file @
6d630928
...
@@ -139,7 +139,6 @@ wxService.page({
...
@@ -139,7 +139,6 @@ wxService.page({
checkPro
(
e
)
{
checkPro
(
e
)
{
var
index
=
e
.
currentTarget
.
dataset
.
index
var
index
=
e
.
currentTarget
.
dataset
.
index
const
{
cartList
}
=
this
.
data
const
{
cartList
}
=
this
.
data
console
.
log
(
'index'
,
index
,
cartList
[
index
].
checked
)
if
(
cartList
[
index
].
checked
)
{
if
(
cartList
[
index
].
checked
)
{
cartList
[
index
].
checked
=
false
cartList
[
index
].
checked
=
false
}
else
{
}
else
{
...
@@ -165,7 +164,6 @@ wxService.page({
...
@@ -165,7 +164,6 @@ wxService.page({
var
cartList
=
this
.
data
.
cartList
var
cartList
=
this
.
data
.
cartList
var
index
=
e
.
currentTarget
.
dataset
.
index
var
index
=
e
.
currentTarget
.
dataset
.
index
let
proNum
=
cartList
[
index
].
count
let
proNum
=
cartList
[
index
].
count
console
.
log
(
'减少数量'
,
proNum
)
if
(
proNum
>
1
)
{
if
(
proNum
>
1
)
{
proNum
--
proNum
--
...
@@ -188,7 +186,6 @@ wxService.page({
...
@@ -188,7 +186,6 @@ wxService.page({
var
index
=
e
.
currentTarget
.
dataset
.
index
var
index
=
e
.
currentTarget
.
dataset
.
index
var
cartList
=
this
.
data
.
cartList
var
cartList
=
this
.
data
.
cartList
var
proNum
=
cartList
[
index
].
count
var
proNum
=
cartList
[
index
].
count
console
.
log
(
'增加数量'
,
proNum
)
proNum
++
proNum
++
...
...
src/pages/refundDetail/refundDetail.js
View file @
6d630928
...
@@ -96,7 +96,6 @@ wxService.page({
...
@@ -96,7 +96,6 @@ wxService.page({
//填写物流信息
//填写物流信息
tapWriteLogis
()
{
tapWriteLogis
()
{
console
.
log
(
'222'
)
this
.
setData
({
this
.
setData
({
showApplyRefundModal
:
true
,
showApplyRefundModal
:
true
,
refundId
:
this
.
data
.
id
refundId
:
this
.
data
.
id
...
...
src/pages/userCenter/userCenter.js
View file @
6d630928
...
@@ -64,7 +64,6 @@ wxService.page({
...
@@ -64,7 +64,6 @@ wxService.page({
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
HOME
,
contentType
:
app
.
globalData
.
contants
.
SHARE_TYPE
.
HOME
,
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
type
:
3
// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
};
};
console
.
log
(
'触点对象id-----------'
,
options
)
this
.
generatePointObject
(
tentacleInfo
);
this
.
generatePointObject
(
tentacleInfo
);
}
}
...
...
src/subPackage/page/pages/categoryPro/categoryPro.js
View file @
6d630928
...
@@ -46,7 +46,6 @@ wxService.page({
...
@@ -46,7 +46,6 @@ wxService.page({
* 生命周期函数--监听页面加载
* 生命周期函数--监听页面加载
*/
*/
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
console
.
log
(
options
)
if
(
options
&&
options
.
id
)
{
if
(
options
&&
options
.
id
)
{
this
.
setData
({
this
.
setData
({
'form.mallCategoryId'
:
options
.
id
'form.mallCategoryId'
:
options
.
id
...
...
src/subPackage/page/pages/paymentStatus/paymentStatus.js
View file @
6d630928
...
@@ -34,7 +34,6 @@ wxService.page({
...
@@ -34,7 +34,6 @@ wxService.page({
*/
*/
onShow
:
function
()
{
onShow
:
function
()
{
const
{
amount
,
status
}
=
this
.
options
const
{
amount
,
status
}
=
this
.
options
console
.
log
(
'this.options'
,
status
)
this
.
setData
({
this
.
setData
({
amount
,
amount
,
status
status
...
...
src/subPackage/page/pages/scanCoupon/scanCoupon.js
View file @
6d630928
...
@@ -45,7 +45,6 @@ wxService.page({
...
@@ -45,7 +45,6 @@ wxService.page({
* 生命周期函数--监听页面加载
* 生命周期函数--监听页面加载
*/
*/
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
console
.
log
(
'--------'
,
options
)
this
.
setData
({
this
.
setData
({
id
:
options
.
id
id
:
options
.
id
},()
=>
{
},()
=>
{
...
...
src/subPackage/page/pages/scanCouponStoreList/scanCouponStoreList.js
View file @
6d630928
...
@@ -26,7 +26,6 @@ wxService.page({
...
@@ -26,7 +26,6 @@ wxService.page({
* 生命周期函数--监听页面显示
* 生命周期函数--监听页面显示
*/
*/
onShow
:
function
()
{
onShow
:
function
()
{
console
.
log
(
'--------'
,
this
.
options
)
const
{
storeList
}
=
this
.
options
const
{
storeList
}
=
this
.
options
this
.
setData
({
this
.
setData
({
...
...
src/subPackage/page/pages/share/share.js
View file @
6d630928
...
@@ -130,7 +130,6 @@ wxService.page({
...
@@ -130,7 +130,6 @@ wxService.page({
},()
=>
{
},()
=>
{
const
{
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
{
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
{
avatarUrl
}
=
wx
.
getStorageSync
(
'_userInfo'
)
const
{
avatarUrl
}
=
wx
.
getStorageSync
(
'_userInfo'
)
console
.
log
(
'0000'
,
avatarUrl
)
wx
.
getSystemInfo
({
wx
.
getSystemInfo
({
success
:
function
(
system
)
{
success
:
function
(
system
)
{
wx
.
getImageInfo
({
wx
.
getImageInfo
({
...
@@ -173,7 +172,6 @@ wxService.page({
...
@@ -173,7 +172,6 @@ wxService.page({
wx
.
saveImageToPhotosAlbum
({
wx
.
saveImageToPhotosAlbum
({
filePath
:
this
.
imagePath
,
filePath
:
this
.
imagePath
,
success
(
res
)
{
success
(
res
)
{
console
.
log
(
'3333'
)
setTimeout
(()
=>
{
setTimeout
(()
=>
{
wx
.
showToast
({
wx
.
showToast
({
title
:
'保存成功,请前往相册查看~'
,
title
:
'保存成功,请前往相册查看~'
,
...
...
src/subPackage/page/pages/subPage/subPage.js
View file @
6d630928
...
@@ -87,7 +87,6 @@ wxService.page({
...
@@ -87,7 +87,6 @@ wxService.page({
*/
*/
onShow
()
{
onShow
()
{
const
{
memberId
,
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
{
memberId
,
member
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
console
.
log
(
'user============='
,
this
.
options
)
// 取会员卡号
// 取会员卡号
const
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
...
...
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