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
a9271465
Commit
a9271465
authored
May 17, 2021
by
刘用法
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.banshouhui.com/lijundan/self-support
parents
5766b197
e696ebf4
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
28 additions
and
35 deletions
+28
-35
App.vue
src/App.vue
+6
-17
http.interceptor.js
src/common/http.interceptor.js
+1
-0
mine.vue
src/pages/index/mine.vue
+6
-5
index.vue
src/pages/login/index.vue
+1
-0
index.vue
src/pages/mine/wallet/index.vue
+9
-6
settlement.vue
src/pages/mine/wallet/settlement.vue
+1
-1
statement.vue
src/pages/mine/wallet/statement.vue
+3
-3
search.vue
src/pages/order/search.vue
+1
-1
$u.mixin.js
src/store/$u.mixin.js
+0
-1
index.js
src/store/index.js
+0
-1
No files found.
src/App.vue
View file @
a9271465
...
@@ -11,11 +11,6 @@ export default {
...
@@ -11,11 +11,6 @@ export default {
// 微信小程序平台编号,空--家维广场,1--自营平台
// 微信小程序平台编号,空--家维广场,1--自营平台
wxAppNo
:
1
,
wxAppNo
:
1
,
//授权提示 图标
icon_auth_notice
:
"https://qn-static.banshouhui.com/auth_notice.png"
,
//授权提示新 图标
icon_auth_notice_new
:
"https://qn-static.banshouhui.com/auth_notice_new.png"
,
// 服务规范教程视频
// 服务规范教程视频
service_standard
:
{
service_standard
:
{
course1
:
{
course1
:
{
...
@@ -47,8 +42,6 @@ export default {
...
@@ -47,8 +42,6 @@ export default {
// 授权用户信息
// 授权用户信息
authUserInfo
:
""
,
authUserInfo
:
""
,
// 用户入驻信息
settledInfo
:
{},
navHeight
:
0
,
//导航栏高度
navHeight
:
0
,
//导航栏高度
rpxScreenHeight
:
0
,
// 照相视框高度
rpxScreenHeight
:
0
,
// 照相视框高度
safeHeight
:
0
,
// 安全高度
safeHeight
:
0
,
// 安全高度
...
@@ -81,7 +74,7 @@ export default {
...
@@ -81,7 +74,7 @@ export default {
// 版本更新
// 版本更新
await
this
.
updateApp
();
await
this
.
updateApp
();
// 系统自动登录
// 系统自动登录
::每次运行小程序重新获取用户信息
await
this
.
autoLogin
();
await
this
.
autoLogin
();
},
},
onShow
:
async
function
()
{
onShow
:
async
function
()
{
...
@@ -116,11 +109,6 @@ export default {
...
@@ -116,11 +109,6 @@ export default {
getSystemInfo
()
{
getSystemInfo
()
{
try
{
try
{
let
a
=
wx
.
getSystemInfoSync
();
let
a
=
wx
.
getSystemInfoSync
();
// this.globalData.platform = systemInfo.platform, this.globalData.pixelRatio = a.pixelRatio,
// this.globalData.statusBarHeight = a.statusBarHeight, this.globalData.navHeight = a.statusBarHeight / a.screenWidth * 750 + 90,
// this.globalData.rpxScreenHeight = a.screenHeight / a.screenWidth * 750, this.globalData.screenWidth = a.screenWidth,
// this.globalData.screenHeight = a.screenHeight;
this
.
globalData
.
navHeight
=
this
.
globalData
.
navHeight
=
(
a
.
statusBarHeight
/
a
.
screenWidth
)
*
750
+
90
;
(
a
.
statusBarHeight
/
a
.
screenWidth
)
*
750
+
90
;
this
.
globalData
.
rpxScreenHeight
=
this
.
globalData
.
rpxScreenHeight
=
...
@@ -154,11 +142,11 @@ export default {
...
@@ -154,11 +142,11 @@ export default {
*/
*/
async
autoLogin
()
{
async
autoLogin
()
{
let
that
=
this
;
let
that
=
this
;
// 如果token不为空,则跳过自动登录
// 如果token不为空,则跳过自动登录
if
(
that
.
vuex_token
)
{
if
(
that
.
vuex_token
)
{
return
;
return
false
}
}
await
login
.
oauth
().
then
(
async
(
res
)
=>
{
await
login
.
oauth
().
then
(
async
(
res
)
=>
{
if
(
res
.
code
)
{
if
(
res
.
code
)
{
let
params
=
{
let
params
=
{
code
:
res
.
code
,
code
:
res
.
code
,
...
@@ -196,6 +184,7 @@ export default {
...
@@ -196,6 +184,7 @@ export default {
this
.
$u
.
vuex
(
"vuex_user"
,
null
);
this
.
$u
.
vuex
(
"vuex_user"
,
null
);
this
.
$u
.
vuex
(
"vuex_wx_uid"
,
""
);
this
.
$u
.
vuex
(
"vuex_wx_uid"
,
""
);
}
}
this
.
$u
.
vuex
(
"vuex_settled"
,
null
);
},
},
/* 版本更新 */
/* 版本更新 */
...
...
src/common/http.interceptor.js
View file @
a9271465
...
@@ -97,6 +97,7 @@ const install = (Vue, vm) => {
...
@@ -97,6 +97,7 @@ const install = (Vue, vm) => {
vm
.
$u
.
vuex
(
'vuex_token'
,
''
);
vm
.
$u
.
vuex
(
'vuex_token'
,
''
);
vm
.
$u
.
vuex
(
'vuex_user'
,
null
);
vm
.
$u
.
vuex
(
'vuex_user'
,
null
);
vm
.
$u
.
vuex
(
'vuex_wx_uid'
,
''
);
vm
.
$u
.
vuex
(
'vuex_wx_uid'
,
''
);
vm
.
$u
.
vuex
(
"vuex_settled"
,
null
);
toLoginPage
()
toLoginPage
()
case
403
:
//没有权限访问
case
403
:
//没有权限访问
case
500
:
case
500
:
...
...
src/pages/index/mine.vue
View file @
a9271465
...
@@ -49,17 +49,17 @@
...
@@ -49,17 +49,17 @@
},
},
computed
:
{
computed
:
{
settled
()
{
settled
()
{
return
this
.
vuex_settled
&&
this
.
vuex_settled
.
record
||
null
return
this
.
vuex_
token
&&
this
.
vuex_
settled
&&
this
.
vuex_settled
.
record
||
null
},
},
avatar
()
{
avatar
()
{
return
this
.
vuex_settled
&&
this
.
vuex_settled
.
avatar
||
''
return
this
.
vuex_settled
&&
this
.
vuex_settled
.
avatar
},
},
name
()
{
name
()
{
return
this
.
settled
&&
(
this
.
settled
.
id_card_name
return
this
.
settled
&&
(
this
.
settled
.
id_card_name
||
this
.
settled
.
nickname
||
this
.
settled
.
name
)
||
''
||
this
.
settled
.
nickname
||
this
.
settled
.
name
)
},
},
mobile
()
{
mobile
()
{
return
this
.
settled
&&
this
.
settled
.
mobile
||
''
return
this
.
settled
&&
this
.
settled
.
mobile
},
},
items
()
{
items
()
{
return
[
return
[
...
@@ -244,8 +244,9 @@
...
@@ -244,8 +244,9 @@
.list-view
{
.list-view
{
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
border-radius
:
16rpx
16
rpx
0
0
;
border-radius
:
32rpx
32
rpx
0
0
;
overflow
:
hidden
;
overflow
:
hidden
;
padding-top
:
16rpx
;
.item-title
{
.item-title
{
font-size
:
32rpx
;
font-size
:
32rpx
;
...
...
src/pages/login/index.vue
View file @
a9271465
...
@@ -209,6 +209,7 @@ export default {
...
@@ -209,6 +209,7 @@ export default {
this
.
$u
.
vuex
(
'vuex_user'
,
null
);
this
.
$u
.
vuex
(
'vuex_user'
,
null
);
this
.
$u
.
vuex
(
'vuex_wx_uid'
,
''
);
this
.
$u
.
vuex
(
'vuex_wx_uid'
,
''
);
}
}
this
.
$u
.
vuex
(
'vuex_settled'
,
null
);
},
},
setLoginStatus
(
authed
=
true
)
{
setLoginStatus
(
authed
=
true
)
{
...
...
src/pages/mine/wallet/index.vue
View file @
a9271465
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
:border-bottom=
"false"
title-bold
></u-navbar>
:border-bottom=
"false"
title-bold
></u-navbar>
<view
class=
"wallet-content-view"
>
<view
class=
"wallet-content-view"
>
<view
class=
"header-view"
>
<view
class=
"header-view"
>
<image
class=
"header-image"
mode=
"widthFix"
:src=
"qianbaobeijing"
></image>
<image
class=
"header-image"
:src=
"qianbaobeijing"
></image>
</view>
</view>
<view
class=
"survey-view"
>
<view
class=
"survey-view"
>
<view
class=
"survey-top-view"
>
<view
class=
"survey-top-view"
>
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
</view>
</view>
</view>
</view>
<view
class=
"content-list-right"
>
<view
class=
"content-list-right"
>
<text
class=
"content-list-right-text"
>
点击查看
</text>
<text
class=
"content-list-right-text"
>
{{
item
.
value
}}
</text>
<u-icon
name=
"arrow-right"
></u-icon>
<u-icon
name=
"arrow-right"
></u-icon>
</view>
</view>
</view>
</view>
...
@@ -90,11 +90,13 @@
...
@@ -90,11 +90,13 @@
return
[{
return
[{
title
:
'结算账单'
,
title
:
'结算账单'
,
content
:
'展示您已提现的账单信息'
,
content
:
'展示您已提现的账单信息'
,
icon
:
this
.
imageUrl
+
'jiesuan.png'
icon
:
this
.
imageUrl
+
'jiesuan.png'
,
value
:
'点击查看'
},
{
},
{
title
:
'收入流水'
,
title
:
'收入流水'
,
content
:
this
.
statementContent
,
content
:
this
.
statementContent
,
icon
:
this
.
imageUrl
+
'liushui.png'
icon
:
this
.
imageUrl
+
'liushui.png'
,
value
:
'查看全部'
}]
}]
},
},
items
()
{
items
()
{
...
@@ -191,9 +193,10 @@
...
@@ -191,9 +193,10 @@
position
:
absolute
;
position
:
absolute
;
width
:
100%
;
width
:
100%
;
padding-top
:
10rpx
;
padding-top
:
10rpx
;
padding-left
:
6
rpx
;
padding-left
:
14
rpx
;
.header-image
{
.header-image
{
width
:
100%
;
width
:
730rpx
;
height
:
420rpx
;
}
}
}
}
...
...
src/pages/mine/wallet/settlement.vue
View file @
a9271465
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
return
this
.
loading
||
this
.
info
.
payableRecordExtendDtos
&&
this
.
info
.
payableRecordExtendDtos
.
length
return
this
.
loading
||
this
.
info
.
payableRecordExtendDtos
&&
this
.
info
.
payableRecordExtendDtos
.
length
},
},
banner
()
{
banner
()
{
return
this
.
imageUrl
+
'
Bill
.png'
return
this
.
imageUrl
+
'
receipt
.png'
},
},
},
},
onLoad
()
{
onLoad
()
{
...
...
src/pages/mine/wallet/statement.vue
View file @
a9271465
...
@@ -72,8 +72,8 @@
...
@@ -72,8 +72,8 @@
number
:
this
.
data
.
statementList
.
length
number
:
this
.
data
.
statementList
.
length
}
}
},
},
endTime
()
{
endTime
()
{
this
.
$u
.
DateTimeFormat
(
new
Date
().
getTime
(),
'YYYY-MM-DD'
)
this
.
moment
().
format
(
'YYYY-MM-DD'
)
},
},
items
()
{
items
()
{
return
{
return
{
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
return
process
.
uniEnv
.
qn_base_url
return
process
.
uniEnv
.
qn_base_url
},
},
banner
()
{
banner
()
{
return
this
.
imageUrl
+
'
Bill
.png'
return
this
.
imageUrl
+
'
receipt
.png'
},
},
hasInfo
()
{
hasInfo
()
{
return
this
.
loading
||
this
.
data
.
statementList
&&
this
.
data
.
statementList
.
length
return
this
.
loading
||
this
.
data
.
statementList
&&
this
.
data
.
statementList
.
length
...
...
src/pages/order/search.vue
View file @
a9271465
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
self
.
loadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
?
'loadmore'
:
'nomore'
self
.
loadStatus
=
res
.
data
.
total
>
self
.
orderList
.
length
?
'loadmore'
:
'nomore'
}
}
}
else
{
}
else
{
self
.
$u
.
toast
(
res
.
message
);
self
.
$u
.
toast
(
'请求失败'
);
}
}
self
.
loaded
=
true
self
.
loaded
=
true
});
});
...
...
src/store/$u.mixin.js
View file @
a9271465
...
@@ -2,7 +2,6 @@ import {
...
@@ -2,7 +2,6 @@ import {
mapState
mapState
}
from
'vuex'
}
from
'vuex'
import
store
from
"@/store/index"
import
store
from
"@/store/index"
console
.
log
(
store
,
store
.
state
,
'store'
)
// 尝试将用户在根目录中的store/index.js的vuex的state变量,全部加载到全局变量中
// 尝试将用户在根目录中的store/index.js的vuex的state变量,全部加载到全局变量中
let
$uStoreKey
=
[];
let
$uStoreKey
=
[];
...
...
src/store/index.js
View file @
a9271465
...
@@ -63,6 +63,5 @@ const store = new Vuex.Store({
...
@@ -63,6 +63,5 @@ const store = new Vuex.Store({
}
}
}
}
})
})
console
.
log
(
store
,
'store----------------'
)
export
default
store
export
default
store
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