Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/store/modules/permission.js

@@ -587,28 +587,28 @@ function setDetailRoute(accessedRoutes) {
         },
         // activeSenior
         {
-          name: '添加分部活动',
+          name: '添加阶梯奖励',
           path: 'branchActiveOperationAdd',
           component: () => import('@/views/categroyManager/insideSetting/branchActiveOperation'),
           hidden: true,
           meta: {
             noCache: '1',
-            title: '添加分部活动',
+            title: '添加阶梯奖励',
             belongTopMenu: "/operateManager",
-            activeMenu: '/branchActiveManager/branchActive',
+            activeMenu: '/operateManager/branchActiveManager/branchActive',
             id: '3527'
           }
         },
         {
-          name: '修改分部活动',
+          name: '修改阶梯奖励',
           path: 'branchActiveOperation',
           component: () => import('@/views/categroyManager/insideSetting/branchActiveOperation'),
           hidden: true,
           meta: {
             noCache: '1',
-            title: '修改分部活动',
+            title: '修改阶梯奖励',
             belongTopMenu: "/operateManager",
-            activeMenu: '/branchActiveManager/branchActive',
+            activeMenu: '/operateManager/branchActiveManager/branchActive',
             id: '3528'
           }
         },
@@ -827,7 +827,7 @@ function setDetailRoute(accessedRoutes) {
             noCache: '1',
             title: '添加&修改系统权限',
             belongTopMenu: "/systemManager",
-            activeMenu: '/parameter/adminManager',
+            activeMenu: '/adminManager',
             id: '3993'
           }
         }, {

src/views/accompaniment/modals/form.vue

@@ -145,7 +145,7 @@
         prop="sysMusicScore.url"
         :rules="[
           {
-            required: form.sysMusicScore.isOpenMetronome ? true : false,
+            required: form.sysMusicScore.isOpenMetronome ? form.sysMusicScore.playMode === 'MP3' : false,
             message: '请上传原音',
           },
         ]"
@@ -161,7 +161,7 @@
         prop="sysMusicScore.metronomeUrl"
         :rules="[
           {
-            required: form.sysMusicScore.isOpenMetronome ? false : true,
+            required: form.sysMusicScore.isOpenMetronome ? false : form.sysMusicScore.playMode === 'MP3',
             message: '原音(含节拍器)',
           },
         ]"

src/views/afterSchoolManager/afterSchoolList.vue

@@ -4,7 +4,7 @@
     <!-- <h2>
       <div class="squrt"></div>课外训练
     </h2> -->
-    <div class="m-core">
+    <div>
       <save-form
         :inline="true"
         @submit="search"

src/views/afterSchoolManager/afterWorkList.vue

@@ -4,7 +4,7 @@
     <!-- <h2>
       <div class="squrt"></div>课外训练
     </h2>-->
-    <div class="m-core">
+    <div>
       <save-form :inline="true"
                :model="searchForm"
                @submit="search"

src/views/categroyManager/generalSettings/groupMarkPrice.vue

@@ -1,172 +1,170 @@
 <template>
   <div class="">
-    <div class="m-core">
-      <el-form :inline="true" :model="form" ref="form">
-        <el-alert
-          style="margin: 10px 0"
-          title="机构团练宝定价范围设置"
-          :closable="false"
-          type="info"
+    <el-form :inline="true" :model="form" ref="form">
+      <el-alert
+        style="margin: 10px 0"
+        title="机构团练宝定价范围设置"
+        :closable="false"
+        type="info"
+      >
+      </el-alert>
+      <el-row>
+        <el-form-item
+          prop="minMonthFee"
+          label="月度团练宝机构定价范围最低:"
+          :rules="[
+            {
+              required: false,
+              pattern: /^[0-9][0-9]*$/,
+              message: '请输入正确的价格',
+            },
+          ]"
         >
-        </el-alert>
-        <el-row>
-          <el-form-item
-            prop="minMonthFee"
-            label="月度团练宝机构定价范围最低:"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[0-9][0-9]*$/,
-                message: '请输入正确的价格',
-              },
-            ]"
+          <el-input
+            v-model="form.minMonthFee"
+            placeholder="请输入金额"
           >
-            <el-input
-              v-model="form.minMonthFee"
-              placeholder="请输入金额"
-            >
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            label="最高"
-            prop="maxMonthFee"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[0-9][0-9]*$/,
-                message: '请输入正确的价格',
-              },
-              { validator: validateMonthMax, trigger: 'blur' }
-            ]"
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          label="最高"
+          prop="maxMonthFee"
+          :rules="[
+            {
+              required: false,
+              pattern: /^[0-9][0-9]*$/,
+              message: '请输入正确的价格',
+            },
+            { validator: validateMonthMax, trigger: 'blur' }
+          ]"
+        >
+          <el-input
+            v-model="form.maxMonthFee"
+            placeholder="请输入金额"
           >
-            <el-input
-              v-model="form.maxMonthFee"
-              placeholder="请输入金额"
-            >
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item
-            prop="minQuarterlyFee"
-            label="季度团练宝机构定价范围最低:"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[0-9][0-9]*$/,
-                message: '请输入正确的价格',
-              },
-            ]"
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item
+          prop="minQuarterlyFee"
+          label="季度团练宝机构定价范围最低:"
+          :rules="[
+            {
+              required: false,
+              pattern: /^[0-9][0-9]*$/,
+              message: '请输入正确的价格',
+            },
+          ]"
+        >
+          <el-input
+            v-model="form.minQuarterlyFee"
+            placeholder="请输入金额"
           >
-            <el-input
-              v-model="form.minQuarterlyFee"
-              placeholder="请输入金额"
-            >
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            label="最高"
-            prop="maxQuarterlyFee"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[0-9][0-9]*$/,
-                message: '请输入正确的价格',
-              },
-              { validator: validateQuarterlyMax, trigger: 'blur' }
-            ]"
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          label="最高"
+          prop="maxQuarterlyFee"
+          :rules="[
+            {
+              required: false,
+              pattern: /^[0-9][0-9]*$/,
+              message: '请输入正确的价格',
+            },
+            { validator: validateQuarterlyMax, trigger: 'blur' }
+          ]"
+        >
+          <el-input
+            v-model="form['maxQuarterlyFee']"
+            placeholder="请输入金额"
           >
-            <el-input
-              v-model="form['maxQuarterlyFee']"
-              placeholder="请输入金额"
-            >
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item
-            prop="minHalfYearFee"
-            label="半年团练宝机构定价范围最低:"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[0-9][0-9]*$/,
-                message: '请输入正确的价格',
-              },
-            ]"
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item
+          prop="minHalfYearFee"
+          label="半年团练宝机构定价范围最低:"
+          :rules="[
+            {
+              required: false,
+              pattern: /^[0-9][0-9]*$/,
+              message: '请输入正确的价格',
+            },
+          ]"
+        >
+          <el-input
+            v-model="form['minHalfYearFee']"
+            placeholder="请输入金额"
           >
-            <el-input
-              v-model="form['minHalfYearFee']"
-              placeholder="请输入金额"
-            >
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            prop="maxHalfYearFee"
-            label="最高"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[0-9][0-9]*$/,
-                message: '请输入正确的价格',
-              },
-              { validator: validateHalfYearMax, trigger: 'blur' }
-            ]"
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          prop="maxHalfYearFee"
+          label="最高"
+          :rules="[
+            {
+              required: false,
+              pattern: /^[0-9][0-9]*$/,
+              message: '请输入正确的价格',
+            },
+            { validator: validateHalfYearMax, trigger: 'blur' }
+          ]"
+        >
+          <el-input
+            v-model="form['maxHalfYearFee']"
+            placeholder="请输入金额"
           >
-            <el-input
-              v-model="form['maxHalfYearFee']"
-              placeholder="请输入金额"
-            >
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item
-            prop="minYearFee"
-            label="年度团练宝机构定价范围最低:"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[0-9][0-9]*$/,
-                message: '请输入正确的价格',
-              },
-            ]"
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item
+          prop="minYearFee"
+          label="年度团练宝机构定价范围最低:"
+          :rules="[
+            {
+              required: false,
+              pattern: /^[0-9][0-9]*$/,
+              message: '请输入正确的价格',
+            },
+          ]"
+        >
+          <el-input
+            v-model="form['minYearFee']"
+            placeholder="请输入金额"
           >
-            <el-input
-              v-model="form['minYearFee']"
-              placeholder="请输入金额"
-            >
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            prop="maxYearFee"
-            label="最高"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[0-9][0-9]*$/,
-                message: '请输入正确的价格',
-              },
-              { validator: validateYearMax, trigger: 'blur' }
-            ]"
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          prop="maxYearFee"
+          label="最高"
+          :rules="[
+            {
+              required: false,
+              pattern: /^[0-9][0-9]*$/,
+              message: '请输入正确的价格',
+            },
+            { validator: validateYearMax, trigger: 'blur' }
+          ]"
+        >
+          <el-input
+            v-model="form['maxYearFee']"
+            placeholder="请输入金额"
           >
-            <el-input
-              v-model="form['maxYearFee']"
-              placeholder="请输入金额"
-            >
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-        </el-row>
-      </el-form>
-    </div>
+            <template slot="append">元</template>
+          </el-input>
+        </el-form-item>
+      </el-row>
+    </el-form>
     <el-button  type="primary" @click="save" class="saveBtn"
      v-permission="'sysConfig/batchUpdate/groupMarkPrice'"
       >保存</el-button

src/views/categroyManager/generalSettings/overallManager.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="">
     <!-- <h2>参数设置</h2> -->
-    <div class="m-core">
+    <div>
       <el-form :inline="true" :model="form" ref="form">
         <el-alert
           style="margin: 10px 0"

src/views/categroyManager/generalSettings/overallManagerTwo.vue

@@ -1,52 +1,50 @@
 <template>
   <div class="">
     <!-- <h2>参数设置</h2> -->
-    <div class="m-core">
       <!-- 列表 -->
-      <el-form :inline="true" :model="form" ref="form">
-        <el-alert
-          style="margin: 10px 0"
-          title="收费分润设置"
-          :closable="false"
-          type="info"
-        >
-        </el-alert>
-        <el-row>
-          <!-- (双乾: YQPAY 汇付: ADAPAY) -->
-          <el-form-item prop="68">
-            默认收款渠道:
-            <el-select v-model="form['68']"  placeholder="请选择渠道">
-              <el-option label="双乾" value="YQPAY"></el-option>
-               <el-option label="汇付" value="ADAPAY"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item prop="69">
-            是否用收费配置:
-               <el-select v-model="form['69']"  placeholder="请选择渠道">
-              <el-option label="使用" value="1"></el-option>
-               <el-option label="不使用" value="0"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item prop="90">
-            延迟分账开始执行时间:
-            <el-date-picker
-              class="marginLR5"
-              v-model="form['90']"
-              type="datetime"
-              format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择始执行时间"
+    <el-form :inline="true" :model="form" ref="form">
+      <el-alert
+        style="margin: 10px 0"
+        title="收费分润设置"
+        :closable="false"
+        type="info"
+      >
+      </el-alert>
+      <el-row>
+        <!-- (双乾: YQPAY 汇付: ADAPAY) -->
+        <el-form-item prop="68">
+          默认收款渠道:
+          <el-select v-model="form['68']"  placeholder="请选择渠道">
+            <el-option label="双乾" value="YQPAY"></el-option>
+              <el-option label="汇付" value="ADAPAY"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item prop="69">
+          是否用收费配置:
+              <el-select v-model="form['69']"  placeholder="请选择渠道">
+            <el-option label="使用" value="1"></el-option>
+              <el-option label="不使用" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item prop="90">
+          延迟分账开始执行时间:
+          <el-date-picker
+            class="marginLR5"
+            v-model="form['90']"
+            type="datetime"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择始执行时间"
 
-            >
-            </el-date-picker>
-          </el-form-item>
-        </el-row>
-      </el-form>
-    </div>
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-row>
+    </el-form>
     <el-button  type="primary" @click="save" class="saveBtn"
      v-permission="'sysConfig/batchUpdate/overallManagerTwo'"
       >保存</el-button

src/views/categroyManager/globalSubjects.vue

@@ -67,7 +67,7 @@
             prop="parentSubjectName"
             label="所属分类"
           ></el-table-column>
-          <el-table-column align="center" prop="name" label="分类图片">
+          <el-table-column align="center" prop="name" label="声部图片">
             <template slot-scope="scope">
               <el-image
                 v-if="scope.row.img"
@@ -120,7 +120,7 @@
         <el-form-item prop="parentSubjectId"  label="所属分类" :rules="[{ required: true, message: '请选择声部分类' }]">
           <el-select
             v-model="form.parentSubjectId"
-            placeholder="所属分类"
+            placeholder="请选择所属分类"
             prop="parentSubjectId"
             style="width:365px!important"
             clearable
@@ -145,22 +145,23 @@
             trigger: 'change,blur',
           }"
         >
-          <el-input v-model="form.name"   style="width:365px!important"></el-input>
+          <el-input v-model="form.name" placeholder="请输入声部名称"  style="width:365px!important"></el-input>
         </el-form-item>
         <el-form-item
-          label="声部图标"
+          label="声部图片"
           prop="img"
-          :rules="[{ required: true, message: '请上传声部图标' }]"
+          :rules="[{ required: true, message: '请上传声部图片' }]"
         >
           <!-- v-if="!addDisabled" -->
-          <upload
+          <!-- <upload
             v-model="form.img"
             :imageWidthM="260"
             :imageHeightM="260"
-          ></upload>
+          ></upload> -->
           <!-- <img v-else :src="form.img" alt="" width="120px" height="120px" /> -->
+          <image-cropper :options="cropperOptions" :imgSize="2" :imageUrl="form.img" @crop-upload-success="cropSuccess" />
           <p style="color: red" >
-            请上传260*260像素，大小2M以内，格式为jpg、png、gif图片
+            仅支持图片格式:JPG、PNG、GIF, 大小2M以内;
           </p>
         </el-form-item>
       </el-form>
@@ -173,18 +174,15 @@
 </template>
 
 <script>
-import axios from "axios";
-import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
-import Upload from "@/components/Upload/index";
-import load from "@/utils/loading";
+import ImageCropper from '@/components/ImageCropper'
 import {
   subjectListTree,
   subjectUpset,
   subSubjectList,
 } from "@/api/specialSetting";
 export default {
-  components: { pagination, Upload },
+  components: { pagination, ImageCropper },
   data() {
     return {
       searchForm: {
@@ -209,6 +207,14 @@ export default {
       },
       categoryVisible: false,
       fatherList: [],
+      cropperOptions: {
+        autoCrop: true, //是否默认生成截图框
+        autoCropWidth: 260, //默认生成截图框宽度
+        autoCropHeight: 260, //默认生成截图框高度
+        fixedBox: true, //是否固定截图框大小 不允许改变
+        previewsCircle: false, //预览图是否是圆形
+        title: '声部图片', //模态框上显示的标题
+      },
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
@@ -302,6 +308,10 @@ export default {
       this.form.img = null;
       this.categoryVisible = true;
     },
+    //上传图片成功
+    cropSuccess(data) {
+      this.form.img = data.data.url;
+    },
   },
 };
 </script>

src/views/categroyManager/insideSetting/branchActive.vue

@@ -199,7 +199,7 @@ export default {
         params.path='/operateManager/branchActiveOperation'
       }
       this.$router.push(params, (route) => {
-        route.meta.title = tagTitle + "VIP分部活动";
+        route.meta.title = tagTitle + "阶梯奖励";
       });
     },
     onFormClose(formName) {

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -3,7 +3,7 @@
     <h2>
       <el-page-header
         @back="onCancel"
-        :content="(pageType == 'create' ? '添加' : '修改') + '分部活动'"
+        :content="(pageType == 'create' ? '添加' : '修改') + '阶梯奖励'"
       ></el-page-header>
     </h2>
     <div class="m-core">

src/views/categroyManager/specialSetup/modals/courseTimeForm.vue

@@ -76,12 +76,13 @@
           @click="showInput"
           >+ 添加</el-button
         >
-        <el-button
+        <!-- 不需要这个按钮,勇哥说的优化 -->
+        <!--  <el-button
           v-if="inputVisible"
           class="button-new-tag"
           @click="handleInputConfirm"
           >保存</el-button
-        >
+        > -->
       </el-form-item>
     </el-form>
   </div>

src/views/chargeManager/one.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <!-- <div @click="chargeOperation('create')" v-permission="'paymentConfig/add'" class="newBand">添加</div> -->
       <el-button
         @click="chargeOperation('create')"

src/views/chargeManager/three.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <!-- <div @click="chargeOperation('create')" v-permission="'paymentConfig/addTypeRoute'" class="newBand">添加</div> -->
       <el-button
         @click="chargeOperation('create')" v-permission="'paymentConfig/addTypeRoute'"

src/views/chargeManager/two.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="m-container">
-    <div class="m-core">
+    <div>
       <!-- <div @click="sporadicStatus = true" v-permission="'sysConfig/update/setting'" class="newBand">零星收费设置</div> -->
       <el-button
         @click="sporadicStatus = true" v-permission="'sysConfig/update/setting'"

src/views/childrensDay/dayList.vue

@@ -2,7 +2,6 @@
 <!--  -->
 <template>
   <div class="">
-    <div class="m-core">
 
       <save-form
         :inline="true"
@@ -278,7 +277,6 @@
           @pagination="getList"
         />
       </div>
-    </div>
     <qr-code v-model="codeStatus" :title="codeTitle" :codeUrl="qrCodeUrl" />
   </div>
 </template>

src/views/contentManager/contentOperation.vue

@@ -127,7 +127,7 @@
             <i v-else
                class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload> -->
-          <image-cropper :options="cropperOptions" :imgSize="2" :imageUrl="form.coverImage" @crop-upload-success="cropSuccess" />
+          <image-cropper :options="cropperOptions" :imgSize="2" showSize :imageUrl="form.coverImage" @crop-upload-success="cropSuccess" />
           <p class="imageSize">图片不能超过 2M；</p>
         </el-form-item>
         <!-- 广告管理才有时长 -->
@@ -461,7 +461,7 @@ export default {
         autoCropHeight: 300, //默认生成截图框高度
         fixedBox: true, //是否固定截图框大小 不允许改变
         previewsCircle: false, //预览图是否是圆形
-        full: true,
+        full: true, // 是否输出原图比例的截图
         title: '上传图片', //模态框上显示的标题
       },
     };

src/views/couponManager/couponUpdate.vue

@@ -494,7 +494,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .form {
-  margin-top: 30px;
+  // margin-top: 30px;
 }
 .infoTitle {
   font-weight: 400;

src/views/courseRulersManager/components/loginRules.vue

@@ -1,78 +1,76 @@
 <template>
   <div class="">
-    <div class="m-core">
-      <el-form :inline="true" :model="form" ref="form">
-        <el-alert
-          style="margin: 10px 0"
-          title="账号登录设置"
-          :closable="false"
-          type="info"
+    <el-form :inline="true" :model="form" ref="form">
+      <el-alert
+        style="margin: 10px 0"
+        title="账号登录设置"
+        :closable="false"
+        type="info"
+      >
+      </el-alert>
+      <el-row>
+        <el-form-item
+          prop="190"
+          :rules="[
+            {
+              required: false,
+              pattern: /^[1-9][0-9]*$/,
+              message: '请输入正确的账号数量',
+            },
+          ]"
         >
-        </el-alert>
-        <el-row>
-          <el-form-item
-            prop="190"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[1-9][0-9]*$/,
-                message: '请输入正确的账号数量',
-              },
-            ]"
-          >
-            教务端每台设备可登录:
-            <el-input
-              v-model="form['190']"
-              placeholder="请输入账号数量"
+          教务端每台设备可登录:
+          <el-input
+            v-model="form['190']"
+            placeholder="请输入账号数量"
 
-            >
-              <template slot="append">个</template>
-            </el-input>
-            员工
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item
-            prop="191"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[1-9][0-9]*$/,
-                message: '请输入正确的账号数量',
-              },
-            ]"
           >
-            老师端每台设备可登录:
-            <el-input
-              v-model="form['191']"
-              placeholder="请输入账号数量"
+            <template slot="append">个</template>
+          </el-input>
+          员工
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item
+          prop="191"
+          :rules="[
+            {
+              required: false,
+              pattern: /^[1-9][0-9]*$/,
+              message: '请输入正确的账号数量',
+            },
+          ]"
+        >
+          老师端每台设备可登录:
+          <el-input
+            v-model="form['191']"
+            placeholder="请输入账号数量"
 
-            >
-              <template slot="append">个</template>
-            </el-input>
-            老师
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item
-            prop="192"
-            :rules="[
-              {
-                required: false,
-                pattern: /^[1-9][0-9]*$/,
-                message: '请输入正确的设备数量',
-              },
-            ]"
           >
-            学生端每个账号可登录:
-            <el-input v-model="form['192']" placeholder="请输入设备数量" >
-              <template slot="append">台</template>
-            </el-input>
-            设备
-          </el-form-item>
-        </el-row>
-      </el-form>
-    </div>
+            <template slot="append">个</template>
+          </el-input>
+          老师
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item
+          prop="192"
+          :rules="[
+            {
+              required: false,
+              pattern: /^[1-9][0-9]*$/,
+              message: '请输入正确的设备数量',
+            },
+          ]"
+        >
+          学生端每个账号可登录:
+          <el-input v-model="form['192']" placeholder="请输入设备数量" >
+            <template slot="append">台</template>
+          </el-input>
+          设备
+        </el-form-item>
+      </el-row>
+    </el-form>
     <el-button  type="primary" @click="save" class="saveBtn"
      v-permission="'sysConfig/batchUpdate_loginRules'"
       >保存</el-button

src/views/evaluateManager/evaluateList.vue

@@ -2,7 +2,7 @@
   <!-- <h2>
       <div class="squrt"></div>评论列表
     </h2> -->
-  <div class="m-core">
+  <div>
     <save-form
       :inline="true"
       class="searchForm"

src/views/evaluateManager/networkList.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="m-core">
+  <div>
     <save-form
       :inline="true"
       class="searchForm"

src/views/evaluateManager/vipEvaluateList.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="m-core">
+  <div>
     <save-form
       :inline="true"
       save-key="commentManager-vipEvaluateList"

src/views/indexErrDataRecord/components/errorCourse.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="m-core">
+    <div>
       <!-- 搜索类型 -->
       <save-form
         :inline="true"
@@ -132,7 +132,7 @@
             label="乐团/课程组编号"
           >
             <template slot-scope="scope">
-              <el-button type="text" @click="gotoCourse(scope.row)">
+              <el-button type="text" style="width: 100%;" @click="gotoCourse(scope.row)">
                 <copy-text>{{ scope.row.musicGroupId }}</copy-text>
               </el-button>
             </template>

src/views/indexErrDataRecord/components/patrol.vue

@@ -10,7 +10,7 @@
         @reload="reloadSearch"
       />
     </h2> -->
-    <div class="m-core">
+    <div>
       <save-form
         :inline="true"
         ref="searchForm"

src/views/organManager/components/memberSetting.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="m-core">
+  <div>
     <el-alert
         title="会员设置"
         type="info"

src/views/organManager/components/openService.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="m-core">
+  <div>
     <el-alert
         title="开通服务"
         type="info"

src/views/organManager/components/organInfo.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="m-core">
+  <div>
     <el-alert
       :title="tenantInfo == 'SETTING' ? '基本信息' : '机构信息'"
       type="info"

src/views/organManager/components/rateSetting.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="m-core">
+  <div>
     <el-alert
         title="手续费设置"
         type="info"

src/views/organManager/components/roomPrice.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="m-core" style="margin-bottom: 18px;overflow: hidden;">
+  <div style="margin-bottom: 18px;overflow: hidden;">
     <el-alert
         title="云教室定价"
         type="info"

src/views/organManager/components/roomRules.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="m-core" style="margin-bottom: 18px;overflow: hidden;">
+  <div style="margin-bottom: 18px;overflow: hidden;">
     <el-alert
         title="云教室规则"
         type="info"

src/views/platformManager/serviceManager/form.vue

@@ -273,14 +273,19 @@ export default {
   display: flex;
   flex-wrap: wrap;
   flex-direction: column;
+  & + .serviceAttr {
+    border-top: 1px solid #E8E8E8;
+    padding-top: 36px;
+  }
 }
 .list-remove {
   position: absolute;
   right: 20px;
   top: 18px;
+  font-size: 16px;
   .el-button--text {
-    font-size: 18px;
-    color: #F56C6C;
+    font-size: 16px;
+    color: #666666;
     &.is-disabled {
       color: #C0C4CC;
     }

src/views/repairManager/repairList.vue

@@ -100,7 +100,7 @@
           </el-select>
         </el-form-item>
         <br />
-        <el-form-item label="送修日期">
+        <el-form-item>
           <el-date-picker
             v-model.trim="searchForm.timer"
             style="width: 400px"

src/views/teachManager/modals/addRoot.vue

@@ -107,7 +107,9 @@ export default {
         autoCropHeight: 140, //默认生成截图框高度
         fixedBox: true, //是否固定截图框大小 不允许改变
         previewsCircle: false, //预览图是否是圆形
-        title: '上传机构LOGO', //模态框上显示的标题
+        full: true, // 是否输出原图比例的截图
+        enlarge: 2,
+        title: '教材封面图', //模态框上显示的标题
       },
     };
   },

src/views/tenantSetting/groupRecordManager.vue

@@ -4,97 +4,99 @@
       <div class="squrt"></div>
       团练宝激活记录
     </h2>
-    <save-form
-      :inline="true"
-      class="searchForm"
-      ref="searchForm"
-      @submit="search"
-      @reset="reset"
-      :saveKey="'tenantTradeManager'"
-      :model.sync="searchForm"
-    >
-      <el-form-item prop="queryCondition">
-        <el-input
-          placeholder="学员编号/姓名/手机号"
-          clearable
-          type="text"
-          v-model.trim="searchForm.queryCondition"
-        ></el-input>
-      </el-form-item>
-      <el-form-item prop="order">
-        <el-input
-          placeholder="订单号"
-          clearable
-          type="text"
-          v-model.trim="searchForm.order"
-        ></el-input>
-      </el-form-item>
-      <el-form-item prop="createTimer">
-        <el-date-picker
-          v-model.trim="searchForm.createTimer"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="订单开始时间"
-          end-placeholder="订单结束时间"
-          :picker-options="{ firstDayOfWeek: 1 }"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button native-type="submit" type="danger">搜索</el-button>
-        <el-button native-type="reset" type="primary">重置</el-button>
-      </el-form-item>
-    </save-form>
-    <!-- 列表 -->
-    <div class="tableWrap">
-      <el-table
-        :data="tableList"
-        :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
-      >
-        <el-table-column align="center" label="交易流水号" prop="transNo">
-        </el-table-column>
-        <el-table-column align="center" label="订单号" prop="orderNo">
-        </el-table-column>
-        <el-table-column align="center" label="订单时间" prop="orderTime">
-        </el-table-column>
-        <el-table-column align="center" label="学员编号" prop="studentId">
-        </el-table-column>
-        <el-table-column align="center" label="学员名称" prop="name">
-        </el-table-column>
-        <el-table-column align="center" label="手机号码" prop="phone">
-        </el-table-column>
-        <!-- <el-table-column align="center" label="交易类型">
-          <template slot-scope="scope">
-            {{ scope.row.type | tenantStatus }}
-          </template>
-        </el-table-column> -->
-        <el-table-column align="center" label="团练宝类型">
-          <template slot-scope="scope">
-            {{ scope.row.type | memberEnumType }}
-          </template>
-        </el-table-column>
-        <!-- <el-table-column align="center" label="网络教室剩余时长" prop="productName">
-        </el-table-column> -->
-        <el-table-column align="center" label="数量">
-          <template slot-scope="scope">
-            {{ scope.row.time }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="激活费用(元)">
-          <template slot-scope="scope">
-            {{ scope.row.amount | moneyFormat }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
+    <div class="m-core">
+      <save-form
+        :inline="true"
+        class="searchForm"
+        ref="searchForm"
+        @submit="search"
+        @reset="reset"
         :saveKey="'tenantTradeManager'"
-        sync
-        :total.sync="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+        :model.sync="searchForm"
+      >
+        <el-form-item prop="queryCondition">
+          <el-input
+            placeholder="学员编号/姓名/手机号"
+            clearable
+            type="text"
+            v-model.trim="searchForm.queryCondition"
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="order">
+          <el-input
+            placeholder="订单号"
+            clearable
+            type="text"
+            v-model.trim="searchForm.order"
+          ></el-input>
+        </el-form-item>
+        <el-form-item prop="createTimer">
+          <el-date-picker
+            v-model.trim="searchForm.createTimer"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="订单开始时间"
+            end-placeholder="订单结束时间"
+            :picker-options="{ firstDayOfWeek: 1 }"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button native-type="submit" type="danger">搜索</el-button>
+          <el-button native-type="reset" type="primary">重置</el-button>
+        </el-form-item>
+      </save-form>
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table
+          :data="tableList"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        >
+          <el-table-column align="center" label="交易流水号" prop="transNo">
+          </el-table-column>
+          <el-table-column align="center" label="订单号" prop="orderNo">
+          </el-table-column>
+          <el-table-column align="center" label="订单时间" prop="orderTime">
+          </el-table-column>
+          <el-table-column align="center" label="学员编号" prop="studentId">
+          </el-table-column>
+          <el-table-column align="center" label="学员名称" prop="name">
+          </el-table-column>
+          <el-table-column align="center" label="手机号码" prop="phone">
+          </el-table-column>
+          <!-- <el-table-column align="center" label="交易类型">
+            <template slot-scope="scope">
+              {{ scope.row.type | tenantStatus }}
+            </template>
+          </el-table-column> -->
+          <el-table-column align="center" label="团练宝类型">
+            <template slot-scope="scope">
+              {{ scope.row.type | memberEnumType }}
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center" label="网络教室剩余时长" prop="productName">
+          </el-table-column> -->
+          <el-table-column align="center" label="数量">
+            <template slot-scope="scope">
+              {{ scope.row.time }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="激活费用(元)">
+            <template slot-scope="scope">
+              {{ scope.row.amount | moneyFormat }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination
+          :saveKey="'tenantTradeManager'"
+          sync
+          :total.sync="pageInfo.total"
+          :page.sync="pageInfo.page"
+          :limit.sync="pageInfo.limit"
+          :page-sizes="pageInfo.page_size"
+          @pagination="getList"
+        />
+      </div>
     </div>
 
   </div>

src/views/workBenchManager/payAppeal.vue

@@ -11,7 +11,6 @@
         type="card"
 
       >
-      <!--  @tab-click="handleClick" -->
         <el-tab-pane label="考勤申诉(未结算)" lazy name="1" >
           <progressRequest v-if="activeIndex === '1'" :isSettle="false"/>
         </el-tab-pane>

src/views/workBenchManager/requestComponent/progressRequest.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="m-core">
+  <div>
     <save-form :inline="true" :model.sync="searchForm" ref="searchForm">
       <el-form-item>
         <el-input