File tree Expand file tree Collapse file tree 8 files changed +20
-17
lines changed Expand file tree Collapse file tree 8 files changed +20
-17
lines changed Original file line number Diff line number Diff line change 47
47
" pages/media/image/image" ,
48
48
" pages/media/video/video" ,
49
49
" pages/media/camera/camera" ,
50
+ " pages/media/camera-scan-code/camera-scan-code" ,
50
51
" pages/media/live-pusher/live-pusher" ,
51
52
" pages/media/live-player/live-player" ,
52
53
" pages/media/channel-video/channel-video" ,
Load Diff This file was deleted.
Original file line number Diff line number Diff line change
1
+ {
2
+ "navigationBarTitleText" : " camera" ,
3
+ "navigationStyle" : " custom"
4
+ }
Original file line number Diff line number Diff line change 1
-
1
+ // @import "../../../../common/lib/weui.wxss";
2
2
3
3
camera {
4
- height: 250px ;
4
+ height : 500 rpx ;
5
5
}
6
6
7
7
.btn-area {
8
8
margin-top : 0 ;
9
9
}
10
10
11
11
form {
12
- margin-top: 15px ;
12
+ margin-top : 30 rpx ;
13
13
}
14
14
15
15
.weui-cell__bd {
16
16
display : flex ;
17
17
justify-content : flex-start ;
18
18
align-items : center ;
19
- padding: 10px 0;
20
- min-height: 30px ;
19
+ padding : 20 rpx 0 ;
20
+ min-height : 60 rpx ;
21
21
}
Original file line number Diff line number Diff line change 7
7
} ,
8
8
9
9
data : {
10
- theme : 'light' ,
11
10
result : { }
12
11
} ,
13
12
onReady ( ) {
29
28
error ( e ) {
30
29
console . log ( e . detail )
31
30
}
32
- } )
31
+ } )
Original file line number Diff line number Diff line change 1
1
<import src="../../../../common/head.wxml" />
2
2
<import src="../../../../common/foot.wxml" />
3
3
4
- <view class="container page" data-weui-theme="{{theme}} ">
4
+ <view class="container">
5
5
<template is="head" data="{{title: 'camera'}}"/>
6
6
7
7
<view class="page-body">
44
44
</view>
45
45
46
46
<template is="foot" />
47
- </view>
47
+ </view>
Original file line number Diff line number Diff line change 45
45
<button type="primary" bindtap="stopRecord">结束录像</button>
46
46
</view>
47
47
<view class="btn-area">
48
- <navigator url="/packageComponent/pages/media/camera-scan-code/camera-scan-code" hover-class="none">
49
- <button type="primary">扫描一维码</button>
50
- </navigator>
48
+ <button type="primary">
49
+ <navigator url="/packageComponent/pages/media/camera-scan-code/camera-scan-code" hover-class="none">
50
+ <text>扫描一维码</text>
51
+ </navigator>
52
+ </button>
51
53
</view>
52
54
<view class="preview-tips">点击录像或拍照即可在下方预览效果</view>
53
55
<image wx:if="{{src}}" mode="widthFix" class="photo" src="{{src}}"></image>
Original file line number Diff line number Diff line change @@ -14,9 +14,9 @@ camera {
14
14
width: 100%;
15
15
}
16
16
17
- .btn-area {
17
+ /* .btn-area {
18
18
margin-top: 0;
19
- }
19
+ } */
20
20
21
21
.first-btn {
22
22
margin-top: 15px;
You can’t perform that action at this time.
0 commit comments