Merge remote-tracking branch 'origin/master'

yudao-admin-vue3/src/components/DiyEditor/components/ComponentLibrary.vue

@@ -23,8 +23,11 @@
               <div>
                 <div class="drag-placement">组件放置区域</div>
                 <div class="component">
-                  <Icon :icon="element.icon" :size="32" />
-                  <span class="mt-4px text-12px">{{ element.name }}</span>
+                  <!-- <Icon :icon="element.icon" :size="32" /> -->
+				  <div>
+					  <img :src="element.icon" />
+				  </div>
+                  <span class="text-12px">{{ element.name }}</span>
                 </div>
               </div>
             </template>
@@ -142,8 +145,9 @@ const handleCloneComponent = (component: DiyComponent<any>) => {
 
   .component.active,
   .component:hover {
-    color: var(--el-color-white);
-    background: var(--el-color-primary);
+    // color: var(--el-color-white);
+    // background: var(--el-color-primary);
+    background: #f6f6f6;
 
     .el-icon {
       color: var(--el-color-white);

yudao-admin-vue3/src/components/DiyEditor/components/mobile/Carousel/config.ts

@@ -26,12 +26,13 @@ export interface CarouselItemProperty {
   // 跳转链接
   url: string
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-09.png'
 // 定义组件
 export const component = {
   id: 'Carousel',
   name: '轮播图',
-  icon: 'system-uicons:carousel',
+  // icon: 'system-uicons:carousel',
+  icon: logo,
   property: {
     type: 'default',
     indicator: 'dot',

yudao-admin-vue3/src/components/DiyEditor/components/mobile/CouponCard/config.ts

@@ -22,12 +22,13 @@ export interface CouponCardProperty {
   // 组件样式
   style: ComponentStyle
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-19.png'
 // 定义组件
 export const component = {
   id: 'CouponCard',
   name: '优惠券',
-  icon: 'ep:ticket',
+  // icon: 'ep:ticket',
+  icon: logo,
   property: {
     columns: 1,
     bgImg: '',

yudao-admin-vue3/src/components/DiyEditor/components/mobile/Divider/config.ts

@@ -13,12 +13,13 @@ export interface DividerProperty {
   // 类型
   borderType: 'solid' | 'dashed' | 'dotted' | 'none'
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-12.png'
 // 定义组件
 export const component = {
   id: 'Divider',
   name: '分割线',
-  icon: 'tdesign:component-divider-vertical',
+  // icon: 'tdesign:component-divider-vertical',
+  icon: logo,
   property: {
     height: 30,
     lineWidth: 1,

yudao-admin-vue3/src/components/DiyEditor/components/mobile/FloatingActionButton/config.ts

@@ -21,12 +21,13 @@ export interface FloatingActionButtonItemProperty {
   // 文字颜色
   textColor: string
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-07.png'
 // 定义组件
 export const component = {
   id: 'FloatingActionButton',
   name: '悬浮按钮',
-  icon: 'tabler:float-right',
+  // icon: 'tabler:float-right',
+  icon: logo,
   position: 'fixed',
   property: {
     direction: 'vertical',

yudao-admin-vue3/src/components/DiyEditor/components/mobile/HotZone/config.ts

@@ -25,12 +25,13 @@ export interface HotZoneItemProperty {
   // 左
   left: number
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-14.png'
 // 定义组件
 export const component = {
   id: 'HotZone',
   name: '热区',
-  icon: 'tabler:hand-click',
+  // icon: 'tabler:hand-click',
+  icon: logo,
   property: {
     imgUrl: '',
     list: [] as HotZoneItemProperty[],

yudao-admin-vue3/src/components/DiyEditor/components/mobile/ImageBar/config.ts

@@ -9,12 +9,13 @@ export interface ImageBarProperty {
   // 组件样式
   style: ComponentStyle
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-08.png'
 // 定义组件
 export const component = {
   id: 'ImageBar',
   name: '图片展示',
-  icon: 'ep:picture',
+  // icon: 'ep:picture',
+  icon: logo,
   property: {
     imgUrl: '',
     url: '',

yudao-admin-vue3/src/components/DiyEditor/components/mobile/MagicCube/config.ts

@@ -29,12 +29,13 @@ export interface MagicCubeItemProperty {
   // 左
   left: number
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-13.png'
 // 定义组件
 export const component = {
   id: 'MagicCube',
   name: '广告魔方',
-  icon: 'bi:columns',
+  // icon: 'bi:columns',
+  icon: logo,
   property: {
     borderRadiusTop: 0,
     borderRadiusBottom: 0,

yudao-admin-vue3/src/components/DiyEditor/components/mobile/MenuGrid/config.ts

@@ -49,12 +49,13 @@ export const EMPTY_MENU_GRID_ITEM_PROPERTY = {
     bgColor: '#FF6000'
   }
 } as MenuGridItemProperty
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-04.png'
 // 定义组件
 export const component = {
   id: 'MenuGrid',
   name: '宫格导航',
-  icon: 'bi:grid-3x3-gap',
+  // icon: 'bi:grid-3x3-gap',
+  icon: logo,
   property: {
     column: 3,
     list: [cloneDeep(EMPTY_MENU_GRID_ITEM_PROPERTY)],

yudao-admin-vue3/src/components/DiyEditor/components/mobile/MenuGrid/property.vue

@@ -6,6 +6,7 @@
         <el-radio-group v-model="formData.column">
           <el-radio :label="3">3个</el-radio>
           <el-radio :label="4">4个</el-radio>
+          <el-radio :label="5">5个</el-radio>
         </el-radio-group>
       </el-form-item>
 

yudao-admin-vue3/src/components/DiyEditor/components/mobile/MenuList/config.ts

@@ -31,12 +31,13 @@ export const EMPTY_MENU_LIST_ITEM_PROPERTY = {
   subtitle: '副标题',
   subtitleColor: '#bbb'
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-05.png'
 // 定义组件
 export const component = {
   id: 'MenuList',
   name: '列表导航',
-  icon: 'fa-solid:list',
+  // icon: 'fa-solid:list',
+  icon: logo,
   property: {
     list: [cloneDeep(EMPTY_MENU_LIST_ITEM_PROPERTY)],
     style: {

yudao-admin-vue3/src/components/DiyEditor/components/mobile/MenuSwiper/config.ts

@@ -46,12 +46,13 @@ export const EMPTY_MENU_SWIPER_ITEM_PROPERTY = {
     bgColor: '#FF6000'
   }
 } as MenuSwiperItemProperty
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-03.png'
 // 定义组件
 export const component = {
   id: 'MenuSwiper',
   name: '菜单导航',
-  icon: 'bi:grid-3x2-gap',
+  // icon: 'bi:grid-3x2-gap',
+  icon: logo,
   property: {
     layout: 'iconText',
     row: 1,

yudao-admin-vue3/src/components/DiyEditor/components/mobile/NoticeBar/config.ts

@@ -21,12 +21,13 @@ export interface NoticeContentProperty {
   // 链接地址
   url: string
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-02.png'
 // 定义组件
 export const component = {
   id: 'NoticeBar',
   name: '公告栏',
-  icon: 'ep:bell',
+  // icon: 'ep:bell',
+  icon: logo,
   property: {
     iconUrl: 'http://mall.yudao.iocoder.cn/static/images/xinjian.png',
     contents: [

yudao-admin-vue3/src/components/DiyEditor/components/mobile/Popover/config.ts

@@ -13,12 +13,13 @@ export interface PopoverItemProperty {
   // 显示类型：仅显示一次、每次启动都会显示
   showType: 'once' | 'always'
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-06.png'
 // 定义组件
 export const component = {
   id: 'Popover',
   name: '弹窗广告',
-  icon: 'carbon:popup',
+  // icon: 'carbon:popup',
+  icon: logo,
   position: 'fixed',
   property: {
     list: [{ showType: 'once' }]

yudao-admin-vue3/src/components/DiyEditor/components/mobile/ProductCard/config.ts

@@ -57,12 +57,13 @@ export interface ProductCardFieldProperty {
   // 颜色
   color: string
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-15.png'
 // 定义组件
 export const component = {
   id: 'ProductCard',
   name: '商品卡片',
-  icon: 'fluent:text-column-two-left-24-filled',
+  // icon: 'fluent:text-column-two-left-24-filled',
+  icon: logo,
   property: {
     layoutType: 'oneColBigImg',
     fields: {

yudao-admin-vue3/src/components/DiyEditor/components/mobile/ProductList/config.ts

@@ -36,12 +36,13 @@ export interface ProductListFieldProperty {
   // 颜色
   color: string
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-16.png'
 // 定义组件
 export const component = {
   id: 'ProductList',
   name: '商品栏',
-  icon: 'fluent:text-column-two-24-filled',
+  // icon: 'fluent:text-column-two-24-filled',
+  icon: logo,
   property: {
     layoutType: 'twoCol',
     fields: {

yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionArticle/config.ts

@@ -7,12 +7,13 @@ export interface PromotionArticleProperty {
   // 组件样式
   style: ComponentStyle
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-20.png'
 // 定义组件
 export const component = {
   id: 'PromotionArticle',
   name: '营销文章',
-  icon: 'ph:article-medium',
+  // icon: 'ph:article-medium',
+  icon: logo,
   property: {
     style: {
       bgType: 'color',

yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/config.ts

@@ -37,12 +37,13 @@ export interface PromotionCombinationFieldProperty {
   // 颜色
   color: string
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-17.png'
 // 定义组件
 export const component = {
   id: 'PromotionCombination',
   name: '拼团',
-  icon: 'mdi:account-group',
+  // icon: 'mdi:account-group',
+  icon: logo,
   property: {
     layoutType: 'oneCol',
     fields: {

yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionPoint/config.ts

@@ -58,12 +58,13 @@ export interface PromotionPointFieldProperty {
   // 颜色
   color: string
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-21.png'
 // 定义组件
 export const component = {
   id: 'PromotionPoint',
   name: '积分商城',
-  icon: 'ep:present',
+  // icon: 'ep:present',
+  icon: logo,
   property: {
     layoutType: 'oneColBigImg',
     fields: {

yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionSeckill/config.ts

@@ -36,12 +36,13 @@ export interface PromotionSeckillFieldProperty {
   // 颜色
   color: string
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-18.png'
 // 定义组件
 export const component = {
   id: 'PromotionSeckill',
   name: '秒杀',
-  icon: 'mdi:calendar-time',
+  // icon: 'mdi:calendar-time',
+  icon: logo,
   property: {
     activityId: undefined,
     layoutType: 'oneCol',

yudao-admin-vue3/src/components/DiyEditor/components/mobile/SearchBar/config.ts

@@ -15,12 +15,12 @@ export interface SearchProperty {
 
 // 文字位置
 export type PlaceholderPosition = 'left' | 'center'
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-01.png'
 // 定义组件
 export const component = {
   id: 'SearchBar',
   name: '搜索框',
-  icon: 'ep:search',
+  icon: logo,
   property: {
     height: 28,
     showScan: false,

yudao-admin-vue3/src/components/DiyEditor/components/mobile/TitleBar/config.ts

@@ -38,12 +38,13 @@ export interface TitleBarProperty {
   // 组件样式
   style: ComponentStyle
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-10.png'
 // 定义组件
 export const component = {
   id: 'TitleBar',
   name: '标题栏',
   icon: 'material-symbols:line-start',
+  icon: logo,
   property: {
     title: '主标题',
     description: '副标题',

yudao-admin-vue3/src/components/DiyEditor/components/mobile/UserCard/index.vue

@@ -1,29 +1,115 @@
 <template>
-  <div class="flex flex-col">
-    <div class="flex items-center justify-between p-x-18px p-y-24px">
-      <div class="flex flex-1 items-center gap-16px">
-        <el-avatar :size="60">
-          <Icon icon="ep:avatar" :size="60" />
-        </el-avatar>
-        <span class="text-18px font-bold">芋道源码</span>
-      </div>
-      <Icon icon="tdesign:qrcode" :size="20" />
-    </div>
-    <div
+	<div class="flex flex-col" style="    margin-bottom: 27px;">
+
+		<div class="new-main">
+			<div class="flex items-center justify-between p-x-18px p-y-24px " style="padding-bottom:15px;">
+				<div class="flex flex-1 items-center gap-16px">
+					<el-avatar :size="60">
+						<Icon icon="ep:avatar" :size="60" />
+					</el-avatar>
+					<span class="text-18px font-bold">用户名称</span>
+				</div>
+				<Icon icon="tdesign:qrcode" :size="20" />
+			</div>
+
+			<div class="new-usercard" style="z-index: 9999;">
+				<div class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center">
+					<div class="value-box ss-flex ss-col-bottom">
+						<div class="value-text ss-line-1">0.00</div>
+						<div class="unit-text ss-m-l-6">
+							<!-- 元 -->
+						</div>
+					</div>
+					<div class="menu-title ss-m-t-28">余额</div>
+				</div>
+
+				<div class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center">
+					<div class="value-box ss-flex ss-col-bottom">
+						<div class="value-text">0</div>
+						<div class="unit-text ss-m-l-6">
+							<!-- 张 -->
+						</div>
+					</div>
+					<div class="menu-title ss-m-t-28">优惠券</div>
+				</div>
+				<div class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center">
+					<div class="value-box ss-flex ss-col-bottom">
+						<div class="value-text">0</div>
+						<div class="unit-text ss-m-l-6">
+							<!-- 个 -->
+						</div>
+					</div>
+					<div class="menu-title ss-m-t-28">积分</div>
+				</div>
+			</div>
+
+			<div class="new-bottom">
+				<img src="https://zysc.fjptzykj.com:3000/shangcheng/64776e2edc3c2f15295e7c3976ba301e08f9170f99a2e845d8f33bd65179b177.png"
+					alt="" />
+				<div class="btn">
+					立即开通
+				</div>
+			</div>
+		</div>
+		<!-- <div
       class="flex items-center justify-between justify-between bg-white p-x-20px p-y-8px text-12px"
     >
       <span class="color-#ff690d">点击绑定手机号</span>
       <span class="rounded-26px bg-#ff6100 p-x-8px p-y-5px color-white">去绑定</span>
-    </div>
-  </div>
+    </div> -->
+	</div>
 </template>
 <script setup lang="ts">
-import { UserCardProperty } from './config'
+	import { UserCardProperty } from './config'
 
-/** 用户卡片 */
-defineOptions({ name: 'UserCard' })
-// 定义属性
-defineProps<{ property: UserCardProperty }>()
+	/** 用户卡片 */
+	defineOptions({ name: 'UserCard' })
+	// 定义属性
+	defineProps<{ property : UserCardProperty }>()
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+	.new-main {
+		position: relative;
+		background: url('@/assets/imgs/userCar/seckilbg.png') no-repeat;
+		background-size: cover;
+		padding-bottom: 53px;
+
+		.value-box {
+			margin-bottom: 6px;
+		}
+
+		.new-usercard {
+			width: 100%;
+			display: flex;
+			justify-content: space-around;
+		}
+
+		div {
+			text-align: center;
+			color: white;
+		}
+
+		.new-bottom {
+			position: absolute;
+			bottom: -28px;
+			width: 100%;
+			z-index: 999999999999999;
+
+			img {
+				width: 92%;
+			}
+
+			.btn {
+				position: absolute;
+				bottom: 19px;
+				right: 29px;
+				background: white;
+				border-radius: 12px;
+				padding: 4px 8px;
+				font-size: 14px;
+				color: #946d2d;
+			}
+		}
+	}
+</style>

yudao-admin-vue3/src/components/DiyEditor/components/mobile/UserOrder/index.vue

@@ -1,5 +1,6 @@
 <template>
-  <el-image src="https://shopro.sheepjs.com/admin/static/images/shop/decorate/orderCardStyle.png" />
+  <!-- <el-image src="https://shopro.sheepjs.com/admin/static/images/shop/decorate/orderCardStyle.png" /> -->
+  <el-image src="  https://zysc.fjptzykj.com:3000/shangcheng/0ba158a1a2de7d39c6cec22cfe54736237438f63893b09c7453b5b5e3482f826.png" />
 </template>
 <script setup lang="ts">
 import { UserOrderProperty } from './config'

yudao-admin-vue3/src/components/DiyEditor/components/mobile/VideoPlayer/config.ts

@@ -17,12 +17,13 @@ export interface VideoPlayerStyle extends ComponentStyle {
   // 视频高度
   height: number
 }
-
+import logo from '@/assets/imgs/DiyEditorImges/组件图标-11.png'
 // 定义组件
 export const component = {
   id: 'VideoPlayer',
   name: '视频播放',
-  icon: 'ep:video-play',
+  // icon: 'ep:video-play',
+  icon: logo,
   property: {
     videoUrl: '',
     posterUrl: '',

yudao-admin-vue3/src/views/mall/promotion/diy/template/decorate1.vue

@@ -2,19 +2,19 @@
 	<DiyEditor v-if="formData && !formLoading" v-model="currentFormData!.property"
 		:title="templateItems[selectedTemplateItem].name" :libs="libs" :show-page-config="selectedTemplateItem !== 0"
 		:show-tab-bar="selectedTemplateItem === 0" :show-navigation-bar="selectedTemplateItem !== 0"
-		:preview-url="previewUrl" @save="submitForm" @reset="handleEditorReset">
+		:preview-url="previewUrl" @save="submitForm" @reset="handleEditorReset" :isShow="false">
 		<template #toolBarLeft>
 			<!-- <el-radio-group
-        v-model="selectedTemplateItem"
-        class="h-full!"
-        @change="handleTemplateItemChange"
-      >
-        <el-tooltip v-for="(item, index) in templateItems" :key="index" :content="item.name">
-          <el-radio-button :label="index">
-            <Icon :icon="item.icon" :size="24" />
-          </el-radio-button>
-        </el-tooltip>
-      </el-radio-group> -->
+				v-model="selectedTemplateItem"
+				class="h-full!"
+				@change="handleTemplateItemChange"
+			  >
+				<el-tooltip v-for="(item, index) in templateItems" :key="index" :content="item.name">
+				  <el-radio-button :label="index">
+					<Icon :icon="item.icon" :size="24" />
+				  </el-radio-button>
+				</el-tooltip>
+			  </el-radio-group> -->
 		</template>
 	</DiyEditor>
 </template>