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-16 14:11:32 +08:00
parent 215ce036fa e76f030970
commit 9db7b47bad
14 changed files with 74 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
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

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

@ -127,7 +127,7 @@
{
"icon_id": "40963300",
"name": "下箭头",
"font_class": "arrow-bottom1",
"font_class": "arrow-bottom",
"unicode": "e759",
"unicode_decimal": 59225
},
@ -173,13 +173,6 @@
"unicode": "e75d",
"unicode_decimal": 59229
},
{
"icon_id": "40963294",
"name": "圆点",
"font_class": "round-dot",
"unicode": "e75e",
"unicode_decimal": 59230
},
{
"icon_id": "40963293",
"name": "内下",
@ -299,13 +292,6 @@
"unicode": "e76f",
"unicode_decimal": 59247
},
{
"icon_id": "40963363",
"name": "复制",
"font_class": "copy1",
"unicode": "e770",
"unicode_decimal": 59248
},
{
"icon_id": "40963364",
"name": "实线",
@ -315,8 +301,8 @@
},
{
"icon_id": "40963362",
"name": "关闭1",
"font_class": "close-o1",
"name": "关闭-填满",
"font_class": "close-fillup",
"unicode": "e773",
"unicode_decimal": 59251
},
@ -337,7 +323,7 @@
{
"icon_id": "40047131",
"name": "进销存上箭头",
"font_class": "arrow-top1",
"font_class": "arrow-top",
"unicode": "e738",
"unicode_decimal": 59192
},
@ -392,14 +378,14 @@
},
{
"icon_id": "41172226",
"name": "文件",
"name": "文件夹",
"font_class": "folder",
"unicode": "e77c",
"unicode_decimal": 59260
},
{
"icon_id": "41176712",
"name": "文件1",
"name": "文件",
"font_class": "file",
"unicode": "e77d",
"unicode_decimal": 59261
@ -476,7 +462,7 @@
},
{
"icon_id": "39755359",
"name": "购物车1",
"name": "购物车",
"font_class": "cart",
"unicode": "e791",
"unicode_decimal": 59281
@ -582,7 +568,7 @@
{
"icon_id": "41231177",
"name": "EXE",
"font_class": "EXE",
"font_class": "exe",
"unicode": "e795",
"unicode_decimal": 59285
},
@ -609,8 +595,8 @@
},
{
"icon_id": "41451474",
"name": "编辑 (2)",
"font_class": "commodity-edit",
"name": "编辑-空心",
"font_class": "icon-edit-o",
"unicode": "e797",
"unicode_decimal": 59287
},
@ -630,8 +616,8 @@
},
{
"icon_id": "40047116",
"name": "进销存关闭2",
"font_class": "close-b",
"name": "关闭-圆空心",
"font_class": "close-round-o",
"unicode": "e745",
"unicode_decimal": 59205
},
@ -658,8 +644,8 @@
},
{
"icon_id": "6296355",
"name": "面性图标_保洁管理",
"font_class": "mianxingtubiao_baojieguanli",
"name": "保洁",
"font_class": "cleaning",
"unicode": "e64d",
"unicode_decimal": 58957
},
@ -672,8 +658,8 @@
},
{
"icon_id": "41150407",
"name": "选中1",
"font_class": "checked-1",
"name": "选中-圆滑",
"font_class": "checked-smooth",
"unicode": "e778",
"unicode_decimal": 59256
},
@ -749,8 +735,8 @@
},
{
"icon_id": "39375287",
"name": "转换2",
"font_class": "convert2",
"name": "转换",
"font_class": "convert",
"unicode": "e71d",
"unicode_decimal": 59165
},
@ -770,8 +756,8 @@
},
{
"icon_id": "39374328",
"name": "转换",
"font_class": "convert",
"name": "转换-空心",
"font_class": "convert-o",
"unicode": "e719",
"unicode_decimal": 59161
},
@ -840,29 +826,29 @@
},
{
"icon_id": "38007961",
"name": "Shopping cart1107",
"font_class": "a-Shoppingcart1107",
"name": "菜单-购物车-填满",
"font_class": "menu-cart-fillup",
"unicode": "e6e7",
"unicode_decimal": 59111
},
{
"icon_id": "38007960",
"name": "me1107",
"font_class": "me1107",
"name": "菜单-用户-填满",
"font_class": "menu-user-fillup",
"unicode": "e6e8",
"unicode_decimal": 59112
},
{
"icon_id": "38007959",
"name": "classify1107",
"font_class": "classify1107",
"name": "菜单-分类-填满",
"font_class": "menu-category-fillup",
"unicode": "e6e9",
"unicode_decimal": 59113
},
{
"icon_id": "38007958",
"name": "index1107",
"font_class": "index1107",
"name": "菜单-首页-填满",
"font_class": "menu-home-fillup",
"unicode": "e6ea",
"unicode_decimal": 59114
},
@ -896,36 +882,36 @@
},
{
"icon_id": "37737702",
"name": "xzzx-shij",
"font_class": "xzzx-shij",
"name": "计时时间",
"font_class": "timing-time",
"unicode": "e6e2",
"unicode_decimal": 59106
},
{
"icon_id": "37737676",
"name": "xzzx-rhaz",
"font_class": "xzzx-rhaz",
"name": "皮夹",
"font_class": "billfold",
"unicode": "e6e0",
"unicode_decimal": 59104
},
{
"icon_id": "37737675",
"name": "xzzx-kfwd",
"font_class": "xzzx-kfwd",
"name": "日志列表",
"font_class": "log-list",
"unicode": "e6e1",
"unicode_decimal": 59105
},
{
"icon_id": "37550661",
"name": "wenda-wytw",
"font_class": "wenda-wytw",
"name": "编辑-下划线",
"font_class": "edit-below-line",
"unicode": "e6de",
"unicode_decimal": 59102
},
{
"icon_id": "37550660",
"name": "wenda-wdtw",
"font_class": "wenda-wdtw",
"name": "列表-点",
"font_class": "list-dot",
"unicode": "e6df",
"unicode_decimal": 59103
},
@ -1062,13 +1048,6 @@
"unicode": "e6cb",
"unicode_decimal": 59083
},
{
"icon_id": "37324824",
"name": "箭头-向下",
"font_class": "arrow-bottom",
"unicode": "e6cc",
"unicode_decimal": 59084
},
{
"icon_id": "37324020",
"name": "关闭-空心",
@ -1174,13 +1153,6 @@
"unicode": "e6b9",
"unicode_decimal": 59065
},
{
"icon_id": "37225044",
"name": "箭头-向上",
"font_class": "arrow-top",
"unicode": "e6b8",
"unicode_decimal": 59064
},
{
"icon_id": "37217394",
"name": "分类更多",

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

Binary file not shown.

8
src/components/base/drag/index.vue
View File

@ -4,11 +4,11 @@
<li v-for="(item, index) in from" :key="index" :class="className" class="flex gap-y-16 re" @click="on_click(item, index)">
<el-icon class="iconfont icon-drag size-16 cursor-move" />
<slot :row="item" :index="index" />
<el-icon v-if="type == 'card'" class="iconfont icon-close-o1 size-16 abs cr-c top-de-5 right-de-5" @click.stop="remove(index)" />
<el-icon v-if="type == 'line'" class="iconfont icon-delete-o size-16 do-not-trigger cr-6" @click.stop="remove(index)" />
<el-icon v-if="type == 'card'" class="iconfont icon-close-fillup size-16 abs c-pointer cr-c top-de-5 right-de-5" @click.stop="remove(index)" />
<el-icon v-if="type == 'line'" class="iconfont icon-delete-o size-16 c-pointer do-not-trigger cr-6" @click.stop="remove(index)" />
<!-- <el-icon v-if="isShowEdit" class="iconfont size-16 cr-primary do-not-trigger two-click" @click.stop="edit(index)" /> -->
<el-dropdown v-if="isShowEdit" placement="bottom">
<icon name="more-o" size="16" class="icon-commodity-edit" color="primary"></icon>
<icon name="more-o" size="16" class="icon-edit-o" color="primary"></icon>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item @click.stop="edit(index)">编辑</el-dropdown-item>
@ -91,7 +91,7 @@ const on_sort = () => {
font-size: 1.6rem !important;
}
.icon-del-o,
.icon-commodity-edit {
.icon-edit-o {
cursor: pointer;
}
.cursor-move {

2
src/components/common/carousel-indicator/index.vue
View File

@ -7,7 +7,7 @@
<el-form-item label="样式">
<el-radio-group v-model="form.indicator_style" is-button>
<el-tooltip content="点" placement="top" effect="light">
<el-radio-button value="dot"><icon name="iconfont icon-round-dot"></icon></el-radio-button>
<el-radio-button value="dot"><icon name="iconfont icon-ellipsis"></icon></el-radio-button>
</el-tooltip>
<el-tooltip content="线" placement="top" effect="light">
<el-radio-button value="elliptic"><icon name="iconfont icon-elliptic"></icon></el-radio-button>

2
src/components/common/upload-icon/index.vue
View File

@ -17,7 +17,7 @@
</el-dialog>
<div class="search-icon re" :style="'height:' + upload_size + ';width:' + upload_size + ';'" @click="icon_click">
<icon :name="!isEmpty(icon_class) ? icon_class : 'add'" :size="Number(size) / 2 + ''" color="c"></icon>
<el-icon v-if="!isEmpty(icon_class)" class="iconfont icon-close-o1 size-16 abs cr-c top-de-5 right-de-5" @click.stop="remove_icon" />
<el-icon v-if="!isEmpty(icon_class)" class="iconfont icon-close-fillup size-16 abs cr-c top-de-5 right-de-5" @click.stop="remove_icon" />
</div>
</template>
<script setup lang="ts">

2
src/components/model-carousel/model-carousel-content.vue
View File

@ -49,7 +49,7 @@
<el-input v-model="item.video_title" placeholder="请输入视频按钮名称" clearable></el-input>
</el-form-item>
</div>
<el-icon class="iconfont icon-close-o1 size-16 abs cr-c top-de-5 right-de-5" @click="remove(index)" />
<el-icon class="iconfont icon-close-fillup size-16 abs cr-c top-de-5 right-de-5" @click="remove(index)" />
</div>
</div>
<el-button class="mt-20 mb-20 w" @click="add">+添加</el-button>

2
src/components/model-custom/components/index.vue
View File

@ -43,7 +43,7 @@
</div>
<div class="abs draggable-icon" :style="item.show_tabs == '1' ? 'opacity: 1;' : 'opacity: 0.5;'">
<el-icon class="iconfont icon-commodity-edit size-16 cr-primary do-not-trigger two-click" @click="on_edit(index)" />
<el-icon class="iconfont icon-close-b size-16" @click.stop="del(index)" />
<el-icon class="iconfont icon-close-round-o size-16" @click.stop="del(index)" />
</div>
</li>
</template>

2
src/components/model-data-magic/components/tabs-content.vue
View File

@ -38,7 +38,7 @@
<url-value v-model="item.carousel_link"></url-value>
</el-form-item>
</div>
<el-icon class="iconfont icon-close-o1 size-16 abs cr-c top-de-5 right-de-5" @click="img_remove(index)" />
<el-icon class="iconfont icon-close-fillup size-16 abs cr-c top-de-5 right-de-5" @click="img_remove(index)" />
</div>
</div>
<el-button class="mt-20 mb-20 w" @click="img_add">+添加</el-button>

1
src/components/model-rich-text/index.vue
View File

@ -26,7 +26,6 @@ watch(
content.value = new_content.html;
style_container.value = common_styles_computer(new_style.common_style);
style_img_container.value = common_img_computer(new_style.common_style);
console.log(new_content.html);
},
{ immediate: true, deep: true }
);

4
src/views/layout/components/main/index.scss
View File

@ -182,11 +182,11 @@
}
.drawer-drag:hover {
background: #f2f8ff;
.iconfont.icon-close-b {
.iconfont.icon-close-round-o {
display: block !important;
}
}
.iconfont.icon-close-b {
.iconfont.icon-close-round-o {
right: 1rem;
top: 1.4rem;
color: #8a8a8a;

4
src/views/layout/components/main/index.vue
View File

@ -28,14 +28,14 @@
<div v-for="(item, index) in tabs_data" :key="index" :class="['flex ptb-12 plr-10 gap-y-8 re align-c drawer-drag', { 'drawer-drag-bg': item.show_tabs == '1' }]" @click="set_tabs_event(true)">
<el-icon class="iconfont icon-jinzhi size-16 cr-d" />
<span class="size-12 cr-6">{{ item.name }}</span>
<el-icon class="iconfont icon-close-b size-16 abs" :style="[item.show_tabs == '1' ? '' : 'display:none']" @click.stop="del(index, true)" />
<el-icon class="iconfont icon-close-round-o size-16 abs" :style="[item.show_tabs == '1' ? '' : 'display:none']" @click.stop="del(index, true)" />
</div>
<VueDraggable v-model="diy_data" :animation="500" target=".sort-target" :scroll="true" :on-sort="on_sort">
<TransitionGroup type="transition" tag="ul" name="fade" class="sort-target flex-col">
<li v-for="(item, index) in diy_data" :key="index" :class="['flex ptb-12 plr-10 gap-y-8 re align-c drawer-drag', { 'drawer-drag-bg': item.show_tabs == '1' }]" @click="on_choose(index, item.show_tabs)">
<el-icon class="iconfont icon-drag size-16 cr-d" />
<span class="size-12 cr-6">{{ item.name }}</span>
<el-icon class="iconfont icon-close-b size-16 abs" :style="[item.show_tabs == '1' ? '' : 'display:none']" @click.stop="del(index, false)" />
<el-icon class="iconfont icon-close-round-o size-16 abs" :style="[item.show_tabs == '1' ? '' : 'display:none']" @click.stop="del(index, false)" />
</li>
</TransitionGroup>
</VueDraggable>

4
src/views/layout/components/navbar/index.vue
View File

@ -32,10 +32,10 @@
<upload v-model="form.logo" :limit="1"></upload>
</el-form-item>
<el-form-item label="名称" prop="name">
<el-input v-model="form.name" placeholder="请输入名称" clearable />
<el-input v-model="form.name" placeholder="请输入名称" clearable @keyup.enter="confirm_event(ruleFormRef)" />
</el-form-item>
<el-form-item label="描述">
<el-input v-model="form.describe" placeholder="请输入描述" :rows="4" type="textarea" clearable />
<el-input v-model="form.describe" placeholder="请输入描述" :rows="4" type="textarea" clearable @keyup.enter="confirm_event(ruleFormRef)" />
</el-form-item>
<el-form-item label="状态">
<el-switch v-model="form.is_enable" active-value="1" inactive-value="0"></el-switch>