feat: 合并 v1.0.4 版本
This commit is contained in:
@@ -93,6 +93,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="bottom-btn-box">
|
<view class="bottom-btn-box">
|
||||||
<toy-button
|
<toy-button
|
||||||
|
openType="share"
|
||||||
type="green"
|
type="green"
|
||||||
flat="{{true}}"
|
flat="{{true}}"
|
||||||
bind:click="onShareAppMessage"
|
bind:click="onShareAppMessage"
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ Component({
|
|||||||
type: String,
|
type: String,
|
||||||
value: 'default', // primary, green, white
|
value: 'default', // primary, green, white
|
||||||
},
|
},
|
||||||
|
openType: {
|
||||||
|
type: String,
|
||||||
|
value: '',
|
||||||
|
},
|
||||||
plain: {
|
plain: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
value: false, // 是否朴素按钮
|
value: false, // 是否朴素按钮
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
data-loading="{{loading}}"
|
data-loading="{{loading}}"
|
||||||
style="{{style}};{{width ? 'width:' + width + ';' : ''}};{{height ? 'height:' + height + ';' : ''}}"
|
style="{{style}};{{width ? 'width:' + width + ';' : ''}};{{height ? 'height:' + height + ';' : ''}}"
|
||||||
session-from="{{ sessionFrom }}"
|
session-from="{{ sessionFrom }}"
|
||||||
|
open-type="{{ disabled || loading ? '' : openType }}"
|
||||||
send-message-title="{{ sendMessageTitle }}"
|
send-message-title="{{ sendMessageTitle }}"
|
||||||
send-message-path="{{ sendMessagePath }}"
|
send-message-path="{{ sendMessagePath }}"
|
||||||
send-message-img="{{ sendMessageImg }}"
|
send-message-img="{{ sendMessageImg }}"
|
||||||
@@ -37,7 +38,6 @@
|
|||||||
<block wx:else>
|
<block wx:else>
|
||||||
<van-icon
|
<van-icon
|
||||||
wx:if="{{ icon }}"
|
wx:if="{{ icon }}"
|
||||||
size="1.2em"
|
|
||||||
name="{{ icon }}"
|
name="{{ icon }}"
|
||||||
size="{{ iconSize }}"
|
size="{{ iconSize }}"
|
||||||
color="{{ wxs.getIconColor(iconColor, type, plain, disabled) }}"
|
color="{{ wxs.getIconColor(iconColor, type, plain, disabled) }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user