Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mallapp
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
viitto
mallapp
Commits
a2326672
Commit
a2326672
authored
Jun 16, 2020
by
zhangjianguo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
92662469
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
41 deletions
+19
-41
index.vue
components/auth/index.vue
+3
-1
style11.vue
components/cats/style11.vue
+1
-1
goods.vue
pages/goods/goods.vue
+3
-0
index.vue
pages/index/index.vue
+8
-1
order-submit.vue
pages/order-submit/order-submit.vue
+3
-37
share-qrcode.vue
pages/share-qrcode/share-qrcode.vue
+1
-1
No files found.
components/auth/index.vue
View file @
a2326672
...
...
@@ -102,6 +102,7 @@ export default {
//登录
getLogin
(
obj
)
{
var
that
=
this
;
let
pid
=
uni
.
getStorageSync
(
"pid"
)?
uni
.
getStorageSync
(
"pid"
).
pid
:
0
;
that
.
request2
(
{
url
:
'/api/AppletLogin/Login'
,
...
...
@@ -111,13 +112,14 @@ export default {
Name
:
obj
.
Name
,
Photo
:
obj
.
Photo
,
Moblie
:
''
,
SuperiorId
:
0
SuperiorId
:
pid
}
},
res
=>
{
if
(
res
.
resultCode
==
1
)
{
uni
.
setStorageSync
(
'mall_UserInfo'
,
res
.
data
);
that
.
$emit
(
'changeuserinfo'
);
uni
.
removeStorageSync
(
'pid'
);
}
}
);
...
...
components/cats/style11.vue
View file @
a2326672
...
...
@@ -222,7 +222,7 @@ export default {
-webkit-box-orient
:
vertical
;
margin-bottom
:
3px
;
font-size
:
14px
;
height
:
3
6
px
;
height
:
3
8
px
;
margin-bottom
:
5px
;
}
.catstyle11
.good
.good-info
{
...
...
pages/goods/goods.vue
View file @
a2326672
...
...
@@ -288,6 +288,9 @@ export default {
}
else
{
this
.
id
=
option
.
GoodsId
?
option
.
GoodsId
:
29
;
//40887 59512 46942
}
if
(
option
&&
option
.
pid
){
uni
.
setStorageSync
(
"pid"
,
{
pid
:
option
.
pid
});
}
this
.
init
();
this
.
mc
=
this
.
$uiConfig
.
mainColor
;
this
.
secondary
=
this
.
$uiConfig
.
secondary
;
...
...
pages/index/index.vue
View file @
a2326672
...
...
@@ -137,6 +137,13 @@ export default {
if
(
options
&&
options
.
page_id
){
this
.
pageId
=
options
.
page_id
}
if
(
options
&&
options
.
pid
){
uni
.
setStorageSync
(
"pid"
,
{
pid
:
options
.
pid
});
}
let
c
=
this
.
$uiConfig
.
is_bang
?
78
:
50
;
this
.
contentHeight
=
this
.
$utils
.
calcContentHeight
(
c
);
this
.
init
();
...
...
@@ -150,7 +157,7 @@ export default {
uni
.
showNavigationBarLoading
();
},
onShow
()
{
onShow
()
{
setTimeout
(()
=>
{
uni
.
hideNavigationBarLoading
();
},
500
);
...
...
pages/order-submit/order-submit.vue
View file @
a2326672
...
...
@@ -307,6 +307,7 @@ export default {
uni
.
requestSubscribeMessage
({
tmplIds
:
this
.
ds
.
template_message_list
,
complete
(
res
)
{
console
.
log
(
res
)
that
.
submitOrder
=
false
;
let
form
=
{};
form
.
Consignee
=
that
.
adressInfo
.
Consignee
;
...
...
@@ -345,42 +346,7 @@ export default {
uni
.
hideNavigationBarLoading
();
}
);
// let h = that.apiheader();
// h["content-type"] = "application/x-www-form-urlencoded";
// that.request(
// {
// data: {
// r: "api/order/submit",
// form_data: JSON.stringify(forms),
// },
// header: h,
// method: "POST",
// },
// (res) => {
// console.log(res.data);
// //TODO 未实现 支付 开始调起支付
// uni.navigateTo({
// url: '/pages/order-submit/pay-success'
// });
// uni.showModal({
// title: "下单提醒",
// content:
// "订单已经创建成功,等待后端实现支付调用,是否前往订单列表",
// success: function (res) {
// if (res.confirm) {
// that.isLeave = true;
// uni.navigateTo({
// url: "/pages/order/index",
// });
// } else if (res.cancel) {
// console.log("用户点击取消");
// }
// },
// });
// }
// );
}
});
}
...
...
@@ -704,7 +670,7 @@ button[disabled]{
flex
:
1
;
}
.ordersubmit
.goodbox
.goodinfo
.name
{
height
:
1
6
px
;
height
:
1
8
px
;
font-size
:
14px
;
color
:
#232323
;
white-space
:
nowrap
;
...
...
pages/share-qrcode/share-qrcode.vue
View file @
a2326672
...
...
@@ -61,7 +61,7 @@
{
url
:
'/api/AppletUser/GetWeiXinQRCodeForApplet'
,
data
:
{
Path
:
'pages/index/index/
pid='
+
this
.
UserInfo
.
UserId
,
Path
:
'pages/index/index/
?pid='
+
this
.
UserInfo
.
UserId
,
With
:
this
.
qrcode
.
QrCodeSize
,
}
},
...
...
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