From b7d451c91ec40bee70f23b1e2cf6a8797643faef Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 25 四月 2026 15:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/unpackage/dist/dev/mp-weixin/components/custom-tabbar/custom-tabbar.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/components/custom-tabbar/custom-tabbar.js b/small-program/unpackage/dist/dev/mp-weixin/components/custom-tabbar/custom-tabbar.js
index 3aeb846..a314454 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/components/custom-tabbar/custom-tabbar.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/components/custom-tabbar/custom-tabbar.js
@@ -1,10 +1,10 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/custom-tabbar/custom-tabbar"],{405:function(t,e,n){"use strict";n.r(e);var a=n(406),r=n(408);for(var o in r)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(o);n(410);var c,i=n(41),s=Object(i["default"])(r["default"],a["render"],a["staticRenderFns"],!1,null,"48eece8c",null,!1,a["components"],c);s.options.__file="components/custom-tabbar/custom-tabbar.vue",e["default"]=s.exports},406:function(t,e,n){"use strict";n.r(e);var a=n(407);n.d(e,"render",(function(){return a["render"]})),n.d(e,"staticRenderFns",(function(){return a["staticRenderFns"]})),n.d(e,"recyclableRender",(function(){return a["recyclableRender"]})),n.d(e,"components",(function(){return a["components"]}))},407:function(t,e,n){"use strict";var a;n.r(e),n.d(e,"render",(function(){return r})),n.d(e,"staticRenderFns",(function(){return c})),n.d(e,"recyclableRender",(function(){return o})),n.d(e,"components",(function(){return a}));var r=function(){var t=this,e=t.$createElement;t._self._c},o=!1,c=[];r._withStripped=!0},408:function(t,e,n){"use strict";n.r(e);var a=n(409),r=n.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(o);e["default"]=r.a},409:function(t,e,n){"use strict";(function(t){var a=n(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=a(n(11)),o=n(37);function c(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,a)}return n}function i(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?c(Object(n),!0).forEach((function(e){(0,r.default)(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}var s={name:"CustomTabbar",data:function(){return{safeAreaBottom:0,memberTabList:[{text:"棣栭〉",pagePath:"/pages/index/index",iconPath:"/static/icon/nav_home@2x.png",selectedIconPath:"/static/icon/nav_home_sel@2x.png"},{text:"琛岀▼",pagePath:"/pages/itinerary/itinerary",iconPath:"/static/icon/nav_xingcheng@2x.png",selectedIconPath:"/static/icon/nav_xingcheng_sel@2x.png"},{text:"娑堟伅",pagePath:"/pages/message/message",iconPath:"/static/icon/nav_xiaoxi@2x.png",selectedIconPath:"/static/icon/nav_xiaoxi_sel@2x.png"},{text:"鎴戠殑",pagePath:"/pages/mine/mine",iconPath:"/static/icon/nav_wode@2x.png",selectedIconPath:"/static/icon/nav_wode_sel@2x.png"}],shopTabList:[{text:"棣栭〉",pagePath:"/shop/pages/store-home/store-home",iconPath:"/static/icon/nav_home@2x.png",selectedIconPath:"/static/icon/nav_home_sel@2x.png"},{text:"閽卞寘",pagePath:"/shop/pages/wallet/wallet",iconPath:"/static/icon/nav_qianbao@2x.png",selectedIconPath:"/static/icon/nav_qianbao_sel@2x.png"},{text:"娑堟伅",pagePath:"/shop/pages/message/message",iconPath:"/static/icon/nav_xiaoxi@2x.png",selectedIconPath:"/static/icon/nav_xiaoxi_sel@2x.png"},{text:"鎴戠殑",pagePath:"/shop/pages/mine/mine",iconPath:"/static/icon/nav_wode@2x.png",selectedIconPath:"/static/icon/nav_wode_sel@2x.png"}]}},computed:i(i({},(0,o.mapState)(["userType"])),{},{currentIndex:function(){var t=getCurrentPages(),e=t[t.length-1],n="/"+e.route,a=this.tabList,r=a.findIndex((function(t){return t.pagePath===n}));return r>-1?r:0},tabList:function(){return 1===this.userType?this.shopTabList:this.memberTabList}}),created:function(){this.getSafeAreaBottom()},methods:{getSafeAreaBottom:function(){var e=t.getSystemInfoSync();this.safeAreaBottom=e.safeAreaInsets.bottom||0},switchTab:function(e){var n=getCurrentPages()[getCurrentPages().length-1].$page.fullPath;1===this.userType?n!==e.pagePath&&t.redirectTo({url:e.pagePath}):n!==e.pagePath&&t.switchTab({url:e.pagePath})}}};e.default=s}).call(this,n(2)["default"])},410:function(t,e,n){"use strict";n.r(e);var a=n(411),r=n.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(o);e["default"]=r.a},411:function(t,e,n){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/custom-tabbar/custom-tabbar"],{187:function(t,e,n){"use strict";n.r(e);var a=n(188),r=n(190);for(var o in r)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(o);n(192);var c,i=n(41),s=Object(i["default"])(r["default"],a["render"],a["staticRenderFns"],!1,null,"48eece8c",null,!1,a["components"],c);s.options.__file="components/custom-tabbar/custom-tabbar.vue",e["default"]=s.exports},188:function(t,e,n){"use strict";n.r(e);var a=n(189);n.d(e,"render",(function(){return a["render"]})),n.d(e,"staticRenderFns",(function(){return a["staticRenderFns"]})),n.d(e,"recyclableRender",(function(){return a["recyclableRender"]})),n.d(e,"components",(function(){return a["components"]}))},189:function(t,e,n){"use strict";var a;n.r(e),n.d(e,"render",(function(){return r})),n.d(e,"staticRenderFns",(function(){return c})),n.d(e,"recyclableRender",(function(){return o})),n.d(e,"components",(function(){return a}));var r=function(){var t=this,e=t.$createElement;t._self._c},o=!1,c=[];r._withStripped=!0},190:function(t,e,n){"use strict";n.r(e);var a=n(191),r=n.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(o);e["default"]=r.a},191:function(t,e,n){"use strict";(function(t){var a=n(4);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=a(n(11)),o=n(37);function c(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,a)}return n}function i(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?c(Object(n),!0).forEach((function(e){(0,r.default)(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}var s={name:"CustomTabbar",data:function(){return{safeAreaBottom:0,memberTabList:[{text:"棣栭〉",pagePath:"/pages/index/index",iconPath:"/static/icon/nav_home@2x.png",selectedIconPath:"/static/icon/nav_home_sel@2x.png"},{text:"琛岀▼",pagePath:"/pages/itinerary/itinerary",iconPath:"/static/icon/nav_xingcheng@2x.png",selectedIconPath:"/static/icon/nav_xingcheng_sel@2x.png"},{text:"娑堟伅",pagePath:"/pages/message/message",iconPath:"/static/icon/nav_xiaoxi@2x.png",selectedIconPath:"/static/icon/nav_xiaoxi_sel@2x.png"},{text:"鎴戠殑",pagePath:"/pages/mine/mine",iconPath:"/static/icon/nav_wode@2x.png",selectedIconPath:"/static/icon/nav_wode_sel@2x.png"}],shopTabList:[{text:"棣栭〉",pagePath:"/shop/pages/store-home/store-home",iconPath:"/static/icon/nav_home@2x.png",selectedIconPath:"/static/icon/nav_home_sel@2x.png"},{text:"閽卞寘",pagePath:"/shop/pages/wallet/wallet",iconPath:"/static/icon/nav_qianbao@2x.png",selectedIconPath:"/static/icon/nav_qianbao_sel@2x.png"},{text:"娑堟伅",pagePath:"/shop/pages/message/message",iconPath:"/static/icon/nav_xiaoxi@2x.png",selectedIconPath:"/static/icon/nav_xiaoxi_sel@2x.png"},{text:"鎴戠殑",pagePath:"/shop/pages/mine/mine",iconPath:"/static/icon/nav_wode@2x.png",selectedIconPath:"/static/icon/nav_wode_sel@2x.png"}]}},computed:i(i({},(0,o.mapState)(["userType"])),{},{currentIndex:function(){var t=getCurrentPages(),e=t[t.length-1],n="/"+e.route,a=this.tabList,r=a.findIndex((function(t){return t.pagePath===n}));return r>-1?r:0},tabList:function(){return 1===this.userType?this.shopTabList:this.memberTabList}}),created:function(){this.getSafeAreaBottom()},methods:{getSafeAreaBottom:function(){var e=t.getSystemInfoSync();this.safeAreaBottom=e.safeAreaInsets.bottom||0},switchTab:function(e){var n=getCurrentPages()[getCurrentPages().length-1].$page.fullPath;1===this.userType?n!==e.pagePath&&t.redirectTo({url:e.pagePath}):n!==e.pagePath&&t.switchTab({url:e.pagePath})}}};e.default=s}).call(this,n(2)["default"])},192:function(t,e,n){"use strict";n.r(e);var a=n(193),r=n.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(o);e["default"]=r.a},193:function(t,e,n){}}]);
//# sourceMappingURL=../../../.sourcemap/mp-weixin/components/custom-tabbar/custom-tabbar.js.map
;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
'components/custom-tabbar/custom-tabbar-create-component',
{
'components/custom-tabbar/custom-tabbar-create-component':(function(module, exports, __webpack_require__){
- __webpack_require__('2')['createComponent'](__webpack_require__(405))
+ __webpack_require__('2')['createComponent'](__webpack_require__(187))
})
},
[['components/custom-tabbar/custom-tabbar-create-component']]
--
Gitblit v1.9.3