yuanyiming 2 years ago
parent
commit
1c135385b5

+ 2 - 2
src/views/makerActvityApply.vue

@@ -17,9 +17,9 @@
 
         <!-- 右边填写信息区域开始 -->
         <div class="right">
-              <div class="pAHeader">
+              <div class="pA1Header">
                   <div class="pAHeader1">创客创新-活动申请</div>
-                  <div style="margin-top: 10px; cursor: pointer;" @click="backBtn1">返回</div>
+                  <div style="margin-top: 10px; cursor: pointer;" @click="$router.back()">返回</div>
               </div>
               <hr>
 

+ 10 - 6
src/views/makerActvityApply2.vue

@@ -19,7 +19,7 @@
         <!-- 右方数据展示区开始 -->
         <div class="right">
           <!-- 标题 -->
-          <div class="pAHeader">
+          <div class="pA1Header">
               <div class="pAHeader1">活动申请</div>
               <div style="margin-top: 10px;cursor: pointer;" @click="back()">返回</div>
           </div>
@@ -28,27 +28,27 @@
             <div>
               <p class="pTit">活动计划</p>
               <div class="editor">
-                <vue-editor v-model="content"></vue-editor>
+                <vue-editor :editorToolbar="customToolbar" v-model="content"></vue-editor>
               </div>
             </div>
 
             <div>
                 <p class="pTit">预期目标</p>
                 <div class="editor">
-                  <vue-editor v-model="content"></vue-editor>
+                  <vue-editor :editorToolbar="customToolbar" v-model="content"></vue-editor>
                 </div>
               </div>
 
               <div>
                 <p class="pTit">活动受面</p>
                 <div class="editor">
-                  <vue-editor v-model="content"></vue-editor>
+                  <vue-editor :editorToolbar="customToolbar" v-model="content"></vue-editor>
                 </div>
               </div>
               <div>
                 <p class="pTit">经费支出计划</p>
                 <div class="editor">
-                  <vue-editor v-model="content"></vue-editor>
+                  <vue-editor :editorToolbar="customToolbar" v-model="content"></vue-editor>
                 </div>
               </div>
               
@@ -94,7 +94,11 @@
           return {
             content:'',
             dialogVisible1:false,
-
+            customToolbar: [
+              ["bold", "italic", "underline"], [{ list: "ordered" }, { list: "bullet" }],
+              [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
+              [{header:[false,1,2,3,4]}]
+            ],
           }
         },
         methods:{

+ 0 - 18
src/views/projectApplicationApply2.vue

@@ -75,24 +75,6 @@
               [{ align: "" }, { align: "center" }, { align: "right"}, { align: "justify"}],
               [{header:[false,1,2,3,4]}]
             ],
-            // customToolbar: [
-            //     ["bold", "italic", "size", " font", "underline", "color", "italic", "strike", "clean",],
-            //     // [{ align: ['', 'center', 'right', 'justify'] }],
-            //     // [{
-            //     //   header: [false, 1, 2, 3, 4, 5, 6]
-            //     // }],
-            //     // [{
-            //     //   list: "ordered"
-            //     // }, {
-            //     //   list: "bullet"
-            //     // }],
-            //     // [{
-            //     //   indent: "-1"
-            //     // }, {
-            //     //   indent: "+1"
-            //     // }],
-            //     // ["image"],
-            // ],
           }
         },
         methods:{

+ 0 - 1
src/views/projectSettlement2.vue

@@ -31,7 +31,6 @@
         stripe
         class="fontSize"
         :header-cell-style="{ background: '#f2f2f2',color:'#000' }"
-        style="width: 100%;"
         >
         <el-table-column
           prop="projectName"