Merge branch 'fix-shenhe' into online

dist/static/css/chunk-9dec6de0.6ae5ecbc.css

@@ -0,0 +1 @@
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-3d34d1da]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-3d34d1da],[data-v-3d34d1da] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-3d34d1da] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-3d34d1da] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-3d34d1da] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-3d34d1da] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-3d34d1da] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-225a961a]{line-height:44px}.fixedBox[data-v-225a961a]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-225a961a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.fixedBox .boxWrap i[data-v-225a961a]{font-size:18px;cursor:pointer}[data-v-225a961a] .el-divider--horizontal{margin:0!important}.minus[data-v-225a961a]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}

src/views/recodeManager/modals/appeal.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form :model="form" ref="form" label-width="80px">
       <el-form-item
-        label="申述图片"
+        label="申诉图片"
         prop="url"
       >
         <div style="width: 100%;">
@@ -20,7 +20,7 @@
         </div>
       </el-form-item>
       <el-form-item
-        label="申述内容"
+        label="申诉内容"
         prop="content"
         :rules="[{required: true, message: '请输入申诉内容'}]"
       >

src/views/resetTeaming/modals/review-detail.vue

@@ -39,7 +39,11 @@
       <descriptions-item label="订单类型：">{{
         auditDto.payUserType | payUserTypeFormat
       }}</descriptions-item>
-      <descriptions-item :span="3" label="备注：">{{ musicGroupPaymentCalenders[0] ? musicGroupPaymentCalenders[0].memo : null }}</descriptions-item>
+      <descriptions-item :span="3" label="备注：">
+        <span style="display: inline-block;max-width: 100%;">
+          <overflow-text :text="musicGroupPaymentCalenders[0] ? musicGroupPaymentCalenders[0].memo : null"></overflow-text>
+        </span>
+      </descriptions-item>
     </descriptions>
     <el-alert title="课程信息"
               :closable="false"
@@ -196,6 +200,7 @@ import Vue from "vue";
 import numeral from 'numeral'
 import { musicGroupPaymentCalenderView } from "../api";
 import descriptions from "@/components/Descriptions";
+import Item from '@/layout/components/Sidebar/Item.vue';
 Vue.use(descriptions);
 const initData = {
   auditDto: {},
@@ -208,6 +213,7 @@ const initData = {
   username: '',
 };
 export default {
+  components: { Item },
   props: ["detail"],
   data () {
     return {