xjc 3 년 전
부모
커밋
adda0ae106
4개의 변경된 파일30개의 추가작업 그리고 11개의 파일을 삭제
  1. 4 3
      src/components/fuEditor/index.vue
  2. 8 5
      src/views/match/addChampionSay.vue
  3. 16 1
      src/views/match/index.vue
  4. 2 2
      vue.config.js

+ 4 - 3
src/components/fuEditor/index.vue

@@ -138,7 +138,7 @@ export default {
   z-index: 0;
   /deep/ .toolbar {
     border: 1px solid #ccc;
-    position: fixed;
+    // position: fixed;
     z-index: 100000;
     width: 100%;
     background: #fff;
@@ -147,10 +147,11 @@ export default {
   /deep/ .text {
     border: 1px solid #ccc;
     min-height: 500px;
+  height: 500px;
+
     // margin-top:52px;
-        top: 52px;
+        // top: 52px;
   }
-  height: 500px;
   overflow-y: scroll;
   // .w-e-toolbar{
   //   position: fixed;

+ 8 - 5
src/views/match/addChampionSay.vue

@@ -1,5 +1,6 @@
 <style lang="scss">
-.avatar-uploader .el-upload {
+.content {
+  .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
     cursor: pointer;
@@ -7,7 +8,7 @@
     overflow: hidden;
   }
   .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
+    border-color: #409eff;
   }
   .avatar-uploader-icon {
     font-size: 28px;
@@ -22,6 +23,8 @@
     height: 178px;
     display: block;
   }
+  height: 110vh!important;
+}
 </style>
 <template>
   <section class="content">
@@ -71,7 +74,7 @@ export default {
   },
   data() {
     return {
-      imageUrl:"",
+      imageUrl: "",
       test: "",
       list: [],
       form: {
@@ -82,7 +85,7 @@ export default {
         address: "",
         point: "",
         status: 1,
-        img:""
+        img: "",
       },
       isClear: false,
       keyword: "",
@@ -160,7 +163,7 @@ export default {
       this.form.img = res.data.url;
     },
     beforeAvatarUpload(file) {
-      return 
+      return;
       const isJPG = file.type === "image/jpeg";
       const isLt2M = file.size / 1024 / 1024 < 2;
 

+ 16 - 1
src/views/match/index.vue

@@ -44,7 +44,7 @@
             :total="total"
             @pageChange="gopage"
         />
-        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="80px">
                 <el-form-item label="比赛名称" prop="name">
                     <el-input clearable v-model="form.name" placeholder="请输入比赛名称"></el-input>
@@ -71,6 +71,17 @@
                     >
                     </el-date-picker>
                 </el-form-item>
+                <el-form-item label="报单日历">
+                    <el-calendar :range="dateRange">
+                        <template
+                            slot="dateCell"
+                            slot-scope="{date, data}">
+                            <p :class="data.isSelected ? 'is-selected' : ''">
+                            {{ data.day.split('-').slice(1).join('-') }} {{ data.isSelected ? '✔️' : ''}}
+                            </p>
+                        </template>
+                    </el-calendar>
+                </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -87,6 +98,10 @@ export default {
     },
     data(){
         return{
+            dateRange:[
+                "2021-12-01",
+                "2022-01-02"
+            ],
             loading:false,
             queryParams:{
                 page:1

+ 2 - 2
vue.config.js

@@ -3,9 +3,9 @@ module.exports={
         proxy:{
             '/api':{
                 // target:'http://39.107.246.59:81',
-                // target:'https://www.hunanwanzhu.com',
+                target:'https://www.hunanwanzhu.com',
                 // target:'http://caos.tederen.com',
-                target:'https://wx.scxjc.club',
+                // target:'https://wx.scxjc.club',
                 changeOrigin: true,
             }
         }