Merge remote-tracking branch 'origin/dev-yxl' into dev-sws

v1.0.0
sws 2024-09-05 15:05:03 +08:00
parent 793aca380e
commit fd0eaf3e76
2 changed files with 35 additions and 8 deletions

View File

@ -11,13 +11,13 @@ declare module 'vue' {
CardContainer: typeof import('./../components/base/card-container/index.vue')['default']
CarouselIndicator: typeof import('./../components/common/carousel-indicator/index.vue')['default']
ColorPicker: typeof import('./../components/base/color-picker/index.vue')['default']
ColorTextSizeGroup: typeof import('./../components/common/color-text-size-group/index.vue')['default']
CommonStyles: typeof import('./../components/common/common-styles/index.vue')['default']
Components: typeof import('./../components/model-custom/components/index.vue')['default']
Content: typeof import('./../components/model-data-magic/components/content.vue')['default']
copy: typeof import('./../components/model-img-magic copy/index.vue')['default']
Cube: typeof import('./../components/common/cube/index.vue')['default']
copy: typeof import('./../components/footer-nav/index copy.vue')['default']
Dialog: typeof import('./../components/model-custom/components/dialog.vue')['default']
Drag: typeof import('./../components/base/drag/index.vue')['default']
DragGroup: typeof import('./../components/common/drag-group/index.vue')['default']
ElBadge: typeof import('element-plus/es')['ElBadge']
ElButton: typeof import('element-plus/es')['ElButton']
ElCarousel: typeof import('element-plus/es')['ElCarousel']
@ -70,16 +70,19 @@ declare module 'vue' {
ImageEmpty: typeof import('./../components/base/image-empty/index.vue')['default']
InputNumber: typeof import('./../components/base/input-number/index.vue')['default']
LinkArticles: typeof import('./../components/common/url-value/link-articles.vue')['default']
LinkBrand: typeof import('./../components/common/url-value/link-brand.vue')['default']
LinkCoupon: typeof import('./../components/common/url-value/link-coupon.vue')['default']
LinkCustom: typeof import('./../components/common/url-value/link-custom.vue')['default']
LinkGoods: typeof import('./../components/common/url-value/link-goods.vue')['default']
LinkGoodsCategory: typeof import('./../components/common/url-value/link-goods-category.vue')['default']
LinkGoodsSearch: typeof import('./../components/common/url-value/link-goods-search.vue')['default']
LinkList: typeof import('./../components/common/url-value/link-list.vue')['default']
LinkTable: typeof import('./../components/common/url-value/link-table.vue')['default']
MagicCarousel: typeof import('./../components/model-data-magic/components/magic-carousel.vue')['default']
MagicCube: typeof import('./../components/common/magic-cube/index.vue')['default']
Main: typeof import('./../layout/components/main/index.vue')['default']
Maps: typeof import('./../components/base/maps/index.vue')['default']
'Model-': typeof import('./../components/model-/index.vue')['default']
Margin: typeof import('./../components/base/margin/index.vue')['default']
ModelArticleList: typeof import('./../components/model-article-list/index.vue')['default']
ModelArticleListContent: typeof import('./../components/model-article-list/model-article-list-content.vue')['default']
ModelArticleListSetting: typeof import('./../components/model-article-list/model-article-list-setting.vue')['default']
@ -100,11 +103,14 @@ declare module 'vue' {
ModelCarouselContent: typeof import('./../components/model-carousel/model-carousel-content.vue')['default']
ModelCarouselSetting: typeof import('./../components/model-carousel/model-carousel-setting.vue')['default']
ModelCarouselStyles: typeof import('./../components/model-carousel/model-carousel-styles.vue')['default']
ModelCoupon: typeof import('./../components/model-coupon/index.vue')['default']
ModelCouponContent: typeof import('./../components/model-coupon/model-coupon-content.vue')['default']
ModelCouponSetting: typeof import('./../components/model-coupon/model-coupon-setting.vue')['default']
ModelCouponStyles: typeof import('./../components/model-coupon/model-coupon-styles.vue')['default']
ModelCustom: typeof import('./../components/model-custom/index.vue')['default']
ModelCustomContent: typeof import('./../components/model-custom/model-custom-content.vue')['default']
ModelCustomSetting: typeof import('./../components/model-custom/model-custom-setting.vue')['default']
ModelCustomStyles: typeof import('./../components/model-custom/model-custom-styles.vue')['default']
ModelDataCube: typeof import('./../components/model-data-cube/index.vue')['default']
ModelDataMagic: typeof import('./../components/model-data-magic/index.vue')['default']
ModelDataMagicContent: typeof import('./../components/model-data-magic/model-data-magic-content.vue')['default']
ModelDataMagicSetting: typeof import('./../components/model-data-magic/model-data-magic-setting.vue')['default']
@ -113,6 +119,14 @@ declare module 'vue' {
ModelFloatWindowContent: typeof import('./../components/model-float-window/model-float-window-content.vue')['default']
ModelFloatWindowSetting: typeof import('./../components/model-float-window/model-float-window-setting.vue')['default']
ModelFloatWindowStyles: typeof import('./../components/model-float-window/model-float-window-styles.vue')['default']
ModelGoodsList: typeof import('./../components/model-goods-list/index.vue')['default']
ModelGoodsListContent: typeof import('./../components/model-goods-list/model-goods-list-content.vue')['default']
ModelGoodsListSetting: typeof import('./../components/model-goods-list/model-goods-list-setting.vue')['default']
ModelGoodsListStyles: typeof import('./../components/model-goods-list/model-goods-list-styles.vue')['default']
ModelGoodsTabs: typeof import('./../components/model-goods-tabs/index.vue')['default']
ModelGoodsTabsContent: typeof import('./../components/model-goods-tabs/model-goods-tabs-content.vue')['default']
ModelGoodsTabsSetting: typeof import('./../components/model-goods-tabs/model-goods-tabs-setting.vue')['default']
ModelGoodsTabsStyles: typeof import('./../components/model-goods-tabs/model-goods-tabs-styles.vue')['default']
ModelHotZone: typeof import('./../components/model-hot-zone/index.vue')['default']
ModelHotZoneContent: typeof import('./../components/model-hot-zone/model-hot-zone-content.vue')['default']
ModelHotZoneSetting: typeof import('./../components/model-hot-zone/model-hot-zone-setting.vue')['default']
@ -141,6 +155,10 @@ declare module 'vue' {
ModelSearchContent: typeof import('./../components/model-search/model-search-content.vue')['default']
ModelSearchSetting: typeof import('./../components/model-search/model-search-setting.vue')['default']
ModelSearchStyles: typeof import('./../components/model-search/model-search-styles.vue')['default']
ModelSeckill: typeof import('./../components/model-seckill/index.vue')['default']
ModelSeckillContent: typeof import('./../components/model-seckill/model-seckill-content.vue')['default']
ModelSeckillSetting: typeof import('./../components/model-seckill/model-seckill-setting.vue')['default']
ModelSeckillStyles: typeof import('./../components/model-seckill/model-seckill-styles.vue')['default']
ModelShopList: typeof import('./../components/model-shop-list/index.vue')['default']
ModelShopListContent: typeof import('./../components/model-shop-list/model-shop-list-content.vue')['default']
ModelShopListSetting: typeof import('./../components/model-shop-list/model-shop-list-setting.vue')['default']
@ -172,8 +190,10 @@ declare module 'vue' {
NoData: typeof import('./../components/base/noData/index.vue')['default']
Padding: typeof import('./../components/base/padding/index.vue')['default']
PageContent: typeof import('./../components/page-settings/page-content.vue')['default']
PageSetting: typeof import('./../components/page-settings/page-setting.vue')['default']
PageSettings: typeof import('./../components/page-settings/index.vue')['default']
PictureCube: typeof import('./../components/common/picture-cube/index.vue')['default']
PageStyles: typeof import('./../components/page-settings/page-styles.vue')['default']
ProductListShow: typeof import('./../components/model-data-magic/components/product-list-show.vue')['default']
ProductShowConfig: typeof import('./../components/common/product-show-config/index.vue')['default']
Qrcode: typeof import('./../components/base/qrcode/index.vue')['default']
Radius: typeof import('./../components/base/radius/index.vue')['default']
@ -181,18 +201,21 @@ declare module 'vue' {
RouterView: typeof import('vue-router')['RouterView']
Settings: typeof import('./../layout/components/settings/index.vue')['default']
Slider: typeof import('./../components/base/slider/index.vue')['default']
Styles: typeof import('./../components/model-data-magic/components/styles.vue')['default']
TabsContent: typeof import('./../components/model-data-magic/components/tabs-content.vue')['default']
TabsStyles: typeof import('./../components/model-data-magic/components/tabs-styles.vue')['default']
TabsView: typeof import('./../components/common/tabs-view/index.vue')['default']
TextSizeType: typeof import('./../components/common/text-size-type/index.vue')['default']
ThemeSelect: typeof import('./../components/common/theme-select/index.vue')['default']
TMap: typeof import('./../components/base/maps/t-map.vue')['default']
TransformCategory: typeof import('./../components/common/upload/transform-category.vue')['default']
TxMap: typeof import('./../components/base/maps/tx-map.vue')['default']
Upload: typeof import('./../components/common/upload/index.vue')['default']
UploadIcon: typeof import('./../components/common/upload-icon/index.vue')['default']
UploadModel: typeof import('./../components/common/upload/upload-model.vue')['default']
UrlValue: typeof import('./../components/common/url-value/index.vue')['default']
UrlValueDialog: typeof import('./../components/common/url-value/url-value-dialog.vue')['default']
}
export interface ComponentCustomProperties {
vPopover: typeof import('element-plus/es')['ElPopoverDirective']
vLoading: typeof import('element-plus/es')['ElLoadingDirective']
}
}

4
temp.d.ts vendored Normal file
View File

@ -0,0 +1,4 @@
const temp_token = '01e8d1181d53260607d2b0180a2ccc68' || '';
const temp_attachment_host = 'http://shopxo.com';
// 导出token
export default { temp_token, temp_attachment_host };