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
bdfe9dc3
Commit
bdfe9dc3
authored
Jun 08, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改页面
parent
0f76a221
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
44 additions
and
26 deletions
+44
-26
index.vue
components/auth/index.vue
+3
-1
goodsaction.vue
components/goods/goodsaction.vue
+4
-3
index.vue
components/userbox/index.vue
+6
-2
address.vue
pages/address/address.vue
+4
-3
balance.vue
pages/balance/balance.vue
+5
-1
index.vue
pages/coupon/index/index.vue
+4
-3
favorite.vue
pages/favorite/favorite.vue
+4
-4
index.vue
pages/foot/index/index.vue
+4
-3
index.vue
pages/share/index/index.vue
+5
-2
integral-detail.vue
pages/user-center/integral-detail/integral-detail.vue
+5
-4
No files found.
components/auth/index.vue
View file @
bdfe9dc3
<
template
>
<div
class=
"auth-page"
>
<u-popup
v-model=
"showDialog"
mode=
"center"
custom-style=
"padding:0;background:none;"
>
<u-popup
v-model=
"showDialog"
mode=
"center"
:mask-close-able=
"false"
custom-style=
"padding:0;background:none;"
>
<img
:src=
"pageinfo.pic_url"
mode=
"widthFix"
/>
<button
:style=
"sureStyle"
class=
"hotsopt"
open-type=
"getUserInfo"
@
getuserinfo=
"getUserInfo"
></button>
<button
:style=
"cancelStyle"
class=
"hotsopt"
@
click=
"close"
></button>
...
...
@@ -28,6 +28,7 @@ export default {
methods
:
{
getUserInfo
(
e
)
{
var
that
=
this
;
that
.
showDialog
=
true
;
uni
.
getProvider
({
service
:
'oauth'
,
success
:
function
(
res
)
{
...
...
@@ -70,6 +71,7 @@ export default {
});
},
close
()
{
this
.
showDialog
=
false
;
this
.
$emit
(
'gbAuth'
);
},
//调用获取code
...
...
components/goods/goodsaction.vue
View file @
bdfe9dc3
...
...
@@ -17,7 +17,7 @@
<view
style=
"flex: 1;"
><u-button
@
click=
"joinCar"
:ripple=
"true"
:hair-line=
"false"
:custom-style=
"btn1"
>
加入购物车
</u-button></view>
<view
style=
"flex: 1;"
><u-button
@
click=
"buy"
:ripple=
"true"
:hair-line=
"false"
:custom-style=
"btn2"
>
立即购买
</u-button></view>
</view>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
"g
oback
"
></auth>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
"g
bAuth
"
></auth>
</view>
</
template
>
...
...
@@ -117,8 +117,9 @@ export default {
this
.
u
=
uni
.
getStorageSync
(
'mall_UserInfo'
);
this
.
showAuth
=
false
;
},
goback
()
{
uni
.
navigateBack
();
//关闭登录窗口
gbAuth
(){
this
.
showAuth
=
false
;
}
}
};
...
...
components/userbox/index.vue
View file @
bdfe9dc3
...
...
@@ -4,7 +4,7 @@
<img
:src=
"u.avatarUrl"
/>
<div
class=
"text"
>
{{
u
.
nickName
}}
</div>
</div>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
></auth>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
"gbAuth"
></auth>
</div>
</
template
>
...
...
@@ -35,7 +35,11 @@ export default {
reloadUserinfo
()
{
this
.
u
=
uni
.
getStorageSync
(
"mall_UserInfo"
);
this
.
showAuth
=
false
}
},
//关闭登录窗口
gbAuth
(){
this
.
showAuth
=
false
;
}
}
};
</
script
>
...
...
pages/address/address.vue
View file @
bdfe9dc3
...
...
@@ -60,7 +60,7 @@
@
confirm=
"confirm"
></u-modal>
<u-toast
ref=
"uToast"
/>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
'g
oback
'
></auth>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
'g
bAuth
'
></auth>
</view>
</
template
>
...
...
@@ -167,8 +167,9 @@ export default {
this
.
showAuth
=
false
;
this
.
init
();
},
goback
(){
uni
.
navigateBack
()
//关闭登录窗口
gbAuth
(){
this
.
showAuth
=
false
;
},
isdefault
(
item
)
{
//设置默认地址
...
...
pages/balance/balance.vue
View file @
bdfe9dc3
...
...
@@ -46,7 +46,7 @@
</view>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
></auth>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
"gbAuth"
></auth>
<view
class=
"loading"
v-if=
"load"
>
<u-loading
mode=
"flower"
size=
"48"
></u-loading>
<Text
style=
'color: #fff;margin-top: 10rpx;'
>
加载中...
</Text>
...
...
@@ -208,6 +208,10 @@
uni
.
navigateTo
({
url
:
'/pages/balance/detail?id='
+
id
})
},
//关闭登录窗口
gbAuth
(){
this
.
showAuth
=
false
;
}
}
}
...
...
pages/coupon/index/index.vue
View file @
bdfe9dc3
...
...
@@ -78,7 +78,7 @@
</view>
<!-- 取消提示 -->
<u-toast
ref=
"uToast"
/>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
'g
oback
'
></auth>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
'g
bAuth
'
></auth>
</view>
</
template
>
...
...
@@ -193,8 +193,9 @@ export default {
this
.
showAuth
=
false
;
this
.
init
();
},
goback
(){
uni
.
navigateBack
()
//关闭登录窗口
gbAuth
(){
this
.
showAuth
=
false
;
},
godetails
(
item
){
if
(
this
.
msg
.
UseState
==
0
){
...
...
pages/favorite/favorite.vue
View file @
bdfe9dc3
...
...
@@ -65,7 +65,7 @@
</view>
</
template
>
<good-sku
v-if=
"showSku"
:option-type=
"2"
borderRadius=
"20"
v-model=
"showSku"
:good=
"sku"
></good-sku>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
'g
oback
'
></auth>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
'g
bAuth
'
></auth>
</view>
</template>
...
...
@@ -174,7 +174,6 @@
res
=>
{
uni
.
hideLoading
();
if
(
res
.
resultCode
==
1
){
this
.
goodslist
=
this
.
goodslist
.
concat
(
res
.
data
.
pageData
);
this
.
page_count
=
res
.
data
.
pageCount
;
if
(
this
.
page_count
==
1
)
{
...
...
@@ -199,8 +198,9 @@
this
.
showAuth
=
false
;
this
.
init
();
},
goback
(){
uni
.
navigateBack
()
//关闭登录窗口
gbAuth
(){
this
.
showAuth
=
false
;
},
clickHandler
(
cx
)
{
uni
.
navigateTo
({
...
...
pages/foot/index/index.vue
View file @
bdfe9dc3
...
...
@@ -75,7 +75,7 @@
</scroll-view>
</view>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
'g
oback
'
></auth>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
'g
bAuth
'
></auth>
<view
class=
"loading"
v-show=
"loading"
>
<u-loading
mode=
"flower"
size=
"48"
></u-loading>
<Text
style=
'color: #fff;margin-top: 10rpx;'
>
加载中...
</Text>
...
...
@@ -255,8 +255,9 @@
this
.
showAuth
=
false
;
this
.
init
();
//成功之后调取接口
},
goback
(){
uni
.
navigateBack
()
//关闭登录窗口
gbAuth
(){
this
.
showAuth
=
false
;
},
change
(
index
)
{
this
.
current
=
index
;
...
...
pages/share/index/index.vue
View file @
bdfe9dc3
...
...
@@ -89,7 +89,7 @@
</view>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
></auth>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
"gbAuth"
></auth>
</view>
</
template
>
...
...
@@ -239,8 +239,11 @@
uni
.
navigateTo
({
url
:
url
+
'?u='
+
amount
});
},
//关闭登录窗口
gbAuth
(){
this
.
showAuth
=
false
;
}
}
}
</
script
>
...
...
pages/user-center/integral-detail/integral-detail.vue
View file @
bdfe9dc3
...
...
@@ -52,7 +52,7 @@
<!-- 取消提示 -->
<u-toast
ref=
"uToast"
/>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
'g
oback
'
></auth>
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
'g
bAuth
'
></auth>
</view>
</
template
>
...
...
@@ -173,9 +173,10 @@ export default {
this
.
showAuth
=
false
;
this
.
init
();
},
goback
(){
uni
.
navigateBack
()
},
//关闭登录窗口
gbAuth
(){
this
.
showAuth
=
false
;
}
},
};
</
script
>
...
...
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