Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
Project
Project
Details
Activity
Releases
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
李俊赕
self-support
Commits
10aa7ea4
Commit
10aa7ea4
authored
Sep 15, 2021
by
Damon
Browse files
Options
Browse Files
Download
Plain Diff
chore: merge
parents
7ac8bea9
5d5b861c
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
10 deletions
+14
-10
.env.dev.js
.env.dev.js
+1
-1
.env.js
.env.js
+2
-2
.env.prod.js
.env.prod.js
+1
-1
.env.test.js
.env.test.js
+1
-1
index.vue
src/components/order/index.vue
+5
-1
mine.vue
src/pages/index/mine.vue
+1
-1
order.vue
src/pages/index/order.vue
+2
-2
parts.vue
src/pages/order/parts.vue
+1
-1
No files found.
.env.dev.js
View file @
10aa7ea4
...
...
@@ -11,6 +11,6 @@ const UNI_APP = {
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
qn_asset_url
:
'http://deudn.c.pp.cc/'
,
argoDebugMode
:
1
,
version
:
'v1.5.0'
version
:
'v1.5.0
1
'
}
module
.
exports
=
UNI_APP
;
.env.js
View file @
10aa7ea4
;(
function
()
{
let
NODE_ENV
=
'
test
'
// dev:开发环境 | test:测试环境 | prod:生产环境
let
NODE_ENV
=
'
prod
'
// dev:开发环境 | test:测试环境 | prod:生产环境
let
ENV_VAR
=
null
let
VERSION_NUMBER
=
'1.5.0'
//版本号
let
VERSION_NUMBER
=
'1.5.0
1
'
//版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
if
(
NODE_ENV
===
'dev'
)
{
...
...
.env.prod.js
View file @
10aa7ea4
...
...
@@ -10,7 +10,7 @@ const UNI_APP = {
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
qn_asset_url
:
'https://qn-static.banshouhui.com'
,
argoDebugMode
:
0
,
version
:
'v1.5.0'
version
:
'v1.5.0
1
'
}
module
.
exports
=
UNI_APP
;
.env.test.js
View file @
10aa7ea4
...
...
@@ -11,6 +11,6 @@ const UNI_APP = {
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
qn_asset_url
:
'https://qn-static.banshouhui.com'
,
argoDebugMode
:
1
,
version
:
'v1.5.0'
version
:
'v1.5.0
1
'
}
module
.
exports
=
UNI_APP
;
src/components/order/index.vue
View file @
10aa7ea4
...
...
@@ -336,7 +336,9 @@ export default {
}
},
auditResults
()
{
let
partAuditResults
=
this
.
orderData
.
partAuditResults
!==
null
&&
Object
.
keys
(
this
.
orderData
.
partAuditResults
).
length
>
0
?
[
'orderSpareParts'
]
:
[]
let
partAuditResults
=
Object
.
keys
(
this
.
orderData
.
partAuditResults
||
{}).
length
>
0
?
[
'orderSpareParts'
]
:
[]
let
auditResults
=
this
.
orderData
.
auditResults
?
Object
.
keys
(
this
.
orderData
.
auditResults
)
:
[]
...
...
@@ -430,6 +432,7 @@ export default {
if
([
3
,
4
,
5
,
6
].
indexOf
(
this
.
orderType
)
!=
-
1
)
{
func
=
'action'
}
this
.
orderData
.
auditResults
=
this
.
auditResults
this
.
$emit
(
func
,
this
.
orderData
,
...
...
@@ -450,6 +453,7 @@ export default {
// 异常单点cell算点按钮
func
=
'action'
}
this
.
orderData
.
auditResults
=
this
.
auditResults
this
.
$emit
(
func
,
this
.
orderData
,
...
...
src/pages/index/mine.vue
View file @
10aa7ea4
...
...
@@ -142,7 +142,7 @@
},
{
pathName
:
'warehouse/spare'
,
title
:
'
物料
库'
,
title
:
'
备件
库'
,
value
:
''
,
icon
:
process
.
uniEnv
.
qn_base_url
+
'wodebeijian.png'
,
imageStyle
:
'width:60rpx;height:54rpx'
...
...
src/pages/index/order.vue
View file @
10aa7ea4
...
...
@@ -416,7 +416,7 @@ export default {
}
})
},
handleClickCellButton
(
item
,
type
,
showCountTime
,
auditResults
)
{
handleClickCellButton
(
item
,
type
)
{
if
(
!
this
.
loaded
)
return
uni
.
navigateTo
({
url
:
...
...
@@ -437,7 +437,7 @@ export default {
'&brandId='
+
item
.
lianbaoBrandId
+
'&auditResults='
+
(
auditResults
?
auditResults
.
join
()
:
''
)
+
(
item
.
auditResults
?
item
.
auditResults
.
join
()
:
''
)
+
'&orderNumber='
+
item
.
orderNumber
,
})
...
...
src/pages/order/parts.vue
View file @
10aa7ea4
...
...
@@ -33,7 +33,7 @@
<view
class=
"message"
>
当前无可用物料
</view>
</view>
<view
class=
"bar"
v-if=
"lists.length > 0"
>
<view
class=
"bar"
>
<submit-bar
:partNum=
"partNum"
:num=
"num"
...
...
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