Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: sku组件修改 #2056

Merged
merged 22 commits into from
Jan 16, 2023
Merged

fix: sku组件修改 #2056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
63a97cc
feat: tour更新
yangxiaolu1993 Jan 11, 2023
88ec556
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 11, 2023
0734bc6
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 11, 2023
ed5b3bd
feat: 文档修改
yangxiaolu1993 Jan 11, 2023
0ed6793
feat: 插槽修改
yangxiaolu1993 Jan 11, 2023
f782c04
feat: slot修改
yangxiaolu1993 Jan 11, 2023
0afc1f3
feat: noticebar发布
yangxiaolu1993 Jan 11, 2023
fe93b0b
feat: 文档更新
yangxiaolu1993 Jan 11, 2023
8c9283f
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 11, 2023
e4b2071
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 11, 2023
a9fdab7
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 12, 2023
b20176b
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 12, 2023
22cdd5e
fix: ellipsis修改
yangxiaolu1993 Jan 12, 2023
14133b0
Merge branch 'v4' of https://github.com/yangxiaolu1993/nutui into v4
yangxiaolu1993 Jan 12, 2023
5c8c2d2
fix: 修改 ellipsis
yangxiaolu1993 Jan 12, 2023
17a2b5b
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 12, 2023
e0ae98e
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 12, 2023
534308e
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 13, 2023
0e20c21
feat: tour修改
yangxiaolu1993 Jan 13, 2023
fe63b0f
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 13, 2023
240e74f
fix: 地址组件问题修改
yangxiaolu1993 Jan 13, 2023
6e5f6ff
Merge branch 'jdf2e:v4' into v4
yangxiaolu1993 Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/packages/__VUE/address/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
display: block;
.nut-address__region {
position: relative;
margin-top: 32px;
// margin-top: 32px;
padding: 0 20px;
display: flex;
font-size: $address-region-tab-font-size;
Expand Down
4 changes: 2 additions & 2 deletions src/packages/__VUE/address/index.taro.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<view class="nut-address__header">
<view class="nut-address__header-back" @click="switchModule">
<slot name="back-icon">
<Left v-show="type == 'exist' && privateType == 'custom'"></Left>
<Left v-show="type == 'exist' && privateType == 'custom'" size="14px"></Left>
</slot>
</view>

Expand All @@ -25,7 +25,7 @@

<view class="nut-address__header-close" @click="handClose('cross')">
<slot name="close-icon">
<Close color="#cccccc" size="18px"></Close>
<Close color="#cccccc" size="14px"></Close>
</slot>
</view>
</view>
Expand Down
10 changes: 5 additions & 5 deletions src/packages/__VUE/address/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<view class="nut-address__header">
<view class="nut-address__header-back" @click="switchModule">
<slot name="back-icon">
<Left v-show="type == 'exist' && privateType == 'custom'"></Left>
<Left v-show="type == 'exist' && privateType == 'custom'" size="14px"></Left>
</slot>
</view>

Expand All @@ -27,7 +27,7 @@

<view class="nut-address__header-close" @click="handClose('cross')">
<slot name="close-icon">
<Close color="#cccccc" size="18px"></Close>
<Close color="#cccccc" size="14px"></Close>
</slot>
</view>
</view>
Expand Down Expand Up @@ -60,7 +60,7 @@
>
<div>
<slot name="icon" v-if="selectedRegion[tabIndex]?.id == item.id">
<Check class="nut-address-select-icon" width="13px"></Check> </slot
<Check class="nut-address-select-icon" size="13px"></Check> </slot
>{{ item.name }}
</div>
</li>
Expand All @@ -87,11 +87,11 @@
@click="selectedExist(item)"
>
<slot name="unselected-icon" v-if="!item.selectedAddress">
<Location2 class="nut-address-select-icon" width="13px"></Location2>
<Location2 class="nut-address-select-icon" size="13px"></Location2>
</slot>

<slot name="icon" v-if="item.selectedAddress">
<Check class="nut-address-select-icon" width="13px"></Check>
<Check class="nut-address-select-icon" size="13px"></Check>
</slot>

<div class="nut-address__exist-item-info">
Expand Down