’码商列表字段文字修改’

src/components/Crontab/index.vue

@@ -2,66 +2,31 @@
   <div>
     <el-tabs type="border-card">
       <el-tab-pane label="秒" v-if="shouldHide('second')">
-        <CrontabSecond
+        <CrontabSecond @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronsecond" />
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronsecond"
-        />
       </el-tab-pane>
 
       <el-tab-pane label="分钟" v-if="shouldHide('min')">
-        <CrontabMin
+        <CrontabMin @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronmin" />
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronmin"
-        />
       </el-tab-pane>
 
       <el-tab-pane label="小时" v-if="shouldHide('hour')">
-        <CrontabHour
+        <CrontabHour @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronhour" />
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronhour"
-        />
       </el-tab-pane>
 
       <el-tab-pane label="日" v-if="shouldHide('day')">
-        <CrontabDay
+        <CrontabDay @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronday" />
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronday"
-        />
       </el-tab-pane>
 
       <el-tab-pane label="月" v-if="shouldHide('month')">
-        <CrontabMonth
+        <CrontabMonth @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronmonth" />
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronmonth"
-        />
       </el-tab-pane>
 
       <el-tab-pane label="周" v-if="shouldHide('week')">
-        <CrontabWeek
+        <CrontabWeek @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronweek" />
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronweek"
-        />
       </el-tab-pane>
 
       <el-tab-pane label="年" v-if="shouldHide('year')">
-        <CrontabYear
+        <CrontabYear @update="updateCrontabValue" :check="checkNumber" :cron="crontabValueObj" ref="cronyear" />
-          @update="updateCrontabValue"
-          :check="checkNumber"
-          :cron="crontabValueObj"
-          ref="cronyear"
-        />
       </el-tab-pane>
     </el-tabs>
 
@@ -373,6 +338,7 @@ export default {
   text-align: center;
   margin-top: 20px;
 }
+
 .popup-main {
   position: relative;
   margin: 10px auto;
@@ -381,12 +347,14 @@ export default {
   font-size: 12px;
   overflow: hidden;
 }
+
 .popup-title {
   overflow: hidden;
   line-height: 34px;
   padding-top: 6px;
   background: #f2f2f2;
 }
+
 .popup-result {
   box-sizing: border-box;
   line-height: 24px;
@@ -395,6 +363,7 @@ export default {
   border: 1px solid #ccc;
   position: relative;
 }
+
 .popup-result .title {
   position: absolute;
   top: -28px;
@@ -406,11 +375,13 @@ export default {
   line-height: 30px;
   background: #fff;
 }
+
 .popup-result table {
   text-align: center;
   width: 100%;
   margin: 0 auto;
 }
+
 .popup-result table span {
   display: block;
   width: 100%;
@@ -421,6 +392,7 @@ export default {
   overflow: hidden;
   border: 1px solid #e8e8e8;
 }
+
 .popup-result-scroll {
   font-size: 12px;
   line-height: 24px;

src/views/carddealer/carddealer/index.vue

@@ -195,8 +195,8 @@
           <el-input v-model="form.limitReceive" placeholder="请输入最大收款限额" style="width:300px" @input="change" />
         </el-form-item>
 
-        <el-form-item label="收款额度" prop="">
+        <el-form-item label="低于押金预警值" prop="">
-          <el-input v-model="form.collectionLimit" placeholder="请输入收款额度" style="width:300px" @input="change" />
+          <el-input v-model="form.collectionLimit" placeholder="请输入低于押金预警值" style="width:300px" @input="change" />
         </el-form-item>
 
         <el-form-item label="上级" prop="superiorId">

src/views/data-view/components/data-view-echart.vue

@@ -54,7 +54,7 @@ export default {
   },
   methods: {
     getOption() {
-      console.log("reseize")
+      // console.log("reseize")
       let percent = 0
       if (this.config.total === 0) {
         percent = 0

src/views/data-view/components/data-view-table.vue

@@ -89,7 +89,7 @@ export default {
     }
   },
   mounted() {
-    console.log(this.getHeight())
+    // console.log(this.getHeight())
     window.addEventListener('resize', debounce(() => {
       this.$refs.tbody.style.height = `${this.getHeight()}px`
     }))

src/views/merchant/merchant/index.vue

@@ -713,7 +713,7 @@ export default {
       this.id = row.id;
       payMerchant.getmd5Key(this.id).then((response) => {
         this.form.md5Key = response.data.md5Key;
-        console.log(this.form)
+        // console.log(this.form)
         // this.title = "重置MD5";
         // this.openMd5 = true;
       });