Browse Source

08/12 16:04

111
mo 4 years ago
parent
commit
14464996fa

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-3d539cb4.8dfde67c.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-668c43c4.d97c7eab.css


+ 0 - 1
dist/static/css/chunk-7c516715.e1cebdbc.css

@@ -1 +0,0 @@
-.m-container[data-v-37ca22dc]{min-width:100%}.el-input[data-v-37ca22dc]{width:400px}[data-v-37ca22dc] .ql-editor{min-height:300px;padding:0}[data-v-37ca22dc] .ql-container .ql-editor{max-height:500px}.el-button--primary[data-v-37ca22dc],.el-button--primary[data-v-37ca22dc]:active,.el-button--primary[data-v-37ca22dc]:focus,.el-button--primary[data-v-37ca22dc]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-37ca22dc]{margin-top:40px}.el-col[data-v-37ca22dc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-37ca22dc]{width:200px;margin:0 20px}[data-v-37ca22dc] .el-tree-node__content{height:40px!important}[data-v-37ca22dc] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-37ca22dc]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-37ca22dc]{font-size:28px;color:#8c939d;width:240px;height:120px;line-height:120px;text-align:center}[data-v-37ca22dc] .el-date-editor{width:400px}.avatar[data-v-37ca22dc]{width:240px;height:120px;display:block}.ivu-upload[data-v-37ca22dc]{display:none}

+ 1 - 0
dist/static/css/chunk-da5fa00c.3e629e0f.css

@@ -0,0 +1 @@
+.m-container[data-v-43e4b4ab]{min-width:100%}.el-input[data-v-43e4b4ab]{width:400px}[data-v-43e4b4ab] .ql-editor{min-height:300px;padding:0}[data-v-43e4b4ab] .ql-container .ql-editor{max-height:500px}.el-button--primary[data-v-43e4b4ab],.el-button--primary[data-v-43e4b4ab]:active,.el-button--primary[data-v-43e4b4ab]:focus,.el-button--primary[data-v-43e4b4ab]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-43e4b4ab]{margin-top:40px}.el-col[data-v-43e4b4ab]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-43e4b4ab]{width:200px;margin:0 20px}[data-v-43e4b4ab] .el-tree-node__content{height:40px!important}[data-v-43e4b4ab] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-43e4b4ab]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-43e4b4ab]{font-size:28px;color:#8c939d;width:240px;height:120px;line-height:120px;text-align:center}[data-v-43e4b4ab] .el-date-editor{width:400px}.avatar[data-v-43e4b4ab]{width:240px;height:120px;display:block}.ivu-upload[data-v-43e4b4ab]{display:none}

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.de344a67.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-203092ff.8c3cae34.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-3d539cb4.1b4bee13.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-668c43c4.0cef3144.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-7c516715.a9ebb6e3.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-a95d22a4.67b55cdb.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-da5fa00c.3ecb14fb.js


+ 120 - 87
src/views/app/entryOperation.vue

@@ -1,92 +1,125 @@
 <template>
   <div class="m-container">
     <h2>
-      <el-page-header @back="onCancel" :content="(pageType == 'create' ? '添加时间充值活动' : '查看时间充值活动')"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="(pageType == 'create' ? '添加时间充值活动' : '查看时间充值活动')"></el-page-header>
     </h2>
 
     <div class="m-core">
-      <el-form :model="form" :rules="rules" ref="form" label-width="120px" style="width: 100%">
-        <el-form-item label="活动名称" prop="name">
-          <el-input v-model.trim="form.name" placeholder="请输入活动名称" :disabled="pageType=='create'?false:true"></el-input>
+      <el-form :model="form"
+               :rules="rules"
+               ref="form"
+               label-width="120px"
+               style="width: 100%">
+        <el-form-item label="活动名称"
+                      prop="name">
+          <el-input v-model.trim="form.name"
+                    placeholder="请输入活动名称"
+                    :disabled="pageType=='create'?false:true"></el-input>
         </el-form-item>
-        <el-form-item label="适用范围" prop="suitableUser">
-          <el-select v-model="form.suitableUser" :disabled="pageType=='create'?false:true" placeholder="请选择适用范围">
-            <el-option label="全部" value="ALL"></el-option>
-            <el-option label="新用户" value="NEW"></el-option>
+        <el-form-item label="适用范围"
+                      prop="suitableUser">
+          <el-select v-model="form.suitableUser"
+                     :disabled="pageType=='create'?false:true"
+                     placeholder="请选择适用范围">
+            <el-option label="全部"
+                       value="ALL"></el-option>
+            <el-option label="新用户"
+                       value="NEW"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="有效期" prop="date">
+        <el-form-item label="有效期"
+                      prop="date">
           <!-- <el-input v-model="form.memo"></el-input> -->
-          <el-date-picker
-           :disabled="pageType=='create'?false:true"
-            v-model="form.date"
-            type="datetimerange"
-            align="right"
-            unlink-panels
-            value-format="yyyy-MM-dd HH:mm:ss"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
+          <el-date-picker :disabled="pageType=='create'?false:true"
+                          v-model="form.date"
+                          type="datetimerange"
+                          :picker-options="{
+                            firstDayOfWeek:1
+                          }"
+                          align="right"
+                          unlink-panels
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
         <!--  -->
-        <el-form-item label="价格" prop="totalPrice">
-          <el-input type="number" @mousewheel.native.prevent v-model.trim="form.totalPrice" placeholder="请输入价格" :disabled="pageType=='create'?false:true"></el-input>
+        <el-form-item label="价格"
+                      prop="totalPrice">
+          <el-input type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="form.totalPrice"
+                    placeholder="请输入价格"
+                    :disabled="pageType=='create'?false:true"></el-input>
         </el-form-item>
-        <el-form-item label="折扣价" prop="discountPrice">
-          <el-input type="number" @mousewheel.native.prevent v-model.trim="form.discountPrice" placeholder="请输入折价格"  :disabled="pageType=='create'?false:true"></el-input>
+        <el-form-item label="折扣价"
+                      prop="discountPrice">
+          <el-input type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="form.discountPrice"
+                    placeholder="请输入折价格"
+                    :disabled="pageType=='create'?false:true"></el-input>
         </el-form-item>
-        <el-form-item label="购买分钟数" prop="purchaseMinutes">
-          <el-input type="number" @mousewheel.native.prevent v-model.trim="form.purchaseMinutes" placeholder="请输入购买分钟"  :disabled="pageType=='create'?false:true"></el-input>
+        <el-form-item label="购买分钟数"
+                      prop="purchaseMinutes">
+          <el-input type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="form.purchaseMinutes"
+                    placeholder="请输入购买分钟"
+                    :disabled="pageType=='create'?false:true"></el-input>
         </el-form-item>
-        <el-form-item label="赠送分钟数" prop="giveMinutes">
-          <el-input type="number" @mousewheel.native.prevent v-model.trim="form.giveMinutes" placeholder="请输入赠送分钟"  :disabled="pageType=='create'?false:true"></el-input>
+        <el-form-item label="赠送分钟数"
+                      prop="giveMinutes">
+          <el-input type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="form.giveMinutes"
+                    placeholder="请输入赠送分钟"
+                    :disabled="pageType=='create'?false:true"></el-input>
         </el-form-item>
-        <el-form-item label="活动图" prop="coverImg">
-          <el-upload
-            class="avatar-uploader"
-            action="/api-web/uploadFile"
-             :disabled="pageType=='create'?false:true"
-            :headers="headers"
-            :show-file-list="false"
-            accept=".jpg, .jpeg, .png"
-            :on-success="handleAvatarSuccess"
-            :before-upload="beforeAvatarUpload"
-          >
-            <img v-if="form.coverImg" :src="form.coverImg" class="avatar" />
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        <el-form-item label="活动图"
+                      prop="coverImg">
+          <el-upload class="avatar-uploader"
+                     action="/api-web/uploadFile"
+                     :disabled="pageType=='create'?false:true"
+                     :headers="headers"
+                     :show-file-list="false"
+                     accept=".jpg, .jpeg, .png"
+                     :on-success="handleAvatarSuccess"
+                     :before-upload="beforeAvatarUpload">
+            <img v-if="form.coverImg"
+                 :src="form.coverImg"
+                 class="avatar" />
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
-          <p class="imageSize" v-if="imageSize">上传图片尺寸为:{{ imageSize }}</p>
+          <p class="imageSize"
+             v-if="imageSize">上传图片尺寸为:{{ imageSize }}</p>
         </el-form-item>
-        <el-form-item label="活动详情" prop="detail">
+        <el-form-item label="活动详情"
+                      prop="detail">
           <!-- bidirectional data binding(双向数据绑定) -->
-          <quill-editor
-            class="ql-editor"
-             :disabled="pageType=='create'?false:true"
-            v-model="form.detail"
-            ref="myQuillEditor"
-            :options="editorOption"
-            @change="onEditorChange($event)"
-          ></quill-editor>
+          <quill-editor class="ql-editor"
+                        :disabled="pageType=='create'?false:true"
+                        v-model="form.detail"
+                        ref="myQuillEditor"
+                        :options="editorOption"
+                        @change="onEditorChange($event)"></quill-editor>
 
-          <el-upload
-            class="ivu-upload"
-            :show-upload-list="false"
-            :headers="headers"
-            :on-success="handleSuccess"
-            accept=".jpg, .jpeg, .png"
-            :max-size="2048"
-            multiple
-            action="/api-web/uploadFile"
-          >
+          <el-upload class="ivu-upload"
+                     :show-upload-list="false"
+                     :headers="headers"
+                     :on-success="handleSuccess"
+                     accept=".jpg, .jpeg, .png"
+                     :max-size="2048"
+                     multiple
+                     action="/api-web/uploadFile">
             <Button icon="ios-cloud-upload-outline"></Button>
           </el-upload>
         </el-form-item>
         <el-form-item v-if="pageType == 'create'">
-          <el-button
-            @click="onSubmit('form')"
-            type="primary"
-          >立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+          <el-button @click="onSubmit('form')"
+                     type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
           <el-button @click="onReSet('form')">重置</el-button>
         </el-form-item>
       </el-form>
@@ -180,7 +213,7 @@ export default {
   components: {
     quillEditor
   },
-  data() {
+  data () {
     let that = this;
     return {
       categoryList: [],
@@ -196,7 +229,7 @@ export default {
           toolbar: {
             container: toolbarOptions,
             handlers: {
-              image: function(value) {
+              image: function (value) {
                 if (value) {
                   // 调用iview图片上传
                   document.querySelector(".ivu-upload .el-upload").click();
@@ -240,11 +273,11 @@ export default {
       imageSize: null
     };
   },
-  created() {},
-  mounted() {
+  created () { },
+  mounted () {
     this.init();
   },
-  activated() {
+  activated () {
     if (this.$route.query.type == "create") {
       this.form = {
         name: null,
@@ -265,9 +298,9 @@ export default {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       this.getList();
-      
+
       this.addQuillTitle();
 
       // this.form.type
@@ -279,11 +312,11 @@ export default {
       };
       this.imageSize = tempTitle[this.form.type];
     },
-    addQuillTitle() {
+    addQuillTitle () {
       const oToolBar = document.querySelector(".ql-toolbar"),
         aButton = oToolBar.querySelectorAll("button"),
         aSelect = oToolBar.querySelectorAll("select");
-      aButton.forEach(function(item) {
+      aButton.forEach(function (item) {
         if (item.className === "ql-script") {
           item.value === "sub" ? (item.title = "下标") : (item.title = "上标");
         } else if (item.className === "ql-indent") {
@@ -294,11 +327,11 @@ export default {
           item.title = titleConfig[item.classList[0]];
         }
       });
-      aSelect.forEach(function(item) {
+      aSelect.forEach(function (item) {
         item.parentNode.title = titleConfig[item.classList[0]];
       });
     },
-    onSubmit(formName) {
+    onSubmit (formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
           if (this.pageType == "create") {
@@ -326,7 +359,7 @@ export default {
         }
       });
     },
-    messageTips(title, res) {
+    messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + "成功");
         this.$router.push({
@@ -336,12 +369,12 @@ export default {
         this.$message.error(res.msg);
       }
     },
-    onCancel() {
+    onCancel () {
       this.$router.push({
         path: "/insideSetting/entryActivities"
       });
     },
-    handleSuccess(res) {
+    handleSuccess (res) {
       // 获取富文本组件实例
       let quill = this.editor;
       // 如果上传成功
@@ -357,10 +390,10 @@ export default {
         this.$message.error("图片插入失败");
       }
     },
-    onReSet(formName) {
+    onReSet (formName) {
       this.$refs[formName].resetFields();
     },
-    getList() {
+    getList () {
       if (this.pageType == "create") {
         return;
       } else {
@@ -385,11 +418,11 @@ export default {
         });
       }
     },
-    handleAvatarSuccess(res, file) {
+    handleAvatarSuccess (res, file) {
       load.endLoading()
       this.form.coverImg = res.data.url;
     },
-    beforeAvatarUpload(file) {
+    beforeAvatarUpload (file) {
       const imageType = {
         "image/png": true,
         "image/jpeg": true
@@ -403,17 +436,17 @@ export default {
       if (!isLt2M) {
         this.$message.error("上传头像图片大小不能超过 2MB!");
       }
-      if(isImage && isLt2M) { // 判断是否满足条件
+      if (isImage && isLt2M) { // 判断是否满足条件
         load.startLoading()
       }
       return isImage && isLt2M;
     },
-    onEditorChange({ quill, html, text }) {
+    onEditorChange ({ quill, html, text }) {
       this.form.detail = html;
     }
   },
   computed: {
-    editor() {
+    editor () {
       return this.$refs.myQuillEditor.quill;
     }
   }
@@ -430,7 +463,7 @@ export default {
   min-height: 300px;
   padding: 0;
 }
-/deep/.ql-container .ql-editor{
+/deep/.ql-container .ql-editor {
   max-height: 500px;
 }
 .el-button--primary {

+ 6 - 0
src/views/categroyManager/vipActiveList.vue

@@ -208,6 +208,9 @@
                             type="datetimerange"
                             range-separator="至"
                             value-format="yyyy-MM-dd HH:mm:ss"
+                            :picker-options="{
+                            firstDayOfWeek:1
+                          }"
                             start-placeholder="开始日期"
                             end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
@@ -215,6 +218,9 @@
                         prop="courseTime">
             <el-date-picker v-model.trim="resetForm.courseTime"
                             type="datetimerange"
+                            :picker-options="{
+                            firstDayOfWeek:1
+                          }"
                             range-separator="至"
                             value-format="yyyy-MM-dd HH:mm:ss"
                             start-placeholder="开始日期"

+ 7 - 1
src/views/categroyManager/vipNewActive.vue

@@ -58,6 +58,9 @@
                           range-separator="至"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           start-placeholder="开始日期"
+                          :picker-options="{
+                            firstDayOfWeek:1
+                          }"
                           end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
         <el-form-item label="课程时间"
@@ -67,6 +70,9 @@
                           range-separator="至"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           start-placeholder="开始日期"
+                          :picker-options="{
+                            firstDayOfWeek:1
+                          }"
                           end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
 
@@ -400,7 +406,7 @@ export default {
       // 线上线下课 勾选就传不勾选就不传
       // addVipActive().then(res => { })
     },
-    onOrganChange() {
+    onOrganChange () {
       this.$forceUpdate()
     },
     onCheckAllBranch () {

Some files were not shown because too many files changed in this diff