提交 f3777e35 编写于 作者: J jayconscious

Merge branch 'develop'

......@@ -10,10 +10,14 @@
data-type="{{tool.type}}"
bindtap="onToggle"
class="card-item">
<cover-image
<!-- <cover-image
class="debug-item-image"
src="{{tool.image}}"
></cover-image>
></cover-image> -->
<image
class="debug-item-image"
src="{{tool.image}}"
></image>
<text class="debug-text">{{tool.title}}</text>
</view>
</view>
......
.page-box{position:absolute;left:0;right:0;top:0;background:#f5f6f7;width:100%;height:100vh;z-index:9998}.debug-container{margin-top:20rpx;width:100%}.debug-collections-main{margin-top:32rpx;display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap}.card{width:100%;background:#fff;box-sizing:border-box;padding:32rpx 55rpx 42rpx}.card-item{width:105rpx;height:145rpx;text-align:center;margin-right:75rpx}.card-item:nth-child(4){margin-right:0}.debug-item-image{width:68rpx;height:68rpx;margin:0 auto}.debug-text{font-size:24rpx}.log-list{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding:40rpx}.log-item{margin:10rpx}
\ No newline at end of file
.page-box{position:absolute;left:0;right:0;top:0;background:#f5f6f7;width:100%;height:100vh;z-index:9998}.debug-container{margin-top:20rpx;width:100%}.debug-collections-main{margin-top:32rpx;display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap}.card{width:100%;background:#fff;box-sizing:border-box;padding:32rpx 55rpx 42rpx}.card-item{width:105rpx;height:145rpx;text-align:center;margin-right:75rpx}.card-item:nth-child(4){margin-right:0}.debug-item-image{display:block;width:68rpx;height:68rpx;margin:0 auto}.debug-text{font-size:24rpx}.log-list{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding:40rpx}.log-item{margin:10rpx}
\ No newline at end of file
......@@ -3,14 +3,12 @@
<textarea class="url-box" focus="true" value="{{qrCodeUrl}}" placeholder="请输入跳转链接" maxlength="140" placeholder-class="url-paceholder-text"
bindinput="textareaChange">
</textarea>
<cover-view class="scaning" bindtap="qrCodeArouse">
<cover-image class="scaning-cover-img" src="{{ img.scanningicon }}"/>
</cover-view>
</view>
<image class="scaning-img" src="{{ img.scanningicon }}" bindtap="qrCodeArouse"></image>
<view class="history-list" wx:if="{{historyUrlList.length>0}}">
<view class="history-content">
<view class="history-item" data-qr-code="{{item}}" bindtap="setQrCode" wx:for="{{historyUrlList}}" wx:key="key">
<image class="search-icon" src="{{ img.searchicon }}"/>
<image class="search-icon" src="{{ img.searchicon }}"></image>
{{item}}
</view>
</view>
......
.h5door-page{position:absolute;left:0;right:0;top:0;width:100%;height:100vh;background-color:#fff;z-index:9998}.h5door-page .url-box{height:358rpx;width:100%;position:absolute;left:0;top:0;z-index:1}.h5door-page .area-box{width:100%;box-sizing:border-box;border:2rpx solid #efefef;height:358rpx;position:relative}.h5door-page .scaning{position:absolute;right:32rpx;bottom:32rpx;height:56rpx;width:56rpx;z-index:99}.scaning-cover-img{height:56rpx;width:56rpx}.url-box .url-paceholder-text{font-size:32rpx;color:#bebebe}.h5door-page .history-list{padding:0 20rpx}.h5door-page .history-content{max-height:600rpx;overflow:auto}.h5door-page .history-item{height:90rpx;line-height:90rpx;padding-left:57rpx;position:relative;font-size:24rpx;color:#333;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;border-bottom:2rpx solid #efefef}.h5door-page .clear-all{width:100%;text-align:center;font-size:24rpx;margin-top:40rpx;height:32rpx;line-height:32rpx;color:#999}.h5door-page .search-icon{height:40rpx;width:40rpx;position:absolute;left:0;bottom:23rpx}.h5door-page .go-webview-button{position:absolute;bottom:30rpx;left:30rpx;width:690rpx;height:100rpx;background:#337cc4;border:0;color:#fff}
\ No newline at end of file
.h5door-page{position:absolute;left:0;right:0;top:0;width:100%;height:100vh;background-color:#fff;z-index:9998}.h5door-page .url-box{height:358rpx;width:100%;position:absolute;left:0;top:0;z-index:1}.h5door-page .area-box{width:98%;margin:0 auto;box-sizing:border-box;border:2rpx solid #efefef;height:358rpx;position:relative}.scaning-img{position:absolute;display:block;right:32rpx;top:375rpx;height:56rpx;width:56rpx}.url-box .url-paceholder-text{font-size:32rpx;color:#bebebe}.h5door-page .history-list{margin-top:70rpx;padding:0 20rpx}.h5door-page .history-content{max-height:600rpx;overflow:auto}.h5door-page .history-item{height:90rpx;line-height:90rpx;padding-left:57rpx;position:relative;font-size:24rpx;color:#333;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;border-bottom:2rpx solid #efefef}.h5door-page .clear-all{width:100%;text-align:center;font-size:24rpx;margin-top:40rpx;height:32rpx;line-height:32rpx;color:#999}.h5door-page .search-icon{height:40rpx;width:40rpx;position:absolute;left:0;bottom:23rpx}.h5door-page .go-webview-button{position:absolute;bottom:30rpx;left:30rpx;width:690rpx;height:100rpx;background:#337cc4;border:0;color:#fff}
\ No newline at end of file
......@@ -10,10 +10,14 @@
data-type="{{tool.type}}"
bindtap="onToggle"
class="card-item">
<cover-image
<!-- <cover-image
class="debug-item-image"
src="{{tool.image}}"
></cover-image>
></cover-image> -->
<image
class="debug-item-image"
src="{{tool.image}}"
></image>
<text class="debug-text">{{tool.title}}</text>
</view>
</view>
......
......@@ -35,6 +35,7 @@
margin-right: 0
}
.debug-item-image {
display: block;
width: 68rpx;
height: 68rpx;
margin: 0 auto
......
......@@ -3,14 +3,12 @@
<textarea class="url-box" focus="true" value="{{qrCodeUrl}}" placeholder="请输入跳转链接" maxlength="140" placeholder-class="url-paceholder-text"
bindinput="textareaChange">
</textarea>
<cover-view class="scaning" bindtap="qrCodeArouse">
<cover-image class="scaning-cover-img" src="{{ img.scanningicon }}"/>
</cover-view>
</view>
<image class="scaning-img" src="{{ img.scanningicon }}" bindtap="qrCodeArouse"></image>
<view class="history-list" wx:if="{{historyUrlList.length>0}}">
<view class="history-content">
<view class="history-item" data-qr-code="{{item}}" bindtap="setQrCode" wx:for="{{historyUrlList}}" wx:key="key">
<image class="search-icon" src="{{ img.searchicon }}"/>
<image class="search-icon" src="{{ img.searchicon }}"></image>
{{item}}
</view>
</view>
......
......@@ -17,21 +17,18 @@
z-index: 1
}
.h5door-page .area-box {
width: 100%;
width: 98%;
margin: 0 auto;
box-sizing: border-box;
border: 2rpx solid #efefef;
height: 358rpx;
position: relative
}
.h5door-page .scaning {
.scaning-img {
position: absolute;
display: block;
right: 32rpx;
bottom: 32rpx;
height: 56rpx;
width: 56rpx;
z-index: 99
}
.scaning-cover-img {
top: 375rpx;
height: 56rpx;
width: 56rpx
}
......@@ -40,6 +37,7 @@
color: #bebebe
}
.h5door-page .history-list {
margin-top: 70rpx;
padding: 0 20rpx
}
.h5door-page .history-content {
......
......@@ -25,7 +25,7 @@
"nodeModules": true
},
"compileType": "miniprogram",
"libVersion": "2.10.4",
"libVersion": "2.11.3",
"appid": "wxdae0660715fa1bf8",
"projectname": "dokit-sdk-example",
"debugOptions": {
......
{
"name": "dokit-miniapp",
"version": "0.0.2",
"version": "0.0.3",
"description": "",
"main": "dist/index/index.js",
"miniprogram": "dokit",
......
......@@ -10,10 +10,14 @@
data-type="{{tool.type}}"
bindtap="onToggle"
class="card-item">
<cover-image
<!-- <cover-image
class="debug-item-image"
src="{{tool.image}}"
></cover-image>
></cover-image> -->
<image
class="debug-item-image"
src="{{tool.image}}"
></image>
<text class="debug-text">{{tool.title}}</text>
</view>
</view>
......
......@@ -33,9 +33,10 @@
margin-right:0;
}
.debug-item-image {
width:68rpx;
height:68rpx;
margin:0 auto;
display: block;
width: 68rpx;
height: 68rpx;
margin: 0 auto;
}
.debug-text{
font-size: 24rpx;
......
......@@ -3,14 +3,12 @@
<textarea class="url-box" focus="true" value="{{qrCodeUrl}}" placeholder="请输入跳转链接" maxlength="140" placeholder-class="url-paceholder-text"
bindinput="textareaChange">
</textarea>
<cover-view class="scaning" bindtap="qrCodeArouse">
<cover-image class="scaning-cover-img" src="{{ img.scanningicon }}"/>
</cover-view>
</view>
<image class="scaning-img" src="{{ img.scanningicon }}" bindtap="qrCodeArouse"></image>
<view class="history-list" wx:if="{{historyUrlList.length>0}}">
<view class="history-content">
<view class="history-item" data-qr-code="{{item}}" bindtap="setQrCode" wx:for="{{historyUrlList}}" wx:key="key">
<image class="search-icon" src="{{ img.searchicon }}"/>
<image class="search-icon" src="{{ img.searchicon }}"></image>
{{item}}
</view>
</view>
......
......@@ -17,21 +17,18 @@
z-index: 1;
}
.h5door-page .area-box{
width: 100%;
width: 98%;
margin: 0 auto;
box-sizing: border-box;
border: 1px solid #efefef;
height: 358rpx;
position: relative;
}
.h5door-page .scaning{
.scaning-img {
position: absolute;
display: block;
right: 32rpx;
bottom: 32rpx;
height: 56rpx;
width: 56rpx;
z-index: 99;
}
.scaning-cover-img {
top: 375rpx;
height: 56rpx;
width: 56rpx;
}
......@@ -40,6 +37,7 @@
color: #BEBEBE;
}
.h5door-page .history-list{
margin-top: 70rpx;
padding:0 20rpx;
}
.h5door-page .history-content{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册