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
6b93300b
Commit
6b93300b
authored
Mar 17, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化部分功能
parent
2e0da3ef
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
10 deletions
+19
-10
wxHtml.js
src/component/html2wxml/wxHtml.js
+1
-1
confirmOrder.js
src/pages/confirmOrder/confirmOrder.js
+1
-0
order.js
src/pages/order/order.js
+4
-0
productDetail.js
src/pages/productDetail/productDetail.js
+6
-1
refund.js
src/pages/refund/refund.js
+5
-6
selfPickUpOrderInfo.wxml
...e/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxml
+1
-1
selfPickUpOrderInfo.wxss
...e/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxss
+1
-1
No files found.
src/component/html2wxml/wxHtml.js
View file @
6b93300b
...
@@ -46,7 +46,7 @@ Component({
...
@@ -46,7 +46,7 @@ Component({
bind
:
'richText'
,
bind
:
'richText'
,
html
:
this
.
data
.
html
||
``
,
html
:
this
.
data
.
html
||
``
,
target
:
this
,
target
:
this
,
enablePreviewImage
:
tru
e
,
// 禁用图片预览功能
enablePreviewImage
:
fals
e
,
// 禁用图片预览功能
tapLink
:
(
url
)
=>
{
// 点击超链接时的回调函数
tapLink
:
(
url
)
=>
{
// 点击超链接时的回调函数
// url 就是 HTML 富文本中 a 标签的 href 属性值
// url 就是 HTML 富文本中 a 标签的 href 属性值
// 这里可以自定义点击事件逻辑,比如页面跳转
// 这里可以自定义点击事件逻辑,比如页面跳转
...
...
src/pages/confirmOrder/confirmOrder.js
View file @
6b93300b
...
@@ -739,6 +739,7 @@ wxService.page({
...
@@ -739,6 +739,7 @@ wxService.page({
success
(
res
)
{
success
(
res
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
// 支付成功页面
// 支付成功页面
//消息订阅
let
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
);
let
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
);
wxService
.
post
(
`
${
'/merchant/message/wxSubMsgMapping/getListByParams'
}
`
,
{
wxService
.
post
(
`
${
'/merchant/message/wxSubMsgMapping/getListByParams'
}
`
,
{
scenarioIds
:
[
'ordersend'
,
'ordersign'
],
scenarioIds
:
[
'ordersend'
,
'ordersign'
],
...
...
src/pages/order/order.js
View file @
6b93300b
...
@@ -211,6 +211,10 @@ wxService.page({
...
@@ -211,6 +211,10 @@ wxService.page({
item
.
count
=
item
.
canRefundNum
;
item
.
count
=
item
.
canRefundNum
;
});
});
// let obj = {
// id :
// }
let
params
=
JSON
.
stringify
(
copyOrderInfo
);
let
params
=
JSON
.
stringify
(
copyOrderInfo
);
// 退款申请
// 退款申请
...
...
src/pages/productDetail/productDetail.js
View file @
6b93300b
...
@@ -192,7 +192,12 @@ wxService.page({
...
@@ -192,7 +192,12 @@ wxService.page({
this
.
data
.
productInfo
.
stock
=
data
.
stock
;
this
.
data
.
productInfo
.
stock
=
data
.
stock
;
this
.
data
.
productInfo
.
productSku
=
data
.
productSku
;
this
.
data
.
productInfo
.
productSku
=
data
.
productSku
;
this
.
data
.
productInfo
.
productStatus
=
data
.
productStatus
;
this
.
data
.
productInfo
.
productStatus
=
data
.
productStatus
;
this
.
data
.
productInfo
.
productStatusDesc
=
data
.
productStatus
==
1
?
'已下架'
:
(
data
.
productStatus
==
2
?
'已上架'
:
'已删除'
);
this
.
data
.
productInfo
.
minSalePrice
=
data
.
minSalePrice
;
this
.
data
.
productInfo
.
maxSalePrice
=
data
.
maxSalePrice
;
this
.
data
.
productInfo
.
productStatusDesc
=
data
.
productStatus
==
1
?
'已下架'
:
(
data
.
productStatus
==
2
?
'已上架'
:
'已删除'
);
this
.
data
.
productInfo
.
productName
=
data
.
productName
;
if
(
data
.
descHtml
){
if
(
data
.
descHtml
){
this
.
data
.
productInfo
.
descHtml
=
data
.
descHtml
;
this
.
data
.
productInfo
.
descHtml
=
data
.
descHtml
;
}
}
...
...
src/pages/refund/refund.js
View file @
6b93300b
...
@@ -84,7 +84,11 @@ wxService.page({
...
@@ -84,7 +84,11 @@ wxService.page({
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
wx
.
showToast
({
title
:
'申请退款成功'
,
});
// 订单列表
// 消息订阅
let
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
);
let
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
);
wxService
.
post
(
`
${
'/merchant/message/wxSubMsgMapping/getListByParams'
}
`
,
{
wxService
.
post
(
`
${
'/merchant/message/wxSubMsgMapping/getListByParams'
}
`
,
{
scenarioIds
:
[
'orderrefundfinsh'
,
'orderrefundcheck'
],
scenarioIds
:
[
'orderrefundfinsh'
,
'orderrefundcheck'
],
...
@@ -122,11 +126,6 @@ wxService.page({
...
@@ -122,11 +126,6 @@ wxService.page({
}
}
})
})
})
})
}
}
}
}
})
})
...
...
src/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxml
View file @
6b93300b
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
<!-- 订单金额 -->
<!-- 订单金额 -->
<view class="order-price">
<view class="order-price">
共计<label>
5
</label>件商品,实付<label>¥{{orderInfo.payAmount}}</label>
共计<label>
{{orderInfo.skuCount}}
</label>件商品,实付<label>¥{{orderInfo.payAmount}}</label>
</view>
</view>
</view>
</view>
...
...
src/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxss
View file @
6b93300b
...
@@ -255,7 +255,7 @@ view{
...
@@ -255,7 +255,7 @@ view{
}
}
.order-goods .order-price label{
.order-goods .order-price label{
color: #
333333
;
color: #
fa6d0d
;
font-weight: 550;
font-weight: 550;
}
}
...
...
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