Skip to content

Commit 8f233e8

Browse files
committed
fix: camera-scan-code
1 parent 07ea728 commit 8f233e8

File tree

8 files changed

+20
-17
lines changed

8 files changed

+20
-17
lines changed

miniprogram/app.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"pages/media/image/image",
4848
"pages/media/video/video",
4949
"pages/media/camera/camera",
50+
"pages/media/camera-scan-code/camera-scan-code",
5051
"pages/media/live-pusher/live-pusher",
5152
"pages/media/live-player/live-player",
5253
"pages/media/channel-video/channel-video",

miniprogram/packageComponent/pages/camera-scan-code/camera-scan-code.json

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"navigationBarTitleText": "camera",
3+
"navigationStyle": "custom"
4+
}
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
1+
// @import "../../../../common/lib/weui.wxss";
22

33
camera {
4-
height: 250px;
4+
height: 500rpx;
55
}
66

77
.btn-area {
88
margin-top: 0;
99
}
1010

1111
form {
12-
margin-top: 15px;
12+
margin-top: 30rpx;
1313
}
1414

1515
.weui-cell__bd {
1616
display: flex;
1717
justify-content: flex-start;
1818
align-items: center;
19-
padding: 10px 0;
20-
min-height: 30px;
19+
padding: 20rpx 0;
20+
min-height: 60rpx;
2121
}

miniprogram/packageComponent/pages/camera-scan-code/camera-scan-code.js renamed to miniprogram/packageComponent/pages/media/camera-scan-code/camera-scan-code.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Page({
77
},
88

99
data: {
10-
theme: 'light',
1110
result: {}
1211
},
1312
onReady() {
@@ -29,4 +28,4 @@ Page({
2928
error(e) {
3029
console.log(e.detail)
3130
}
32-
})
31+
})

miniprogram/packageComponent/pages/camera-scan-code/camera-scan-code.wxml renamed to miniprogram/packageComponent/pages/media/camera-scan-code/camera-scan-code.wxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<import src="../../../../common/head.wxml" />
22
<import src="../../../../common/foot.wxml" />
33

4-
<view class="container page" data-weui-theme="{{theme}}">
4+
<view class="container">
55
<template is="head" data="{{title: 'camera'}}"/>
66

77
<view class="page-body">
@@ -44,4 +44,4 @@
4444
</view>
4545

4646
<template is="foot" />
47-
</view>
47+
</view>

miniprogram/packageComponent/pages/media/camera/camera.wxml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@
4545
<button type="primary" bindtap="stopRecord">结束录像</button>
4646
</view>
4747
<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>
5153
</view>
5254
<view class="preview-tips">点击录像或拍照即可在下方预览效果</view>
5355
<image wx:if="{{src}}" mode="widthFix" class="photo" src="{{src}}"></image>

miniprogram/packageComponent/pages/media/camera/camera.wxss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ camera {
1414
width: 100%;
1515
}
1616

17-
.btn-area {
17+
/* .btn-area {
1818
margin-top: 0;
19-
}
19+
} */
2020

2121
.first-btn {
2222
margin-top: 15px;

0 commit comments

Comments
 (0)