sileya-ai
/
vr-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sws' into dev-yxl

v1.0.0
于肖磊 2024-10-21 15:50:18 +08:00
parent 020b95be31 db844a3ccb
commit 9068153f92
12 changed files with 79 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/assets/icons/iconfont.css
View File

File diff suppressed because one or more lines are too long

2
src/assets/icons/iconfont.js
View File

File diff suppressed because one or more lines are too long

55
src/assets/icons/iconfont.json
View File

@ -5,6 +5,13 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "42182269",
"name": "圆背景右箭头",
"font_class": "arrow-right-bg-round",
"unicode": "e7a5",
"unicode_decimal": 59301
},
{
"icon_id": "42124616",
"name": "删除",
@ -1090,13 +1097,6 @@
"unicode": "e6c3",
"unicode_decimal": 59075
},
{
"icon_id": "37288627",
"name": "qiandao-dqxz",
"font_class": "qiandao-dqxz",
"unicode": "e6bc",
"unicode_decimal": 59068
},
{
"icon_id": "37288626",
"name": "分享-正方形",
@ -1176,112 +1176,105 @@
},
{
"icon_id": "37187704",
"name": "icon-zhibo-zt",
"font_class": "zhibo-zt",
"name": "暂停",
"font_class": "player-pause",
"unicode": "e6b5",
"unicode_decimal": 59061
},
{
"icon_id": "37187703",
"name": "icon-zhibo-jies",
"font_class": "zhibo-jies",
"name": "结束",
"font_class": "player-end",
"unicode": "e6b6",
"unicode_decimal": 59062
},
{
"icon_id": "37176907",
"name": "icon-md-phone",
"name": "电话",
"font_class": "md-phone",
"unicode": "e6b1",
"unicode_decimal": 59057
},
{
"icon_id": "37176908",
"name": "icon-md-dh",
"name": "发送",
"font_class": "md-dh",
"unicode": "e6b2",
"unicode_decimal": 59058
},
{
"icon_id": "37137572",
"name": "icon-index-zxmd-phone",
"name": "电话+背景",
"font_class": "index-zxmd-phone",
"unicode": "e6ac",
"unicode_decimal": 59052
},
{
"icon_id": "37137571",
"name": "icon-index-zxmd-dh",
"name": "发送+背景",
"font_class": "index-zxmd-dh",
"unicode": "e6ad",
"unicode_decimal": 59053
},
{
"icon_id": "37137569",
"name": "icon-index-zxmd-time",
"name": "时间",
"font_class": "index-zxmd-time",
"unicode": "e6ae",
"unicode_decimal": 59054
},
{
"icon_id": "37137568",
"name": "icon-index-zxmd-dress",
"name": "地址定位",
"font_class": "index-zxmd-dress",
"unicode": "e6af",
"unicode_decimal": 59055
},
{
"icon_id": "37131264",
"name": "icon-index-notice",
"name": "通知",
"font_class": "index-notice",
"unicode": "e6a8",
"unicode_decimal": 59048
},
{
"icon_id": "37131263",
"name": "icon-index-search",
"name": "搜索",
"font_class": "index-search",
"unicode": "e6a9",
"unicode_decimal": 59049
},
{
"icon_id": "37113110",
"name": "icon-applet-me-settings-acquiesce",
"name": "我的设置-默认",
"font_class": "applet-me-settings-acquiesce",
"unicode": "e6a6",
"unicode_decimal": 59046
},
{
"icon_id": "37113109",
"name": "icon-applet-me-message-acquiesce",
"name": "我的消息-默认",
"font_class": "applet-me-message-acquiesce",
"unicode": "e6a7",
"unicode_decimal": 59047
},
{
"icon_id": "37112559",
"name": "icon-applet-me-acquiesce",
"name": "我的-默认",
"font_class": "applet-me-acquiesce",
"unicode": "e6a2",
"unicode_decimal": 59042
},
{
"icon_id": "37112562",
"name": "icon-applet-sort-acquiesce",
"font_class": "applet-sort-acquiesce",
"unicode": "e6a5",
"unicode_decimal": 59045
},
{
"icon_id": "37112561",
"name": "icon-applet-index-acquiesce",
"name": "首页",
"font_class": "applet-index-acquiesce",
"unicode": "e6a4",
"unicode_decimal": 59044
},
{
"icon_id": "37112560",
"name": "icon-applet-shop-acquiesce",
"name": "购物车",
"font_class": "applet-shop-acquiesce",
"unicode": "e6a3",
"unicode_decimal": 59043

BIN
src/assets/icons/iconfont.ttf
View File

Binary file not shown.

15
src/components/common/tabs-view/index.vue
View File

@ -16,7 +16,7 @@
</div>
</template>
</div>
<icon v-if="isTabs" :name="new_style.more_icon_class || 'category-more'" :size="new_style.more_icon_size + '' || '14'" :color="new_style.more_icon_color || '#000'" class="pb-5"></icon>
<icon v-if="isTabs" :name="new_style.more_icon_class || 'category-more'" :size="new_style.more_icon_size + '' || '14'" :color="new_style.more_icon_color || '#000'" :class="tabs_theme_index == '3' ? 'pb-12' : 'pb-6'"></icon>
</div>
</template>
@ -103,10 +103,9 @@ const icon_tabs_check = () => {
.tabs-container {
.tabs {
max-width: 39rem;
min-height: 2.9rem;
min-height: 3rem;
.item {
padding: 0 0 0.5rem 0;
// margin: 0 1rem;
padding: 0 0 0.8rem 0;
position: relative;
&:first-of-type {
margin-left: 0;
@ -132,14 +131,14 @@ const icon_tabs_check = () => {
position: absolute;
left: 0;
right: 0;
bottom: 0;
bottom: 0.4rem;
display: none;
}
.icon {
position: absolute;
left: 0;
right: 0;
bottom: -0.6rem;
bottom: 0;
text-align: center;
font-size: 2rem;
display: none;
@ -159,7 +158,7 @@ const icon_tabs_check = () => {
}
.tabs-bottom-line-theme {
opacity: 0.6;
bottom: 0.8rem;
bottom: 1.2rem;
z-index: 0;
height: 0.6rem;
border-radius: 0;
@ -191,7 +190,7 @@ const icon_tabs_check = () => {
}
}
&.tabs-style-4 {
padding-bottom: 0.8rem;
padding-bottom: 1.2rem;
&.active {
.title {
color: #ff2222;

4
src/components/common/upload/upload-model.vue
View File

@ -496,7 +496,7 @@ const submit_event = async (formEl: FormInstance | undefined) => {
});
}
});
}
}
// else {
// console.log('error submit!', fields);
// }
@ -574,7 +574,7 @@ const reset_data = () => {
dialogVisible.value = false;
form.value = {
type: 'loc',
category_id: [],
category_id: form.value.category_id,
file: [],
qrcode: '',
web_image: '',

7
src/components/common/url-value/link-articles.vue
View File

@ -12,7 +12,7 @@
</el-input>
</div>
<div class="content">
<el-table :data="tableData" class="w" :header-cell-style="{ background: '#f7f7f7' }" row-key="id" height="438" fixed @row-click="row_click" @select="handle_select" @select-all="handle_select">
<el-table v-loading="loading" :data="tableData" class="w" :header-cell-style="{ background: '#f7f7f7' }" row-key="id" height="438" fixed @row-click="row_click" @select="handle_select" @select-all="handle_select">
<el-table-column v-if="multiple" type="selection" width="60" />
<el-table-column v-else label="#" width="60" type="">
<template #default="scope">
@ -72,6 +72,7 @@ onMounted(() => {
const modelValue = defineModel({ type: Object, default: {} });
const tableData = ref<pageLinkList[]>([]);
const search_value = ref('');
const loading = ref(false);
const init = () => {
template_selection.value = '';
category_ids.value = '';
@ -105,10 +106,14 @@ const get_list = (new_page: number) => {
category_ids: category_ids.value,
page_size: page_size.value,
};
loading.value = true;
UrlValueAPI.getArticleList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
setTimeout(() => {
loading.value = false;
}, 500);
});
};
//#region 分页 -----------------------------------------------end

12
src/components/common/url-value/link-brand.vue
View File

@ -12,7 +12,7 @@
</el-input>
</div>
<div class="content">
<el-table :data="tableData" class="w" :header-cell-style="{ background: '#f7f7f7' }" row-key="id" height="438" fixed @row-click="row_click" @select="handle_select" @select-all="handle_select">
<el-table v-loading="loading" :data="tableData" class="w" :header-cell-style="{ background: '#f7f7f7' }" row-key="id" height="438" fixed @row-click="row_click" @select="handle_select" @select-all="handle_select">
<el-table-column v-if="multiple" type="selection" width="60" />
<el-table-column v-else label="#" width="60" type="">
<template #default="scope">
@ -73,11 +73,7 @@ onMounted(() => {
const modelValue = defineModel({ type: Object, default: {} });
const tableData = ref<pageLinkList[]>([]);
const search_value = ref('');
const cascader_config = {
value: 'id',
label: 'name',
children: 'items',
};
const loading = ref(false);
const init = () => {
template_selection.value = '';
category_ids.value = [];
@ -110,10 +106,14 @@ const get_list = (new_page: number) => {
page_size: page_size.value,
category_ids: brand_ids.value,
};
loading.value = true;
UrlValueAPI.getBrandList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
setTimeout(() => {
loading.value = false;
}, 500);
});
};
//#region 分页 -----------------------------------------------end

7
src/components/common/url-value/link-coupon.vue
View File

@ -12,7 +12,7 @@
</el-input>
</div>
<div class="content">
<el-table :data="tableData" class="w" :header-cell-style="{ background: '#f7f7f7' }" row-key="id" height="438" fixed @row-click="row_click" @select="handle_select" @select-all="handle_select">
<el-table v-loading="loading" :data="tableData" class="w" :header-cell-style="{ background: '#f7f7f7' }" row-key="id" height="438" fixed @row-click="row_click" @select="handle_select" @select-all="handle_select">
<el-table-column v-if="multiple" type="selection" width="60" />
<el-table-column v-else label="#" width="60" type="">
<template #default="scope">
@ -71,6 +71,7 @@ onMounted(() => {
const modelValue = defineModel({ type: Object, default: {} });
const tableData = ref<pageLinkList[]>([]);
const search_value = ref('');
const loading = ref(false);
const init = () => {
template_selection.value = '';
type.value = '';
@ -106,10 +107,14 @@ const get_list = (new_page: number) => {
type: type.value,
page_size: page_size.value,
};
loading.value = true;
UrlValueAPI.getCouponList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
setTimeout(() => {
loading.value = false;
}, 500);
});
};
//#region 分页 -----------------------------------------------end

7
src/components/common/url-value/link-goods.vue
View File

@ -13,7 +13,7 @@
</el-input>
</div>
<div class="content">
<el-table :data="tableData" class="w" :header-cell-style="{ background: '#f7f7f7' }" row-key="id" height="438" fixed @row-click="row_click" @select="handle_select" @select-all="handle_select">
<el-table v-loading="loading" :data="tableData" class="w" :header-cell-style="{ background: '#f7f7f7' }" row-key="id" height="438" fixed @row-click="row_click" @select="handle_select" @select-all="handle_select">
<el-table-column v-if="multiple" type="selection" width="60" />
<el-table-column v-else label="#" width="60" type="">
<template #default="scope">
@ -75,6 +75,7 @@ onMounted(() => {
const modelValue = defineModel({ type: Object, default: {} });
const tableData = ref<pageLinkList[]>([]);
const search_value = ref('');
const loading = ref(false);
const cascader_config = {
value: 'id',
label: 'name',
@ -120,10 +121,14 @@ const get_list = (new_page: number) => {
page_size: page_size.value,
category_ids: category_ids.value.length > 0 ? category_ids.value[category_ids.value.length - 1] : '',
};
loading.value = true;
UrlValueAPI.getGoodsList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
setTimeout(() => {
loading.value = false;
}, 500);
});
};
//#region 分页 -----------------------------------------------end

14
src/components/common/url-value/link-table.vue
View File

@ -9,7 +9,7 @@
</el-input>
</div>
<div class="content">
<el-table :data="tableData" class="w" :header-cell-style="{ background: '#f7f7f7' }" row-key="id" height="438" fixed @row-click="row_click" @select="handle_select" @select-all="handle_select">
<el-table v-loading="loading" :data="tableData" class="w" :header-cell-style="{ background: '#f7f7f7' }" row-key="id" height="438" fixed @row-click="row_click" @select="handle_select" @select-all="handle_select">
<el-table-column v-if="multiple" type="selection" width="60" />
<el-table-column v-else label="#" width="60" type="">
<template #default="scope">
@ -72,7 +72,7 @@ onMounted(() => {
const modelValue = defineModel({ type: Object, default: {} });
const tableData = ref<pageLinkList[]>([]);
const search_value = ref('');
const loading = ref(false);
const init = () => {
template_selection.value = '';
search_value.value = '';
@ -97,23 +97,33 @@ const get_list = (new_page: number) => {
page_size: page_size.value,
keywords: search_value.value,
};
loading.value = true;
if (props.type == 'diy') {
UrlValueAPI.getDiyList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
setTimeout(() => {
loading.value = false;
}, 500);
});
} else if (props.type == 'design') {
UrlValueAPI.getDesignList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
setTimeout(() => {
loading.value = false;
}, 500);
});
} else if (props.type == 'custom-view') {
UrlValueAPI.getCustomList(new_data).then((res: any) => {
tableData.value = res.data.data_list;
data_total.value = res.data.data_total;
page.value = res.data.page;
setTimeout(() => {
loading.value = false;
}, 500);
});
}
};

3
src/utils/request.ts
View File

@ -26,7 +26,7 @@ const pro_url = window.location.href.substring(0, index);
const service = axios.create({
baseURL: import.meta.env.VITE_APP_BASE_API == '/dev-api' ? import.meta.env.VITE_APP_BASE_API : pro_url + '?s=',
timeout: 60000,
headers: { 'Content-Type': 'application/json;charset=utf-8' },
headers: { 'Content-Type': 'application/json;charset=utf-8', 'X-Requested-With': 'XMLHttpRequest' },
});
/** @ts-ignore */
// 请求拦截器
@ -43,6 +43,7 @@ service.interceptors.request.use(
config.url = config.url + '&token=' + JSON.parse(cookie).token;
}
}
console.log(config);
return config;
},
(error: any) => {