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
bf29670e
Commit
bf29670e
authored
Apr 29, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改字体门店bug
parent
cc473b4c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
2 deletions
+5
-2
app.json
src/app.json
+0
-0
index.js
src/config/index.js
+1
-1
confirmOrder.js
src/pages/confirmOrder/confirmOrder.js
+3
-0
project.config.json
src/project.config.json
+1
-1
No files found.
src/app.json
View file @
bf29670e
src/config/index.js
View file @
bf29670e
...
@@ -25,7 +25,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
...
@@ -25,7 +25,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
//2992 山东盛联微商城 wx53dedc202ae0d0c2
//2992 山东盛联微商城 wx53dedc202ae0d0c2
//2002 巴黎贝甜 wx21968cb3a486d4ab
//2002 巴黎贝甜 wx21968cb3a486d4ab
const
BRANCH_ID
=
3001
const
BRANCH_ID
=
2012
const
isMall
=
true
const
isMall
=
true
// const needMock = '' //
// const needMock = '' //
...
...
src/pages/confirmOrder/confirmOrder.js
View file @
bf29670e
...
@@ -921,6 +921,7 @@ wxService.page({
...
@@ -921,6 +921,7 @@ wxService.page({
},
},
//下单
//下单
order
(
isSelect
,
params
)
{
order
(
isSelect
,
params
)
{
if
(
params
.
orderType
==
1
){
if
(
this
.
data
.
orderStoreInfo
)
{
if
(
this
.
data
.
orderStoreInfo
)
{
if
(
this
.
data
.
orderStoreInfo
.
storeId
)
{
if
(
this
.
data
.
orderStoreInfo
.
storeId
)
{
params
.
storeId
=
this
.
data
.
orderStoreInfo
.
storeId
;
params
.
storeId
=
this
.
data
.
orderStoreInfo
.
storeId
;
...
@@ -929,6 +930,8 @@ wxService.page({
...
@@ -929,6 +930,8 @@ wxService.page({
params
.
storeInfo
=
this
.
data
.
orderStoreInfo
.
storeInfo
;
params
.
storeInfo
=
this
.
data
.
orderStoreInfo
.
storeInfo
;
}
}
}
}
}
//处理积分抵扣
//处理积分抵扣
if
(
this
.
data
.
deductCheckStatus
){
if
(
this
.
data
.
deductCheckStatus
){
params
.
pointPayInfo
=
this
.
data
.
pointPayInfo
;
params
.
pointPayInfo
=
this
.
data
.
pointPayInfo
;
...
...
src/project.config.json
View file @
bf29670e
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
},
},
"compileType"
:
"miniprogram"
,
"compileType"
:
"miniprogram"
,
"libVersion"
:
"2.8.2"
,
"libVersion"
:
"2.8.2"
,
"appid"
:
"wx
313ec36b710125d4
"
,
"appid"
:
"wx
fe14ebde4a6eea3d
"
,
"projectname"
:
"%E5%BE%AE%E5%95%86%E5%9F%8E"
,
"projectname"
:
"%E5%BE%AE%E5%95%86%E5%9F%8E"
,
"debugOptions"
:
{
"debugOptions"
:
{
"hidedInDevtools"
:
[]
"hidedInDevtools"
:
[]
...
...
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