Merge branch 'Nov16thResetMusic' into online

src/components/copy-text/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <span class="copy" v-if="$slots.default || text">
+  <span class="copy" v-if="textContent">
     <slot/>{{text}}
-    <i v-if="!!text" @click="copyText" title="复制" class="el-icon-document-copy"></i>
+    <i v-if="!!textContent" @click="copyText" title="复制" class="el-icon-document-copy"></i>
   </span>
 </template>
 
@@ -20,6 +20,11 @@ export default {
       default: true
     }
   },
+  computed: {
+    textContent() {
+      return this.$slots.default || this.text
+    }
+  },
   methods: {
     copyText() {
       const slot = this.$slots.default || []

src/components/statistic/index.vue

@@ -68,6 +68,8 @@ export default {
   .statistic{
     padding: 20px 0;
     text-align: center;
+    width: 100%;
+    margin: auto!important;
     /deep/ .el-icon-edit{
       cursor: pointer;
       color: #14928A;

src/views/categroyManager/specialSetup/chargesList.vue

@@ -61,13 +61,13 @@
           <el-table-column prop="totalCurrentPrice"
                            label="现价(元)">
             <template slot-scope="scope">
-              {{ scope.row.totalCurrentPrice | moneyFormat }}
+              {{ numeral(scope.row.totalCurrentPrice).format('0,0') }}
             </template>
           </el-table-column>
           <el-table-column prop="totalOriginalPrice"
                            label="原价(元)">
             <template slot-scope="scope">
-              {{ scope.row.totalOriginalPrice | moneyFormat }}
+              {{ numeral(scope.row.totalOriginalPrice).format('0,0') }}
             </template>
           </el-table-column>
           <el-table-column prop="updateTime"
@@ -113,6 +113,7 @@
 import pagination from '@/components/Pagination/index'
 import { chargeTypeList, chargeTypeOrganizationFeeAdd, musicGroupOrganizationCourseSettingsDel, chargeTypeOrganizationFeeUpdate, chargeTypeOrganizationFee, branchQueryPage, musicGroupOrganizationCourseSettingsQueryPage } from '@/api/specialSetting'
 import chargesForm from './modals/chargesForm'
+import numeral from 'numeral'
 export default {
   components: {
     pagination,
@@ -197,6 +198,7 @@ export default {
     })
   },
   methods: {
+    numeral,
     search() {
       this.pageInfo.page = 1;
       this.getList();

src/views/categroyManager/specialSetup/discountManage.vue

@@ -126,14 +126,14 @@
         <el-form-item label="折扣(%)"
                       prop="goodsDiscountRate"
                       :label-width="formLabelWidth">
-          <el-input-number v-model.trim="form.goodsDiscountRate"
-                           autocomplete="off"
-                           placeholder="请输入折扣 1%-100%"
-                           controls-position="right"
-                           class="number-input"
-                           :min="0"
-                           :max="100"
-                           :precision="2"></el-input-number>
+          <el-input v-model.trim="form.goodsDiscountRate"
+                    autocomplete="off"
+                    type="number"
+                    placeholder="请输入折扣 0%-100%"
+                    controls-position="right"
+                    class="number-input"
+                    min="0"
+                    max="100"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer"

src/views/categroyManager/specialSetup/modals/create-discount.vue

@@ -28,14 +28,14 @@
                     :prop="`types.${item.value}`"
                     :label-width="formLabelWidth"
                     :rules="[{ required: true, message: '请输入折扣', trigger: 'blur' }]">
-        <el-input-number v-model.trim="form.types[item.value]"
-                         autocomplete="off"
-                         placeholder="请输入折扣 1%-100%"
-                         controls-position="right"
-                         class="number-input"
-                         :min="1"
-                         :max="100"
-                         :precision="0"></el-input-number>
+        <el-input v-model.trim="form.types[item.value]"
+                  autocomplete="off"
+                  type="number"
+                  placeholder="请输入折扣 0%-100%"
+                  controls-position="right"
+                  class="number-input"
+                  min="0"
+                  max="100"></el-input>
       </el-form-item>
     </el-form>
     <span slot="footer"

src/views/categroyManager/specialSetup/musicCourseFee.vue

@@ -68,7 +68,7 @@
                            prop="goodsDiscountRate"
                            label="缴费金额">
             <template slot-scope="scope">{{
-              scope.row.unitPrice | moneyFormat
+              scope.row.unitPrice
             }}</template>
           </el-table-column>
           <el-table-column align="center"