Bladeren bron

活动详情富文本预览样式修改

zuy 1 jaar geleden
bovenliggende
commit
6faf0d1443
3 gewijzigde bestanden met toevoegingen van 15 en 23 verwijderingen
  1. 2 2
      admin-web/src/theme/app.scss
  2. 11 19
      admin-web/src/views/admin/activity/dialog.vue
  3. 2 2
      admin-web/vite.config.ts

+ 2 - 2
admin-web/src/theme/app.scss

@@ -367,7 +367,7 @@ body,
 }
 }
 
 
 //固定宽度
 //固定宽度
-@for $i from 0 through 30 {
+@for $i from 0 through 60 {
   .wd#{$i*5} {
   .wd#{$i*5} {
     width: #{$i*5}px !important;
     width: #{$i*5}px !important;
   }
   }
@@ -507,7 +507,7 @@ body,
   font-weight: 600;
   font-weight: 600;
   font-size: 14px;
   font-size: 14px;
   width: 100%;
   width: 100%;
-
+  transition: width 0.5s;
   &:before {
   &:before {
     content: " ";
     content: " ";
     border-bottom: 4px solid var(--el-color-primary);
     border-bottom: 4px solid var(--el-color-primary);

+ 11 - 19
admin-web/src/views/admin/activity/dialog.vue

@@ -17,7 +17,7 @@
     <el-dialog
     <el-dialog
         :title="state.dialog.title"
         :title="state.dialog.title"
         v-model="state.dialog.isShowDialog"
         v-model="state.dialog.isShowDialog"
-        width="820px"
+        width="920px"
         draggable
         draggable
         destroy-on-close
         destroy-on-close
         :close-on-click-modal="false"
         :close-on-click-modal="false"
@@ -41,25 +41,17 @@
               class="w100">
               class="w100">
           </el-input>
           </el-input>
         </el-form-item>
         </el-form-item>
-        <el-form-item label="活动描述" prop="remark" class="w100">
-          <!--          <el-input
-                        maxlength="500"
-                        show-word-limit
-                        type="textarea"
-                        :rows="3"
-                        v-model.trim="state.ruleForm.activityDesc"
-                        placeholder="活动描述"
-                        clearable
-                        class="w100">
-                    </el-input>-->
-
-
-          <ext-editor class="w100" ref="ext_editor_ref" v-model="state.ruleForm.activityDesc"></ext-editor>
-          <el-divider></el-divider>
+
+        <el-form-item label="活动描述" prop="remark" class="w100"></el-form-item>
+        <div class="w100 flex mt20 mb20 flex-justify-between">
+          <ext-editor style="width:380px;flex:1;margin-right: 10px;" ref="ext_editor_ref" v-model="state.ruleForm.activityDesc"></ext-editor>
+
+<!--          <el-divider direction="vertical"></el-divider>-->
           <div class="preview">
           <div class="preview">
             <div class="preview_body" v-html="state.ruleForm.activityDesc"></div>
             <div class="preview_body" v-html="state.ruleForm.activityDesc"></div>
           </div>
           </div>
-        </el-form-item>
+        </div>
+
         <el-form-item label="开始时间" prop="startTime">
         <el-form-item label="开始时间" prop="startTime">
           <ext-date-picker
           <ext-date-picker
               v-model.trim="state.ruleForm.startTime"
               v-model.trim="state.ruleForm.startTime"
@@ -456,7 +448,7 @@ const open = (action: string = 'add', row: any) => {
     loadData(row.id);
     loadData(row.id);
   } else {
   } else {
     state.ruleForm = Object.assign(state.ruleForm, row);
     state.ruleForm = Object.assign(state.ruleForm, row);
-    ext_editor_ref.value?.initText(state.ruleForm.activityDesc||'');
+    ext_editor_ref.value?.initText(state.ruleForm.activityDesc || '');
   }
   }
 };
 };
 // 关闭弹窗
 // 关闭弹窗
@@ -526,7 +518,7 @@ const loadData = (id: number) => {
     state.ruleForm = res;
     state.ruleForm = res;
     state.ruleForm.rechargeRightsList = res.rechargeRightsList || []
     state.ruleForm.rechargeRightsList = res.rechargeRightsList || []
 
 
-    ext_editor_ref.value?.initText(res.activityDesc||'');
+    ext_editor_ref.value?.initText(res.activityDesc || '');
   })
   })
 }
 }
 
 

+ 2 - 2
admin-web/vite.config.ts

@@ -28,9 +28,9 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
             port: env.VITE_PORT as unknown as number,
             port: env.VITE_PORT as unknown as number,
             open: JSON.parse(env.VITE_OPEN),
             open: JSON.parse(env.VITE_OPEN),
             hmr: true,
             hmr: true,
-     /*       proxy: {
+           /* proxy: {
                 '/admin': {
                 '/admin': {
-                    target: 'https://www.kuaiyuman.cn/admin/',
+                    target: 'http://localhost:8080/admin/',
                     changeOrigin: true,
                     changeOrigin: true,
                     // rewrite: (path) => path.replace(/^\/admin/, '')
                     // rewrite: (path) => path.replace(/^\/admin/, '')
                 }
                 }