Merge branch 'master' into 0601Action

dist/static/css/chunk-02132e30.a1850e8c.css

@@ -0,0 +1 @@
+.statistic .statistic-content>span[data-v-b0c3b712]{font-size:22px!important}.statistic .statistic-content>span[data-v-b0c3b712]:first-child{font-size:14px!important}

dist/static/css/chunk-0538936c.5a49e87c.css

@@ -1 +0,0 @@
-.statistic .statistic-content>span[data-v-1b270d08]{font-size:22px!important}.statistic .statistic-content>span[data-v-1b270d08]:first-child{font-size:14px!important}

src/App.vue

@@ -360,7 +360,7 @@ input[type="number"] {
   .el-scrollbar__wrap {
     overflow-x: hidden;
     margin-bottom: -8px !important;
-    margin-right: -8px !important;
+    // margin-right: -8px !important;
     .el-scrollbar__view {
       white-space: nowrap;
     }

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

@@ -94,7 +94,7 @@
                                v-model="item.courseTotalMinuties"
                                :controls="false"
                                :precision="0"
-                               :min="1"
+                               :min="0"
                                @change="() => courseItemChange(item, index)"
                                placeholder="课程总时长" />
             </el-form-item>
@@ -266,7 +266,7 @@ export default {
       if (item.courseType) {
         const active = this.courseTypesByType[item.courseType] || {}
         const _list = this.form.details
-        const price = Math.round(numeral((active.unitPrice || 1)).multiply((item.courseTotalMinuties || 1)).value())
+        const price = Math.round(numeral((active.unitPrice || 1)).multiply((item.courseTotalMinuties || 0)).value())
         _list[index] = {
           ...item,
           courseCurrentPrice: price,

src/views/contentManager/model/systemNotifyModel.vue

@@ -419,7 +419,6 @@ export default {
                         content,
                         organIdList: organIdList ? organIdList.join(',') : null
                     }
-
                     if (this.pageType == "create") {
                         if (form.id) {
                             // 判断有没有Id，如果有则删除
@@ -472,12 +471,11 @@ export default {
             }
         },
         onReSet (formName) {
-            const query = this.$route.query
             this.form = {
                 title: null,
                 order: null,
                 linkUrl: null,
-                type: query.type,
+                type: this.type,
                 status: 1,
                 content: null,
                 organIdList: []

src/views/teamBuild/signupList.vue

@@ -607,7 +607,7 @@
               </auth>
               <!--  -->
               <auth
-                v-show="scope.row.payingStatus == 2"
+                v-show="scope.row.payingStatus == 2 && scope.row.noneNeedCloudTeacher == 0"
                 :auths="'studentRegistration/setNoneCloudTeacher'"
               >
                 <el-button type="text" @click="relieve(scope.row)"