From 2b1238d9672d2c2a4ee403d1f7ff89e9cbd06ef9 Mon Sep 17 00:00:00 2001 From: lukaijie Date: Fri, 17 Apr 2026 22:13:14 +0800 Subject: [PATCH] merge(scope): merge --- .../2026-04-09-employee-activity-id-column.md | 15 ++ .../2026-04-09-invoice-tax-category-labels.md | 13 ++ ...-platform-account-related-stores-column.md | 11 + .../2026-04-13-sale-category-transfer-i18n.md | 19 ++ ...026-04-13-self-products-sun-code-center.md | 12 + .cursor/commit-summary/2026-04-13-summary.md | 12 + .../2026-04-14-ECX-8282-8283.md | 13 ++ .cursor/commit-summary/2026-04-15-ECX-8303.md | 16 ++ .../2026-04-15-promotion-vip-level-persist.md | 15 ++ .../2026-04-16-i18n-path-settings-language.md | 14 ++ .../2026-04-16-shopinfo-pluspricebuy.md | 13 ++ .cursor/commit-summary/last-summary.md | 12 + package-lock.json | 2 +- package.json | 2 +- src/api/mail.js | 23 ++ src/api/request/request.js | 6 +- src/api/shop.js | 2 +- src/components/element/imgBox.vue | 2 +- src/components/function/crowdSelectV2.vue | 6 +- src/components/function/distributorSelect.vue | 10 +- src/components/function/goodsSelector.vue | 8 +- src/components/function/mallList.vue | 12 +- src/components/function/skuSelector.vue | 2 +- src/components/function/skuSelectorPrice.vue | 2 +- src/components/function/templatePreview.vue | 4 +- src/components/imageselect/index.vue | 2 +- src/components/img_picker/index.vue | 2 +- src/components/kqhjSelect/index.vue | 10 +- src/components/kqselect/index.vue | 2 +- src/components/messagesender/index.vue | 2 +- src/components/sp-form/index.vue | 5 +- src/components/sp-page-upload/index.vue | 6 +- .../sp-picker/pickers/picker-goodsParams.vue | 8 +- .../sp-picker/pickers/picker-image.vue | 22 +- .../sp-picker/pickers/picker-live.vue | 2 +- .../sp-picker/pickers/picker-regactivity.vue | 2 +- .../sp-picker/pickers/picker-shop.vue | 4 +- .../sp-picker/pickers/picker-video.vue | 62 +++-- src/components/sp-picker/plugin.js | 9 +- src/components/sp-video-picker/index.vue | 2 +- src/components/tagselect/index.vue | 12 +- src/components/template/coupon.vue | 8 +- src/components/template/floorImg-two.vue | 2 +- src/components/template/floorImg.vue | 6 +- src/components/template/goods.vue | 2 +- src/components/template/goods_grid.vue | 4 +- src/components/template/goods_grid_tab.vue | 4 +- src/components/template/goods_scroll.vue | 6 +- src/components/template/img-gif.vue | 2 +- src/components/template/img_hotzone.vue | 2 +- src/components/template/navigation.vue | 2 +- src/components/template/nearby_shop.vue | 4 +- src/components/template/showcase.vue | 6 +- src/components/template/slider.vue | 4 +- src/components/template/store.vue | 6 +- src/components/template_editor/coupon.vue | 4 +- .../template_editor/floorImg-two.vue | 2 +- src/components/template_editor/floorImg.vue | 4 +- src/components/template_editor/goods.vue | 2 +- src/components/template_editor/goods_grid.vue | 2 +- .../template_editor/goods_grid_tab.vue | 2 +- .../template_editor/goods_scroll.vue | 4 +- src/components/template_editor/img-gif.vue | 2 +- .../template_editor/img_hotzone.vue | 2 +- src/components/template_editor/navigation.vue | 4 +- src/components/template_editor/showcase.vue | 4 +- src/components/template_editor/slider.vue | 4 +- src/components/template_editor/store.vue | 6 +- src/components/template_editor/tab_bar.vue | 4 +- .../template_editor/tab_bar_new.vue | 4 +- src/components/timechoose/index.vue | 3 +- src/components/twxxselect/index.vue | 6 +- src/components/uploadGoods/index.vue | 2 +- src/components/videoselect/index.vue | 30 ++- src/components/wbappselect/index.vue | 2 +- src/components/wechatshare/index.vue | 6 +- src/i18n/locales/ar.json | 30 ++- src/i18n/locales/en.json | 30 ++- src/i18n/locales/zh-CN.json | 30 ++- src/layout/basic/components/menu-search.vue | 4 +- src/layout/basic/layout-sidebar.vue | 3 +- src/router/routes/modules/sellers.js | 2 +- src/router/routes/modules/setting.js | 15 ++ src/view/applications/plugin/appDetail.vue | 12 +- src/view/applications/pointmall/add.vue | 16 +- src/view/applications/pointmall/list.vue | 53 ++--- .../applications/pointmall/orderDetail.vue | 6 +- src/view/applications/pointmall/orderList.vue | 60 ++--- src/view/applications/pointmall/setting.vue | 6 +- src/view/auth/components/uploadImg.vue | 2 +- src/view/auth/dealer_login.vue | 2 +- src/view/auth/login.vue | 6 +- src/view/base/account/normalroles.vue | 6 +- src/view/base/account/normalstaff.vue | 4 +- src/view/base/account/roles.vue | 12 +- src/view/base/account/storestaff.vue | 6 +- .../base/app/masterofcoupon/capriciousadd.vue | 3 +- .../base/app/masterofcoupon/giftadddialog.vue | 2 +- src/view/base/app/masterofcoupon/index.vue | 2 +- src/view/base/article/columns.vue | 6 +- src/view/base/article/generalcolumns.vue | 6 +- src/view/base/article/index.vue | 2 +- .../base/asset/accountactivation/index.vue | 4 +- src/view/base/currency/index.vue | 12 +- src/view/base/exportlog/index.vue | 6 +- src/view/base/index.vue | 28 +-- src/view/base/member/rightsList.vue | 18 +- src/view/base/merchant_index.vue | 28 +-- src/view/base/screen/openScreenAD.vue | 2 +- src/view/base/setting/dataAnalysis/youshu.vue | 6 +- .../base/setting/dealer/cpn/bspay_result.vue | 8 +- src/view/base/setting/dealer/cpn/checkBox.vue | 2 +- .../base/setting/dealer/cpn/imageSelect.vue | 16 +- src/view/base/setting/dealer/cpn/result.vue | 8 +- .../base/setting/dealer/upload_picture.vue | 34 ++- src/view/base/setting/mapsetting.vue | 6 +- src/view/base/setting/mapsetting/youshu.vue | 6 +- src/view/base/setting/memberCenter/banner.vue | 6 +- .../base/setting/memberCenter/menuoption.vue | 6 +- .../base/setting/memberCenter/redirect.vue | 6 +- src/view/base/setting/payment/adapay copy.vue | 6 +- src/view/base/setting/payment/alipay.vue | 12 +- src/view/base/setting/payment/chinaumspay.vue | 14 +- src/view/base/setting/payment/ebuypay.vue | 12 +- src/view/base/setting/payment/hfpay.vue | 10 +- src/view/base/setting/payment/pointpay.vue | 6 +- src/view/base/setting/payment/wxpay.vue | 14 +- src/view/base/setting/publicsetting copy.vue | 24 +- src/view/base/setting/sfbsp.vue | 6 +- src/view/base/setting/shopexerp.vue | 6 +- src/view/base/setting/weburlsetting.vue | 6 +- .../base/setting/workwechat/workwechat.vue | 6 +- src/view/base/setting/yilianyun/shop.vue | 18 +- src/view/base/shop/admininfo copy.vue | 6 +- src/view/base/shop/comments.vue | 2 +- src/view/base/shop/editshop.vue | 10 +- src/view/base/shop/wxshop.vue | 28 +-- .../base/shopstaff/salesperson/leaderlist.vue | 6 +- src/view/base/shortmessage/index.vue | 2 +- src/view/base/trade/order/list.vue | 12 +- src/view/base/wxa/index.vue | 14 +- src/view/base/wxa/mendian.vue | 16 +- src/view/base/wxa/promotion.vue | 12 +- .../brand/codegoods/thingsbatchsdetail.vue | 2 +- src/view/brand/codegoods/thingsedit.vue | 2 +- src/view/brand/codegoods/thingslist.vue | 2 +- src/view/brand/wechat/custommenu.vue | 4 +- src/view/brand/wechat/customservice.vue | 4 +- src/view/brand/wechat/fans.vue | 4 +- src/view/brand/wechat/reply.vue | 3 +- src/view/crossborder/crossborderset/info.vue | 4 +- src/view/crossborder/origincountry/list.vue | 2 +- src/view/dealer/account/index.vue | 12 +- src/view/decorate/comps/comp-button.vue | 12 +- src/view/decorate/comps/comp-pickerLink.vue | 6 +- .../decorate/comps/comp_background_outer.vue | 6 +- src/view/decorate/comps/comp_style.vue | 18 +- src/view/decorate/comps/configsetting.js | 2 +- .../decorate/comps/goods-attr/attr-data.vue | 6 +- .../comps/goods-layout/columngoods.vue | 6 +- .../decorate/comps/goods-layout/gridgoods.vue | 9 +- .../decorate/comps/goods-layout/rowgoods.vue | 9 +- src/view/decorate/index.vue | 24 +- src/view/decorate/pc/index.vue | 12 +- .../pc/wgts/wgt_hotzone/attr-hotsetting.vue | 6 +- src/view/decorate/wgts/index.js | 2 +- .../wgts/wgt-page/attr-function-area.vue | 3 +- .../wgts/wgt-page/attr-hotsetting.vue | 9 +- src/view/decorate/wgts/wgt-page/attr-item.vue | 9 +- src/view/decorate/wgts/wgt-page/index.vue | 1 - .../decorate/wgts/wgt_classify/attr_data.vue | 3 +- .../wgt_contentPartition/comp_pickerLink.vue | 3 +- .../wgts/wgt_contentPartition/index.vue | 6 +- .../wgts/wgt_contentPartition/nav-item.vue | 3 +- .../decorate/wgts/wgt_coupon/attr-data.vue | 13 +- src/view/decorate/wgts/wgt_coupon/index.vue | 11 +- .../wgts/wgt_floorImg/attr-imgList.vue | 4 +- .../wgts/wgt_fullSlider/attr-item.vue | 12 +- .../decorate/wgts/wgt_fullSlider/index.vue | 2 +- .../wgts/wgt_fullSlider/sliderDialog.vue | 5 +- .../wgts/wgt_goods/comps/goodsgoods.vue | 7 +- .../wgts/wgt_goodsCard/attr-goods.vue | 4 +- .../decorate/wgts/wgt_goodsCard/index.vue | 4 +- .../wgts/wgt_goodsGrid/attr-goods.vue | 3 +- .../decorate/wgts/wgt_goodsGrid/index.vue | 6 +- .../wgts/wgt_goodsGridTab/attr-class.vue | 6 +- .../decorate/wgts/wgt_goodsGridTab/index.vue | 7 +- .../wgts/wgt_goodsScroll/attr-goods.vue | 3 +- .../decorate/wgts/wgt_goodsScroll/index.vue | 5 +- .../wgts/wgt_group/comps/groupgoods.vue | 7 +- src/view/decorate/wgts/wgt_heading/config.js | 8 +- .../wgt_hotranking/comps/hotrankinggoods.vue | 4 +- .../wgts/wgt_hotzone/attr-hotsetting.vue | 5 +- .../wgt_locationModule/comp_pickerLink.vue | 3 +- .../wgts/wgt_locationModule/index.vue | 6 +- .../wgts/wgt_locationModule/nav-item.vue | 3 +- .../wgts/wgt_marquees/attr_horizontal.vue | 4 +- .../wgts/wgt_nearbyShop/attr-category.vue | 3 +- .../decorate/wgts/wgt_nearbyShop/config.js | 7 +- .../decorate/wgts/wgt_nearbyShop/index.vue | 3 +- .../wgts/wgt_nearbyShop/product-label.vue | 3 +- .../wgts/wgt_ranking/comps/rankinggoods.vue | 10 +- src/view/decorate/wgts/wgt_search/config.js | 7 +- .../decorate/wgts/wgt_shop/attr-goods.vue | 4 +- .../decorate/wgts/wgt_shop/attr-label.vue | 4 +- .../decorate/wgts/wgt_shop/attr-store.vue | 4 +- src/view/decorate/wgts/wgt_shop/index.vue | 6 +- .../decorate/wgts/wgt_slider/attr-item.vue | 84 +++++-- src/view/decorate/wgts/wgt_slider/config.js | 3 +- src/view/decorate/wgts/wgt_slider/index.vue | 102 +++++--- .../decorate/wgts/wgt_slider/sliderDialog.vue | 58 +++-- .../wgts/wgt_speedkill/comps/seckillgoods.vue | 10 +- .../wgts/wgt_store-alphabet/attr-store.vue | 4 +- .../wgts/wgt_store-alphabet/index.vue | 3 +- .../decorate/wgts/wgt_store/attr-goods.vue | 4 +- .../decorate/wgts/wgt_store/attr-label.vue | 4 +- .../decorate/wgts/wgt_store/attr-store.vue | 4 +- src/view/decorate/wgts/wgt_store/index.vue | 5 +- src/view/financial/invoice/information.vue | 5 +- src/view/financial/invoice/invoiceTax.vue | 5 +- src/view/forget.vue | 4 +- src/view/goods/arrivalNotice.vue | 6 +- src/view/goods/components/SkuParams.vue | 12 +- src/view/goods/rate.vue | 6 +- src/view/goods/saleCategory.vue | 17 +- src/view/guide/children.vue | 24 +- src/view/guide/salesman.vue | 18 +- src/view/guide/shopActivities_editor.vue | 6 +- src/view/guide/shopactivities.vue | 16 +- src/view/guide/shopnoticetempl.vue | 6 +- src/view/guide/shoppingGuideTask_editor.vue | 8 +- src/view/gyslogin.vue | 2 +- src/view/layout.vue | 16 +- src/view/mall/accountopeninfo/index.vue | 2 +- src/view/mall/aftersales/detail.vue | 2 +- src/view/mall/aftersales/list.vue | 2 +- .../refundList/components/order.vue | 6 +- src/view/mall/community/communitygoods.vue | 6 +- .../mall/datacube/accountingstatistics.vue | 6 +- src/view/mall/datacube/cashrecord.vue | 12 +- src/view/mall/datacube/companydata/order.vue | 24 +- src/view/mall/fapiao/set.vue | 12 +- src/view/mall/goods/attributes/attributes.vue | 14 +- src/view/mall/goods/attributes/params.vue | 4 +- .../mall/goods/audit/comps/CmBaseForm.vue | 6 +- src/view/mall/goods/audit/comps/CmSkuForm.vue | 12 +- .../goods/audit/comps/goodsSelect/index.vue | 6 +- src/view/mall/goods/audit/list.vue | 12 +- src/view/mall/goods/category.vue | 8 +- src/view/mall/goods/hotkeywords.vue | 2 +- src/view/mall/goods/maincategory.vue | 18 +- .../mall/goods/physical/list.standard.vue | 16 +- src/view/mall/goods/physical/list.vue | 41 +++- .../goods/physical/supplier_goods_check.vue | 7 +- .../goods/physical/supplier_goods_list.vue | 7 +- src/view/mall/goods/service/items/add.vue | 2 +- src/view/mall/liveroom/list.vue | 4 +- .../mall/marketing/component/AddShipModal.vue | 12 +- .../mall/marketing/component/BaseModal.vue | 4 +- src/view/mall/marketing/dealer/detail.vue | 8 +- .../mall/marketing/dealer_accountopen.vue | 4 +- src/view/mall/marketing/distributor.vue | 22 +- src/view/mall/marketing/distributorCode.vue | 2 +- .../mall/marketing/distributor_details.vue | 8 +- .../components/ImageForm.vue | 4 +- .../mall/marketing/huifuBspay/approve.vue | 4 +- src/view/mall/marketing/huifuBspay/index.vue | 8 +- .../mall/marketing/merchantList/editor.vue | 10 +- .../mall/marketing/merchantVerify/index.vue | 4 +- .../marketing/openingapproval/approve.vue | 4 +- .../mall/marketing/openingapproval/index.vue | 8 +- src/view/mall/marketing/shops/edit.vue | 4 +- .../marketing/transactionStatistics/index.vue | 4 +- .../pointsmallgoods/attributes/attributes.vue | 4 +- .../mall/pointsmallgoods/attributes/brand.vue | 2 +- src/view/mall/pointsmalltrade/list.vue | 2 +- .../pointsmalltrade/normalorders/shopList.vue | 42 ++-- src/view/mall/pointsmalltrade/rate/list.vue | 6 +- .../mall/pointsmalltrade/shipping/add.vue | 2 +- .../pointsmalltrade/shipping/templates.vue | 6 +- .../mall/reservation/resourcesetting/add.vue | 2 +- .../mall/reservation/resourcesetting/list.vue | 2 +- .../resourcesetting/reservation.vue | 8 +- src/view/mall/reservation/setting/index.vue | 2 +- src/view/mall/splitbill/applytype/corp.vue | 14 +- src/view/mall/splitbill/applytype/solo.vue | 6 +- src/view/mall/storeddeposit/storedvalue.vue | 6 +- src/view/mall/subdistrict/list.vue | 12 +- src/view/mall/supplier/supplier_list.vue | 7 +- src/view/mall/supplier/supplier_orders.vue | 15 +- src/view/mall/trade/examineTransfer.vue | 9 +- src/view/mall/trade/list.vue | 2 +- .../components/ListDeliveryDialog.vue | 6 +- src/view/mall/trade/normalorders/drugList.vue | 6 +- .../mall/trade/normalorders/list.supplier.vue | 6 +- src/view/mall/trade/normalorders/list.vue | 24 +- src/view/mall/trade/normalorders/prepList.vue | 24 +- src/view/mall/trade/normalorders/shopList.vue | 54 ++--- src/view/mall/trade/order/afterSale.vue | 3 +- .../trade/order/detail/component/GoodCard.vue | 2 +- src/view/mall/trade/shipping/add.vue | 2 +- .../shipping/templates/buyerTemplates.vue | 12 +- .../shipping/templates/numberTemplates.vue | 12 +- .../shipping/templates/priceTemplates.vue | 12 +- .../shipping/templates/volumeTemplates.vue | 12 +- .../shipping/templates/weightTemplates.vue | 12 +- src/view/mall/withdraw/withdraw_setting.vue | 6 +- src/view/marketing/employee/result.vue | 12 +- src/view/marketing/lottery/list.vue | 6 +- src/view/member/bargain/add.vue | 8 +- src/view/member/bargain/index.vue | 4 +- src/view/member/cardticket/coupon.vue | 8 +- src/view/member/cardticket/coupon/gift.vue | 38 ++- .../member/cardticket/coupon/giftEdit.vue | 5 +- src/view/member/cardticket/edit.vue | 38 ++- src/view/member/cardticket/info.vue | 23 +- src/view/member/comps/cpViplevel.vue | 2 +- src/view/member/coupon/giveLog.vue | 6 +- src/view/member/groups/add.vue | 4 +- src/view/member/membercard/setting.vue | 12 +- src/view/member/members/comps/CompAddTag.vue | 27 +-- src/view/member/members/comps/CompTagList.vue | 22 +- src/view/member/members/detail.vue | 10 +- src/view/member/members/enterprise.vue | 6 +- src/view/member/members/orderlist.vue | 18 +- src/view/member/members/quanyilist.vue | 12 +- src/view/member/members/rightsList.vue | 18 +- src/view/member/members/tags.vue | 146 ++++++------ .../promotions/community/activity/add.vue | 8 +- .../promotions/community/activity/list.vue | 8 +- .../community/activity/orderList.vue | 8 +- src/view/member/promotions/community/add.vue | 12 +- .../promotions/community/deliverydetail.vue | 2 +- .../member/promotions/distributorEdit.vue | 2 +- .../member/promotions/distributorIndex.vue | 3 +- .../member/promotions/extrapoint/list.vue | 2 +- .../member/promotions/fulldiscount/list.vue | 2 +- src/view/member/promotions/fullgift/list.vue | 2 +- src/view/member/promotions/fullminus/list.vue | 2 +- src/view/member/promotions/goodslimit/add.vue | 25 +- .../luckydraw/list/luckyDrawList.vue | 6 +- .../promotions/luckydraw/luckydrawrule.vue | 2 +- .../promotions/luckydraw/luckydrawshow.vue | 8 +- .../member/promotions/pluspricebuy/add.vue | 27 ++- .../member/promotions/pluspricebuy/list.vue | 42 ++-- .../promotions/pointupvaluation/list.vue | 2 +- .../member/promotions/purchase/detail.vue | 2 +- src/view/member/promotions/register.vue | 112 ++++----- src/view/member/promotions/saleMemberCard.vue | 2 +- src/view/member/promotions/seckill/list.vue | 2 +- src/view/member/promotions/wheel/index.vue | 2 +- src/view/member/purchase/company.vue | 6 +- .../member/selfservice/formsettingadd.vue | 12 +- .../member/selfservice/formsettinglist.vue | 2 +- .../member/selfservice/formtemplateadd.vue | 12 +- .../member/selfservice/formtemplatelist.vue | 2 +- .../selfservice/registrationactivityadd.vue | 8 +- .../member/selfservice/registrationrecord.vue | 14 +- .../selfservice/registrationrecordetail.vue | 18 +- .../member/selfservice/templatepreview.vue | 6 +- .../member/selfservice/userdaliyrecord.vue | 12 +- src/view/member/trustlogin/list.vue | 18 +- src/view/member/ugc/comps/flagModal.vue | 12 +- src/view/member/ugc/comps/flaglist.vue | 12 +- src/view/member/ugc/comps/noteslist.vue | 2 +- src/view/member/ugc/comps/reviewlist.vue | 8 +- src/view/member/ugc/comps/sensitivelist.vue | 12 +- src/view/member/ugc/comps/taglist.vue | 2 +- src/view/member/ugc/comps/topicModal.vue | 12 +- src/view/member/ugc/comps/topiclist.vue | 2 +- src/view/member/ugc/comps/viewNotes.vue | 16 +- src/view/member/ugc/ugcIndex.vue | 12 +- src/view/member/ugc/ugcNotesEditor.vue | 6 +- src/view/member/ugc/ugcTopic.vue | 12 +- src/view/member/whitelist/list.purchase.vue | 18 +- src/view/member/whitelist/list.vue | 24 +- src/view/menus/distributormenu.vue | 60 ++--- src/view/menus/merchantmenu.vue | 60 ++--- src/view/menus/shopmenu.vue | 60 ++--- src/view/menus/supplier.vue | 60 ++--- src/view/merchant/store.vue | 11 +- src/view/merchantlogin.vue | 2 +- src/view/notExistAuth.vue | 2 +- src/view/order/entitytrade/list.vue | 12 +- src/view/order/tradeSetting.vue | 6 +- src/view/pc/custompage.vue | 6 +- .../custompage/components/common/YButton.vue | 2 +- .../components/plugins/banner/index.vue | 2 +- .../components/plugins/floor/index.vue | 6 +- .../components/plugins/floor/style.vue | 6 +- .../components/plugins/goodsGrid/index.vue | 2 +- .../components/plugins/imgHotzone/index.vue | 2 +- .../components/plugins/imgHotzone/style.vue | 2 +- .../components/plugins/panel/index.vue | 2 +- src/view/pc/custompage/default.vue | 6 +- .../pluginscomponents/ProductMap.vue | 2 +- .../pc/homePage/components/common/YButton.vue | 2 +- .../components/plugins/banner/index.vue | 4 +- .../components/plugins/floor/index.vue | 6 +- .../components/plugins/floor/style.vue | 8 +- .../components/plugins/goodsGrid/index.vue | 2 +- .../components/plugins/imgHotzone/index.vue | 2 +- .../components/plugins/imgHotzone/style.vue | 2 +- .../components/plugins/panel/index.vue | 2 +- src/view/pc/homePage/default.vue | 6 +- .../homePage/pluginscomponents/ProductMap.vue | 2 +- src/view/pc/pctemplate/index.vue | 12 +- src/view/pc/pctemplate/login.vue | 6 +- src/view/pc/tdk/givenset.vue | 6 +- src/view/pc/tdk/globalset.vue | 6 +- .../components/plugins/poster/index.vue | 2 +- src/view/pc/vipPage/default.vue | 6 +- src/view/popularize/brokerageLog.vue | 6 +- src/view/popularize/children.vue | 24 +- src/view/popularize/data.vue | 3 +- src/view/popularize/promoterSetting.vue | 2 +- src/view/popularize/setting.vue | 8 +- src/view/popularize/taskBrokerage.vue | 18 +- src/view/popularize/taskBrokerageCount.vue | 6 +- src/view/popularize/withdraw.vue | 30 +-- src/view/regionauth/list.vue | 3 +- src/view/shop/editstore.vue | 10 +- src/view/shop/goods/companygoods.vue | 6 +- src/view/shop/storelist.vue | 18 +- src/view/shoplist.vue | 2 +- src/view/shoplogin.vue | 2 +- src/view/shopscreen/bigScreenAd.vue | 4 +- src/view/shopscreen/category.vue | 18 +- src/view/shopscreen/homeCarousel.vue | 2 +- src/view/wxapp/aliapp/authorize/index.vue | 4 +- src/view/wxapp/aliapp/category.vue | 18 +- src/view/wxapp/aliapp/color_style.vue | 2 +- src/view/wxapp/aliapp/custompage.vue | 2 +- src/view/wxapp/aliapp/floor_guide.vue | 4 +- src/view/wxapp/aliapp/index.vue | 22 +- .../sourcemanagement/monito_detail.vue | 2 +- src/view/wxapp/aliapp/template.vue | 14 +- .../wxapp/aliapp/template/apple/default.vue | 4 +- .../wxapp/aliapp/template/mall/baDefault.vue | 4 +- .../wxapp/aliapp/template/store/default.vue | 18 +- .../wxapp/aliapp/template/store/sport.vue | 22 +- .../wxapp/aliapp/template/store/universal.vue | 36 ++- src/view/wxapp/aliminiapp/setting.vue | 6 +- src/view/wxapp/authorize/index.vue | 14 +- src/view/wxapp/authorize/policy.vue | 14 +- src/view/wxapp/cartremind.vue | 6 +- src/view/wxapp/category/addCartas.vue | 10 +- src/view/wxapp/category/index.vue | 16 +- .../wxapp/classificationTemplate/index.vue | 4 +- src/view/wxapp/customPage/index.vue | 4 +- src/view/wxapp/floor_guide.vue | 4 +- src/view/wxapp/home/index.vue | 6 +- src/view/wxapp/index.vue | 18 +- .../wxapp/memberCenter/comps/menuoption.vue | 6 +- src/view/wxapp/messages.vue | 6 +- src/view/wxapp/shopInfo/index.vue | 40 +--- .../sourcemanagement/monito_detail.vue | 8 +- .../sourcemanagement/monito_list.vue | 12 +- src/view/wxapp/template.vue | 14 +- src/view/wxapp/template/apple/default.vue | 10 +- src/view/wxapp/template/mall/baDefault.vue | 10 +- src/view/wxapp/template/store/default.vue | 30 ++- src/view/wxapp/template/store/sport.vue | 22 +- src/view/wxapp/template/store/universal.vue | 36 ++- src/view/wxapp/theme/colorStyle.vue | 8 +- src/view/wxapp/wxappmanage/list.vue | 14 +- src/view/wxapp/wxappmanage/policy.vue | 14 +- src/views/applications/kujiale/list.vue | 6 +- src/views/core/account-activation.vue | 4 +- src/views/core/authentication/login.vue | 2 +- .../core/authentication/merchant-login.vue | 2 +- src/views/core/authentication/shop-login.vue | 2 +- .../core/authentication/supplier-login.vue | 2 +- src/views/marketing/autoMarketing/_id.vue | 6 +- .../components/activity-daterange.vue | 6 +- .../components/gift-coupon-list.vue | 12 +- src/views/members/components/CompTagList.vue | 6 +- .../members/config/member_list_schema.js | 9 + src/views/members/crowd_marking_editor.vue | 40 ++-- src/views/members/member_list.vue | 80 +++---- src/views/members/register_member.vue | 6 +- .../deliverySettings/logistics-inquiry.vue | 18 +- .../logistics/component/logisticsBlock.vue | 2 +- .../logistics/comps/form-item-appointdays.vue | 12 +- .../logistics/comps/form-item-timeslot.vue | 6 +- .../settings/systemConfig/ShangPai-erp.vue | 25 +- .../component/PersonInfo.vue | 6 +- src/views/settings/systemConfig/domain.vue | 6 +- .../systemConfig/encrypt/authAdmin.vue | 6 +- .../systemConfig/extMiniLinkDetail.vue | 12 +- .../settings/systemConfig/external-app.vue | 52 ++++- .../settings/systemConfig/jstSetting.vue | 6 +- .../systemConfig/mailServiceSetting.vue | 217 ++++++++++++++++++ src/views/settings/systemConfig/payment.vue | 4 +- .../systemConfig/smsService/base_config.vue | 6 +- .../systemConfig/smsService/shopex_sms.vue | 39 ++-- .../smsService/sms_MassLog_edit.vue | 12 +- .../smsService/sms_signatures_edit.vue | 6 +- .../smsService/sms_template_edit.vue | 6 +- .../settings/systemConfig/wdtSetting.vue | 6 +- .../systemConfig/webPrivacyStatement.vue | 6 +- .../systemConfig/wxapp-customer-service.vue | 4 +- src/views/store/store-category.vue | 4 +- 503 files changed, 2706 insertions(+), 2760 deletions(-) create mode 100644 .cursor/commit-summary/2026-04-09-employee-activity-id-column.md create mode 100644 .cursor/commit-summary/2026-04-09-invoice-tax-category-labels.md create mode 100644 .cursor/commit-summary/2026-04-09-platform-account-related-stores-column.md create mode 100644 .cursor/commit-summary/2026-04-13-sale-category-transfer-i18n.md create mode 100644 .cursor/commit-summary/2026-04-13-self-products-sun-code-center.md create mode 100644 .cursor/commit-summary/2026-04-13-summary.md create mode 100644 .cursor/commit-summary/2026-04-14-ECX-8282-8283.md create mode 100644 .cursor/commit-summary/2026-04-15-ECX-8303.md create mode 100644 .cursor/commit-summary/2026-04-15-promotion-vip-level-persist.md create mode 100644 .cursor/commit-summary/2026-04-16-i18n-path-settings-language.md create mode 100644 .cursor/commit-summary/2026-04-16-shopinfo-pluspricebuy.md create mode 100644 .cursor/commit-summary/last-summary.md create mode 100644 src/api/mail.js create mode 100644 src/views/settings/systemConfig/mailServiceSetting.vue diff --git a/.cursor/commit-summary/2026-04-09-employee-activity-id-column.md b/.cursor/commit-summary/2026-04-09-employee-activity-id-column.md new file mode 100644 index 0000000..5e4abe7 --- /dev/null +++ b/.cursor/commit-summary/2026-04-09-employee-activity-id-column.md @@ -0,0 +1,15 @@ +## 本次变更总结 + +**时间**: 2026-04-09 + +**涉及文件**: +- `src/view/marketing/employee/list.vue` (修改) +- `src/i18n/locales/zh-CN.json` (修改) +- `src/i18n/locales/en.json` (修改) +- `src/i18n/locales/ar.json` (修改) + +**主要改动**: +- 企业购活动管理列表（`/employeepurchase/activities`）表格首列增加「活动ID」，绑定字段 `id`。 +- 新增 i18n 键 `bea3f44a.7a9e2d`（中/英/阿）。 + +**一句话概括**: feat(企业购): 活动管理列表展示活动ID diff --git a/.cursor/commit-summary/2026-04-09-invoice-tax-category-labels.md b/.cursor/commit-summary/2026-04-09-invoice-tax-category-labels.md new file mode 100644 index 0000000..63cd150 --- /dev/null +++ b/.cursor/commit-summary/2026-04-09-invoice-tax-category-labels.md @@ -0,0 +1,13 @@ +## 本次变更总结 + +**时间**: 2026-04-09 + +**涉及文件**: +- `src/i18n/locales/zh-CN.json` (修改) +- `src/i18n/locales/en.json` (修改) +- `src/i18n/locales/ar.json` (修改) + +**主要改动**: +- 开票税率列表新增/编辑弹窗中「税率配置」单选项文案：`7350de2d.1a7503` / `7350de2d.9f7160` 调整为「全部管理分类」「指定管理分类」，并同步 en/ar。 + +**一句话概括**: i18n(财务开票税率): 税率配置选项改为全部/指定管理分类 diff --git a/.cursor/commit-summary/2026-04-09-platform-account-related-stores-column.md b/.cursor/commit-summary/2026-04-09-platform-account-related-stores-column.md new file mode 100644 index 0000000..0c2b9a6 --- /dev/null +++ b/.cursor/commit-summary/2026-04-09-platform-account-related-stores-column.md @@ -0,0 +1,11 @@ +## Change summary + +**Date**: 2026-04-09 + +**Files**: +- `src/view/base/account/normalstaff.vue` (modified) + +**What changed**: +- Platform account list (`/setting/system-account/platform-account`) now includes a **Related stores** column (i18n key `f3a67ede.5c16c5`), showing `distributor_ids` as tags; shows an em dash when empty. + +**One-line summary (commit title)**: feat(settings): show related stores on platform account list diff --git a/.cursor/commit-summary/2026-04-13-sale-category-transfer-i18n.md b/.cursor/commit-summary/2026-04-13-sale-category-transfer-i18n.md new file mode 100644 index 0000000..ada7b99 --- /dev/null +++ b/.cursor/commit-summary/2026-04-13-sale-category-transfer-i18n.md @@ -0,0 +1,19 @@ +## 本次变更总结 + +**时间**: 2026-04-13 + +**涉及文件**: +- `src/components/sp-form/index.vue` (修改) +- `src/i18n/locales/zh-CN.json` (修改) +- `src/i18n/locales/en.json` (修改) +- `src/i18n/locales/ar.json` (修改) +- `src/view/goods/saleCategory.vue` (修改) +- `src/view/mall/trade/examineTransfer.vue` (修改) + +**主要改动**: +- **销售分类**：「投放」生成小程序码/复制链接时，页面路径由 `pages/item/list` 改为 `subpages/item/list`。 +- **国际化**：键 `0e7dabe2.63cd0e`（销售分类页总开关旁文案）由「前端是否展示」改为「店铺分类展示与查询」，并同步 en、ar。 +- **SpForm**：`el-form-item` 的 `style` 支持与 `item.style` 对象合并，便于单项自定义样式。 +- **转账审核弹窗**：收款银行名称 / 收款银行账号 / 收款银联号三行去掉 `display: 'inline'`，改为默认块级纵向排布。 + +**一句话概括**: feat: 销售分类投放路径与开关文案，SpForm 支持 item.style diff --git a/.cursor/commit-summary/2026-04-13-self-products-sun-code-center.md b/.cursor/commit-summary/2026-04-13-self-products-sun-code-center.md new file mode 100644 index 0000000..c788fc9 --- /dev/null +++ b/.cursor/commit-summary/2026-04-13-self-products-sun-code-center.md @@ -0,0 +1,12 @@ +## 本次变更总结 + +**时间**: 2026-04-13 + +**涉及文件**: +- `src/view/mall/goods/physical/list.vue` (修改) + +**主要改动**: +- **自营商品列表**（路由 `product-manage/self-products`）：太阳码弹窗 `el-dialog` 增加 `custom-class="goods-self-products-sun-code-dialog"`。 +- 在该类下为 `.page-code`、`.page-code-img`、`.page-btns` 增加 flex 布局与间距，使二维码与「下载码 / 复制链接」按钮在弹窗内水平居中、排列一致。 + +**一句话概括**: style: 自营商品列表太阳码弹窗二维码与按钮居中 diff --git a/.cursor/commit-summary/2026-04-13-summary.md b/.cursor/commit-summary/2026-04-13-summary.md new file mode 100644 index 0000000..8c28116 --- /dev/null +++ b/.cursor/commit-summary/2026-04-13-summary.md @@ -0,0 +1,12 @@ +## 本次变更总结 + +**时间**: 2026-04-13 + +**涉及文件**: +- `src/view/base/account/normalstaff.vue` (修改) + +**主要改动**: +- 普通员工列表表格：当 `VERSION_PLATFORM()` 为真（平台版）时，通过 `v-if="!VERSION_PLATFORM()"` 隐藏「关联分销商」列，避免平台场景展示不适用的列。 +- 「角色」列增加 `min-width="180"`，避免多角色标签时列过窄。 + +**一句话概括**: fix: 平台版员工列表隐藏关联分销商列并优化角色列宽度 diff --git a/.cursor/commit-summary/2026-04-14-ECX-8282-8283.md b/.cursor/commit-summary/2026-04-14-ECX-8282-8283.md new file mode 100644 index 0000000..b234f94 --- /dev/null +++ b/.cursor/commit-summary/2026-04-14-ECX-8282-8283.md @@ -0,0 +1,13 @@ +## 本次变更总结 + +**时间**: 2026-04-14 + +**涉及文件**: +- `src/view/member/selfservice/registrationrecord.vue` (修改) +- `src/view/member/cardticket/coupon/gift.vue` (修改) + +**主要改动**: +- **ECX-8283 报名记录**：导出改为调用 `getParams()`，与列表接口使用相同的 `start_time`/`end_time` 与 `status` 处理，避免筛选条数与导出不一致；结束时间改为当日 `23:59:59`，支持起止同一天且覆盖完整申请日；筛选项文案改为与列表「申请时间」一致的 i18n key；移除无效的 `currentPage` 赋值。 +- **ECX-8282 兑换券**：VIP 可领等级勾选使用 `lv_type` 作为 checkbox 的 key/label（与接口及其它营销页一致），修复黑钻等 VIP 等级保存后不回显；详情初始化时解析 `grade_ids`/`vip_grade_ids` 的 JSON 字符串并规范化类型；`mounted` 中先并行拉取会员与 VIP 等级列表再 `init`；初始化后同步 `params`。 + +**一句话概括**: fix: 报名记录导出与筛选一致、兑换券 VIP 等级按 lv_type 回显（ECX-8283/8282） diff --git a/.cursor/commit-summary/2026-04-15-ECX-8303.md b/.cursor/commit-summary/2026-04-15-ECX-8303.md new file mode 100644 index 0000000..4136cf3 --- /dev/null +++ b/.cursor/commit-summary/2026-04-15-ECX-8303.md @@ -0,0 +1,16 @@ +## 本次变更总结 + +**时间**: 2026-04-15 + +**涉及文件**: +- `src/view/applications/pointmall/add.vue` (修改) +- `src/i18n/locales/zh-CN.json` (修改) +- `src/i18n/locales/en.json` (修改) +- `src/i18n/locales/ar.json` (修改) + +**主要改动**: +- 积分商品新增/编辑页修正库存、重量、体积字段标签与单位对应关系，避免字段文案错位。 +- 修正积分商品模块 i18n 文案映射：将成本价与市场价 key 对应到正确字段。 +- 同步更新中英文与阿拉伯语文案，确保三端显示一致。 + +**一句话概括**: fix: 修正积分商品库存重量体积与价格文案映射 diff --git a/.cursor/commit-summary/2026-04-15-promotion-vip-level-persist.md b/.cursor/commit-summary/2026-04-15-promotion-vip-level-persist.md new file mode 100644 index 0000000..af12609 --- /dev/null +++ b/.cursor/commit-summary/2026-04-15-promotion-vip-level-persist.md @@ -0,0 +1,15 @@ +## 本次变更总结 + +**时间**: 2026-04-15 + +**涉及文件**: +- `src/view/member/promotions/goodslimit/add.vue` (修改) +- `src/view/member/promotions/pluspricebuy/add.vue` (修改) +- `src/view/member/promotions/pluspricebuy/list.vue` (修改) + +**主要改动**: +- 修复限购、加价购活动中会员等级勾选保存后回显不生效：统一复选框值类型，并在提交/回显时做类型归一化。 +- 修复加价购活动列表默认“全部商品类型”传参导致列表为空：`item_type=0` 时不作为过滤条件提交。 +- 修复加价购列表页 `tabList` 在 `data` 与 `computed` 重复定义造成的 Vue 警告。 + +**一句话概括**: fix: 修复加价购与限购会员等级回显及列表展示 diff --git a/.cursor/commit-summary/2026-04-16-i18n-path-settings-language.md b/.cursor/commit-summary/2026-04-16-i18n-path-settings-language.md new file mode 100644 index 0000000..c77a414 --- /dev/null +++ b/.cursor/commit-summary/2026-04-16-i18n-path-settings-language.md @@ -0,0 +1,14 @@ +## 本次变更总结 + +**时间**: 2026-04-16 + +**涉及文件**: +- `src/i18n/locales/zh-CN.json` (修改) +- `src/i18n/locales/en.json` (修改) +- `src/i18n/locales/ar.json` (修改) + +**主要改动**: +- **`223cc8af.e366cc`**（如 `picker-link` 中 settings 类链接展示名）：由「设置」改为 **「切换语言」**；英文为 *Switch language*，阿语为 *تبديل اللغة*。 +- **`d81d8932.4f2c29`**（路径选择器 SpPicker 默认标题）：由「切换语言」恢复为 **「设置路径」**；英文 *Set path*，阿语恢复为 تعيين المسار。 + +**一句话概括**: i18n: 路径弹窗标题恢复为设置路径；链接项 223cc8af 改为切换语言 diff --git a/.cursor/commit-summary/2026-04-16-shopinfo-pluspricebuy.md b/.cursor/commit-summary/2026-04-16-shopinfo-pluspricebuy.md new file mode 100644 index 0000000..86c06f5 --- /dev/null +++ b/.cursor/commit-summary/2026-04-16-shopinfo-pluspricebuy.md @@ -0,0 +1,13 @@ +## 本次变更总结 + +**时间**: 2026-04-16 + +**涉及文件**: +- `src/view/wxapp/shopInfo/index.vue` (修改) +- `src/view/member/promotions/pluspricebuy/list.vue` (修改) + +**主要改动**: +- **商城信息**：去掉「登录页背景图」表单项及相关数据与保存字段；`handleImgChange` 仅处理门店 LOGO；移除未使用的 `uploadMaterial` 引用。 +- **加价购列表**：待开始状态下编辑/删除图标包在 `pluspricebuy-waiting-actions` 内；为 `.operating-icons` 增加 `flex` + `nowrap` + `white-space: nowrap`，避免操作列换行；图标区增加内边距与字号便于点击（用户后续可自行去掉 `gap`，以 margin 等方式控距）。 + +**一句话概括**: feat: 商城信息移除登录页背景配置；加价购待开始操作列单行展示并优化图标区 diff --git a/.cursor/commit-summary/last-summary.md b/.cursor/commit-summary/last-summary.md new file mode 100644 index 0000000..844e7c3 --- /dev/null +++ b/.cursor/commit-summary/last-summary.md @@ -0,0 +1,12 @@ +## 本次变更总结 + +**时间**: 2026-04-16 + +**涉及文件**: +- `src/i18n/locales/zh-CN.json`、`en.json`、`ar.json` + +**主要改动**: +- `223cc8af.e366cc` → 切换语言（及 en/ar 对应译文）。 +- `d81d8932.4f2c29` → 设置路径（路径选择器标题，三语与语义对齐）。 + +**一句话概括**: i18n: 路径弹窗标题恢复为设置路径；链接项 223cc8af 改为切换语言 diff --git a/package-lock.json b/package-lock.json index ee133a9..a64d94a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49267,4 +49267,4 @@ } } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index a5b97e8..b0e60d4 100755 --- a/package.json +++ b/package.json @@ -139,4 +139,4 @@ "jugglingdb-nano": "0.0.1", "global": "2.0.1" } -} +} \ No newline at end of file diff --git a/src/api/mail.js b/src/api/mail.js new file mode 100644 index 0000000..dfadfc3 --- /dev/null +++ b/src/api/mail.js @@ -0,0 +1,23 @@ +/** + * Copyright © ShopeX （http://www.shopex.cn）. All rights reserved. + * See LICENSE file for license details. + */ +import { fetch } from './request' + +/** 店铺端：读取本企业 SMTP 配置（GET .../mail/setting） */ +export function getMailSetting(query) { + return fetch({ + url: '/mail/setting', + method: 'get', + params: query + }) +} + +/** 店铺端：保存本企业 SMTP 配置（POST .../mail/setting） */ +export function saveMailSetting(params) { + return fetch({ + url: '/mail/setting', + method: 'post', + params + }) +} diff --git a/src/api/request/request.js b/src/api/request/request.js index 563cecb..842c5fd 100755 --- a/src/api/request/request.js +++ b/src/api/request/request.js @@ -63,7 +63,11 @@ class RequestClient { const countryCode = langMap[lang] if (config.data) { if (typeof config.data === 'string') { - config.data = config.data + (config.data ? '&' : '') + 'country_code=' + encodeURIComponent(countryCode) + config.data = + config.data + + (config.data ? '&' : '') + + 'country_code=' + + encodeURIComponent(countryCode) } else { config.data.country_code = countryCode } diff --git a/src/api/shop.js b/src/api/shop.js index f67bfb4..c87fbe2 100755 --- a/src/api/shop.js +++ b/src/api/shop.js @@ -254,7 +254,7 @@ export function putRulesInfo(query) { method: 'put', params: query, headers: { - 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' + 'Content-Type': 'application/json' } }) } diff --git a/src/components/element/imgBox.vue b/src/components/element/imgBox.vue index 7db50ed..35fd540 100755 --- a/src/components/element/imgBox.vue +++ b/src/components/element/imgBox.vue @@ -13,7 +13,7 @@ :class="{ 'border-dashed': border === 'dashed', 'border-none': border === 'none' }" :style="{ width: width + 'px', height: height + 'px' }" > - +
diff --git a/src/components/function/crowdSelectV2.vue b/src/components/function/crowdSelectV2.vue index 117b880..4234e02 100644 --- a/src/components/function/crowdSelectV2.vue +++ b/src/components/function/crowdSelectV2.vue @@ -7,10 +7,8 @@ @change="handleTypeChange" > -{{ - item.name - }} - + {{ item.name }} +
{{ $t('f15fc38a.aa7527') }} - {{ $t('f15fc38a.38ee33') }} - {{ $t('f15fc38a.90d8ec') }} + {{ + $t('f15fc38a.38ee33') + }} + {{ + $t('f15fc38a.90d8ec') + }} diff --git a/src/components/function/goodsSelector.vue b/src/components/function/goodsSelector.vue index 53e7108..47c4fcf 100755 --- a/src/components/function/goodsSelector.vue +++ b/src/components/function/goodsSelector.vue @@ -9,7 +9,7 @@
- +
@@ -33,10 +33,8 @@
-{{ - $t('ea95ac26.43d1e2') - }} - + {{ $t('ea95ac26.43d1e2') }} +
- +
@@ -48,7 +48,7 @@ @@ -57,15 +57,15 @@
- img + img
- img + img
- img + img
diff --git a/src/components/kqselect/index.vue b/src/components/kqselect/index.vue index da72fe9..edbfdc4 100755 --- a/src/components/kqselect/index.vue +++ b/src/components/kqselect/index.vue @@ -15,7 +15,7 @@ diff --git a/src/components/messagesender/index.vue b/src/components/messagesender/index.vue index 1a7ae31..f920a7f 100755 --- a/src/components/messagesender/index.vue +++ b/src/components/messagesender/index.vue @@ -193,7 +193,7 @@
- +

{{ data.card.title }} diff --git a/src/components/sp-form/index.vue b/src/components/sp-form/index.vue index 507e2c8..df49ce6 100755 --- a/src/components/sp-form/index.vue +++ b/src/components/sp-form/index.vue @@ -471,11 +471,12 @@ export default { 'no-label': typeof item.label == 'undefined', 'custom-error': typeof item.component != 'undefined', 'is-required': item.required || item.validator, - inline: typeof item.inline != 'undefined' ? item.inline : false, + inline: typeof item.inline != 'undefined' ? item.inline : false } ]} style={{ - width: item.width ? item.width : 'auto' + width: item.width ? item.width : 'auto', + ...(item.style && typeof item.style === 'object' ? item.style : {}) }} showMessage={typeof item.showMessage == 'undefined' ? true : item.showMessage} v-show={this.getItemShow(item)} diff --git a/src/components/sp-page-upload/index.vue b/src/components/sp-page-upload/index.vue index 7c722a8..ebc83fc 100644 --- a/src/components/sp-page-upload/index.vue +++ b/src/components/sp-page-upload/index.vue @@ -19,10 +19,8 @@ }} {{ $t('089d6e70.498a19') }} -{{ - $t('089d6e70.84fac4') - }} - + {{ $t('089d6e70.84fac4') }} +

diff --git a/src/components/sp-picker/pickers/picker-goodsParams.vue b/src/components/sp-picker/pickers/picker-goodsParams.vue index 0555adf..c3d5dee 100755 --- a/src/components/sp-picker/pickers/picker-goodsParams.vue +++ b/src/components/sp-picker/pickers/picker-goodsParams.vue @@ -156,9 +156,11 @@ export default { const { list } = response.data.data if (this.value.data) { // 统一转换为字符串类型 不然incluses匹配不到 - let dataArrayString = this.value.data.map(item => String(item)) - - const selectRows = list.filter(item => dataArrayString.includes(String(item.attribute_id))) + let dataArrayString = this.value.data.map((item) => String(item)) + + const selectRows = list.filter((item) => + dataArrayString.includes(String(item.attribute_id)) + ) const { finderTable } = this.$refs.finder.$refs setTimeout(() => { finderTable.$refs.finderTable.setSelection(selectRows) diff --git a/src/components/sp-picker/pickers/picker-image.vue b/src/components/sp-picker/pickers/picker-image.vue index d47b2e3..2021687 100755 --- a/src/components/sp-picker/pickers/picker-image.vue +++ b/src/components/sp-picker/pickers/picker-image.vue @@ -171,15 +171,11 @@ /> -{{ - addGroupBtnText - }} - + {{ addGroupBtnText }} + -{{ - moveGroupBtnText - }} - + {{ moveGroupBtnText }} + @@ -204,10 +200,8 @@ 下载 --> -{{ - cancelAllBtnText - }} - + {{ cancelAllBtnText }} +
- + diff --git a/src/components/template/img_hotzone.vue b/src/components/template/img_hotzone.vue index 48aef1c..7816d0a 100755 --- a/src/components/template/img_hotzone.vue +++ b/src/components/template/img_hotzone.vue @@ -18,7 +18,7 @@
-->
- +
- +
{{ item.content }}
diff --git a/src/components/template/nearby_shop.vue b/src/components/template/nearby_shop.vue index a81d916..788948b 100755 --- a/src/components/template/nearby_shop.vue +++ b/src/components/template/nearby_shop.vue @@ -25,7 +25,7 @@
- +

{{ $t('6d548076.d17ff7') }}

@@ -39,7 +39,7 @@ backgroundRepeat: 'no-repeat' }" > - +
diff --git a/src/components/template/showcase.vue b/src/components/template/showcase.vue index 7582bd9..8c89b2f 100755 --- a/src/components/template/showcase.vue +++ b/src/components/template/showcase.vue @@ -20,15 +20,15 @@
- +
- +
- +
diff --git a/src/components/template/slider.vue b/src/components/template/slider.vue index de266d7..7aea812 100755 --- a/src/components/template/slider.vue +++ b/src/components/template/slider.vue @@ -24,7 +24,7 @@ (data[0] && data[0].imgUrl) || 'https://fakeimg.pl/320x240/EFEFEF/CCC/?text=image&font=lobster' " - > + /> + />
diff --git a/src/components/template/store.vue b/src/components/template/store.vue index bff3986..63e49de 100755 --- a/src/components/template/store.vue +++ b/src/components/template/store.vue @@ -30,7 +30,7 @@ class="store-logo" :src="store.logo || 'https://fakeimg.pl/120x120/EFEFEF/CCC/?text=logo&font=lobster'" alt="" - > + />

{{ store.name }} @@ -41,7 +41,7 @@

- +
@@ -50,7 +50,7 @@ :src="item.imgUrl" alt="" :style="{ 'border-color': base.borderColor || '#000' }" - > + />
¥{{ item.price / 100 }}
diff --git a/src/components/template_editor/coupon.vue b/src/components/template_editor/coupon.vue index 3d83698..9b55e4f 100755 --- a/src/components/template_editor/coupon.vue +++ b/src/components/template_editor/coupon.vue @@ -24,7 +24,7 @@ :src="wximageurl + item.imgUrl" class="banner-uploader square thumbnail" @click="handleImgChange(index)" - > + />