Skip to content

W
wx-boss
Commit 50e2a390 by 姜雷
Options

Merge branch 'develop' into test

parents 2c48ce7f 448a2cb2
Showing with 7 additions and 6 deletions
miniprogram/custom-tab-bar/index.js
"use strict";
Component({
properties: {
checked: { type: Number, value: 0 },
checked: { type: String, value: '' },
listData: { type: Array, value: [] },
},
lifetimes: {
......@@ -31,4 +31,4 @@ Component({
}
},
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQ0EsU0FBUyxDQUFDO0lBSVIsVUFBVSxFQUFFO1FBQ1YsT0FBTyxFQUFFLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFO1FBQ25DLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTtLQUNyQztJQUNELFNBQVMsRUFBRTtRQUNULFFBQVEsRUFBRTtZQUVSLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2xDLElBQUksQ0FBQyxPQUFPLENBQUM7b0JBQ1gsS0FBSyxFQUFFLENBQUM7aUJBQ1QsQ0FBQyxDQUFDO1lBQ0wsQ0FBQztZQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO2dCQUMzQyxJQUFJLENBQUMsT0FBTyxDQUFDO29CQUNYLEtBQUssRUFBRSxDQUFDO2lCQUNULENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDO1FBQ0QsUUFBUSxFQUFFO1FBRVYsQ0FBQztLQUNGO0lBSUQsSUFBSSxFQUFFLEVBRUw7SUFLRCxPQUFPLEVBQUU7UUFDUCxXQUFXLFlBQUMsQ0FBQztZQUNQLElBQUEsNEJBQXlDLEVBQXZDLGNBQUksRUFBRSxnQkFBSyxDQUE2QjtZQUM5QyxJQUFJLGFBQWEsR0FBRztnQkFDbEIsSUFBSSxNQUFBLEVBQUUsS0FBSyxPQUFBO2FBQ1osQ0FBQTtZQUNELElBQUksQ0FBQyxZQUFZLENBQUMsYUFBYSxFQUFFLGFBQWEsQ0FBQyxDQUFBO1FBQ2pELENBQUM7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIGN1c3RvbS10YWItYmFyL2luZGV4LnRzXG5Db21wb25lbnQoe1xuICAvKipcbiAgICog57uE5Lu255qE5bGe5oCn5YiX6KGoXG4gICAqL1xuICBwcm9wZXJ0aWVzOiB7XG4gICAgY2hlY2tlZDogeyB0eXBlOiBOdW1iZXIsIHZhbHVlOiAwIH0sXG4gICAgbGlzdERhdGE6IHsgdHlwZTogQXJyYXksIHZhbHVlOiBbXSB9LFxuICB9LFxuICBsaWZldGltZXM6IHtcbiAgICBhdHRhY2hlZDogZnVuY3Rpb24gKCkge1xuICAgICAgLy8g5Zyo57uE5Lu25a6e5L6L6L+b5YWl6aG16Z2i6IqC54K55qCR5pe25omn6KGMXG4gICAgICBpZiAodGhpcy5kYXRhLnBhZ2VQYXRoID09PSAnaG9tZScpIHtcbiAgICAgICAgdGhpcy5zZXREYXRhKHtcbiAgICAgICAgICBpbmRleDogMCxcbiAgICAgICAgfSk7XG4gICAgICB9IGVsc2UgaWYgKHRoaXMuZGF0YS5wYWdlUGF0aCA9PT0gJ3JlcG9ydCcpIHtcbiAgICAgICAgdGhpcy5zZXREYXRhKHtcbiAgICAgICAgICBpbmRleDogMSxcbiAgICAgICAgfSk7XG4gICAgICB9XG4gICAgfSxcbiAgICBkZXRhY2hlZDogZnVuY3Rpb24gKCkge1xuICAgICAgLy8g5Zyo57uE5Lu25a6e5L6L6KKr5LuO6aG16Z2i6IqC54K55qCR56e76Zmk5pe25omn6KGMXG4gICAgfSxcbiAgfSxcbiAgLyoqXG4gICAqIOe7hOS7tueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuXG4gIH0sXG5cbiAgLyoqXG4gICAqIOe7hOS7tueahOaWueazleWIl+ihqFxuICAgKi9cbiAgbWV0aG9kczoge1xuICAgIGNsaWNrSGFuZGxlKGUpIHtcbiAgICAgIGxldCB7IHBhdGgsIGluZGV4IH0gPSBlLmN1cnJlbnRUYXJnZXQuZGF0YXNldDtcbiAgICAgIGxldCBteUV2ZW50RGV0YWlsID0ge1xuICAgICAgICBwYXRoLCBpbmRleCxcbiAgICAgIH0gLy8gZGV0YWls5a+56LGh77yM5o+Q5L6b57uZ5LqL5Lu255uR5ZCs5Ye95pWwXG4gICAgICB0aGlzLnRyaWdnZXJFdmVudCgnY3VzdG9tZXZlbnQnLCBteUV2ZW50RGV0YWlsKVxuICAgIH1cbiAgfSxcbn0pO1xuIl19
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQ0EsU0FBUyxDQUFDO0lBSVIsVUFBVSxFQUFFO1FBQ1YsT0FBTyxFQUFFLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFO1FBQ3BDLFFBQVEsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTtLQUNyQztJQUNELFNBQVMsRUFBRTtRQUNULFFBQVEsRUFBRTtZQUVSLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7Z0JBQ2xDLElBQUksQ0FBQyxPQUFPLENBQUM7b0JBQ1gsS0FBSyxFQUFFLENBQUM7aUJBQ1QsQ0FBQyxDQUFDO1lBQ0wsQ0FBQztZQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDO2dCQUMzQyxJQUFJLENBQUMsT0FBTyxDQUFDO29CQUNYLEtBQUssRUFBRSxDQUFDO2lCQUNULENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDO1FBQ0QsUUFBUSxFQUFFO1FBRVYsQ0FBQztLQUNGO0lBSUQsSUFBSSxFQUFFLEVBRUw7SUFLRCxPQUFPLEVBQUU7UUFDUCxXQUFXLFlBQUMsQ0FBQztZQUNQLElBQUEsNEJBQXlDLEVBQXZDLGNBQUksRUFBRSxnQkFBSyxDQUE2QjtZQUM5QyxJQUFJLGFBQWEsR0FBRztnQkFDbEIsSUFBSSxNQUFBLEVBQUUsS0FBSyxPQUFBO2FBQ1osQ0FBQTtZQUNELElBQUksQ0FBQyxZQUFZLENBQUMsYUFBYSxFQUFFLGFBQWEsQ0FBQyxDQUFBO1FBQ2pELENBQUM7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIGN1c3RvbS10YWItYmFyL2luZGV4LnRzXG5Db21wb25lbnQoe1xuICAvKipcbiAgICog57uE5Lu255qE5bGe5oCn5YiX6KGoXG4gICAqL1xuICBwcm9wZXJ0aWVzOiB7XG4gICAgY2hlY2tlZDogeyB0eXBlOiBTdHJpbmcsIHZhbHVlOiAnJyB9LFxuICAgIGxpc3REYXRhOiB7IHR5cGU6IEFycmF5LCB2YWx1ZTogW10gfSxcbiAgfSxcbiAgbGlmZXRpbWVzOiB7XG4gICAgYXR0YWNoZWQ6IGZ1bmN0aW9uICgpIHtcbiAgICAgIC8vIOWcqOe7hOS7tuWunuS+i+i/m+WFpemhtemdouiKgueCueagkeaXtuaJp+ihjFxuICAgICAgaWYgKHRoaXMuZGF0YS5wYWdlUGF0aCA9PT0gJ2hvbWUnKSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgICAgaW5kZXg6IDAsXG4gICAgICAgIH0pO1xuICAgICAgfSBlbHNlIGlmICh0aGlzLmRhdGEucGFnZVBhdGggPT09ICdyZXBvcnQnKSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgICAgaW5kZXg6IDEsXG4gICAgICAgIH0pO1xuICAgICAgfVxuICAgIH0sXG4gICAgZGV0YWNoZWQ6IGZ1bmN0aW9uICgpIHtcbiAgICAgIC8vIOWcqOe7hOS7tuWunuS+i+iiq+S7jumhtemdouiKgueCueagkeenu+mZpOaXtuaJp+ihjFxuICAgIH0sXG4gIH0sXG4gIC8qKlxuICAgKiDnu4Tku7bnmoTliJ3lp4vmlbDmja5cbiAgICovXG4gIGRhdGE6IHtcblxuICB9LFxuXG4gIC8qKlxuICAgKiDnu4Tku7bnmoTmlrnms5XliJfooahcbiAgICovXG4gIG1ldGhvZHM6IHtcbiAgICBjbGlja0hhbmRsZShlKSB7XG4gICAgICBsZXQgeyBwYXRoLCBpbmRleCB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgICBsZXQgbXlFdmVudERldGFpbCA9IHtcbiAgICAgICAgcGF0aCwgaW5kZXgsXG4gICAgICB9IC8vIGRldGFpbOWvueixoe+8jOaPkOS+m+e7meS6i+S7tuebkeWQrOWHveaVsFxuICAgICAgdGhpcy50cmlnZ2VyRXZlbnQoJ2N1c3RvbWV2ZW50JywgbXlFdmVudERldGFpbClcbiAgICB9XG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file
miniprogram/custom-tab-bar/index.ts
......@@ -4,7 +4,7 @@ Component({
* 组件的属性列表
*/
properties: {
checked: { type: Number, value: 0 },
checked: { type: String, value: '' },
listData: { type: Array, value: [] },
},
lifetimes: {
......
miniprogram/custom-tab-bar/index.wxml
<!-- custom-tab-bar/index.wxml -->
<view class="custom-tab-bar">
<view wx:for="{{listData}}" wx:key="index" class="custom-tab-bar-item {{checked === index?'checked':''}}" data-index="{{index}}" data-path="{{item.pagePath}}" bindtap="clickHandle">
<image class="custom-tab-bar-icon" src="{{checked === index ? item.selectedIconPath : item.iconPath}}"></image>
<view wx:for="{{listData}}" wx:key="index" class="custom-tab-bar-item {{checked === item.code?'checked':''}}" data-index="{{item.code}}" data-path="{{item.pagePath}}" bindtap="clickHandle">
<image class="custom-tab-bar-icon" src="{{checked === item.code ? item.selectedIconPath : item.iconPath}}"></image>
<view>{{item.text}}</view>
</view>
</view>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment