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
a44b66da
Commit
a44b66da
authored
Jun 26, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://git.banshouhui.com/lijundan/self-support
into dev
parents
2b0d218f
3a0fdf84
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
467 deletions
+20
-467
.env.dev.js
.env.dev.js
+1
-1
.env.js
.env.js
+1
-1
spareCell.vue
src/components/parts/spareCell.vue
+1
-1
mine.vue
src/pages/index/mine.vue
+2
-2
index.vue
src/pages/mine/warehouse/index.vue
+9
-424
spare.vue
src/pages/mine/warehouse/spare.vue
+2
-34
nodes.vue
src/pages/parts/nodes.vue
+4
-4
No files found.
.env.dev.js
View file @
a44b66da
...
@@ -5,7 +5,7 @@ const UNI_APP = {
...
@@ -5,7 +5,7 @@ const UNI_APP = {
// banshou: 'https://m.banshou.com', //扳手app
// banshou: 'https://m.banshou.com', //扳手app
},
},
systemUrl
:
{
systemUrl
:
{
apiUrl
:
'http://192.168.
0.62:37080
'
,
//java端域名请求头
apiUrl
:
'http://192.168.
1.22
'
,
//java端域名请求头
// apiUrl: 'http://apidoc.banshouhui.com:3000/mock/31', // mock端域名请求头
// apiUrl: 'http://apidoc.banshouhui.com:3000/mock/31', // mock端域名请求头
},
},
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
qn_base_url
:
'https://qn-static.banshouhui.com/self-support/'
,
...
...
.env.js
View file @
a44b66da
(
function
()
{
(
function
()
{
let
NODE_ENV
=
'
test
'
;
// dev:开发环境 | test:测试环境 | prod:生产环境
let
NODE_ENV
=
'
dev
'
;
// dev:开发环境 | test:测试环境 | prod:生产环境
let
ENV_VAR
=
null
;
let
ENV_VAR
=
null
;
let
VERSION_NUMBER
=
'1.3.9'
;
//版本号
let
VERSION_NUMBER
=
'1.3.9'
;
//版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
...
...
src/components/parts/spareCell.vue
View file @
a44b66da
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<view>
{{
remarkText
}}
</view>
<view>
{{
remarkText
}}
</view>
</view>
</view>
</view>
</view>
<view
class=
"count-view"
>
x
{{
item
.
quantity
}}
</view>
<view
class=
"count-view"
>
x
{{
item
.
quantity
||
0
}}
</view>
</view>
</view>
</
template
>
</
template
>
...
...
src/pages/index/mine.vue
View file @
a44b66da
...
@@ -139,14 +139,14 @@
...
@@ -139,14 +139,14 @@
return
[
return
[
{
{
pathName
:
'warehouse/index'
,
pathName
:
'warehouse/index'
,
title
:
'
我的配件
'
,
title
:
'
备件订单
'
,
value
:
''
,
value
:
''
,
icon
:
process
.
uniEnv
.
qn_base_url
+
'wodepeijian.png'
,
icon
:
process
.
uniEnv
.
qn_base_url
+
'wodepeijian.png'
,
imageStyle
:
'width:60rpx;height:54rpx'
imageStyle
:
'width:60rpx;height:54rpx'
},
},
{
{
pathName
:
'warehouse/spare'
,
pathName
:
'warehouse/spare'
,
title
:
'
我的备件
'
,
title
:
'
备件库
'
,
value
:
''
,
value
:
''
,
icon
:
process
.
uniEnv
.
qn_base_url
+
'wodebeijian.png'
,
icon
:
process
.
uniEnv
.
qn_base_url
+
'wodebeijian.png'
,
imageStyle
:
'width:60rpx;height:54rpx'
imageStyle
:
'width:60rpx;height:54rpx'
...
...
src/pages/mine/warehouse/index.vue
View file @
a44b66da
This diff is collapsed.
Click to expand it.
src/pages/mine/warehouse/spare.vue
View file @
a44b66da
...
@@ -124,7 +124,8 @@
...
@@ -124,7 +124,8 @@
},
},
},
},
onLoad
(
e
)
{
onLoad
(
e
)
{
getApp
().
trackPage
(
'我的备件页'
)
this
.
$u
.
vuex
(
"vuex_token"
,
'RTOKEN3c193c7c1727930d45649096f87bbe62131dbc5d'
);
getApp
().
trackPage
(
'备件库页'
)
this
.
getReserveList
()
this
.
getReserveList
()
},
},
methods
:
{
methods
:
{
...
@@ -138,39 +139,6 @@
...
@@ -138,39 +139,6 @@
this
.
$u
.
api
.
reserveList
(
param
).
then
((
res
)
=>
{
this
.
$u
.
api
.
reserveList
(
param
).
then
((
res
)
=>
{
if
(
res
.
code
==
200
)
{
if
(
res
.
code
==
200
)
{
res
.
data
=
[{
"name"
:
"minim in dolor"
,
"quantity"
:
15128407.808330506
,
"skuId"
:
-
31990898.14022602
,
"images"
:
"mollit nisi Duis"
,
"remark"
:
"in elit"
,
"code"
:
"esse commodo Ut ex cillum"
,
"stock"
:
"8"
},
{
"name"
:
"Excepteur ullamco dolore"
,
"quantity"
:
-
16408657.848651886
,
"skuId"
:
99507283.4197697
,
"images"
:
"dolore velit"
,
"remark"
:
"fugiat"
,
"code"
:
"elit dolore"
,
"stock"
:
"71"
},
{
"name"
:
"consectetur tempor ut in eu"
,
"quantity"
:
-
16070458.813757822
,
"skuId"
:
95208174.19993973
,
"images"
:
"do eiusmod"
,
"remark"
:
"amet magna"
,
"code"
:
"do"
,
"stock"
:
"100"
},
{
"name"
:
"deserunt"
,
"quantity"
:
12448683.358913198
,
"skuId"
:
-
78230180.52803165
,
"images"
:
"irure ut commodo"
,
"remark"
:
"dolore quis"
,
"code"
:
"deserunt cillum incididunt proident"
,
"stock"
:
"10"
}]
this
.
partsList
=
[]
this
.
partsList
=
[]
let
list
=
res
.
data
||
[]
let
list
=
res
.
data
||
[]
for
(
var
item
of
list
)
{
for
(
var
item
of
list
)
{
...
...
src/pages/parts/nodes.vue
View file @
a44b66da
...
@@ -75,10 +75,10 @@
...
@@ -75,10 +75,10 @@
}
}
if
(
this
.
isReturn
){
if
(
this
.
isReturn
){
var
pages
=
getCurrentPages
();
var
pages
=
getCurrentPages
();
if
(
pages
.
length
>=
3
)
{
if
(
pages
.
length
>=
4
)
{
var
prevPage
=
pages
[
pages
.
length
-
3
];
var
prevPage
=
pages
[
pages
.
length
-
4
];
prevPage
.
$vm
.
getReserveList
(
)
this
.
$u
.
route
({
type
:
'back'
,
delta
:
3
}
)
this
.
$u
.
route
({
type
:
'back'
,
delta
:
2
})
prevPage
.
$vm
.
$u
.
route
({
url
:
'pages/mine/warehouse/return'
})
}
else
{
}
else
{
this
.
$u
.
route
({
type
:
'back'
})
this
.
$u
.
route
({
type
:
'back'
})
}
}
...
...
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