diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/Final/AppletCouponType.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/Final/AppletCouponType.java
index a380fe9..40d5d52 100644
--- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/Final/AppletCouponType.java
+++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/Final/AppletCouponType.java
@@ -1,4 +1,9 @@
 package org.jeecg.modules.applet.Final;
 
 public class AppletCouponType {
+
+    public static final String MANUAL = "0";
+    public static final String NEW_USER = "1";//新用户自动领取
+
+
 }
diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiLoginService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiLoginService.java
index 418a326..fac2fe9 100644
--- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiLoginService.java
+++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/applet/service/impl/AppletApiLoginService.java
@@ -11,15 +11,19 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.AppletUser;
 import org.jeecg.common.api.IAppletUserService;
 import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.applet.Final.AppletCouponType;
 import org.jeecg.modules.applet.Final.LoginType;
 import org.jeecg.modules.common.wxUtils.WxHttpClientUtil;
 import org.jeecg.modules.common.wxUtils.WxHttpUtils;
+import org.jeecg.modules.demo.appletCoupon.entity.AppletCoupon;
+import org.jeecg.modules.demo.appletCoupon.service.IAppletCouponService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -42,6 +46,9 @@ public class AppletApiLoginService {
     @Autowired
     private RedisUtil redisUtil;
 
+    @Autowired
+    private IAppletCouponService appletCouponService;
+
     private JSONObject openLogin(String code, String type){
         log.info("开始小程序登录，code: {}", code);
         // 调用微信API获取openid和session_key
@@ -236,6 +243,9 @@ public class AppletApiLoginService {
                 // 保存到数据库
                 appletUserService.save(user);
                 log.info("创建小程序用户成功: {}", user.getName());
+
+                appletCouponService.distributeCouponByType(AppletCouponType.NEW_USER, user.getId());
+
             } else {
                 log.info("找到已存在的小程序用户: {}", user.getName());
             }
diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/entity/AppletCoupon.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/entity/AppletCoupon.java
index 62e893c..3b65565 100644
--- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/entity/AppletCoupon.java
+++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/entity/AppletCoupon.java
@@ -33,49 +33,75 @@ import lombok.experimental.Accessors;
 public class AppletCoupon implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private java.lang.String id;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @Schema(description = "创建人")
     private java.lang.String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
     private java.util.Date createTime;
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @Schema(description = "更新人")
     private java.lang.String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
     private java.util.Date updateTime;
-	/**所属部门*/
+    /**
+     * 所属部门
+     */
     @Schema(description = "所属部门")
     private java.lang.String sysOrgCode;
-	/**优惠券名称*/
-	@Excel(name = "优惠券名称", width = 15)
+    /**
+     * 优惠券名称
+     */
+    @Excel(name = "优惠券名称", width = 15)
     @Schema(description = "优惠券名称")
     private java.lang.String name;
-	/**面额*/
-	@Excel(name = "面额", width = 15)
+    /**
+     * 面额
+     */
+    @Excel(name = "面额", width = 15)
     @Schema(description = "面额")
     private java.math.BigDecimal money;
-	/**有效期*/
-	@Excel(name = "有效期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    /**
+     * 有效期
+     */
+    @Excel(name = "有效期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "有效期")
     private java.util.Date endTime;
-	/**发放数量*/
-	@Excel(name = "发放数量", width = 15)
+    /**
+     * 发放数量
+     */
+    @Excel(name = "发放数量", width = 15)
     @Schema(description = "发放数量")
     private java.lang.Integer count;
-	/**已使用数量*/
-	@Excel(name = "已使用数量", width = 15)
+    /**
+     * 已使用数量
+     */
+    @Excel(name = "已使用数量", width = 15)
     @Schema(description = "已使用数量")
     private java.lang.Integer quantityused;
-}
+
+    @Dict(dicCode = "applet_discount_coupon_type")
+    private java.lang.String type;
+
+}
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/service/IAppletCouponService.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/service/IAppletCouponService.java
index ca6109d..5489fa6 100644
--- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/service/IAppletCouponService.java
+++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/service/IAppletCouponService.java
@@ -19,6 +19,14 @@ public interface IAppletCouponService extends IService<AppletCoupon> {
      */
     void distributeCoupon(String couponId, String userIds);
 
+
+    /**
+     * 优惠券根据类型批量发放
+     * @param type 优惠券类型
+     * @param userIds 用户ID列表，为空表示发放给所有用户
+     */
+    void distributeCouponByType(String type, String userIds);
+
     /**
      * 优惠券核销
      * @param recordId 优惠券记录ID
diff --git a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/service/impl/AppletCouponServiceImpl.java b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/service/impl/AppletCouponServiceImpl.java
index 4b424d2..a44ad4a 100644
--- a/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/service/impl/AppletCouponServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module/jeecgboot-boot-applet/src/main/java/org/jeecg/modules/demo/appletCoupon/service/impl/AppletCouponServiceImpl.java
@@ -1,6 +1,7 @@
 package org.jeecg.modules.demo.appletCoupon.service.impl;
 
 import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.applet.Final.AppletCouponType;
 import org.jeecg.modules.demo.appletCoupon.entity.AppletCoupon;
 import org.jeecg.modules.demo.appletCoupon.mapper.AppletCouponMapper;
 import org.jeecg.modules.demo.appletCoupon.service.IAppletCouponService;
@@ -86,6 +87,17 @@ public class AppletCouponServiceImpl extends ServiceImpl<AppletCouponMapper, App
         updateById(coupon);
     }
 
+    @Override
+    public void distributeCouponByType(String type, String userIds) {
+        //新用户领取
+        List<AppletCoupon> list = lambdaQuery()
+                .eq(AppletCoupon::getType, type)
+                .list();
+        for (AppletCoupon coupon : list){
+            distributeCoupon(coupon.getId(), userIds);
+        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AppletCouponRecord useCoupon(String recordId, String userId) {
diff --git a/jeecgboot-vue3/src/views/applet/coupon/AppletCoupon.data.ts b/jeecgboot-vue3/src/views/applet/coupon/AppletCoupon.data.ts
index 2ed723b..153d1d4 100644
--- a/jeecgboot-vue3/src/views/applet/coupon/AppletCoupon.data.ts
+++ b/jeecgboot-vue3/src/views/applet/coupon/AppletCoupon.data.ts
@@ -15,6 +15,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'money'
    },
+   {
+    title: '优惠券类型',
+    align:"center",
+    dataIndex: 'type_dictText'
+   },
    {
     title: '有效期',
     align:"center",
@@ -46,6 +51,15 @@ export const formSchema: FormSchema[] = [
     field: 'money',
     component: 'InputNumber',
   },
+  {
+    label: '优惠券类型',
+    field: 'type',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'applet_discount_coupon_type',
+      type: 'radio',
+    },
+  },
   {
     label: '有效期',
     field: 'endTime',
@@ -78,9 +92,10 @@ export const formSchema: FormSchema[] = [
 export const superQuerySchema = {
   name: {title: '优惠券名称',order: 0,view: 'text', type: 'string',},
   money: {title: '面额',order: 1,view: 'number', type: 'number',},
-  endTime: {title: '有效期',order: 2,view: 'datetime', type: 'string',},
-  count: {title: '发放数量',order: 3,view: 'text', type: 'string',},
-  quantityused: {title: '已使用数量',order: 4,view: 'text', type: 'string',},
+  type: {title: '优惠券类型',order: 2,view: 'list', type: 'string',dictCode: 'applet_discount_coupon_type',},
+  endTime: {title: '有效期',order: 3,view: 'datetime', type: 'string',},
+  count: {title: '发放数量',order: 4,view: 'text', type: 'string',},
+  quantityused: {title: '已使用数量',order: 5,view: 'text', type: 'string',},
 };
 
 /**
diff --git a/jeecgboot-vue3/src/views/applet/course-page/AppletCoursePageList.vue b/jeecgboot-vue3/src/views/applet/course-page/AppletCoursePageList.vue
index 9e582a4..ca583a3 100644
--- a/jeecgboot-vue3/src/views/applet/course-page/AppletCoursePageList.vue
+++ b/jeecgboot-vue3/src/views/applet/course-page/AppletCoursePageList.vue
@@ -24,15 +24,8 @@
     <!-- 上方：课程页面列表（横向滑动） -->
     <div class="page-list-container">
       <div class="page-list-scroll">
-        <draggable 
-          v-model="pageList" 
-          class="page-list"
-          item-key="id"
-          handle=".drag-handle"
-          :animation="200"
-          @start="onPageDragStart"
-          @end="onPageDragEnd"
-        >
+        <draggable v-model="pageList" class="page-list" item-key="id" handle=".drag-handle" :animation="200"
+          @start="onPageDragStart" @end="onPageDragEnd">
           <template #item="{ element: page, index }">
             <div :class="['page-item', { active: currentPageId === page.id }]" @click="selectPage(page)">
               <!-- 拖拽手柄 -->
@@ -73,7 +66,7 @@
             <a-form :model="currentPage" layout="vertical" class="page-form">
               <!-- 内容编辑组件 -->
               <ContentEditor v-model:components="contentComponents" />
-              
+
               <!-- 重点单词表格组件 -->
               <WordTable :course-page-id="currentPage.id" ref="wordTableRef" />
             </a-form>
@@ -97,11 +90,7 @@
                 </a-form-item>
                 <a-form-item label="页面类型" name="type">
                   <a-select v-model:value="currentPage.type" placeholder="选择类型">
-                    <a-select-option 
-                      v-for="option in pageTypeOptions" 
-                      :key="option.value" 
-                      :value="option.value"
-                    >
+                    <a-select-option v-for="option in pageTypeOptions" :key="option.value" :value="option.value">
                       {{ option.label }}
                     </a-select-option>
                   </a-select>
@@ -117,10 +106,7 @@
           </div>
 
           <!-- 右侧：手机预览区域 -->
-          <MobilePreview 
-            :content-components="contentComponents" 
-            @refresh="refreshPreview"
-          />
+          <MobilePreview :content-components="contentComponents" @refresh="refreshPreview" />
         </div>
       </div>
     </div>
@@ -241,7 +227,7 @@ async function loadPageList() {
     const result = await list(params);
     const records = result.records || [];
     pageList.value = records;
-    
+
     // 如果没有页面，自动创建一个
     if (pageList.value.length === 0) {
       await handleAddPage();
@@ -256,7 +242,7 @@ async function loadPageList() {
  */
 function selectPage(page: any) {
   currentPageId.value = page.id;
-  
+
   // 加载页面数据
   loadPageData(page.id);
 }
@@ -268,12 +254,32 @@ async function loadPageData(id: string) {
   if (!id) {
     return;
   }
-  
+
   try {
     const result = await getById({ id });
     Object.assign(currentPage, result);
+
+    // 保存原始内容用于比较
+    const originalContent = result.content;
+
     // 解析content字段为组件列表
     parseContentToComponents(result.content);
+
+    // 检查解析后的内容是否有变化（添加了style等默认值）
+    const updatedContent = componentsToContent();
+
+    // 如果内容有变化，自动保存到数据库
+    if (originalContent !== updatedContent) {
+      try {
+        await edit({
+          id: currentPage.id,
+          content: updatedContent
+        });
+        console.log('自动保存了组件样式初始化数据');
+      } catch (error) {
+        console.error('自动保存组件样式失败:', error);
+      }
+    }
   } catch (error) {
     createMessage.error('加载页面数据失败');
   }
@@ -289,19 +295,69 @@ function parseContentToComponents(content: string) {
   try {
     const parsed = JSON.parse(content);
     if (Array.isArray(parsed)) {
-      // 确保每个文本组件都有language字段
+      // 确保每个组件都有必要的字段
       contentComponents.value = parsed.map(component => {
-        if (component.type === 'text' && !component.language) {
-          return { ...component, language: 'zh' }; // 默认中文
+        const updatedComponent = { ...component };
+
+        if (component.type == 'text') {
+
+          if (!updatedComponent.language) {
+            updatedComponent.language = 'zh'; // 默认中文
+          }
+
+          // 确保组件有style对象
+          if (!updatedComponent.style) {
+            updatedComponent.style = {};
+          }
+
+          // 确保style对象有字体大小，如果没有则初始化为40rpx
+          if (!updatedComponent.style.fontSize) {
+            updatedComponent.style.fontSize = '40rpx';
+          } else {
+            // 检查并修正fontSize单位，清理异常单位
+            let fontSize = updatedComponent.style.fontSize;
+            if (typeof fontSize === 'string') {
+              // 清理异常的rpx单位（如：rrpx, rrrpx, 40rrrrrrpx等）
+              fontSize = fontSize.replace(/r+px$/i, 'rpx');
+              
+              // 提取数字部分，确保格式正确
+              const numMatch = fontSize.match(/(\d+)/);
+              if (numMatch) {
+                const num = numMatch[1];
+                // 统一设置为正确的rpx格式
+                updatedComponent.style.fontSize = `${num}rpx`;
+              } else {
+                // 如果无法提取数字，使用默认值
+                updatedComponent.style.fontSize = '40rpx';
+              }
+            }
+          }
+
+          // 确保style对象有字体颜色，如果没有则初始化为#333
+          if (!updatedComponent.style.color) {
+            updatedComponent.style.color = '#333';
+          }
+
+          // 确保style对象有字体样式，如果没有则初始化为宋体
+          if (!updatedComponent.style.fontFamily) {
+            updatedComponent.style.fontFamily = 'SimSun';
+          }
         }
-        return component;
+
+        return updatedComponent;
       });
+      console.log('解析后的组件列表:', contentComponents.value);
     } else {
       // 如果是字符串，创建一个文本组件
       contentComponents.value = [{
         type: 'text',
         content: content,
-        language: 'zh' // 默认中文
+        language: 'zh', // 默认中文
+        style: {
+          fontSize: '40rpx', // 默认字体大小
+          color: '#333', // 默认字体颜色
+          fontFamily: '宋体' // 默认字体样式
+        }
       }];
     }
   } catch (error) {
@@ -309,7 +365,12 @@ function parseContentToComponents(content: string) {
     contentComponents.value = [{
       type: 'text',
       content: content,
-      language: 'zh' // 默认中文
+      language: 'zh', // 默认中文
+      style: {
+        fontSize: '40rpx', // 默认字体大小
+        color: '#333', // 默认字体颜色
+        fontFamily: '宋体' // 默认字体样式
+      }
     }];
   }
 }
@@ -348,18 +409,18 @@ async function handleAddPage() {
     if (result.id) {
       // 设置新页面的ID
       newPage.id = result.id;
-      
+
       // 将新页面添加到页面列表中
       pageList.value.push(newPage);
-      
+
       // 重新设置所有页面的排序值
       updatePageSortOrder();
-      
+
       // 设置为当前编辑页面
       Object.assign(currentPage, newPage);
       contentComponents.value = [];
       currentPageId.value = newPage.id;
-      
+
       createMessage.success('新增页面成功');
     } else {
       createMessage.error(result.message || '新增页面失败');
@@ -472,7 +533,7 @@ async function savePageOrder() {
         return edit({ id: page.id, sort: page.sort });
       }
     }).filter(Boolean);
-    
+
     await Promise.all(updatePromises);
   } catch (error) {
     console.error('保存页面排序失败:', error);
@@ -506,10 +567,10 @@ async function handleSave() {
     const result = await edit(pageData);
     if (result) {
       // createMessage.success('保存成功');
-      
+
       // 重新加载页面列表以确保数据同步
       await loadPageList();
-      
+
       // 保持当前页面选中状态
       if (currentPageId.value) {
         const currentPageInList = pageList.value.find(p => p.id === currentPageId.value);
diff --git a/jeecgboot-vue3/src/views/applet/course-page/components/ContentEditor.vue b/jeecgboot-vue3/src/views/applet/course-page/components/ContentEditor.vue
index 754a3e3..70d0629 100644
--- a/jeecgboot-vue3/src/views/applet/course-page/components/ContentEditor.vue
+++ b/jeecgboot-vue3/src/views/applet/course-page/components/ContentEditor.vue
@@ -181,14 +181,23 @@ watch(
       if (!c.style.fontFamily) c.style.fontFamily = 'SimSun';
       if (!c.style.fontWeight) c.style.fontWeight = 'normal';
       if (typeof c.isLead === 'undefined') c.isLead = false;
-      // 单位归一化：如果是 px，替换为 rpx；如果是纯数字，补 rpx；如果已经是 rpx，保持不变
+      // 单位归一化和清理异常单位
       if (typeof c.style.fontSize === 'string') {
-        if (/px$/i.test(c.style.fontSize)) {
-          c.style.fontSize = c.style.fontSize.replace(/px$/i, 'rpx');
-        } else if (/^\d+$/.test(c.style.fontSize)) {
-          c.style.fontSize = `${c.style.fontSize}rpx`;
+        let fontSize = c.style.fontSize;
+        
+        // 清理异常的rpx单位（如：rrpx, rrrpx, 40rrrrrrpx等）
+        fontSize = fontSize.replace(/r+px$/i, 'rpx');
+        
+        // 提取数字部分，确保格式正确
+        const numMatch = fontSize.match(/(\d+)/);
+        if (numMatch) {
+          const num = numMatch[1];
+          // 统一设置为正确的rpx格式
+          c.style.fontSize = `${num}rpx`;
+        } else {
+          // 如果无法提取数字，使用默认值
+          c.style.fontSize = '40rpx';
         }
-        // 如果已经是 rpx 格式，不做任何处理，避免重复添加单位
       }
     }
     return c;
@@ -284,6 +293,14 @@ function setFontSizeNumber(component: any, value: number) {
   if (isNaN(numValue) || numValue <= 0) {
     component.style.fontSize = '40rpx'; // 默认值
   } else {
+    // 清理当前fontSize中的异常单位，然后设置新值
+    let currentFontSize = component.style.fontSize;
+    if (typeof currentFontSize === 'string') {
+      // 清理异常的rpx单位（如：rrpx, rrrpx, 40rrrrrrpx等）
+      currentFontSize = currentFontSize.replace(/r+px$/i, 'rpx');
+    }
+    
+    // 统一设置为正确的rpx格式
     component.style.fontSize = `${numValue}rpx`;
   }
   emitUpdate();