Skip to content

Commit a8050ed

Browse files
wlxuquwlxuqu
committed
1. 给Modal弹窗添加clearLoading方法，可以在异步回调中清除loading状态
2. 给popup弹窗组件添加控制关闭的图标 3. line线条组件增加margin参数 4. search搜索框组件添加控制图标和字体颜色的参数 5. 优化card卡片组件的内部样式 6. 修复http请求loading第二次以后无效的问题 7. 修复微信小程序Link链接组件mp-tips参数无效的问题 8. 瀑布流新增清空列表的clear方法和移除某条数据的remove方法
1 parent 8f16628 commit a8050ed

File tree

28 files changed

+1066
-702
lines changed

28 files changed

+1066
-702
lines changed

‎manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"template" : "template.h5.html",
115115
"router" : {
116116
"mode" : "hash",
117-
"base" : ""
117+
"base" : "/h5/"
118118
},
119119
"optimization" : {
120120
"treeShaking" : {

‎pages/componentsA/avatarCropper/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<view class="u-avatar-wrap">
88
<image @tap="preAvatar" class="u-avatar-demo" v-if="avatar" :src="avatar" mode="aspectFill"></image>
99
</view>
10-
<u-button @tap="chooseAvatar">选择图片</u-button>
10+
<u-button @click="chooseAvatar">选择图片</u-button>
1111
</view>
1212
</view>
1313
<!-- <view class="u-config-wrap">

‎pages/componentsA/empty/index.vue

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,54 +19,54 @@
1919
<u-table>
2020
<u-tr>
2121
<u-td>
22-
<u-button :hair-line="false" size="mini" @tap="modeChange('car')">购物车为空</u-button>
22+
<u-button :hair-line="false" size="mini" @click="modeChange('car')">购物车为空</u-button>
2323
</u-td>
2424
<u-td>
25-
<u-button :hair-line="false" size="mini" @tap="modeChange('page')">页面不存在</u-button>
25+
<u-button :hair-line="false" size="mini" @click="modeChange('page')">页面不存在</u-button>
2626
</u-td>
2727
<u-td>
28-
<u-button :hair-line="false" size="mini" @tap="modeChange('search')">没有搜索结果</u-button>
28+
<u-button :hair-line="false" size="mini" @click="modeChange('search')">没有搜索结果</u-button>
2929
</u-td>
3030
</u-tr>
3131
<u-tr>
3232
<u-td>
33-
<u-button :hair-line="false" size="mini" @tap="modeChange('address')">没有收货地址</u-button>
33+
<u-button :hair-line="false" size="mini" @click="modeChange('address')">没有收货地址</u-button>
3434
</u-td>
3535
<u-td>
36-
<u-button :hair-line="false" size="mini" @tap="modeChange('wifi')">没有WiFi</u-button>
36+
<u-button :hair-line="false" size="mini" @click="modeChange('wifi')">没有WiFi</u-button>
3737
</u-td>
3838
<u-td>
39-
<u-button :hair-line="false" size="mini" @tap="modeChange('order')">订单为空</u-button>
39+
<u-button :hair-line="false" size="mini" @click="modeChange('order')">订单为空</u-button>
4040
</u-td>
4141
</u-tr>
4242
<u-tr>
4343
<u-td>
44-
<u-button :hair-line="false" size="mini" @tap="modeChange('coupon')">没有优惠券</u-button>
44+
<u-button :hair-line="false" size="mini" @click="modeChange('coupon')">没有优惠券</u-button>
4545
</u-td>
4646
<u-td>
47-
<u-button :hair-line="false" size="mini" @tap="modeChange('favor')">没有收藏</u-button>
47+
<u-button :hair-line="false" size="mini" @click="modeChange('favor')">没有收藏</u-button>
4848
</u-td>
4949
<u-td>
50-
<u-button :hair-line="false" size="mini" @tap="modeChange('permission')">无权限</u-button>
50+
<u-button :hair-line="false" size="mini" @click="modeChange('permission')">无权限</u-button>
5151
</u-td>
5252
</u-tr>
5353
<u-tr>
5454
<u-td>
55-
<u-button :hair-line="false" size="mini" @tap="modeChange('history')">无历史记录</u-button>
55+
<u-button :hair-line="false" size="mini" @click="modeChange('history')">无历史记录</u-button>
5656
</u-td>
5757
<u-td>
58-
<u-button :hair-line="false" size="mini" @tap="modeChange('news')">无新闻列表</u-button>
58+
<u-button :hair-line="false" size="mini" @click="modeChange('news')">无新闻列表</u-button>
5959
</u-td>
6060
<u-td>
61-
<u-button :hair-line="false" size="mini" @tap="modeChange('message')">消息列表为空</u-button>
61+
<u-button :hair-line="false" size="mini" @click="modeChange('message')">消息列表为空</u-button>
6262
</u-td>
6363
</u-tr>
6464
<u-tr>
6565
<u-td>
66-
<u-button :hair-line="false" size="mini" @tap="modeChange('list')">列表为空</u-button>
66+
<u-button :hair-line="false" size="mini" @click="modeChange('list')">列表为空</u-button>
6767
</u-td>
6868
<u-td>
69-
<u-button :hair-line="false" size="mini" @tap="modeChange('data')">数据为空</u-button>
69+
<u-button :hair-line="false" size="mini" @click="modeChange('data')">数据为空</u-button>
7070
</u-td>
7171
<u-td>
7272
待扩展

‎pages/componentsA/modal/index.vue

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
<view class="u-demo-area">
66
<u-toast ref="uToast"></u-toast>
77
<view class="u-no-demo-here">请点击弹出弹窗查看效果</view>
8-
<u-modal v-model="show" :show-cancel-button="true" :show-title="showTitle" :content-slot="contentSlot">
8+
<u-modal ref="uModal" v-model="show" :show-cancel-button="true"
9+
:show-title="showTitle" :content-slot="contentSlot" :async-close="asyncClose"
10+
@confirm="confirm"
11+
>
912
<view class="warp" style="margin: 30rpx;" v-if="content">
1013
<image class="logo" src="https://uviewui.com/common/logo.png" style="width: 220rpx;" mode="widthFix"></image>
1114
</view>
@@ -22,11 +25,14 @@
2225
<view class="u-item-title">是否显示标题</view>
2326
<u-subsection vibrateShort current="0" :list="['是', '否']" @change="titleChange"></u-subsection>
2427
</view>
25-
2628
<view class="u-config-item">
2729
<view class="u-item-title">自定义内容</view>
2830
<u-subsection vibrateShort current="1" :list="['是', '否']" @change="contentChange"></u-subsection>
2931
</view>
32+
<view class="u-config-item">
33+
<view class="u-item-title">异步关闭</view>
34+
<u-subsection vibrateShort current="1" :list="['是', '否']" @change="asyncChange"></u-subsection>
35+
</view>
3036
</view>
3137
</view>
3238
</template>
@@ -39,7 +45,8 @@
3945
zoom: false,
4046
content: false,
4147
showTitle: true,
42-
contentSlot: false
48+
contentSlot: false,
49+
asyncClose: false
4350
};
4451
},
4552
computed: {
@@ -59,6 +66,15 @@
5966
this.contentSlot = !index;
6067
this.content = !index;
6168
this.show = true;
69+
},
70+
asyncChange(index) {
71+
this.show = true;
72+
this.asyncClose = !index;
73+
},
74+
confirm() {
75+
setTimeout(() => {
76+
this.show = false;
77+
}, 2000)
6278
}
6379
}
6480
};

‎pages/componentsA/verificationCode/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<u-verification-code :seconds="seconds" @end="end" @start="start" ref="uCode"
88
@change="codeChange" :startText="startText" :changeText="changeText"
99
:endText="endText"></u-verification-code>
10-
<u-button @tap="getCode">{{tips}}</u-button>
10+
<u-button @click="getCode">{{tips}}</u-button>
1111
<u-button :custom-style="{marginTop: '30rpx'}" @tap="reset" style="margin-top: 30rpx;">重置</u-button>
1212
</view>
1313
</view>

‎pages/componentsB/card/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<image src="https://img12.360buyimg.com/n7/jfs/t1/102191/19/9072/330688/5e0af7cfE17698872/c91c00d713bf729a.jpg" mode="aspectFill"></image>
1717
</view>
1818
</view>
19-
<view class="" slot="foot" v-if="bottomSlot">
20-
<u-icon name="chat-fill" size="34" color="" label="30评论"></u-icon>
19+
<view class="" slot="foot">
20+
<u-icon v-if="bottomSlot" name="chat-fill" size="34" color="" label="30评论"></u-icon>
2121
</view>
2222
</u-card>
2323
</view>

0 commit comments

Comments
 (0)