diff --git a/unpackage/dist/dev/mp-weixin/addProduct.js b/unpackage/dist/dev/mp-weixin/addProduct.js index 2da82fb..09601cd 100644 --- a/unpackage/dist/dev/mp-weixin/addProduct.js +++ b/unpackage/dist/dev/mp-weixin/addProduct.js @@ -29,11 +29,8 @@ const _sfc_main = { cookie: common_vendor.wx$1.getStorageSync("cookie") }, data: { - userId: userInfo.value.id, goodId: productBrief.value.id, - quantity: quantity.value, - subtotal: productBrief.value.price * quantity.value, - isGoodType: productBrief.value.isGoodType + quantity: quantity.value } }); if (res.data.code === 1) { @@ -46,13 +43,13 @@ const _sfc_main = { console.log("失败原因-->", res.data); common_vendor.index.showToast({ icon: "error", - title: "请求失败" + title: res.data.message }); return; } }; const decrease = () => { - if (quantity.value > 0) { + if (quantity.value != 1) { quantity.value -= 1; } }; @@ -75,5 +72,5 @@ const _sfc_main = { }; } }; -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-ac6f555c"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-ac6f555c"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/component/addProduct.vue"]]); exports.MiniProgramPage = MiniProgramPage; diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js index f902777..426325a 100644 --- a/unpackage/dist/dev/mp-weixin/app.js +++ b/unpackage/dist/dev/mp-weixin/app.js @@ -12,17 +12,14 @@ if (!Math) { "./pages/booking/ContactInformation.js"; "./pages/booking/date.js"; "./pages/store-home/ProductDetails/ProductDetails.js"; - "./pages/Shopping-cart/Phone/Phone.js"; - "./pages/order/product-unpay/product-unpay.js"; + "./pages/order/product-paysuccess/product-paysuccess.js"; "./pages/booking/BillingOfFees/BillingOfFees.js"; "./pages/booking/ReservationInstructions/ReservationInstructions.js"; "./pages/booking/respectable/respectable.js"; "./pages/Shopping-cart/newaddress_Info/newaddress_Info.js"; "./pages/order/product-waitpay/product-waitpay.js"; - "./pages/order/paysuccess/paysuccess.js"; "./pages/booking/Simple/Simple.js"; "./pages/booking/bookingpay/bookingpay.js"; - "./pages/order/productOrderDetail/productOrderDetail.js"; "./pages/login/login.js"; "./pages/Shopping-cart/component/addProduct.js"; "./pages/mine/OrderDetails/OrderDetails.js"; @@ -31,12 +28,17 @@ if (!Math) { "./pages/booking/CostumeDisplay/CostumeDisplay.js"; "./pages/booking/CostumeDetails/CostumeDetails.js"; "./pages/mine/Contact/Contact.js"; + "./pages/workshop/productmain/productmain.js"; + "./pages/workshop/component/timePopUp.js"; + "./pages/store-home/main/testMain.js"; + "./pages/syy.js"; + "./pages/order/singleGoodOrder/singleGoodOrder.js"; } const _sfc_main = {}; function _sfc_render(_ctx, _cache) { return {}; } -const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]); +const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/App.vue"]]); function createApp() { const app = common_vendor.createSSRApp(App); app.use(store_index.pinia); diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json index 5ef8c6a..80d0549 100644 --- a/unpackage/dist/dev/mp-weixin/app.json +++ b/unpackage/dist/dev/mp-weixin/app.json @@ -9,17 +9,14 @@ "pages/booking/ContactInformation", "pages/booking/date", "pages/store-home/ProductDetails/ProductDetails", - "pages/Shopping-cart/Phone/Phone", - "pages/order/product-unpay/product-unpay", + "pages/order/product-paysuccess/product-paysuccess", "pages/booking/BillingOfFees/BillingOfFees", "pages/booking/ReservationInstructions/ReservationInstructions", "pages/booking/respectable/respectable", "pages/Shopping-cart/newaddress_Info/newaddress_Info", "pages/order/product-waitpay/product-waitpay", - "pages/order/paysuccess/paysuccess", "pages/booking/Simple/Simple", "pages/booking/bookingpay/bookingpay", - "pages/order/productOrderDetail/productOrderDetail", "pages/login/login", "pages/Shopping-cart/component/addProduct", "pages/mine/OrderDetails/OrderDetails", @@ -27,7 +24,12 @@ "pages/workshop/index/index", "pages/booking/CostumeDisplay/CostumeDisplay", "pages/booking/CostumeDetails/CostumeDetails", - "pages/mine/Contact/Contact" + "pages/mine/Contact/Contact", + "pages/workshop/productmain/productmain", + "pages/workshop/component/timePopUp", + "pages/store-home/main/testMain", + "pages/syy", + "pages/order/singleGoodOrder/singleGoodOrder" ], "window": { "navigationBarTextStyle": "black", @@ -36,30 +38,26 @@ "backgroundColor": "#F8F8F8" }, "tabBar": { - "backgroundColor": "#F7E7C6", + "backgroundColor": "#FFFFFF", "list": [ { "pagePath": "pages/home/home", "iconPath": "./static/home.png", - "selectedIconPath": "./static/homeselected.png", "text": "首页" }, { "pagePath": "pages/store-home/main/main", "iconPath": "./static/store.png", - "selectedIconPath": "./static/storeselected.png", "text": "商城" }, { "pagePath": "pages/Shopping-cart/productmain/productmain", "iconPath": "./static/shopcar.png", - "selectedIconPath": "./static/shopcarselected.png", "text": "购物车" }, { "pagePath": "pages/mine/main/main", "iconPath": "./static/mine.png", - "selectedIconPath": "./static/mineselected.png", "text": "我的" } ] diff --git a/unpackage/dist/dev/mp-weixin/assets/add.c73b1e4b.png b/unpackage/dist/dev/mp-weixin/assets/add.c73b1e4b.png deleted file mode 100644 index 7f1530a..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/add.c73b1e4b.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/add.dace8cf5.png b/unpackage/dist/dev/mp-weixin/assets/add.dace8cf5.png deleted file mode 100644 index 0b3310f..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/add.dace8cf5.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/address.e91cc3a1.png b/unpackage/dist/dev/mp-weixin/assets/address.e91cc3a1.png deleted file mode 100644 index adf3f3e..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/address.e91cc3a1.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/avator.7ac17437.png b/unpackage/dist/dev/mp-weixin/assets/avator.7ac17437.png deleted file mode 100644 index 59348f3..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/avator.7ac17437.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/background.27d7292c.png b/unpackage/dist/dev/mp-weixin/assets/background.27d7292c.png deleted file mode 100644 index 8d35895..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/background.27d7292c.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/cailiaobao.52f9097b.png b/unpackage/dist/dev/mp-weixin/assets/cailiaobao.52f9097b.png deleted file mode 100644 index 5e14e41..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/cailiaobao.52f9097b.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/choose.f501b5d4.png b/unpackage/dist/dev/mp-weixin/assets/choose.f501b5d4.png deleted file mode 100644 index 5b700ad..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/choose.f501b5d4.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/choosed.ea32c69c.png b/unpackage/dist/dev/mp-weixin/assets/choosed.ea32c69c.png deleted file mode 100644 index 8d36d1f..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/choosed.ea32c69c.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/daifahuo.8369326b.png b/unpackage/dist/dev/mp-weixin/assets/daifahuo.8369326b.png deleted file mode 100644 index 03f76bc..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/daifahuo.8369326b.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/daishouhuo.ff694766.png b/unpackage/dist/dev/mp-weixin/assets/daishouhuo.ff694766.png deleted file mode 100644 index 9a7a971..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/daishouhuo.ff694766.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/dec.1cf16d78.png b/unpackage/dist/dev/mp-weixin/assets/dec.1cf16d78.png deleted file mode 100644 index c68cb7f..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/dec.1cf16d78.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/denglong.a91d13af.png b/unpackage/dist/dev/mp-weixin/assets/denglong.a91d13af.png deleted file mode 100644 index bcd82ea..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/denglong.a91d13af.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/dingdan.6b4043d6.png b/unpackage/dist/dev/mp-weixin/assets/dingdan.6b4043d6.png deleted file mode 100644 index f247263..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/dingdan.6b4043d6.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/dingwei.69908177.png b/unpackage/dist/dev/mp-weixin/assets/dingwei.69908177.png deleted file mode 100644 index 42904d6..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/dingwei.69908177.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/dingwei.a57a6fb6.png b/unpackage/dist/dev/mp-weixin/assets/dingwei.a57a6fb6.png deleted file mode 100644 index f09812a..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/dingwei.a57a6fb6.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/dingzhi.d6614f9f.png b/unpackage/dist/dev/mp-weixin/assets/dingzhi.d6614f9f.png deleted file mode 100644 index fe9c8c7..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/dingzhi.d6614f9f.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/haibao.2883ea9c.png b/unpackage/dist/dev/mp-weixin/assets/haibao.2883ea9c.png deleted file mode 100644 index 1a9c5df..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/haibao.2883ea9c.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/jifenduihuan.a1c23524.png b/unpackage/dist/dev/mp-weixin/assets/jifenduihuan.a1c23524.png deleted file mode 100644 index 9ae355a..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/jifenduihuan.a1c23524.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/kefu.eef0848c.png b/unpackage/dist/dev/mp-weixin/assets/kefu.eef0848c.png deleted file mode 100644 index 796f5d4..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/kefu.eef0848c.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/left.ddabbcdb.png b/unpackage/dist/dev/mp-weixin/assets/left.ddabbcdb.png deleted file mode 100644 index 8d07527..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/left.ddabbcdb.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/lianxiren_s.17e4954c.png b/unpackage/dist/dev/mp-weixin/assets/lianxiren_s.17e4954c.png deleted file mode 100644 index 80ada84..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/lianxiren_s.17e4954c.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/product.72fb10c1.png b/unpackage/dist/dev/mp-weixin/assets/product.72fb10c1.png deleted file mode 100644 index f7b1566..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/product.72fb10c1.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/product.7900e336.png b/unpackage/dist/dev/mp-weixin/assets/product.7900e336.png deleted file mode 100644 index fa97349..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/product.7900e336.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/product.d45a003d.png b/unpackage/dist/dev/mp-weixin/assets/product.d45a003d.png deleted file mode 100644 index 43f64bf..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/product.d45a003d.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/productimg.a8fe2d32.png b/unpackage/dist/dev/mp-weixin/assets/productimg.a8fe2d32.png deleted file mode 100644 index 1ddfcae..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/productimg.a8fe2d32.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/pull.902be841.png b/unpackage/dist/dev/mp-weixin/assets/pull.902be841.png deleted file mode 100644 index b4410ee..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/pull.902be841.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/qianbao.bbfd6c3d.png b/unpackage/dist/dev/mp-weixin/assets/qianbao.bbfd6c3d.png deleted file mode 100644 index 596ce1b..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/qianbao.bbfd6c3d.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/right.99910151.png b/unpackage/dist/dev/mp-weixin/assets/right.99910151.png deleted file mode 100644 index 9962f71..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/right.99910151.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/rili.7746043b.png b/unpackage/dist/dev/mp-weixin/assets/rili.7746043b.png deleted file mode 100644 index a4e0a85..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/rili.7746043b.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/rmb.6e85dd4a.png b/unpackage/dist/dev/mp-weixin/assets/rmb.6e85dd4a.png deleted file mode 100644 index cc3c40f..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/rmb.6e85dd4a.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/rmb.dd886a2c.png b/unpackage/dist/dev/mp-weixin/assets/rmb.dd886a2c.png deleted file mode 100644 index e397201..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/rmb.dd886a2c.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/rmb_32.6ba70d59.png b/unpackage/dist/dev/mp-weixin/assets/rmb_32.6ba70d59.png deleted file mode 100644 index 015faa7..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/rmb_32.6ba70d59.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/rmb_36px.929d25f5.png b/unpackage/dist/dev/mp-weixin/assets/rmb_36px.929d25f5.png deleted file mode 100644 index 60e9daf..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/rmb_36px.929d25f5.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/rmb_cheng.03ace464.png b/unpackage/dist/dev/mp-weixin/assets/rmb_cheng.03ace464.png deleted file mode 100644 index b176eea..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/rmb_cheng.03ace464.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/rmb_huang.28b44dfc.png b/unpackage/dist/dev/mp-weixin/assets/rmb_huang.28b44dfc.png deleted file mode 100644 index a780003..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/rmb_huang.28b44dfc.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/selected.c24e4f58.png b/unpackage/dist/dev/mp-weixin/assets/selected.c24e4f58.png deleted file mode 100644 index 52a1349..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/selected.c24e4f58.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/setting_s.3e5c5149.png b/unpackage/dist/dev/mp-weixin/assets/setting_s.3e5c5149.png deleted file mode 100644 index a7bbb6a..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/setting_s.3e5c5149.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/shangpingtupian.ec8c0440.png b/unpackage/dist/dev/mp-weixin/assets/shangpingtupian.ec8c0440.png deleted file mode 100644 index 12fbf4b..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/shangpingtupian.ec8c0440.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/shizi.dd0347ec.png b/unpackage/dist/dev/mp-weixin/assets/shizi.dd0347ec.png deleted file mode 100644 index d1a8aa9..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/shizi.dd0347ec.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/short.2191a0bf.png b/unpackage/dist/dev/mp-weixin/assets/short.2191a0bf.png deleted file mode 100644 index 4db3f01..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/short.2191a0bf.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/short.be252386.png b/unpackage/dist/dev/mp-weixin/assets/short.be252386.png deleted file mode 100644 index 51481c5..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/short.be252386.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/shouchiwu.37cdee46.png b/unpackage/dist/dev/mp-weixin/assets/shouchiwu.37cdee46.png deleted file mode 100644 index 76fd73a..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/shouchiwu.37cdee46.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/show1.6119e6ca.png b/unpackage/dist/dev/mp-weixin/assets/show1.6119e6ca.png deleted file mode 100644 index ba0c2c1..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/show1.6119e6ca.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/show2.6ef01c5d.png b/unpackage/dist/dev/mp-weixin/assets/show2.6ef01c5d.png deleted file mode 100644 index 57a61e7..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/show2.6ef01c5d.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/show3.4b906849.png b/unpackage/dist/dev/mp-weixin/assets/show3.4b906849.png deleted file mode 100644 index 7b6de73..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/show3.4b906849.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/show4.00c949b6.png b/unpackage/dist/dev/mp-weixin/assets/show4.00c949b6.png deleted file mode 100644 index b5b420d..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/show4.00c949b6.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/sousuokuang.6160c4c7.png b/unpackage/dist/dev/mp-weixin/assets/sousuokuang.6160c4c7.png deleted file mode 100644 index 6f9b05c..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/sousuokuang.6160c4c7.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/success.3df77989.png b/unpackage/dist/dev/mp-weixin/assets/success.3df77989.png deleted file mode 100644 index f1e56e4..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/success.3df77989.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/tianjia.187834c9.png b/unpackage/dist/dev/mp-weixin/assets/tianjia.187834c9.png deleted file mode 100644 index 531f024..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/tianjia.187834c9.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/toushi.6558cc23.png b/unpackage/dist/dev/mp-weixin/assets/toushi.6558cc23.png deleted file mode 100644 index 902ceec..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/toushi.6558cc23.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/tuikuan.d34aac5f.png b/unpackage/dist/dev/mp-weixin/assets/tuikuan.d34aac5f.png deleted file mode 100644 index caad89e..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/tuikuan.d34aac5f.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/xian.51ee54bc.png b/unpackage/dist/dev/mp-weixin/assets/xian.51ee54bc.png deleted file mode 100644 index cec5b52..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/xian.51ee54bc.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/xian2.316f0e4c.png b/unpackage/dist/dev/mp-weixin/assets/xian2.316f0e4c.png deleted file mode 100644 index 953dc8e..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/xian2.316f0e4c.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/xuanchuan.f0fc207c.png b/unpackage/dist/dev/mp-weixin/assets/xuanchuan.f0fc207c.png deleted file mode 100644 index cb9158d..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/xuanchuan.f0fc207c.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/yiwen.9096364a.png b/unpackage/dist/dev/mp-weixin/assets/yiwen.9096364a.png deleted file mode 100644 index 654306a..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/yiwen.9096364a.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/you.60391a00.png b/unpackage/dist/dev/mp-weixin/assets/you.60391a00.png deleted file mode 100644 index c4581b4..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/you.60391a00.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/you.70a370f0.png b/unpackage/dist/dev/mp-weixin/assets/you.70a370f0.png deleted file mode 100644 index 85634cc..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/you.70a370f0.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/you_cheng.a0b56a7d.png b/unpackage/dist/dev/mp-weixin/assets/you_cheng.a0b56a7d.png deleted file mode 100644 index 96adf0d..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/you_cheng.a0b56a7d.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/assets/you_hei.f7b3f203.png b/unpackage/dist/dev/mp-weixin/assets/you_hei.f7b3f203.png deleted file mode 100644 index 871a146..0000000 Binary files a/unpackage/dist/dev/mp-weixin/assets/you_hei.f7b3f203.png and /dev/null differ diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js deleted file mode 100644 index 208c02e..0000000 --- a/unpackage/dist/dev/mp-weixin/common/assets.js +++ /dev/null @@ -1,73 +0,0 @@ -"use strict"; -const product$1 = "/assets/product.7900e336.png"; -const rili = "/assets/rili.7746043b.png"; -const xuanchuan = "/assets/xuanchuan.f0fc207c.png"; -const shizi = "/assets/shizi.dd0347ec.png"; -const you$1 = "/assets/you.60391a00.png"; -const add_img = "/assets/tianjia.187834c9.png"; -const sousuokuang = "/assets/sousuokuang.6160c4c7.png"; -const address = "/assets/address.e91cc3a1.png"; -const avator = "/assets/avator.7ac17437.png"; -const daifahuo = "/assets/daifahuo.8369326b.png"; -const daishouhuo = "/assets/daishouhuo.ff694766.png"; -const dingdan = "/assets/dingdan.6b4043d6.png"; -const lianxiren_s = "/assets/lianxiren_s.17e4954c.png"; -const qianbao = "/assets/qianbao.bbfd6c3d.png"; -const setting_s = "/assets/setting_s.3e5c5149.png"; -const tuikuan = "/assets/tuikuan.d34aac5f.png"; -const you = "/assets/you.70a370f0.png"; -const denglong = "/assets/denglong.a91d13af.png"; -const kefu = "/assets/kefu.eef0848c.png"; -const show1 = "/assets/show1.6119e6ca.png"; -const show2 = "/assets/show2.6ef01c5d.png"; -const show3 = "/assets/show3.4b906849.png"; -const show4 = "/assets/show4.00c949b6.png"; -const dingwei$1 = "/assets/dingwei.69908177.png"; -const add = "/assets/add.dace8cf5.png"; -const dingwei = "/assets/dingwei.a57a6fb6.png"; -const rmb_36px = "/assets/rmb_36px.929d25f5.png"; -const rmb_huang = "/assets/rmb_huang.28b44dfc.png"; -const short = "/assets/short.be252386.png"; -const yiwen = "/assets/yiwen.9096364a.png"; -const you_cheng = "/assets/you_cheng.a0b56a7d.png"; -const success = "/assets/success.3df77989.png"; -const xian = "/assets/xian.51ee54bc.png"; -const xian2 = "/assets/xian2.316f0e4c.png"; -const rmb = "/assets/rmb.dd886a2c.png"; -const product = "/assets/product.d45a003d.png"; -exports.add = add; -exports.add_img = add_img; -exports.address = address; -exports.avator = avator; -exports.daifahuo = daifahuo; -exports.daishouhuo = daishouhuo; -exports.denglong = denglong; -exports.dingdan = dingdan; -exports.dingwei = dingwei$1; -exports.dingwei$1 = dingwei; -exports.kefu = kefu; -exports.lianxiren_s = lianxiren_s; -exports.product = product$1; -exports.product$1 = product; -exports.qianbao = qianbao; -exports.rili = rili; -exports.rmb = rmb; -exports.rmb_36px = rmb_36px; -exports.rmb_huang = rmb_huang; -exports.setting_s = setting_s; -exports.shizi = shizi; -exports.short = short; -exports.show1 = show1; -exports.show2 = show2; -exports.show3 = show3; -exports.show4 = show4; -exports.sousuokuang = sousuokuang; -exports.success = success; -exports.tuikuan = tuikuan; -exports.xian = xian; -exports.xian2 = xian2; -exports.xuanchuan = xuanchuan; -exports.yiwen = yiwen; -exports.you = you$1; -exports.you$1 = you; -exports.you_cheng = you_cheng; diff --git a/unpackage/dist/dev/mp-weixin/common/global.js b/unpackage/dist/dev/mp-weixin/common/global.js new file mode 100644 index 0000000..3d25558 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/common/global.js @@ -0,0 +1,38 @@ +"use strict"; +const stateList = [ + { + state: "待支付", + img: "https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FFybMDtHR-dengdaifukuan.png", + msg: "等待买家付款" + }, + { + state: "待发货", + img: "https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png", + msg: "等待卖家发货" + }, + { + state: "已退款", + img: "https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FlPnvgqCp-yituikuan.png", + msg: "订单已经退款" + }, + { + state: "待收货", + img: "https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FEOzVqolp-fahuo.png", + msg: "商品已发货，注意查收" + }, + { + state: "交易成功", + img: "", + msg: "订单完成，感谢您的支持" + }, + { + state: "交易关闭", + img: "https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHDhacaI-dengdaifukuan.png", + msg: "您的订单已关闭" + } +]; +const stateMap = /* @__PURE__ */ new Map(); +stateList.forEach((item) => { + stateMap.set(item.state, item); +}); +exports.stateMap = stateMap; diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js index ee3f3eb..1357684 100644 --- a/unpackage/dist/dev/mp-weixin/common/vendor.js +++ b/unpackage/dist/dev/mp-weixin/common/vendor.js @@ -25,22 +25,22 @@ const isOn = (key) => key.charCodeAt(0) === 111 && key.charCodeAt(1) === 110 && const isModelListener = (key) => key.startsWith("onUpdate:"); const extend = Object.assign; const remove = (arr, el) => { - const i = arr.indexOf(el); - if (i > -1) { - arr.splice(i, 1); + const i2 = arr.indexOf(el); + if (i2 > -1) { + arr.splice(i2, 1); } }; -const hasOwnProperty$1 = Object.prototype.hasOwnProperty; -const hasOwn = (val, key) => hasOwnProperty$1.call(val, key); -const isArray = Array.isArray; -const isMap = (val) => toTypeString(val) === "[object Map]"; +const hasOwnProperty$3 = Object.prototype.hasOwnProperty; +const hasOwn$1 = (val, key) => hasOwnProperty$3.call(val, key); +const isArray$1 = Array.isArray; +const isMap$1 = (val) => toTypeString(val) === "[object Map]"; const isSet = (val) => toTypeString(val) === "[object Set]"; -const isFunction = (val) => typeof val === "function"; -const isString = (val) => typeof val === "string"; +const isFunction$1 = (val) => typeof val === "function"; +const isString$1 = (val) => typeof val === "string"; const isSymbol = (val) => typeof val === "symbol"; -const isObject = (val) => val !== null && typeof val === "object"; +const isObject$2 = (val) => val !== null && typeof val === "object"; const isPromise = (val) => { - return (isObject(val) || isFunction(val)) && isFunction(val.then) && isFunction(val.catch); + return (isObject$2(val) || isFunction$1(val)) && isFunction$1(val.then) && isFunction$1(val.catch); }; const objectToString = Object.prototype.toString; const toTypeString = (value) => objectToString.call(value); @@ -48,7 +48,7 @@ const toRawType = (value) => { return toTypeString(value).slice(8, -1); }; const isPlainObject$1 = (val) => toTypeString(val) === "[object Object]"; -const isIntegerKey = (key) => isString(key) && key !== "NaN" && key[0] !== "-" && "" + parseInt(key, 10) === key; +const isIntegerKey = (key) => isString$1(key) && key !== "NaN" && key[0] !== "-" && "" + parseInt(key, 10) === key; const isReservedProp = /* @__PURE__ */ makeMap( // the leading comma is intentional so empty string "" is also included ",key,ref,ref_for,ref_key,onVnodeBeforeMount,onVnodeMounted,onVnodeBeforeUpdate,onVnodeUpdated,onVnodeBeforeUnmount,onVnodeUnmounted" @@ -65,7 +65,7 @@ const cacheStringFunction = (fn) => { }; const camelizeRE = /-(\w)/g; const camelize = cacheStringFunction((str) => { - return str.replace(camelizeRE, (_, c) => c ? c.toUpperCase() : ""); + return str.replace(camelizeRE, (_2, c2) => c2 ? c2.toUpperCase() : ""); }); const hyphenateRE = /\B([A-Z])/g; const hyphenate = cacheStringFunction( @@ -80,8 +80,8 @@ const toHandlerKey = cacheStringFunction((str) => { }); const hasChanged = (value, oldValue) => !Object.is(value, oldValue); const invokeArrayFns$1 = (fns, arg) => { - for (let i = 0; i < fns.length; i++) { - fns[i](arg); + for (let i2 = 0; i2 < fns.length; i2++) { + fns[i2](arg); } }; const def = (obj, key, value) => { @@ -100,11 +100,11 @@ const getGlobalThis = () => { return _globalThis || (_globalThis = typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : {}); }; function normalizeStyle(value) { - if (isArray(value)) { + if (isArray$1(value)) { const res = {}; - for (let i = 0; i < value.length; i++) { - const item = value[i]; - const normalized = isString(item) ? parseStringStyle(item) : normalizeStyle(item); + for (let i2 = 0; i2 < value.length; i2++) { + const item = value[i2]; + const normalized = isString$1(item) ? parseStringStyle(item) : normalizeStyle(item); if (normalized) { for (const key in normalized) { res[key] = normalized[key]; @@ -112,7 +112,7 @@ function normalizeStyle(value) { } } return res; - } else if (isString(value) || isObject(value)) { + } else if (isString$1(value) || isObject$2(value)) { return value; } } @@ -131,35 +131,35 @@ function parseStringStyle(cssText) { } function normalizeClass(value) { let res = ""; - if (isString(value)) { + if (isString$1(value)) { res = value; - } else if (isArray(value)) { - for (let i = 0; i < value.length; i++) { - const normalized = normalizeClass(value[i]); + } else if (isArray$1(value)) { + for (let i2 = 0; i2 < value.length; i2++) { + const normalized = normalizeClass(value[i2]); if (normalized) { res += normalized + " "; } } - } else if (isObject(value)) { - for (const name in value) { - if (value[name]) { - res += name + " "; + } else if (isObject$2(value)) { + for (const name2 in value) { + if (value[name2]) { + res += name2 + " "; } } } return res.trim(); } const toDisplayString = (val) => { - return isString(val) ? val : val == null ? "" : isArray(val) || isObject(val) && (val.toString === objectToString || !isFunction(val.toString)) ? JSON.stringify(val, replacer, 2) : String(val); + return isString$1(val) ? val : val == null ? "" : isArray$1(val) || isObject$2(val) && (val.toString === objectToString || !isFunction$1(val.toString)) ? JSON.stringify(val, replacer, 2) : String(val); }; const replacer = (_key, val) => { if (val && val.__v_isRef) { return replacer(_key, val.value); - } else if (isMap(val)) { + } else if (isMap$1(val)) { return { [`Map(${val.size})`]: [...val.entries()].reduce( - (entries, [key, val2], i) => { - entries[stringifySymbol(key, i) + " =>"] = val2; + (entries, [key, val2], i2) => { + entries[stringifySymbol(key, i2) + " =>"] = val2; return entries; }, {} @@ -167,19 +167,20 @@ const replacer = (_key, val) => { }; } else if (isSet(val)) { return { - [`Set(${val.size})`]: [...val.values()].map((v) => stringifySymbol(v)) + [`Set(${val.size})`]: [...val.values()].map((v2) => stringifySymbol(v2)) }; } else if (isSymbol(val)) { return stringifySymbol(val); - } else if (isObject(val) && !isArray(val) && !isPlainObject$1(val)) { + } else if (isObject$2(val) && !isArray$1(val) && !isPlainObject$1(val)) { return String(val); } return val; }; -const stringifySymbol = (v, i = "") => { +const stringifySymbol = (v2, i2 = "") => { var _a; - return isSymbol(v) ? `Symbol(${(_a = v.description) != null ? _a : i})` : v; + return isSymbol(v2) ? `Symbol(${(_a = v2.description) != null ? _a : i2})` : v2; }; +const LINEFEED = "\n"; const SLOT_DEFAULT_NAME = "d"; const ON_SHOW = "onShow"; const ON_HIDE = "onHide"; @@ -220,8 +221,8 @@ function addLeadingSlash(str) { } const invokeArrayFns = (fns, arg) => { let ret; - for (let i = 0; i < fns.length; i++) { - ret = fns[i](arg); + for (let i2 = 0; i2 < fns.length; i2++) { + ret = fns[i2](arg); } return ret; }; @@ -236,7 +237,7 @@ function once(fn, ctx = null) { }; } function getValueByDataPath(obj, path) { - if (!isString(path)) { + if (!isString$1(path)) { return; } path = path.replace(/\[(\d+)\]/g, ".$1"); @@ -294,8 +295,8 @@ const PAGE_HOOKS = [ ON_NAVIGATION_BAR_SEARCH_INPUT_CONFIRMED, ON_NAVIGATION_BAR_SEARCH_INPUT_FOCUS_CHANGED ]; -function isRootHook(name) { - return PAGE_HOOKS.indexOf(name) > -1; +function isRootHook(name2) { + return PAGE_HOOKS.indexOf(name2) > -1; } const UniLifecycleHooks = [ ON_SHOW, @@ -333,13 +334,13 @@ const MINI_PROGRAM_PAGE_RUNTIME_HOOKS = /* @__PURE__ */ (() => { onShareTimeline: 1 << 2 }; })(); -function isUniLifecycleHook(name, value, checkType = true) { - if (checkType && !isFunction(value)) { +function isUniLifecycleHook(name2, value, checkType = true) { + if (checkType && !isFunction$1(value)) { return false; } - if (UniLifecycleHooks.indexOf(name) > -1) { + if (UniLifecycleHooks.indexOf(name2) > -1) { return true; - } else if (name.indexOf("on") === 0) { + } else if (name2.indexOf("on") === 0) { return true; } return false; @@ -357,63 +358,148 @@ function invokeCreateVueAppHook(app) { createVueAppHooks.forEach((hook) => hook(app)); } const invokeCreateErrorHandler = once((app, createErrorHandler2) => { - if (isFunction(app._component.onError)) { + if (isFunction$1(app._component.onError)) { return createErrorHandler2(app); } }); -const E = function() { +const E$1 = function() { }; -E.prototype = { - on: function(name, callback, ctx) { +E$1.prototype = { + on: function(name2, callback, ctx) { var e2 = this.e || (this.e = {}); - (e2[name] || (e2[name] = [])).push({ + (e2[name2] || (e2[name2] = [])).push({ fn: callback, ctx }); return this; }, - once: function(name, callback, ctx) { + once: function(name2, callback, ctx) { var self2 = this; function listener() { - self2.off(name, listener); + self2.off(name2, listener); callback.apply(ctx, arguments); } listener._ = callback; - return this.on(name, listener, ctx); + return this.on(name2, listener, ctx); }, - emit: function(name) { + emit: function(name2) { var data = [].slice.call(arguments, 1); - var evtArr = ((this.e || (this.e = {}))[name] || []).slice(); - var i = 0; + var evtArr = ((this.e || (this.e = {}))[name2] || []).slice(); + var i2 = 0; var len = evtArr.length; - for (i; i < len; i++) { - evtArr[i].fn.apply(evtArr[i].ctx, data); + for (i2; i2 < len; i2++) { + evtArr[i2].fn.apply(evtArr[i2].ctx, data); } return this; }, - off: function(name, callback) { + off: function(name2, callback) { var e2 = this.e || (this.e = {}); - var evts = e2[name]; + var evts = e2[name2]; var liveEvents = []; if (evts && callback) { - for (var i = evts.length - 1; i >= 0; i--) { - if (evts[i].fn === callback || evts[i].fn._ === callback) { - evts.splice(i, 1); + for (var i2 = evts.length - 1; i2 >= 0; i2--) { + if (evts[i2].fn === callback || evts[i2].fn._ === callback) { + evts.splice(i2, 1); break; } } liveEvents = evts; } - liveEvents.length ? e2[name] = liveEvents : delete e2[name]; + liveEvents.length ? e2[name2] = liveEvents : delete e2[name2]; return this; } }; -var E$1 = E; +var E$1$1 = E$1; +const isObject$1 = (val) => val !== null && typeof val === "object"; +const defaultDelimiters = ["{", "}"]; +class BaseFormatter { + constructor() { + this._caches = /* @__PURE__ */ Object.create(null); + } + interpolate(message, values, delimiters = defaultDelimiters) { + if (!values) { + return [message]; + } + let tokens = this._caches[message]; + if (!tokens) { + tokens = parse$2(message, delimiters); + this._caches[message] = tokens; + } + return compile$1(tokens, values); + } +} +const RE_TOKEN_LIST_VALUE = /^(?:\d)+/; +const RE_TOKEN_NAMED_VALUE = /^(?:\w)+/; +function parse$2(format2, [startDelimiter, endDelimiter]) { + const tokens = []; + let position = 0; + let text = ""; + while (position < format2.length) { + let char = format2[position++]; + if (char === startDelimiter) { + if (text) { + tokens.push({ type: "text", value: text }); + } + text = ""; + let sub2 = ""; + char = format2[position++]; + while (char !== void 0 && char !== endDelimiter) { + sub2 += char; + char = format2[position++]; + } + const isClosed = char === endDelimiter; + const type = RE_TOKEN_LIST_VALUE.test(sub2) ? "list" : isClosed && RE_TOKEN_NAMED_VALUE.test(sub2) ? "named" : "unknown"; + tokens.push({ value: sub2, type }); + } else { + text += char; + } + } + text && tokens.push({ type: "text", value: text }); + return tokens; +} +function compile$1(tokens, values) { + const compiled = []; + let index2 = 0; + const mode = Array.isArray(values) ? "list" : isObject$1(values) ? "named" : "unknown"; + if (mode === "unknown") { + return compiled; + } + while (index2 < tokens.length) { + const token = tokens[index2]; + switch (token.type) { + case "text": + compiled.push(token.value); + break; + case "list": + compiled.push(values[parseInt(token.value, 10)]); + break; + case "named": + if (mode === "named") { + compiled.push(values[token.value]); + } else { + { + console.warn(`Type of token '${token.type}' and format of value '${mode}' don't match!`); + } + } + break; + case "unknown": + { + console.warn(`Detect 'unknown' type of token!`); + } + break; + } + index2++; + } + return compiled; +} const LOCALE_ZH_HANS = "zh-Hans"; const LOCALE_ZH_HANT = "zh-Hant"; const LOCALE_EN = "en"; const LOCALE_FR = "fr"; const LOCALE_ES = "es"; +const hasOwnProperty$2 = Object.prototype.hasOwnProperty; +const hasOwn = (val, key) => hasOwnProperty$2.call(val, key); +const defaultFormatter = new BaseFormatter(); function include(str, parts) { return !!parts.find((part) => str.indexOf(part) !== -1); } @@ -453,63 +539,218 @@ function normalizeLocale(locale, messages) { return lang; } } +class I18n { + constructor({ locale, fallbackLocale, messages, watcher, formater: formater2 }) { + this.locale = LOCALE_EN; + this.fallbackLocale = LOCALE_EN; + this.message = {}; + this.messages = {}; + this.watchers = []; + if (fallbackLocale) { + this.fallbackLocale = fallbackLocale; + } + this.formater = formater2 || defaultFormatter; + this.messages = messages || {}; + this.setLocale(locale || LOCALE_EN); + if (watcher) { + this.watchLocale(watcher); + } + } + setLocale(locale) { + const oldLocale = this.locale; + this.locale = normalizeLocale(locale, this.messages) || this.fallbackLocale; + if (!this.messages[this.locale]) { + this.messages[this.locale] = {}; + } + this.message = this.messages[this.locale]; + if (oldLocale !== this.locale) { + this.watchers.forEach((watcher) => { + watcher(this.locale, oldLocale); + }); + } + } + getLocale() { + return this.locale; + } + watchLocale(fn) { + const index2 = this.watchers.push(fn) - 1; + return () => { + this.watchers.splice(index2, 1); + }; + } + add(locale, message, override = true) { + const curMessages = this.messages[locale]; + if (curMessages) { + if (override) { + Object.assign(curMessages, message); + } else { + Object.keys(message).forEach((key) => { + if (!hasOwn(curMessages, key)) { + curMessages[key] = message[key]; + } + }); + } + } else { + this.messages[locale] = message; + } + } + f(message, values, delimiters) { + return this.formater.interpolate(message, values, delimiters).join(""); + } + t(key, locale, values) { + let message = this.message; + if (typeof locale === "string") { + locale = normalizeLocale(locale, this.messages); + locale && (message = this.messages[locale]); + } else { + values = locale; + } + if (!hasOwn(message, key)) { + console.warn(`Cannot translate the value of keypath ${key}. Use the value of keypath as default.`); + return key; + } + return this.formater.interpolate(message[key], values).join(""); + } +} +function watchAppLocale(appVm, i18n) { + if (appVm.$watchLocale) { + appVm.$watchLocale((newLocale) => { + i18n.setLocale(newLocale); + }); + } else { + appVm.$watch(() => appVm.$locale, (newLocale) => { + i18n.setLocale(newLocale); + }); + } +} +function getDefaultLocale() { + if (typeof index !== "undefined" && index.getLocale) { + return index.getLocale(); + } + if (typeof global !== "undefined" && global.getLocale) { + return global.getLocale(); + } + return LOCALE_EN; +} +function initVueI18n(locale, messages = {}, fallbackLocale, watcher) { + if (typeof locale !== "string") { + [locale, messages] = [ + messages, + locale + ]; + } + if (typeof locale !== "string") { + locale = getDefaultLocale(); + } + if (typeof fallbackLocale !== "string") { + fallbackLocale = typeof __uniConfig !== "undefined" && __uniConfig.fallbackLocale || LOCALE_EN; + } + const i18n = new I18n({ + locale, + fallbackLocale, + messages, + watcher + }); + let t2 = (key, values) => { + if (typeof getApp !== "function") { + t2 = function(key2, values2) { + return i18n.t(key2, values2); + }; + } else { + let isWatchedAppLocale = false; + t2 = function(key2, values2) { + const appVm = getApp().$vm; + if (appVm) { + appVm.$locale; + if (!isWatchedAppLocale) { + isWatchedAppLocale = true; + watchAppLocale(appVm, i18n); + } + } + return i18n.t(key2, values2); + }; + } + return t2(key, values); + }; + return { + i18n, + f(message, values, delimiters) { + return i18n.f(message, values, delimiters); + }, + t(key, values) { + return t2(key, values); + }, + add(locale2, message, override = true) { + return i18n.add(locale2, message, override); + }, + watch(fn) { + return i18n.watchLocale(fn); + }, + getLocale() { + return i18n.getLocale(); + }, + setLocale(newLocale) { + return i18n.setLocale(newLocale); + } + }; +} function getBaseSystemInfo() { return wx.getSystemInfoSync(); } -function validateProtocolFail(name, msg) { - console.warn(`${name}: ${msg}`); +function validateProtocolFail(name2, msg) { + console.warn(`${name2}: ${msg}`); } -function validateProtocol(name, data, protocol, onFail) { +function validateProtocol(name2, data, protocol, onFail) { if (!onFail) { onFail = validateProtocolFail; } for (const key in protocol) { - const errMsg = validateProp$1(key, data[key], protocol[key], !hasOwn(data, key)); - if (isString(errMsg)) { - onFail(name, errMsg); + const errMsg = validateProp$1(key, data[key], protocol[key], !hasOwn$1(data, key)); + if (isString$1(errMsg)) { + onFail(name2, errMsg); } } } -function validateProtocols(name, args, protocol, onFail) { +function validateProtocols(name2, args, protocol, onFail) { if (!protocol) { return; } - if (!isArray(protocol)) { - return validateProtocol(name, args[0] || /* @__PURE__ */ Object.create(null), protocol, onFail); + if (!isArray$1(protocol)) { + return validateProtocol(name2, args[0] || /* @__PURE__ */ Object.create(null), protocol, onFail); } const len = protocol.length; const argsLen = args.length; - for (let i = 0; i < len; i++) { - const opts = protocol[i]; + for (let i2 = 0; i2 < len; i2++) { + const opts = protocol[i2]; const data = /* @__PURE__ */ Object.create(null); - if (argsLen > i) { - data[opts.name] = args[i]; + if (argsLen > i2) { + data[opts.name] = args[i2]; } - validateProtocol(name, data, { [opts.name]: opts }, onFail); + validateProtocol(name2, data, { [opts.name]: opts }, onFail); } } -function validateProp$1(name, value, prop, isAbsent) { +function validateProp$1(name2, value, prop, isAbsent) { if (!isPlainObject$1(prop)) { prop = { type: prop }; } const { type, required, validator } = prop; if (required && isAbsent) { - return 'Missing required args: "' + name + '"'; + return 'Missing required args: "' + name2 + '"'; } if (value == null && !required) { return; } if (type != null) { let isValid = false; - const types = isArray(type) ? type : [type]; + const types = isArray$1(type) ? type : [type]; const expectedTypes = []; - for (let i = 0; i < types.length && !isValid; i++) { - const { valid, expectedType } = assertType$1(value, types[i]); + for (let i2 = 0; i2 < types.length && !isValid; i2++) { + const { valid, expectedType } = assertType$1(value, types[i2]); expectedTypes.push(expectedType || ""); isValid = valid; } if (!isValid) { - return getInvalidTypeMessage$1(name, value, expectedTypes); + return getInvalidTypeMessage$1(name2, value, expectedTypes); } } if (validator) { @@ -527,9 +768,9 @@ function assertType$1(value, type) { valid = value instanceof type; } } else if (expectedType === "Object") { - valid = isObject(value); + valid = isObject$2(value); } else if (expectedType === "Array") { - valid = isArray(value); + valid = isArray$1(value); } else { { valid = value instanceof type; @@ -540,13 +781,13 @@ function assertType$1(value, type) { expectedType }; } -function getInvalidTypeMessage$1(name, value, expectedTypes) { - let message = `Invalid args: type check failed for args "${name}". Expected ${expectedTypes.map(capitalize).join(", ")}`; +function getInvalidTypeMessage$1(name2, value, expectedTypes) { + let message = `Invalid args: type check failed for args "${name2}". Expected ${expectedTypes.map(capitalize).join(", ")}`; const expectedType = expectedTypes[0]; const receivedType = toRawType(value); const expectedValue = styleValue$1(value, expectedType); const receivedValue = styleValue$1(value, receivedType); - if (expectedTypes.length === 1 && isExplicable$1(expectedType) && !isBoolean$1(expectedType, receivedType)) { + if (expectedTypes.length === 1 && isExplicable$1(expectedType) && !isBoolean$2(expectedType, receivedType)) { message += ` with value ${expectedValue}`; } message += `, got ${receivedType} `; @@ -572,7 +813,7 @@ function isExplicable$1(type) { const explicitTypes = ["string", "number", "boolean"]; return explicitTypes.some((elem) => type.toLowerCase() === elem); } -function isBoolean$1(...args) { +function isBoolean$2(...args) { return args.some((elem) => elem.toLowerCase() === "boolean"); } function tryCatch(fn) { @@ -586,9 +827,9 @@ function tryCatch(fn) { } let invokeCallbackId = 1; const invokeCallbacks = {}; -function addInvokeCallback(id, name, callback, keepAlive = false) { +function addInvokeCallback(id, name2, callback, keepAlive = false) { invokeCallbacks[id] = { - name, + name: name2, keepAlive, callback }; @@ -611,36 +852,36 @@ const API_FAIL = "fail"; const API_COMPLETE = "complete"; function getApiCallbacks(args) { const apiCallbacks = {}; - for (const name in args) { - const fn = args[name]; - if (isFunction(fn)) { - apiCallbacks[name] = tryCatch(fn); - delete args[name]; + for (const name2 in args) { + const fn = args[name2]; + if (isFunction$1(fn)) { + apiCallbacks[name2] = tryCatch(fn); + delete args[name2]; } } return apiCallbacks; } -function normalizeErrMsg(errMsg, name) { +function normalizeErrMsg$1(errMsg, name2) { if (!errMsg || errMsg.indexOf(":fail") === -1) { - return name + ":ok"; + return name2 + ":ok"; } - return name + errMsg.substring(errMsg.indexOf(":fail")); + return name2 + errMsg.substring(errMsg.indexOf(":fail")); } -function createAsyncApiCallback(name, args = {}, { beforeAll, beforeSuccess } = {}) { +function createAsyncApiCallback(name2, args = {}, { beforeAll, beforeSuccess } = {}) { if (!isPlainObject$1(args)) { args = {}; } const { success, fail, complete } = getApiCallbacks(args); - const hasSuccess = isFunction(success); - const hasFail = isFunction(fail); - const hasComplete = isFunction(complete); + const hasSuccess = isFunction$1(success); + const hasFail = isFunction$1(fail); + const hasComplete = isFunction$1(complete); const callbackId = invokeCallbackId++; - addInvokeCallback(callbackId, name, (res) => { + addInvokeCallback(callbackId, name2, (res) => { res = res || {}; - res.errMsg = normalizeErrMsg(res.errMsg, name); - isFunction(beforeAll) && beforeAll(res); - if (res.errMsg === name + ":ok") { - isFunction(beforeSuccess) && beforeSuccess(res, args); + res.errMsg = normalizeErrMsg$1(res.errMsg, name2); + isFunction$1(beforeAll) && beforeAll(res); + if (res.errMsg === name2 + ":ok") { + isFunction$1(beforeSuccess) && beforeSuccess(res, args); hasSuccess && success(res); } else { hasFail && fail(res); @@ -661,8 +902,8 @@ function wrapperHook(hook, params) { } function queue$2(hooks, data, params) { let promise = false; - for (let i = 0; i < hooks.length; i++) { - const hook = hooks[i]; + for (let i2 = 0; i2 < hooks.length; i2++) { + const hook = hooks[i2]; if (promise) { promise = Promise.resolve(wrapperHook(hook, params)); } else { @@ -689,15 +930,15 @@ function queue$2(hooks, data, params) { }; } function wrapperOptions(interceptors2, options = {}) { - [HOOK_SUCCESS, HOOK_FAIL, HOOK_COMPLETE].forEach((name) => { - const hooks = interceptors2[name]; - if (!isArray(hooks)) { + [HOOK_SUCCESS, HOOK_FAIL, HOOK_COMPLETE].forEach((name2) => { + const hooks = interceptors2[name2]; + if (!isArray$1(hooks)) { return; } - const oldCallback = options[name]; - options[name] = function callbackInterceptor(res) { + const oldCallback = options[name2]; + options[name2] = function callbackInterceptor(res) { queue$2(hooks, res, options).then((res2) => { - return isFunction(oldCallback) && oldCallback(res2) || res2; + return isFunction$1(oldCallback) && oldCallback(res2) || res2; }); }; }); @@ -705,11 +946,11 @@ function wrapperOptions(interceptors2, options = {}) { } function wrapperReturnValue(method, returnValue) { const returnValueHooks = []; - if (isArray(globalInterceptors.returnValue)) { + if (isArray$1(globalInterceptors.returnValue)) { returnValueHooks.push(...globalInterceptors.returnValue); } const interceptor = scopedInterceptors[method]; - if (interceptor && isArray(interceptor.returnValue)) { + if (interceptor && isArray$1(interceptor.returnValue)) { returnValueHooks.push(...interceptor.returnValue); } returnValueHooks.forEach((hook) => { @@ -737,7 +978,7 @@ function getApiInterceptorHooks(method) { function invokeApi(method, api, options, params) { const interceptor = getApiInterceptorHooks(method); if (interceptor && Object.keys(interceptor).length) { - if (isArray(interceptor.invoke)) { + if (isArray$1(interceptor.invoke)) { const res = queue$2(interceptor.invoke, options); return res.then((options2) => { return api(wrapperOptions(getApiInterceptorHooks(method), options2), ...params); @@ -749,7 +990,7 @@ function invokeApi(method, api, options, params) { return api(options, ...params); } function hasCallback(args) { - if (isPlainObject$1(args) && [API_SUCCESS, API_FAIL, API_COMPLETE].find((cb) => isFunction(args[cb]))) { + if (isPlainObject$1(args) && [API_SUCCESS, API_FAIL, API_COMPLETE].find((cb) => isFunction$1(args[cb]))) { return true; } return false; @@ -757,57 +998,57 @@ function hasCallback(args) { function handlePromise(promise) { return promise; } -function promisify$1(name, fn) { +function promisify$1(name2, fn) { return (args = {}, ...rest) => { if (hasCallback(args)) { - return wrapperReturnValue(name, invokeApi(name, fn, args, rest)); + return wrapperReturnValue(name2, invokeApi(name2, fn, args, rest)); } - return wrapperReturnValue(name, handlePromise(new Promise((resolve2, reject) => { - invokeApi(name, fn, extend(args, { success: resolve2, fail: reject }), rest); + return wrapperReturnValue(name2, handlePromise(new Promise((resolve2, reject) => { + invokeApi(name2, fn, extend(args, { success: resolve2, fail: reject }), rest); }))); }; } function formatApiArgs(args, options) { const params = args[0]; - if (!options || !options.formatArgs || !isPlainObject$1(options.formatArgs) && isPlainObject$1(params)) { + if (!options || !isPlainObject$1(options.formatArgs) && isPlainObject$1(params)) { return; } const formatArgs = options.formatArgs; const keys = Object.keys(formatArgs); - for (let i = 0; i < keys.length; i++) { - const name = keys[i]; - const formatterOrDefaultValue = formatArgs[name]; - if (isFunction(formatterOrDefaultValue)) { - const errMsg = formatterOrDefaultValue(args[0][name], params); - if (isString(errMsg)) { + for (let i2 = 0; i2 < keys.length; i2++) { + const name2 = keys[i2]; + const formatterOrDefaultValue = formatArgs[name2]; + if (isFunction$1(formatterOrDefaultValue)) { + const errMsg = formatterOrDefaultValue(args[0][name2], params); + if (isString$1(errMsg)) { return errMsg; } } else { - if (!hasOwn(params, name)) { - params[name] = formatterOrDefaultValue; + if (!hasOwn$1(params, name2)) { + params[name2] = formatterOrDefaultValue; } } } } -function invokeSuccess(id, name, res) { +function invokeSuccess(id, name2, res) { const result = { - errMsg: name + ":ok" + errMsg: name2 + ":ok" }; return invokeCallback(id, extend(res || {}, result)); } -function invokeFail(id, name, errMsg, errRes = {}) { - const apiErrMsg = name + ":fail" + (errMsg ? " " + errMsg : ""); +function invokeFail(id, name2, errMsg, errRes = {}) { + const apiErrMsg = name2 + ":fail" + (errMsg ? " " + errMsg : ""); delete errRes.errCode; let res = extend({ errMsg: apiErrMsg }, errRes); return invokeCallback(id, res); } -function beforeInvokeApi(name, args, protocol, options) { +function beforeInvokeApi(name2, args, protocol, options) { { - validateProtocols(name, args, protocol); + validateProtocols(name2, args, protocol); } if (options && options.beforeInvoke) { const errMsg2 = options.beforeInvoke(args); - if (isString(errMsg2)) { + if (isString$1(errMsg2)) { return errMsg2; } } @@ -816,46 +1057,46 @@ function beforeInvokeApi(name, args, protocol, options) { return errMsg; } } -function parseErrMsg(errMsg) { - if (!errMsg || isString(errMsg)) { +function normalizeErrMsg(errMsg) { + if (!errMsg || isString$1(errMsg)) { return errMsg; } if (errMsg.stack) { - console.error(errMsg.message + "\n" + errMsg.stack); + console.error(errMsg.message + LINEFEED + errMsg.stack); return errMsg.message; } return errMsg; } -function wrapperTaskApi(name, fn, protocol, options) { +function wrapperTaskApi(name2, fn, protocol, options) { return (args) => { - const id = createAsyncApiCallback(name, args, options); - const errMsg = beforeInvokeApi(name, [args], protocol, options); + const id = createAsyncApiCallback(name2, args, options); + const errMsg = beforeInvokeApi(name2, [args], protocol, options); if (errMsg) { - return invokeFail(id, name, errMsg); + return invokeFail(id, name2, errMsg); } return fn(args, { - resolve: (res) => invokeSuccess(id, name, res), - reject: (errMsg2, errRes) => invokeFail(id, name, parseErrMsg(errMsg2), errRes) + resolve: (res) => invokeSuccess(id, name2, res), + reject: (errMsg2, errRes) => invokeFail(id, name2, normalizeErrMsg(errMsg2), errRes) }); }; } -function wrapperSyncApi(name, fn, protocol, options) { +function wrapperSyncApi(name2, fn, protocol, options) { return (...args) => { - const errMsg = beforeInvokeApi(name, args, protocol, options); + const errMsg = beforeInvokeApi(name2, args, protocol, options); if (errMsg) { throw new Error(errMsg); } return fn.apply(null, args); }; } -function wrapperAsyncApi(name, fn, protocol, options) { - return wrapperTaskApi(name, fn, protocol, options); +function wrapperAsyncApi(name2, fn, protocol, options) { + return wrapperTaskApi(name2, fn, protocol, options); } -function defineSyncApi(name, fn, protocol, options) { - return wrapperSyncApi(name, fn, protocol, options); +function defineSyncApi(name2, fn, protocol, options) { + return wrapperSyncApi(name2, fn, protocol, options); } -function defineAsyncApi(name, fn, protocol, options) { - return promisify$1(name, wrapperAsyncApi(name, fn, protocol, options)); +function defineAsyncApi(name2, fn, protocol, options) { + return promisify$1(name2, wrapperAsyncApi(name2, fn, protocol, options)); } const API_UPX2PX = "upx2px"; const Upx2pxProtocol = [ @@ -911,7 +1152,7 @@ const AddInterceptorProtocol = [ const RemoveInterceptorProtocol = AddInterceptorProtocol; function mergeInterceptorHook(interceptors2, interceptor) { Object.keys(interceptor).forEach((hook) => { - if (isFunction(interceptor[hook])) { + if (isFunction$1(interceptor[hook])) { interceptors2[hook] = mergeHook(interceptors2[hook], interceptor[hook]); } }); @@ -920,36 +1161,36 @@ function removeInterceptorHook(interceptors2, interceptor) { if (!interceptors2 || !interceptor) { return; } - Object.keys(interceptor).forEach((name) => { - const hooks = interceptors2[name]; - const hook = interceptor[name]; - if (isArray(hooks) && isFunction(hook)) { + Object.keys(interceptor).forEach((name2) => { + const hooks = interceptors2[name2]; + const hook = interceptor[name2]; + if (isArray$1(hooks) && isFunction$1(hook)) { remove(hooks, hook); } }); } function mergeHook(parentVal, childVal) { - const res = childVal ? parentVal ? parentVal.concat(childVal) : isArray(childVal) ? childVal : [childVal] : parentVal; + const res = childVal ? parentVal ? parentVal.concat(childVal) : isArray$1(childVal) ? childVal : [childVal] : parentVal; return res ? dedupeHooks(res) : res; } function dedupeHooks(hooks) { const res = []; - for (let i = 0; i < hooks.length; i++) { - if (res.indexOf(hooks[i]) === -1) { - res.push(hooks[i]); + for (let i2 = 0; i2 < hooks.length; i2++) { + if (res.indexOf(hooks[i2]) === -1) { + res.push(hooks[i2]); } } return res; } const addInterceptor = defineSyncApi(API_ADD_INTERCEPTOR, (method, interceptor) => { - if (isString(method) && isPlainObject$1(interceptor)) { + if (isString$1(method) && isPlainObject$1(interceptor)) { mergeInterceptorHook(scopedInterceptors[method] || (scopedInterceptors[method] = {}), interceptor); } else if (isPlainObject$1(method)) { mergeInterceptorHook(globalInterceptors, method); } }, AddInterceptorProtocol); const removeInterceptor = defineSyncApi(API_REMOVE_INTERCEPTOR, (method, interceptor) => { - if (isString(method)) { + if (isString$1(method)) { if (isPlainObject$1(interceptor)) { removeInterceptorHook(scopedInterceptors[method], interceptor); } else { @@ -994,26 +1235,26 @@ const EmitProtocol = [ required: true } ]; -const emitter = new E$1(); -const $on = defineSyncApi(API_ON, (name, callback) => { - emitter.on(name, callback); - return () => emitter.off(name, callback); +const emitter = new E$1$1(); +const $on = defineSyncApi(API_ON, (name2, callback) => { + emitter.on(name2, callback); + return () => emitter.off(name2, callback); }, OnProtocol); -const $once = defineSyncApi(API_ONCE, (name, callback) => { - emitter.once(name, callback); - return () => emitter.off(name, callback); +const $once = defineSyncApi(API_ONCE, (name2, callback) => { + emitter.once(name2, callback); + return () => emitter.off(name2, callback); }, OnceProtocol); -const $off = defineSyncApi(API_OFF, (name, callback) => { - if (!name) { +const $off = defineSyncApi(API_OFF, (name2, callback) => { + if (!name2) { emitter.e = {}; return; } - if (!isArray(name)) - name = [name]; - name.forEach((n2) => emitter.off(n2, callback)); + if (!isArray$1(name2)) + name2 = [name2]; + name2.forEach((n2) => emitter.off(n2, callback)); }, OffProtocol); -const $emit = defineSyncApi(API_EMIT, (name, ...args) => { - emitter.emit(name, ...args); +const $emit = defineSyncApi(API_EMIT, (name2, ...args) => { + emitter.emit(name2, ...args); }, EmitProtocol); let cid; let cidErrMsg; @@ -1037,8 +1278,8 @@ function invokePushCallback(args) { type: "receive", data: normalizePushMessage(args.message) }; - for (let i = 0; i < onPushMessageCallbacks.length; i++) { - const callback = onPushMessageCallbacks[i]; + for (let i2 = 0; i2 < onPushMessageCallbacks.length; i2++) { + const callback = onPushMessageCallbacks[i2]; callback(message); if (message.stopped) { break; @@ -1061,7 +1302,7 @@ function invokeGetPushCidCallbacks(cid2, errMsg) { getPushCidCallbacks.length = 0; } const API_GET_PUSH_CLIENT_ID = "getPushClientId"; -const getPushClientId = defineAsyncApi(API_GET_PUSH_CLIENT_ID, (_, { resolve: resolve2, reject }) => { +const getPushClientId = defineAsyncApi(API_GET_PUSH_CLIENT_ID, (_2, { resolve: resolve2, reject }) => { Promise.resolve().then(() => { if (typeof enabled === "undefined") { enabled = false; @@ -1101,17 +1342,17 @@ const CONTEXT_API_RE = /^create|Manager$/; const CONTEXT_API_RE_EXC = ["createBLEConnection"]; const ASYNC_API = ["createBLEConnection"]; const CALLBACK_API_RE = /^on|^off/; -function isContextApi(name) { - return CONTEXT_API_RE.test(name) && CONTEXT_API_RE_EXC.indexOf(name) === -1; +function isContextApi(name2) { + return CONTEXT_API_RE.test(name2) && CONTEXT_API_RE_EXC.indexOf(name2) === -1; } -function isSyncApi(name) { - return SYNC_API_RE.test(name) && ASYNC_API.indexOf(name) === -1; +function isSyncApi(name2) { + return SYNC_API_RE.test(name2) && ASYNC_API.indexOf(name2) === -1; } -function isCallbackApi(name) { - return CALLBACK_API_RE.test(name) && name !== "onPush"; +function isCallbackApi(name2) { + return CALLBACK_API_RE.test(name2) && name2 !== "onPush"; } -function shouldPromise(name) { - if (isContextApi(name) || isSyncApi(name) || isCallbackApi(name)) { +function shouldPromise(name2) { + if (isContextApi(name2) || isSyncApi(name2) || isCallbackApi(name2)) { return false; } return true; @@ -1124,19 +1365,19 @@ if (!Promise.prototype.finally) { })); }; } -function promisify(name, api) { - if (!shouldPromise(name)) { +function promisify(name2, api) { + if (!shouldPromise(name2)) { return api; } - if (!isFunction(api)) { + if (!isFunction$1(api)) { return api; } return function promiseApi(options = {}, ...rest) { - if (isFunction(options.success) || isFunction(options.fail) || isFunction(options.complete)) { - return wrapperReturnValue(name, invokeApi(name, api, options, rest)); + if (isFunction$1(options.success) || isFunction$1(options.fail) || isFunction$1(options.complete)) { + return wrapperReturnValue(name2, invokeApi(name2, api, options, rest)); } - return wrapperReturnValue(name, handlePromise(new Promise((resolve2, reject) => { - invokeApi(name, api, extend({}, options, { + return wrapperReturnValue(name2, handlePromise(new Promise((resolve2, reject) => { + invokeApi(name2, api, extend({}, options, { success: resolve2, fail: reject }), rest); @@ -1153,47 +1394,47 @@ function initWrapper(protocols2) { function processArgs(methodName, fromArgs, argsOption = {}, returnValue = {}, keepFromArgs = false) { if (isPlainObject$1(fromArgs)) { const toArgs = keepFromArgs === true ? fromArgs : {}; - if (isFunction(argsOption)) { + if (isFunction$1(argsOption)) { argsOption = argsOption(fromArgs, toArgs) || {}; } for (const key in fromArgs) { - if (hasOwn(argsOption, key)) { + if (hasOwn$1(argsOption, key)) { let keyOption = argsOption[key]; - if (isFunction(keyOption)) { + if (isFunction$1(keyOption)) { keyOption = keyOption(fromArgs[key], fromArgs, toArgs); } if (!keyOption) { console.warn(`微信小程序 ${methodName} 暂不支持 ${key}`); - } else if (isString(keyOption)) { + } else if (isString$1(keyOption)) { toArgs[keyOption] = fromArgs[key]; } else if (isPlainObject$1(keyOption)) { toArgs[keyOption.name ? keyOption.name : key] = keyOption.value; } } else if (CALLBACKS.indexOf(key) !== -1) { const callback = fromArgs[key]; - if (isFunction(callback)) { + if (isFunction$1(callback)) { toArgs[key] = processCallback(methodName, callback, returnValue); } } else { - if (!keepFromArgs && !hasOwn(toArgs, key)) { + if (!keepFromArgs && !hasOwn$1(toArgs, key)) { toArgs[key] = fromArgs[key]; } } } return toArgs; - } else if (isFunction(fromArgs)) { + } else if (isFunction$1(fromArgs)) { fromArgs = processCallback(methodName, fromArgs, returnValue); } return fromArgs; } function processReturnValue(methodName, res, returnValue, keepReturnValue = false) { - if (isFunction(protocols2.returnValue)) { + if (isFunction$1(protocols2.returnValue)) { res = protocols2.returnValue(methodName, res); } return processArgs(methodName, res, returnValue, {}, keepReturnValue); } return function wrapper(methodName, method) { - if (!hasOwn(protocols2, methodName)) { + if (!hasOwn$1(protocols2, methodName)) { return method; } const protocol = protocols2[methodName]; @@ -1204,7 +1445,7 @@ function initWrapper(protocols2) { } return function(arg1, arg2) { let options = protocol; - if (isFunction(protocol)) { + if (isFunction$1(protocol)) { options = protocol(arg1); } arg1 = processArgs(methodName, arg1, options.args, options.returnValue); @@ -1221,14 +1462,14 @@ function initWrapper(protocols2) { }; } const getLocale = () => { - const app = isFunction(getApp) && getApp({ allowDefault: true }); + const app = isFunction$1(getApp) && getApp({ allowDefault: true }); if (app && app.$vm) { return app.$vm.$locale; } return normalizeLocale(wx.getSystemInfoSync().language) || LOCALE_EN; }; const setLocale = (locale) => { - const app = isFunction(getApp) && getApp(); + const app = isFunction$1(getApp) && getApp(); if (!app) { return false; } @@ -1252,7 +1493,7 @@ if (typeof global !== "undefined") { const UUID_KEY = "__DC_STAT_UUID"; let deviceId; function useDeviceId(global2 = wx) { - return function addDeviceId(_, toRes) { + return function addDeviceId(_2, toRes) { deviceId = deviceId || global2.getStorageSync(UUID_KEY); if (!deviceId) { deviceId = Date.now() + "" + Math.floor(Math.random() * 1e7); @@ -1297,8 +1538,8 @@ function populateParameters(fromRes, toRes) { appVersion: "1.0.0", appVersionCode: "100", appLanguage: getAppLanguage(hostLanguage), - uniCompileVersion: "4.23", - uniRuntimeVersion: "4.23", + uniCompileVersion: "4.15", + uniRuntimeVersion: "4.15", uniPlatform: "mp-weixin", deviceBrand, deviceModel: model, @@ -1383,7 +1624,7 @@ const previewImage = { return; } const urls = fromArgs.urls; - if (!isArray(urls)) { + if (!isArray$1(urls)) { return; } const len = urls.length; @@ -1487,13 +1728,13 @@ function initUni(api, protocols2, platform = wx) { const wrapper = initWrapper(protocols2); const UniProxyHandlers = { get(target, key) { - if (hasOwn(target, key)) { + if (hasOwn$1(target, key)) { return target[key]; } - if (hasOwn(api, key)) { + if (hasOwn$1(api, key)) { return promisify(key, api[key]); } - if (hasOwn(baseApis, key)) { + if (hasOwn$1(baseApis, key)) { return promisify(key, baseApis[key]); } return promisify(key, wrapper(key, platform[key])); @@ -1510,14 +1751,14 @@ function initGetProvider(providers) { service, provider: providers[service] }; - isFunction(success) && success(res); + isFunction$1(success) && success(res); } else { res = { errMsg: "getProvider:fail:服务[" + service + "]不存在" }; - isFunction(fail) && fail(res); + isFunction$1(fail) && fail(res); } - isFunction(complete) && complete(res); + isFunction$1(complete) && complete(res); }; } const objectKeys = [ @@ -1561,8 +1802,8 @@ const getProvider = initGetProvider({ }); function initComponentMocks(component) { const res = /* @__PURE__ */ Object.create(null); - mocks$1.forEach((name) => { - res[name] = component[name]; + mocks$1.forEach((name2) => { + res[name2] = component[name2]; }); return res; } @@ -1644,9 +1885,9 @@ function warn$1$1(msg, ...args) { instance, 11, [ - msg + args.map((a) => { + msg + args.map((a2) => { var _a, _b; - return (_b = (_a = a.toString) == null ? void 0 : _a.call(a)) != null ? _b : JSON.stringify(a); + return (_b = (_a = a2.toString) == null ? void 0 : _a.call(a2)) != null ? _b : JSON.stringify(a2); }).join(""), instance && instance.proxy, trace.map( @@ -1688,8 +1929,8 @@ function getComponentTrace$1() { } function formatTrace$1(trace) { const logs = []; - trace.forEach((entry, i) => { - logs.push(...i === 0 ? [] : [` + trace.forEach((entry, i2) => { + logs.push(...i2 === 0 ? [] : [` `], ...formatTraceEntry$1(entry)); }); return logs; @@ -1717,7 +1958,7 @@ function formatProps$1(props) { return res; } function formatProp$1(key, value, raw) { - if (isString(value)) { + if (isString$1(value)) { value = JSON.stringify(value); return raw ? value : [`${key}=${value}`]; } else if (typeof value === "number" || typeof value === "boolean" || value == null) { @@ -1725,7 +1966,7 @@ function formatProp$1(key, value, raw) { } else if (isRef$1(value)) { value = formatProp$1(key, toRaw$1(value.value), true); return raw ? value : [`${key}=Ref<`, value, `>`]; - } else if (isFunction(value)) { + } else if (isFunction$1(value)) { return [`${key}=fn${value.name ? `<${value.name}>` : ``}`]; } else { value = toRaw$1(value); @@ -1779,8 +2020,8 @@ function handleError$1(err, instance, type, throwInDev = true) { while (cur) { const errorCapturedHooks = cur.ec; if (errorCapturedHooks) { - for (let i = 0; i < errorCapturedHooks.length; i++) { - if (errorCapturedHooks[i](err, exposedInstance, errorInfo) === false) { + for (let i2 = 0; i2 < errorCapturedHooks.length; i2++) { + if (errorCapturedHooks[i2](err, exposedInstance, errorInfo) === false) { return; } } @@ -1861,7 +2102,7 @@ function queueFlush$1() { } } function queuePostFlushCb$1(cb) { - if (!isArray(cb)) { + if (!isArray$1(cb)) { if (!activePostFlushCbs$1 || !activePostFlushCbs$1.includes( cb, cb.allowRecurse ? postFlushIndex$1 + 1 : postFlushIndex$1 @@ -1876,7 +2117,7 @@ function queuePostFlushCb$1(cb) { function flushPostFlushCbs$1(seen) { if (pendingPostFlushCbs$1.length) { const deduped = [...new Set(pendingPostFlushCbs$1)].sort( - (a, b) => getId$1(a) - getId$1(b) + (a2, b2) => getId$1(a2) - getId$1(b2) ); pendingPostFlushCbs$1.length = 0; if (activePostFlushCbs$1) { @@ -1898,12 +2139,12 @@ function flushPostFlushCbs$1(seen) { } } const getId$1 = (job) => job.id == null ? Infinity : job.id; -const comparator$1 = (a, b) => { - const diff2 = getId$1(a) - getId$1(b); +const comparator$1 = (a2, b2) => { + const diff2 = getId$1(a2) - getId$1(b2); if (diff2 === 0) { - if (a.pre && !b.pre) + if (a2.pre && !b2.pre) return -1; - if (b.pre && !a.pre) + if (b2.pre && !a2.pre) return 1; } return diff2; @@ -2057,42 +2298,42 @@ function tryWrap(fn) { }; } { - const g = getGlobalThis(); + const g2 = getGlobalThis(); const registerGlobalSetter = (key, setter) => { let setters; - if (!(setters = g[key])) - setters = g[key] = []; + if (!(setters = g2[key])) + setters = g2[key] = []; setters.push(setter); - return (v) => { + return (v2) => { if (setters.length > 1) - setters.forEach((set2) => set2(v)); + setters.forEach((set2) => set2(v2)); else - setters[0](v); + setters[0](v2); }; }; registerGlobalSetter( `__VUE_INSTANCE_SETTERS__`, - (v) => v + (v2) => v2 ); registerGlobalSetter( `__VUE_SSR_SETTERS__`, - (v) => v + (v2) => v2 ); } const classifyRE$1 = /(?:^|[-_])(\w)/g; const classify$1 = (str) => str.replace(classifyRE$1, (c2) => c2.toUpperCase()).replace(/[-_]/g, ""); function getComponentName$1(Component2, includeInferred = true) { - return isFunction(Component2) ? Component2.displayName || Component2.name : Component2.name || includeInferred && Component2.__name; + return isFunction$1(Component2) ? Component2.displayName || Component2.name : Component2.name || includeInferred && Component2.__name; } function formatComponentName$1(instance, Component2, isRoot = false) { - let name = getComponentName$1(Component2); - if (!name && Component2.__file) { + let name2 = getComponentName$1(Component2); + if (!name2 && Component2.__file) { const match = Component2.__file.match(/([^/\\]+)\.\w+$/); if (match) { - name = match[1]; + name2 = match[1]; } } - if (!name && instance && instance.parent) { + if (!name2 && instance && instance.parent) { const inferFromRegistry = (registry) => { for (const key in registry) { if (registry[key] === Component2) { @@ -2100,14 +2341,14 @@ function formatComponentName$1(instance, Component2, isRoot = false) { } } }; - name = inferFromRegistry( + name2 = inferFromRegistry( instance.components || instance.parent.type.components ) || inferFromRegistry(instance.appContext.components); } - return name ? classify$1(name) : isRoot ? `App` : `Anonymous`; + return name2 ? classify$1(name2) : isRoot ? `App` : `Anonymous`; } function isClassComponent$1(value) { - return isFunction(value) && "__vccOpts" in value; + return isFunction$1(value) && "__vccOpts" in value; } /** * @dcloudio/uni-mp-vue v3.4.21 @@ -2163,16 +2404,16 @@ class EffectScope { } stop(fromParent) { if (this._active) { - let i, l; - for (i = 0, l = this.effects.length; i < l; i++) { - this.effects[i].stop(); + let i2, l2; + for (i2 = 0, l2 = this.effects.length; i2 < l2; i2++) { + this.effects[i2].stop(); } - for (i = 0, l = this.cleanups.length; i < l; i++) { - this.cleanups[i](); + for (i2 = 0, l2 = this.cleanups.length; i2 < l2; i2++) { + this.cleanups[i2](); } if (this.scopes) { - for (i = 0, l = this.scopes.length; i < l; i++) { - this.scopes[i].stop(true); + for (i2 = 0, l2 = this.scopes.length; i2 < l2; i2++) { + this.scopes[i2].stop(true); } } if (!this.detached && this.parent && !fromParent) { @@ -2198,15 +2439,6 @@ function recordEffectScope(effect2, scope = activeEffectScope) { function getCurrentScope() { return activeEffectScope; } -function onScopeDispose(fn) { - if (activeEffectScope) { - activeEffectScope.cleanups.push(fn); - } else { - warn$2( - `onScopeDispose() is called when there is no active effect scope to be associated with.` - ); - } -} let activeEffect; class ReactiveEffect2 { constructor(fn, trigger2, scheduler, scope) { @@ -2226,8 +2458,8 @@ class ReactiveEffect2 { if (this._dirtyLevel === 2 || this._dirtyLevel === 3) { this._dirtyLevel = 1; pauseTracking(); - for (let i = 0; i < this._depsLength; i++) { - const dep = this.deps[i]; + for (let i2 = 0; i2 < this._depsLength; i2++) { + const dep = this.deps[i2]; if (dep.computed) { triggerComputed(dep.computed); if (this._dirtyLevel >= 4) { @@ -2242,8 +2474,8 @@ class ReactiveEffect2 { } return this._dirtyLevel >= 4; } - set dirty(v) { - this._dirtyLevel = v ? 4 : 0; + set dirty(v2) { + this._dirtyLevel = v2 ? 4 : 0; } run() { this._dirtyLevel = 0; @@ -2284,8 +2516,8 @@ function preCleanupEffect(effect2) { } function postCleanupEffect(effect2) { if (effect2.deps.length > effect2._depsLength) { - for (let i = effect2._depsLength; i < effect2.deps.length; i++) { - cleanupDepEffect(effect2.deps[i], effect2); + for (let i2 = effect2._depsLength; i2 < effect2.deps.length; i2++) { + cleanupDepEffect(effect2.deps[i2], effect2); } effect2.deps.length = effect2._depsLength; } @@ -2400,7 +2632,7 @@ function trigger(target, type, key, newValue, oldValue, oldTarget) { let deps = []; if (type === "clear") { deps = [...depsMap.values()]; - } else if (key === "length" && isArray(target)) { + } else if (key === "length" && isArray$1(target)) { const newLength = Number(newValue); depsMap.forEach((dep, key2) => { if (key2 === "length" || !isSymbol(key2) && key2 >= newLength) { @@ -2413,9 +2645,9 @@ function trigger(target, type, key, newValue, oldValue, oldTarget) { } switch (type) { case "add": - if (!isArray(target)) { + if (!isArray$1(target)) { deps.push(depsMap.get(ITERATE_KEY)); - if (isMap(target)) { + if (isMap$1(target)) { deps.push(depsMap.get(MAP_KEY_ITERATE_KEY)); } } else if (isIntegerKey(key)) { @@ -2423,15 +2655,15 @@ function trigger(target, type, key, newValue, oldValue, oldTarget) { } break; case "delete": - if (!isArray(target)) { + if (!isArray$1(target)) { deps.push(depsMap.get(ITERATE_KEY)); - if (isMap(target)) { + if (isMap$1(target)) { deps.push(depsMap.get(MAP_KEY_ITERATE_KEY)); } } break; case "set": - if (isMap(target)) { + if (isMap$1(target)) { deps.push(depsMap.get(ITERATE_KEY)); } break; @@ -2456,10 +2688,6 @@ function trigger(target, type, key, newValue, oldValue, oldTarget) { } resetScheduling(); } -function getDepFromReactive(object, key) { - var _a; - return (_a = targetMap.get(object)) == null ? void 0 : _a.get(key); -} const isNonTrackableKeys = /* @__PURE__ */ makeMap(`__proto__,__v_isRef,__isVue`); const builtInSymbols = new Set( /* @__PURE__ */ Object.getOwnPropertyNames(Symbol).filter((key) => key !== "arguments" && key !== "caller").map((key) => Symbol[key]).filter(isSymbol) @@ -2470,8 +2698,8 @@ function createArrayInstrumentations() { ["includes", "indexOf", "lastIndexOf"].forEach((key) => { instrumentations[key] = function(...args) { const arr = toRaw(this); - for (let i = 0, l = this.length; i < l; i++) { - track(arr, "get", i + ""); + for (let i2 = 0, l2 = this.length; i2 < l2; i2++) { + track(arr, "get", i2 + ""); } const res = arr[key](...args); if (res === -1 || res === false) { @@ -2493,7 +2721,7 @@ function createArrayInstrumentations() { }); return instrumentations; } -function hasOwnProperty(key) { +function hasOwnProperty$1(key) { const obj = toRaw(this); track(obj, "has", key); return obj.hasOwnProperty(key); @@ -2519,13 +2747,13 @@ class BaseReactiveHandler2 { } return; } - const targetIsArray = isArray(target); + const targetIsArray = isArray$1(target); if (!isReadonly2) { - if (targetIsArray && hasOwn(arrayInstrumentations, key)) { + if (targetIsArray && hasOwn$1(arrayInstrumentations, key)) { return Reflect.get(arrayInstrumentations, key, receiver); } if (key === "hasOwnProperty") { - return hasOwnProperty; + return hasOwnProperty$1; } } const res = Reflect.get(target, key, receiver); @@ -2541,7 +2769,7 @@ class BaseReactiveHandler2 { if (isRef(res)) { return targetIsArray && isIntegerKey(key) ? res : res.value; } - if (isObject(res)) { + if (isObject$2(res)) { return isReadonly2 ? readonly(res) : reactive(res); } return res; @@ -2559,7 +2787,7 @@ class MutableReactiveHandler2 extends BaseReactiveHandler2 { oldValue = toRaw(oldValue); value = toRaw(value); } - if (!isArray(target) && isRef(oldValue) && !isRef(value)) { + if (!isArray$1(target) && isRef(oldValue) && !isRef(value)) { if (isOldValueReadonly) { return false; } else { @@ -2568,7 +2796,7 @@ class MutableReactiveHandler2 extends BaseReactiveHandler2 { } } } - const hadKey = isArray(target) && isIntegerKey(key) ? Number(key) < target.length : hasOwn(target, key); + const hadKey = isArray$1(target) && isIntegerKey(key) ? Number(key) < target.length : hasOwn$1(target, key); const result = Reflect.set(target, key, value, receiver); if (target === toRaw(receiver)) { if (!hadKey) { @@ -2580,7 +2808,7 @@ class MutableReactiveHandler2 extends BaseReactiveHandler2 { return result; } deleteProperty(target, key) { - const hadKey = hasOwn(target, key); + const hadKey = hasOwn$1(target, key); const oldValue = target[key]; const result = Reflect.deleteProperty(target, key); if (result && hadKey) { @@ -2599,7 +2827,7 @@ class MutableReactiveHandler2 extends BaseReactiveHandler2 { track( target, "iterate", - isArray(target) ? "length" : ITERATE_KEY + isArray$1(target) ? "length" : ITERATE_KEY ); return Reflect.ownKeys(target); } @@ -2634,8 +2862,8 @@ const shallowReactiveHandlers = /* @__PURE__ */ new MutableReactiveHandler2( ); const shallowReadonlyHandlers = /* @__PURE__ */ new ReadonlyReactiveHandler2(true); const toShallow = (value) => value; -const getProto = (v) => Reflect.getPrototypeOf(v); -function get(target, key, isReadonly2 = false, isShallow2 = false) { +const getProto = (v2) => Reflect.getPrototypeOf(v2); +function get$1(target, key, isReadonly2 = false, isShallow2 = false) { target = target["__v_raw"]; const rawTarget = toRaw(target); const rawKey = toRaw(key); @@ -2672,7 +2900,7 @@ function size(target, isReadonly2 = false) { !isReadonly2 && track(toRaw(target), "iterate", ITERATE_KEY); return Reflect.get(target, "size", target); } -function add(value) { +function add$1(value) { value = toRaw(value); const target = toRaw(this); const proto = getProto(target); @@ -2723,7 +2951,7 @@ function deleteEntry(key) { function clear() { const target = toRaw(this); const hadItems = target.size !== 0; - const oldTarget = isMap(target) ? new Map(target) : new Set(target); + const oldTarget = isMap$1(target) ? new Map(target) : new Set(target); const result = target.clear(); if (hadItems) { trigger(target, "clear", void 0, void 0, oldTarget); @@ -2746,7 +2974,7 @@ function createIterableMethod(method, isReadonly2, isShallow2) { return function(...args) { const target = this["__v_raw"]; const rawTarget = toRaw(target); - const targetIsMap = isMap(rawTarget); + const targetIsMap = isMap$1(rawTarget); const isPair = method === "entries" || method === Symbol.iterator && targetIsMap; const isKeyOnly = method === "keys" && targetIsMap; const innerIterator = target[method](...args); @@ -2787,13 +3015,13 @@ function createReadonlyMethod(type) { function createInstrumentations() { const mutableInstrumentations2 = { get(key) { - return get(this, key); + return get$1(this, key); }, get size() { return size(this); }, has, - add, + add: add$1, set: set$1, delete: deleteEntry, clear, @@ -2801,13 +3029,13 @@ function createInstrumentations() { }; const shallowInstrumentations2 = { get(key) { - return get(this, key, false, true); + return get$1(this, key, false, true); }, get size() { return size(this); }, has, - add, + add: add$1, set: set$1, delete: deleteEntry, clear, @@ -2815,7 +3043,7 @@ function createInstrumentations() { }; const readonlyInstrumentations2 = { get(key) { - return get(this, key, true); + return get$1(this, key, true); }, get size() { return size(this, true); @@ -2831,7 +3059,7 @@ function createInstrumentations() { }; const shallowReadonlyInstrumentations2 = { get(key) { - return get(this, key, true, true); + return get$1(this, key, true, true); }, get size() { return size(this, true); @@ -2885,7 +3113,7 @@ function createInstrumentationGetter(isReadonly2, shallow) { return target; } return Reflect.get( - hasOwn(instrumentations, key) && key in target ? instrumentations : target, + hasOwn$1(instrumentations, key) && key in target ? instrumentations : target, key, receiver ); @@ -2973,7 +3201,7 @@ function shallowReadonly(target) { ); } function createReactiveObject(target, isReadonly2, baseHandlers, collectionHandlers, proxyMap) { - if (!isObject(target)) { + if (!isObject$2(target)) { { warn$2(`value cannot be made reactive: ${String(target)}`); } @@ -3022,8 +3250,8 @@ function markRaw(value) { } return value; } -const toReactive = (value) => isObject(value) ? reactive(value) : value; -const toReadonly = (value) => isObject(value) ? readonly(value) : value; +const toReactive = (value) => isObject$2(value) ? reactive(value) : value; +const toReadonly = (value) => isObject$2(value) ? readonly(value) : value; const COMPUTED_SIDE_EFFECT_WARN = `Computed is still dirty after getter evaluation, likely because a computed is mutating its own dependency in its getter. State mutations in computed getters should be avoided. Check the docs for more details: https://vuejs.org/guide/essentials/computed.html#getters-should-be-side-effect-free`; class ComputedRefImpl { constructor(getter, _setter, isReadonly2, isSSR) { @@ -3066,15 +3294,15 @@ getter: `, this.getter); get _dirty() { return this.effect.dirty; } - set _dirty(v) { - this.effect.dirty = v; + set _dirty(v2) { + this.effect.dirty = v2; } // #endregion } function computed$1(getterOrOptions, debugOptions, isSSR = false) { let getter; let setter; - const onlyGetter = isFunction(getterOrOptions); + const onlyGetter = isFunction$1(getterOrOptions); if (onlyGetter) { getter = getterOrOptions; setter = () => { @@ -3177,59 +3405,6 @@ const shallowUnwrapHandlers = { function proxyRefs(objectWithRefs) { return isReactive(objectWithRefs) ? objectWithRefs : new Proxy(objectWithRefs, shallowUnwrapHandlers); } -function toRefs(object) { - if (!isProxy(object)) { - warn$2(`toRefs() expects a reactive object but received a plain one.`); - } - const ret = isArray(object) ? new Array(object.length) : {}; - for (const key in object) { - ret[key] = propertyToRef(object, key); - } - return ret; -} -class ObjectRefImpl { - constructor(_object, _key, _defaultValue) { - this._object = _object; - this._key = _key; - this._defaultValue = _defaultValue; - this.__v_isRef = true; - } - get value() { - const val = this._object[this._key]; - return val === void 0 ? this._defaultValue : val; - } - set value(newVal) { - this._object[this._key] = newVal; - } - get dep() { - return getDepFromReactive(toRaw(this._object), this._key); - } -} -class GetterRefImpl { - constructor(_getter) { - this._getter = _getter; - this.__v_isRef = true; - this.__v_isReadonly = true; - } - get value() { - return this._getter(); - } -} -function toRef(source, key, defaultValue) { - if (isRef(source)) { - return source; - } else if (isFunction(source)) { - return new GetterRefImpl(source); - } else if (isObject(source) && arguments.length > 1) { - return propertyToRef(source, key, defaultValue); - } else { - return ref(source); - } -} -function propertyToRef(source, key, defaultValue) { - const val = source[key]; - return isRef(val) ? val : new ObjectRefImpl(source, key, defaultValue); -} const stack = []; function pushWarningContext(vnode) { stack.push(vnode); @@ -3248,9 +3423,9 @@ function warn$1(msg, ...args) { instance, 11, [ - msg + args.map((a) => { + msg + args.map((a2) => { var _a, _b; - return (_b = (_a = a.toString) == null ? void 0 : _a.call(a)) != null ? _b : JSON.stringify(a); + return (_b = (_a = a2.toString) == null ? void 0 : _a.call(a2)) != null ? _b : JSON.stringify(a2); }).join(""), instance && instance.proxy, trace.map( @@ -3293,8 +3468,8 @@ function getComponentTrace() { } function formatTrace(trace) { const logs = []; - trace.forEach((entry, i) => { - logs.push(...i === 0 ? [] : [` + trace.forEach((entry, i2) => { + logs.push(...i2 === 0 ? [] : [` `], ...formatTraceEntry(entry)); }); return logs; @@ -3322,7 +3497,7 @@ function formatProps(props) { return res; } function formatProp(key, value, raw) { - if (isString(value)) { + if (isString$1(value)) { value = JSON.stringify(value); return raw ? value : [`${key}=${value}`]; } else if (typeof value === "number" || typeof value === "boolean" || value == null) { @@ -3330,7 +3505,7 @@ function formatProp(key, value, raw) { } else if (isRef(value)) { value = formatProp(key, toRaw(value.value), true); return raw ? value : [`${key}=Ref<`, value, `>`]; - } else if (isFunction(value)) { + } else if (isFunction$1(value)) { return [`${key}=fn${value.name ? `<${value.name}>` : ``}`]; } else { value = toRaw(value); @@ -3376,7 +3551,7 @@ function callWithErrorHandling(fn, instance, type, args) { } } function callWithAsyncErrorHandling(fn, instance, type, args) { - if (isFunction(fn)) { + if (isFunction$1(fn)) { const res = callWithErrorHandling(fn, instance, type, args); if (res && isPromise(res)) { res.catch((err) => { @@ -3386,8 +3561,8 @@ function callWithAsyncErrorHandling(fn, instance, type, args) { return res; } const values = []; - for (let i = 0; i < fn.length; i++) { - values.push(callWithAsyncErrorHandling(fn[i], instance, type, args)); + for (let i2 = 0; i2 < fn.length; i2++) { + values.push(callWithAsyncErrorHandling(fn[i2], instance, type, args)); } return values; } @@ -3400,8 +3575,8 @@ function handleError(err, instance, type, throwInDev = true) { while (cur) { const errorCapturedHooks = cur.ec; if (errorCapturedHooks) { - for (let i = 0; i < errorCapturedHooks.length; i++) { - if (errorCapturedHooks[i](err, exposedInstance, errorInfo) === false) { + for (let i2 = 0; i2 < errorCapturedHooks.length; i2++) { + if (errorCapturedHooks[i2](err, exposedInstance, errorInfo) === false) { return; } } @@ -3490,13 +3665,13 @@ function hasQueueJob(job) { return queue.indexOf(job) > -1; } function invalidateJob(job) { - const i = queue.indexOf(job); - if (i > flushIndex) { - queue.splice(i, 1); + const i2 = queue.indexOf(job); + if (i2 > flushIndex) { + queue.splice(i2, 1); } } function queuePostFlushCb(cb) { - if (!isArray(cb)) { + if (!isArray$1(cb)) { if (!activePostFlushCbs || !activePostFlushCbs.includes( cb, cb.allowRecurse ? postFlushIndex + 1 : postFlushIndex @@ -3508,12 +3683,12 @@ function queuePostFlushCb(cb) { } queueFlush(); } -function flushPreFlushCbs(instance, seen, i = isFlushing ? flushIndex + 1 : 0) { +function flushPreFlushCbs(instance, seen, i2 = isFlushing ? flushIndex + 1 : 0) { { seen = seen || /* @__PURE__ */ new Map(); } - for (; i < queue.length; i++) { - const cb = queue[i]; + for (; i2 < queue.length; i2++) { + const cb = queue[i2]; if (cb && cb.pre) { if (instance && cb.id !== instance.uid) { continue; @@ -3521,8 +3696,8 @@ function flushPreFlushCbs(instance, seen, i = isFlushing ? flushIndex + 1 : 0) { if (checkRecursiveUpdates(seen, cb)) { continue; } - queue.splice(i, 1); - i--; + queue.splice(i2, 1); + i2--; cb(); } } @@ -3530,7 +3705,7 @@ function flushPreFlushCbs(instance, seen, i = isFlushing ? flushIndex + 1 : 0) { function flushPostFlushCbs(seen) { if (pendingPostFlushCbs.length) { const deduped = [...new Set(pendingPostFlushCbs)].sort( - (a, b) => getId(a) - getId(b) + (a2, b2) => getId(a2) - getId(b2) ); pendingPostFlushCbs.length = 0; if (activePostFlushCbs) { @@ -3552,12 +3727,12 @@ function flushPostFlushCbs(seen) { } } const getId = (job) => job.id == null ? Infinity : job.id; -const comparator = (a, b) => { - const diff2 = getId(a) - getId(b); +const comparator = (a2, b2) => { + const diff2 = getId(a2) - getId(b2); if (diff2 === 0) { - if (a.pre && !b.pre) + if (a2.pre && !b2.pre) return -1; - if (b.pre && !a.pre) + if (b2.pre && !a2.pre) return 1; } return diff2; @@ -3732,7 +3907,7 @@ function emit(instance, event, ...rawArgs) { } } else { const validator = emitsOptions[event]; - if (isFunction(validator)) { + if (isFunction$1(validator)) { const isValid = validator(...rawArgs); if (!isValid) { warn$1( @@ -3750,7 +3925,7 @@ function emit(instance, event, ...rawArgs) { const modifiersKey = `${modelArg === "modelValue" ? "model" : modelArg}Modifiers`; const { number, trim } = props[modifiersKey] || EMPTY_OBJ; if (trim) { - args = rawArgs.map((a) => isString(a) ? a.trim() : a); + args = rawArgs.map((a2) => isString$1(a2) ? a2.trim() : a2); } if (number) { args = rawArgs.map(looseToNumber); @@ -3811,7 +3986,7 @@ function normalizeEmitsOptions(comp, appContext, asMixin = false) { const raw = comp.emits; let normalized = {}; let hasExtends = false; - if (!isFunction(comp)) { + if (!isFunction$1(comp)) { const extendEmits = (raw2) => { const normalizedFromExtend = normalizeEmitsOptions(raw2, appContext, true); if (normalizedFromExtend) { @@ -3830,17 +4005,17 @@ function normalizeEmitsOptions(comp, appContext, asMixin = false) { } } if (!raw && !hasExtends) { - if (isObject(comp)) { + if (isObject$2(comp)) { cache.set(comp, null); } return null; } - if (isArray(raw)) { + if (isArray$1(raw)) { raw.forEach((key) => normalized[key] = null); } else { extend(normalized, raw); } - if (isObject(comp)) { + if (isObject$2(comp)) { cache.set(comp, normalized); } return normalized; @@ -3850,7 +4025,7 @@ function isEmitListener(options, key) { return false; } key = key.slice(2).replace(/Once$/, ""); - return hasOwn(options, key[0].toLowerCase() + key.slice(1)) || hasOwn(options, hyphenate(key)) || hasOwn(options, key); + return hasOwn$1(options, key[0].toLowerCase() + key.slice(1)) || hasOwn$1(options, hyphenate(key)) || hasOwn$1(options, key); } let currentRenderingInstance = null; function setCurrentRenderingInstance(instance) { @@ -3860,10 +4035,10 @@ function setCurrentRenderingInstance(instance) { return prev; } const COMPONENTS = "components"; -function resolveComponent(name, maybeSelfReference) { - return resolveAsset(COMPONENTS, name, true, maybeSelfReference) || name; +function resolveComponent(name2, maybeSelfReference) { + return resolveAsset(COMPONENTS, name2, true, maybeSelfReference) || name2; } -function resolveAsset(type, name, warnMissing = true, maybeSelfReference = false) { +function resolveAsset(type, name2, warnMissing = true, maybeSelfReference = false) { const instance = currentRenderingInstance || currentInstance; if (instance) { const Component2 = instance.type; @@ -3872,15 +4047,15 @@ function resolveAsset(type, name, warnMissing = true, maybeSelfReference = false Component2, false ); - if (selfName && (selfName === name || selfName === camelize(name) || selfName === capitalize(camelize(name)))) { + if (selfName && (selfName === name2 || selfName === camelize(name2) || selfName === capitalize(camelize(name2)))) { return Component2; } } const res = ( // local registration // check instance[type] first which is resolved for options API - resolve(instance[type] || Component2[type], name) || // global registration - resolve(instance.appContext[type], name) + resolve(instance[type] || Component2[type], name2) || // global registration + resolve(instance.appContext[type], name2) ); if (!res && maybeSelfReference) { return Component2; @@ -3888,7 +4063,7 @@ function resolveAsset(type, name, warnMissing = true, maybeSelfReference = false if (warnMissing && !res) { const extra = type === COMPONENTS ? ` If this is a native custom element, make sure to exclude it from component resolution via compilerOptions.isCustomElement.` : ``; - warn$1(`Failed to resolve ${type.slice(0, -1)}: ${name}${extra}`); + warn$1(`Failed to resolve ${type.slice(0, -1)}: ${name2}${extra}`); } return res; } else { @@ -3897,12 +4072,12 @@ If this is a native custom element, make sure to exclude it from component resol ); } } -function resolve(registry, name) { - return registry && (registry[name] || registry[camelize(name)] || registry[capitalize(camelize(name))]); +function resolve(registry, name2) { + return registry && (registry[name2] || registry[camelize(name2)] || registry[capitalize(camelize(name2))]); } const INITIAL_WATCHER_VALUE = {}; function watch(source, cb, options) { - if (!isFunction(cb)) { + if (!isFunction$1(cb)) { warn$1( `\`watch(fn, options?)\` signature has been moved to a separate API. Use \`watchEffect(fn, options?)\` instead. \`watch\` now only supports \`watch(source, cb, options?) signature.` ); @@ -3967,7 +4142,7 @@ function doWatch(source, cb, { } else if (isReactive(source)) { getter = () => reactiveGetter(source); forceTrigger = true; - } else if (isArray(source)) { + } else if (isArray$1(source)) { isMultiSource = true; forceTrigger = source.some((s2) => isReactive(s2) || isShallow(s2)); getter = () => source.map((s2) => { @@ -3975,13 +4150,13 @@ function doWatch(source, cb, { return s2.value; } else if (isReactive(s2)) { return reactiveGetter(s2); - } else if (isFunction(s2)) { + } else if (isFunction$1(s2)) { return callWithErrorHandling(s2, instance, 2); } else { warnInvalidSource(s2); } }); - } else if (isFunction(source)) { + } else if (isFunction$1(source)) { if (cb) { getter = () => callWithErrorHandling(source, instance, 2); } else { @@ -4019,7 +4194,7 @@ function doWatch(source, cb, { } if (cb) { const newValue = effect2.run(); - if (deep || forceTrigger || (isMultiSource ? newValue.some((v, i) => hasChanged(v, oldValue[i])) : hasChanged(newValue, oldValue)) || false) { + if (deep || forceTrigger || (isMultiSource ? newValue.some((v2, i2) => hasChanged(v2, oldValue[i2])) : hasChanged(newValue, oldValue)) || false) { if (cleanup) { cleanup(); } @@ -4077,9 +4252,9 @@ function doWatch(source, cb, { } function instanceWatch(source, value, options) { const publicThis = this.proxy; - const getter = isString(source) ? source.includes(".") ? createPathGetter(publicThis, source) : () => publicThis[source] : source.bind(publicThis, publicThis); + const getter = isString$1(source) ? source.includes(".") ? createPathGetter(publicThis, source) : () => publicThis[source] : source.bind(publicThis, publicThis); let cb; - if (isFunction(value)) { + if (isFunction$1(value)) { cb = value; } else { cb = value.handler; @@ -4094,14 +4269,14 @@ function createPathGetter(ctx, path) { const segments = path.split("."); return () => { let cur = ctx; - for (let i = 0; i < segments.length && cur; i++) { - cur = cur[segments[i]]; + for (let i2 = 0; i2 < segments.length && cur; i2++) { + cur = cur[segments[i2]]; } return cur; }; } function traverse(value, depth, currentDepth = 0, seen) { - if (!isObject(value) || value["__v_skip"]) { + if (!isObject$2(value) || value["__v_skip"]) { return value; } if (depth && depth > 0) { @@ -4117,13 +4292,13 @@ function traverse(value, depth, currentDepth = 0, seen) { seen.add(value); if (isRef(value)) { traverse(value.value, depth, currentDepth, seen); - } else if (isArray(value)) { - for (let i = 0; i < value.length; i++) { - traverse(value[i], depth, currentDepth, seen); + } else if (isArray$1(value)) { + for (let i2 = 0; i2 < value.length; i2++) { + traverse(value[i2], depth, currentDepth, seen); } - } else if (isSet(value) || isMap(value)) { - value.forEach((v) => { - traverse(v, depth, currentDepth, seen); + } else if (isSet(value) || isMap$1(value)) { + value.forEach((v2) => { + traverse(v2, depth, currentDepth, seen); }); } else if (isPlainObject$1(value)) { for (const key in value) { @@ -4132,9 +4307,9 @@ function traverse(value, depth, currentDepth = 0, seen) { } return value; } -function validateDirectiveName(name) { - if (isBuiltInDirective(name)) { - warn$1("Do not use built-in directive ids as custom directive id: " + name); +function validateDirectiveName(name2) { + if (isBuiltInDirective(name2)) { + warn$1("Do not use built-in directive ids as custom directive id: " + name2); } } function createAppContext() { @@ -4161,10 +4336,10 @@ function createAppContext() { let uid$1 = 0; function createAppAPI(render, hydrate) { return function createApp2(rootComponent, rootProps = null) { - if (!isFunction(rootComponent)) { + if (!isFunction$1(rootComponent)) { rootComponent = extend({}, rootComponent); } - if (rootProps != null && !isObject(rootProps)) { + if (rootProps != null && !isObject$2(rootProps)) { warn$1(`root props passed to app.mount() must be an object.`); rootProps = null; } @@ -4181,7 +4356,7 @@ function createAppAPI(render, hydrate) { get config() { return context.config; }, - set config(v) { + set config(v2) { { warn$1( `app.config cannot be replaced. Modify individual options instead.` @@ -4191,10 +4366,10 @@ function createAppAPI(render, hydrate) { use(plugin2, ...options) { if (installedPlugins.has(plugin2)) { warn$1(`Plugin has already been applied to target app.`); - } else if (plugin2 && isFunction(plugin2.install)) { + } else if (plugin2 && isFunction$1(plugin2.install)) { installedPlugins.add(plugin2); plugin2.install(app, ...options); - } else if (isFunction(plugin2)) { + } else if (isFunction$1(plugin2)) { installedPlugins.add(plugin2); plugin2(app, ...options); } else { @@ -4216,30 +4391,30 @@ function createAppAPI(render, hydrate) { } return app; }, - component(name, component) { + component(name2, component) { { - validateComponentName(name, context.config); + validateComponentName(name2, context.config); } if (!component) { - return context.components[name]; + return context.components[name2]; } - if (context.components[name]) { - warn$1(`Component "${name}" has already been registered in target app.`); + if (context.components[name2]) { + warn$1(`Component "${name2}" has already been registered in target app.`); } - context.components[name] = component; + context.components[name2] = component; return app; }, - directive(name, directive) { + directive(name2, directive) { { - validateDirectiveName(name); + validateDirectiveName(name2); } if (!directive) { - return context.directives[name]; + return context.directives[name2]; } - if (context.directives[name]) { - warn$1(`Directive "${name}" has already been registered in target app.`); + if (context.directives[name2]) { + warn$1(`Directive "${name2}" has already been registered in target app.`); } - context.directives[name] = directive; + context.directives[name2] = directive; return app; }, // fixed by xxxxxx @@ -4295,7 +4470,7 @@ function inject(key, defaultValue, treatDefaultAsFactory = false) { if (provides && key in provides) { return provides[key]; } else if (arguments.length > 1) { - return treatDefaultAsFactory && isFunction(defaultValue) ? defaultValue.call(instance && instance.proxy) : defaultValue; + return treatDefaultAsFactory && isFunction$1(defaultValue) ? defaultValue.call(instance && instance.proxy) : defaultValue; } else { warn$1(`injection "${String(key)}" not found.`); } @@ -4303,13 +4478,10 @@ function inject(key, defaultValue, treatDefaultAsFactory = false) { warn$1(`inject() can only be used inside setup() or functional components.`); } } -function hasInjectionContext() { - return !!(currentInstance || currentRenderingInstance || currentApp); -} /*! #__NO_SIDE_EFFECTS__ */ // @__NO_SIDE_EFFECTS__ function defineComponent(options, extraOptions) { - return isFunction(options) ? ( + return isFunction$1(options) ? ( // #8326: extend call and options.name access are considered side-effects // by Rollup, so we have to wrap it in a pure-annotated IIFE. /* @__PURE__ */ (() => extend({ name: options.name }, extraOptions, { setup: options }))() @@ -4408,40 +4580,40 @@ const onRenderTracked = createHook$1( function onErrorCaptured(hook, target = currentInstance) { injectHook("ec", hook, target); } -const getPublicInstance = (i) => { - if (!i) +const getPublicInstance = (i2) => { + if (!i2) return null; - if (isStatefulComponent(i)) - return getExposeProxy(i) || i.proxy; - return getPublicInstance(i.parent); + if (isStatefulComponent(i2)) + return getExposeProxy(i2) || i2.proxy; + return getPublicInstance(i2.parent); }; const publicPropertiesMap = ( // Move PURE marker to new line to workaround compiler discarding it // due to type annotation /* @__PURE__ */ extend(/* @__PURE__ */ Object.create(null), { - $: (i) => i, + $: (i2) => i2, // fixed by xxxxxx vue-i18n 在 dev 模式，访问了 $el，故模拟一个假的 // $el: i => i.vnode.el, - $el: (i) => i.__$el || (i.__$el = {}), - $data: (i) => i.data, - $props: (i) => shallowReadonly(i.props), - $attrs: (i) => shallowReadonly(i.attrs), - $slots: (i) => shallowReadonly(i.slots), - $refs: (i) => shallowReadonly(i.refs), - $parent: (i) => getPublicInstance(i.parent), - $root: (i) => getPublicInstance(i.root), - $emit: (i) => i.emit, - $options: (i) => resolveMergedOptions(i), - $forceUpdate: (i) => i.f || (i.f = () => { - i.effect.dirty = true; - queueJob(i.update); + $el: (i2) => i2.__$el || (i2.__$el = {}), + $data: (i2) => i2.data, + $props: (i2) => shallowReadonly(i2.props), + $attrs: (i2) => shallowReadonly(i2.attrs), + $slots: (i2) => shallowReadonly(i2.slots), + $refs: (i2) => shallowReadonly(i2.refs), + $parent: (i2) => getPublicInstance(i2.parent), + $root: (i2) => getPublicInstance(i2.root), + $emit: (i2) => i2.emit, + $options: (i2) => resolveMergedOptions(i2), + $forceUpdate: (i2) => i2.f || (i2.f = () => { + i2.effect.dirty = true; + queueJob(i2.update); }), // $nextTick: i => i.n || (i.n = nextTick.bind(i.proxy!)),// fixed by xxxxxx - $watch: (i) => instanceWatch.bind(i) + $watch: (i2) => instanceWatch.bind(i2) }) ); const isReservedPrefix = (key) => key === "_" || key === "$"; -const hasSetupBinding = (state, key) => state !== EMPTY_OBJ && !state.__isScriptSetup && hasOwn(state, key); +const hasSetupBinding = (state, key) => state !== EMPTY_OBJ && !state.__isScriptSetup && hasOwn$1(state, key); const PublicInstanceProxyHandlers = { get({ _: instance }, key) { const { ctx, setupState, data, props, accessCache, type, appContext } = instance; @@ -4465,17 +4637,17 @@ const PublicInstanceProxyHandlers = { } else if (hasSetupBinding(setupState, key)) { accessCache[key] = 1; return setupState[key]; - } else if (data !== EMPTY_OBJ && hasOwn(data, key)) { + } else if (data !== EMPTY_OBJ && hasOwn$1(data, key)) { accessCache[key] = 2; return data[key]; } else if ( // only cache other properties when instance has declared (thus stable) // props - (normalizedProps = instance.propsOptions[0]) && hasOwn(normalizedProps, key) + (normalizedProps = instance.propsOptions[0]) && hasOwn$1(normalizedProps, key) ) { accessCache[key] = 3; return props[key]; - } else if (ctx !== EMPTY_OBJ && hasOwn(ctx, key)) { + } else if (ctx !== EMPTY_OBJ && hasOwn$1(ctx, key)) { accessCache[key] = 4; return ctx[key]; } else if (shouldCacheAccess) { @@ -4496,20 +4668,20 @@ const PublicInstanceProxyHandlers = { (cssModule = type.__cssModules) && (cssModule = cssModule[key]) ) { return cssModule; - } else if (ctx !== EMPTY_OBJ && hasOwn(ctx, key)) { + } else if (ctx !== EMPTY_OBJ && hasOwn$1(ctx, key)) { accessCache[key] = 4; return ctx[key]; } else if ( // global properties - globalProperties = appContext.config.globalProperties, hasOwn(globalProperties, key) + globalProperties = appContext.config.globalProperties, hasOwn$1(globalProperties, key) ) { { return globalProperties[key]; } - } else if (currentRenderingInstance && (!isString(key) || // #1091 avoid internal isRef/isVNode checks on component instance leading + } else if (currentRenderingInstance && (!isString$1(key) || // #1091 avoid internal isRef/isVNode checks on component instance leading // to infinite warning loop key.indexOf("__v") !== 0)) { - if (data !== EMPTY_OBJ && isReservedPrefix(key[0]) && hasOwn(data, key)) { + if (data !== EMPTY_OBJ && isReservedPrefix(key[0]) && hasOwn$1(data, key)) { warn$1( `Property ${JSON.stringify( key @@ -4527,13 +4699,13 @@ const PublicInstanceProxyHandlers = { if (hasSetupBinding(setupState, key)) { setupState[key] = value; return true; - } else if (setupState.__isScriptSetup && hasOwn(setupState, key)) { + } else if (setupState.__isScriptSetup && hasOwn$1(setupState, key)) { warn$1(`Cannot mutate