Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
shop_mobile_uni
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
郑秀明
shop_mobile_uni
Commits
1887691e
Commit
1887691e
authored
Feb 21, 2020
by
王建威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix
parent
e673e491
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
7 deletions
+30
-7
host.js
common/host.js
+8
-2
mirror.sh
mirror.sh
+2
-0
Category.vue
pages/category/Category.vue
+12
-2
index.vue
pages/index/index.vue
+8
-3
No files found.
common/host.js
View file @
1887691e
// php测试环境
// php测试环境
export
const
php
=
'http://test.pet-dbc.cn/mobile/index.php?'
// export const php = 'http://test.pet-dbc.cn/mobile/index.php?'
// php镜像
export
const
php
=
'https://jingxiang.pet-dbc.cn/mobile/index.php?'
// php正式环境
// php正式环境
//export php = 'https://shop.pet-dbc.cn/mobile/index.php?'
//export php = 'https://shop.pet-dbc.cn/mobile/index.php?'
// go测试环境
// go测试环境
export
const
go
=
'https://tm.pet-dbc.cn'
// export const go = 'https://tm.pet-dbc.cn'
// go镜像环境
export
const
go
=
'https://jxm.pet-dbc.cn'
// go正式环境
// go正式环境
// export go 'https://m.pet-dbc.cn';
// export go 'https://m.pet-dbc.cn';
\ No newline at end of file
mirror.sh
0 → 100755
View file @
1887691e
#!/usr/bin/env bash
sshpass
-p
dbc_root123 scp
-P
22
-r
unpackage/dist/build/h5/
*
root@39.96.85.45:/docker/shop_mobile_uni/mirror/dist
pages/category/Category.vue
View file @
1887691e
...
@@ -111,6 +111,7 @@
...
@@ -111,6 +111,7 @@
this
.
cate_id_2
=
cate_id
+
''
;
this
.
cate_id_2
=
cate_id
+
''
;
}
}
this
.
tabIndex
=
index
;
this
.
tabIndex
=
index
;
this
.
$refs
.
pagination
.
parentsChangeCurrent
(
1
);
uni
.
request
({
uni
.
request
({
url
:
'/uni/api/credit_goods/get_credit_second_goods'
,
url
:
'/uni/api/credit_goods/get_credit_second_goods'
,
method
:
'POST'
,
method
:
'POST'
,
...
@@ -127,17 +128,25 @@
...
@@ -127,17 +128,25 @@
this
.
goods_list
=
credit_goods_list
;
this
.
goods_list
=
credit_goods_list
;
this
.
page
=
page
;
this
.
page
=
page
;
!!
cb
&&
cb
();
!!
cb
&&
cb
();
console
.
log
(
this
.
goods_list
)
}
}
});
});
},
},
changePage
(
data
)
{
changePage
(
data
)
{
const
{
current
}
=
data
;
const
{
current
}
=
data
;
if
(
this
.
cate_id_2
)
{
var
params
=
{
pageSize
:
10
,
cate_id_2
:
this
.
cate_id_2
,
goods_name
:
this
.
keyword
}
}
else
{
var
params
=
this
.
params
;
}
uni
.
request
({
uni
.
request
({
url
:
'/uni/api/credit_goods/get_credit_second_goods'
,
url
:
'/uni/api/credit_goods/get_credit_second_goods'
,
method
:
'POST'
,
method
:
'POST'
,
data
:
{
data
:
{
...
this
.
params
,
...
params
,
current
:
current
,
current
:
current
,
},
},
dataType
:
'json'
,
dataType
:
'json'
,
...
@@ -153,6 +162,7 @@
...
@@ -153,6 +162,7 @@
method
:
'POST'
,
method
:
'POST'
,
data
:
{
data
:
{
goods_name
:
this
.
keyword
,
goods_name
:
this
.
keyword
,
cate_id_1
:
this
.
firsr_cate_id
,
current
:
1
,
current
:
1
,
pageSize
:
10
pageSize
:
10
},
},
...
...
pages/index/index.vue
View file @
1887691e
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
<view
class=
"part_two"
>
<view
class=
"part_two"
>
<view>
<view>
<image
class=
"portrait"
:src=
"portrait || $defaultPortrait"
></image>
<image
class=
"portrait"
:src=
"portrait || $defaultPortrait"
></image>
<
text
class=
"user_name"
>
{{
user_name
}}
</text
>
<
p
class=
"user_name"
>
{{
customer_name
}}
</p
>
</view>
</view>
<text
class=
"go_credit"
@
click=
"isLogin ? (credit_flg ? jumpGoPage() : jumpGoPage('/introduce')) : jumpPhpPage('app=member&act=login')"
><text>
我的白条
</text><i
class=
"go_credit_icon"
></i></text>
<text
class=
"go_credit"
@
click=
"isLogin ? (credit_flg ? jumpGoPage() : jumpGoPage('/introduce')) : jumpPhpPage('app=member&act=login')"
><text>
我的白条
</text><i
class=
"go_credit_icon"
></i></text>
</view>
</view>
...
@@ -98,7 +98,7 @@
...
@@ -98,7 +98,7 @@
tabIndex
:
3
,
// 1:首页 2:精彩活动 3:谛宝白条 4:采购分期
tabIndex
:
3
,
// 1:首页 2:精彩活动 3:谛宝白条 4:采购分期
credit_cates_list
:
[],
// 分类
credit_cates_list
:
[],
// 分类
credit_goods_list
:
[],
// 商品
credit_goods_list
:
[],
// 商品
us
er_name
:
'Hi, 谛宝多多'
,
custom
er_name
:
'Hi, 谛宝多多'
,
portrait
:
''
,
portrait
:
''
,
current
:
0
,
current
:
0
,
keyword
:
''
,
keyword
:
''
,
...
@@ -144,7 +144,7 @@
...
@@ -144,7 +144,7 @@
this
.
isLogin
=
res
.
data
.
login_flg
;
this
.
isLogin
=
res
.
data
.
login_flg
;
this
.
credit_flg
=
res
.
data
.
credit_flg
;
this
.
credit_flg
=
res
.
data
.
credit_flg
;
if
(
res
.
data
.
data
.
user_name
)
{
if
(
res
.
data
.
data
.
user_name
)
{
this
.
user_name
=
res
.
data
.
data
.
us
er_name
;
this
.
customer_name
=
res
.
data
.
data
.
custom
er_name
;
}
}
if
(
res
.
data
.
data
.
portrait
)
{
if
(
res
.
data
.
data
.
portrait
)
{
this
.
portrait
=
res
.
data
.
data
.
portrait
;
this
.
portrait
=
res
.
data
.
data
.
portrait
;
...
@@ -341,6 +341,11 @@
...
@@ -341,6 +341,11 @@
font
-
weight
:
600
;
font
-
weight
:
600
;
vertical
-
align
:
middle
;
vertical
-
align
:
middle
;
margin
:
0
0
0
16
rpx
;
margin
:
0
0
0
16
rpx
;
width
:
380
rpx
;
overflow
:
hidden
;
text
-
overflow
:
ellipsis
;
white
-
space
:
nowrap
;
display
:
inline
-
block
;
}
}
.
go_credit
{
.
go_credit
{
display
:
inline
-
block
;
display
:
inline
-
block
;
...
...
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