更新优化

src/views/buildVip/index.vue

@@ -542,6 +542,14 @@
           </div>
         </div>
       </div>
+
+      <div class="btnWrap">
+        <div class="okBtn" @click="submitInfo">{{ id ? "修改" : "确定" }}</div>
+
+        <div class="okBtn" style="background-color: var(--color-primary)" @click="resetFrom">
+          重置
+        </div>
+      </div>
     </div>
     <!-- 弹窗 -->
     <el-dialog
@@ -650,14 +658,6 @@
       </div>
     </el-dialog>
 
-    <div class="btnWrap">
-      <div class="okBtn" @click="submitInfo">{{ id ? "修改" : "确定" }}</div>
-
-      <div class="okBtn" style="background-color: var(--color-primary)" @click="resetFrom">
-        重置
-      </div>
-    </div>
-
     <!-- <div class="btnWrap"> -->
     <!-- <div class="closeBtn">
         取消
@@ -2442,7 +2442,7 @@ export default {
   float: right;
 }
 .m-core {
-  margin-top: 30px;
+  // margin-top: 30px;
   // display: flex;
   // flex-direction: row;
   // justify-content: space-around;

src/views/categroyManager/vipNewActive.vue

@@ -5,87 +5,89 @@
       <el-page-header @back="onCancel" :content="title"></el-page-header>
     </h2>
 
-    <el-steps
-      :active="active"
-      finish-status="success"
-      align-center
-      class="steps"
-    >
-      <el-step title="基础信息"></el-step>
-      <el-step title="缴费信息"></el-step>
-      <el-step title="课酬信息"></el-step>
-    </el-steps>
-    <div class="wrap">
-      <baseInfo
-        :baseForm="baseForm"
-        v-if="active == 1"
-        ref="baseForm"
-        @resetPayInfo="resetPayInfo"
-        @resetBaseChannel="resetBaseChannel"
-        :isDisabled="isDisabled"
-        :status="statuss"
-      />
+    <div class="m-core">
+      <el-steps
+        :active="active"
+        finish-status="success"
+        align-center
+        class="steps"
+      >
+        <el-step title="基础信息"></el-step>
+        <el-step title="缴费信息"></el-step>
+        <el-step title="课酬信息"></el-step>
+      </el-steps>
+      <div class="wrap">
+        <baseInfo
+          :baseForm="baseForm"
+          v-if="active == 1"
+          ref="baseForm"
+          @resetPayInfo="resetPayInfo"
+          @resetBaseChannel="resetBaseChannel"
+          :isDisabled="isDisabled"
+          :status="statuss"
+        />
 
 
-      <payInfo
-        :payForm="payForm"
-        ref="payInfo"
-        :activeType="baseForm.activityType"
-        :activityChannel="baseForm.activityChannel"
-        @changeCourseType="changeCourseType"
-        @changeGiveCourseType="changeGiveCourseType"
-        @chageSalary="chageSalary"
-        @resetIsLimitNum="resetIsLimitNum"
-        v-if="active == 2"
-        :remberList="remberList"
-        :isDisabled="isDisabled || statuss != 'DRAFT'"
-      />
-      <salaryInfo
-        ref="salaryInfo"
-        :salaryForm="salaryForm"
-        v-if="active == 3"
-        :activeType="baseForm.activityType"
-        :payForm="payForm"
-        :isDisabled="isDisabled || statuss != 'DRAFT'"
-        :status="statuss"
-      />
-    </div>
-    <el-button
-      style="margin-top: 12px"
-      type="primary"
-      @click="prve"
-      v-if="active > 1"
-      >上一步</el-button
-    >
-    <el-button
-      style="margin-top: 12px"
-      type="primary"
-      @click="next"
-      v-if="active < 3"
-      >下一步</el-button
-    >
+        <payInfo
+          :payForm="payForm"
+          ref="payInfo"
+          :activeType="baseForm.activityType"
+          :activityChannel="baseForm.activityChannel"
+          @changeCourseType="changeCourseType"
+          @changeGiveCourseType="changeGiveCourseType"
+          @chageSalary="chageSalary"
+          @resetIsLimitNum="resetIsLimitNum"
+          v-if="active == 2"
+          :remberList="remberList"
+          :isDisabled="isDisabled || statuss != 'DRAFT'"
+        />
+        <salaryInfo
+          ref="salaryInfo"
+          :salaryForm="salaryForm"
+          v-if="active == 3"
+          :activeType="baseForm.activityType"
+          :payForm="payForm"
+          :isDisabled="isDisabled || statuss != 'DRAFT'"
+          :status="statuss"
+        />
+      </div>
+      <el-button
+        style="margin-top: 12px"
+        type="primary"
+        @click="prve"
+        v-if="active > 1"
+        >上一步</el-button
+      >
+      <el-button
+        style="margin-top: 12px"
+        type="primary"
+        @click="next"
+        v-if="active < 3"
+        >下一步</el-button
+      >
 
-    <el-button
-      style="margin-top: 12px"
-      type="danger"
-      @click="save"
-      v-if="!isDisabled && statuss == 'DRAFT'"
-      >保存草稿</el-button
-    >
-    <el-button
-      style="margin-top: 12px"
-      type="danger"
-      @click="submit"
-      v-if="active == 3 && !isDisabled && statuss == 'DRAFT'"
-      >创建活动</el-button
-    >
-    <el-button
-      style="margin-top: 12px"
-      type="danger"
-      @click="submit"
-      v-if="active == 3 && !isDisabled && statuss != 'DRAFT'"
-      >提交修改</el-button
-    >
+      <el-button
+        style="margin-top: 12px"
+        type="danger"
+        @click="save"
+        v-if="!isDisabled && statuss == 'DRAFT'"
+        >保存草稿</el-button
+      >
+      <el-button
+        style="margin-top: 12px"
+        type="danger"
+        @click="submit"
+        v-if="active == 3 && !isDisabled && statuss == 'DRAFT'"
+        >创建活动</el-button
+      >
+      <el-button
+        style="margin-top: 12px"
+        type="danger"
+        @click="submit"
+        v-if="active == 3 && !isDisabled && statuss != 'DRAFT'"
+        >提交修改</el-button
+      >
+    </div>
   </div>
 </template>
 

src/views/couponManager/couponUpdate.vue

@@ -1,332 +1,336 @@
 <template>
   <div class="m-container">
-    <el-page-header @back="onCancel" :content="title"></el-page-header>
+    <h2>
+      <el-page-header @back="onCancel" :content="title"></el-page-header>
+    </h2>
     <!-- <h3 class="infoTitle">优惠券信息</h3>
     <el-divider></el-divider> -->
-    <el-form :model="form" ref="form" class="form">
-      <el-row>
-        <el-col style="width: 500px">
-          <el-form-item
-            label="优惠券名称"
-            prop="name"
-            :rules="[{ required: true, message: '请输入优惠卷名称' }]"
-          >
-            <el-input
-              :disabled="isDisabled"
-              v-model="form.name"
-              placeholder="请输入优惠卷名称"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col style="width: 500px">
-          <el-form-item
-            label="描述"
-            prop="description"
-            :rules="[{ required: true, message: '请输入优惠卷描述' }]"
-          >
-            <el-input
-              :disabled="isDisabled"
-              v-model="form.description"
-              maxlength="20"
-              type="textarea"
-              :rows="3"
-              show-word-limit
-              placeholder="请输入优惠券描述，该描述会在优惠券上展示"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col style="width: 395px">
-          <el-form-item
-            label="领券方式"
-            prop="issuanceType"
-            :rules="[{ required: true, message: '领券方式' }]"
-          >
-            <el-select
-              :disabled="isDisabled"
-              placeholder="领券方式"
-              v-model.trim="form.issuanceType"
-              filterable
-              clearable
-              style="width: 355px !important"
+    <div class="m-core">
+      <el-form :model="form" ref="form" class="form">
+        <el-row>
+          <el-col style="width: 500px">
+            <el-form-item
+              label="优惠券名称"
+              prop="name"
+              :rules="[{ required: true, message: '请输入优惠卷名称' }]"
             >
-              <el-option :value="0" label="学员主动领取"></el-option>
-              <el-option :value="1" label="后台手动发放"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col style="width: 395px">
-          <el-form-item
-            label="优惠券类型"
-            prop="typeDetail"
-            :rules="[{ required: true, message: '请选择优惠券类型' }]"
-          >
-            <el-select
-              :disabled="isDisabled"
-              placeholder="请选择优惠券类型"
-              v-model.trim="form.typeDetail"
-              filterable
-              clearable
-              style="width: 355px !important"
+              <el-input
+                :disabled="isDisabled"
+                v-model="form.name"
+                placeholder="请输入优惠卷名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col style="width: 500px">
+            <el-form-item
+              label="描述"
+              prop="description"
+              :rules="[{ required: true, message: '请输入优惠卷描述' }]"
             >
-              <el-option
-                v-for="item in coupontypeDetail"
-                :key="item.value"
-                :value="item.value"
-                :label="item.label"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <!-- <el-col style="width: 395px">
-          <el-form-item
-            label="优惠券类型"
-            prop="type"
-            :rules="[{ required: true, message: '请选择优惠卷类型' }]"
-          >
-            <el-select
-              :disabled="isDisabled"
-              placeholder="优惠券类型"
-              v-model.trim="form.type"
-              filterable
-              clearable
-              @change="changeType"
-              style="width: 355px !important"
+              <el-input
+                :disabled="isDisabled"
+                v-model="form.description"
+                maxlength="20"
+                type="textarea"
+                :rows="3"
+                show-word-limit
+                placeholder="请输入优惠券描述，该描述会在优惠券上展示"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col style="width: 395px">
+            <el-form-item
+              label="领券方式"
+              prop="issuanceType"
+              :rules="[{ required: true, message: '领券方式' }]"
             >
-              <el-option
-                v-for="item in couponTypeList"
-                :key="item.value"
-                :value="item.value"
-                :label="item.label"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col> -->
-        <el-col style="width: 395px" v-if="form.type == 'FULL_REDUCTION'">
-          <el-form-item
-            label="满减金额"
-            prop="fullAmount"
-            :rules="[{ required: true, message: '请输入满减金额' }]"
-          >
-            <el-input
-              v-model="form.fullAmount"
-              placeholder="请输入满减金额"
-              :disabled="isDisabled"
+              <el-select
+                :disabled="isDisabled"
+                placeholder="领券方式"
+                v-model.trim="form.issuanceType"
+                filterable
+                clearable
+                style="width: 355px !important"
+              >
+                <el-option :value="0" label="学员主动领取"></el-option>
+                <el-option :value="1" label="后台手动发放"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col style="width: 395px">
+            <el-form-item
+              label="优惠券类型"
+              prop="typeDetail"
+              :rules="[{ required: true, message: '请选择优惠券类型' }]"
             >
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col style="width: 395px" v-if="form.type == 'FULL_REDUCTION'">
-          <el-form-item
-            label="面值"
-            prop="faceValue"
-            :rules="[{ required: true, message: '请输入面值' }]"
-          >
-            <el-input
-              v-model="form.faceValue"
-              placeholder="请输入面值"
-              :disabled="isDisabled"
+              <el-select
+                :disabled="isDisabled"
+                placeholder="请选择优惠券类型"
+                v-model.trim="form.typeDetail"
+                filterable
+                clearable
+                style="width: 355px !important"
+              >
+                <el-option
+                  v-for="item in coupontypeDetail"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <!-- <el-col style="width: 395px">
+            <el-form-item
+              label="优惠券类型"
+              prop="type"
+              :rules="[{ required: true, message: '请选择优惠卷类型' }]"
+            >
+              <el-select
+                :disabled="isDisabled"
+                placeholder="优惠券类型"
+                v-model.trim="form.type"
+                filterable
+                clearable
+                @change="changeType"
+                style="width: 355px !important"
+              >
+                <el-option
+                  v-for="item in couponTypeList"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+          <el-col style="width: 395px" v-if="form.type == 'FULL_REDUCTION'">
+            <el-form-item
+              label="满减金额"
+              prop="fullAmount"
+              :rules="[{ required: true, message: '请输入满减金额' }]"
+            >
+              <el-input
+                v-model="form.fullAmount"
+                placeholder="请输入满减金额"
+                :disabled="isDisabled"
+              >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col style="width: 395px" v-if="form.type == 'FULL_REDUCTION'">
+            <el-form-item
+              label="面值"
+              prop="faceValue"
+              :rules="[{ required: true, message: '请输入面值' }]"
             >
-              <template slot="append">元</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
+              <el-input
+                v-model="form.faceValue"
+                placeholder="请输入面值"
+                :disabled="isDisabled"
+              >
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
 
-        <el-col style="width: 395px" v-if="form.type == 'DISCOUNT'">
-          <el-form-item
-            label="折扣"
-            prop="faceValue"
-            :rules="[{ required: true, message: '请输入折扣' }]"
-          >
-            <el-input
-              v-model="form.faceValue"
-              placeholder="请输入折扣"
-              :disabled="isDisabled"
+          <el-col style="width: 395px" v-if="form.type == 'DISCOUNT'">
+            <el-form-item
+              label="折扣"
+              prop="faceValue"
+              :rules="[{ required: true, message: '请输入折扣' }]"
             >
-              <template slot="append">%</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
+              <el-input
+                v-model="form.faceValue"
+                placeholder="请输入折扣"
+                :disabled="isDisabled"
+              >
+                <template slot="append">%</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="20">
-        <el-col style="width: 395px">
-          <el-form-item
-            label="有效期类型"
-            prop="effectiveType"
-            :rules="[{ required: true, message: '请选择有效期类型' }]"
-          >
-            <el-select
-              style="width: 355px !important"
-              placeholder="优惠券类型"
-              v-model.trim="form.effectiveType"
-              filterable
-              clearable
-              @change="changeEffectiveType"
-              :disabled="isDisabled"
+        <el-row :gutter="20">
+          <el-col style="width: 395px">
+            <el-form-item
+              label="有效期类型"
+              prop="effectiveType"
+              :rules="[{ required: true, message: '请选择有效期类型' }]"
             >
-              <el-option label="固定有效期天数" value="DAYS"></el-option>
-              <el-option label="固定时间段" value="TIME_BUCKET"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col style="width: 395px" v-if="form.effectiveType == 'DAYS'">
-          <el-form-item
-            prop="deadline"
-            :rules="[{ required: true, message: '请输入有效期天数' }]"
-          >
-            <span style="color: #606266"
-              ><span style="color: #f56c6c">*</span>有效期天数
-              <el-tooltip placement="top" popper-class="mTooltip">
-                <div slot="content">自领取之日起多少天有效</div>
-                <i
-                  class="el-icon-question"
-                  style="font-size: 18px; color: #f56c6c"
-                ></i> </el-tooltip
-            ></span>
-            <el-input
-              v-model="form.deadline"
-              placeholder="请输入有效期天数"
-              :disabled="isDisabled"
+              <el-select
+                style="width: 355px !important"
+                placeholder="优惠券类型"
+                v-model.trim="form.effectiveType"
+                filterable
+                clearable
+                @change="changeEffectiveType"
+                :disabled="isDisabled"
+              >
+                <el-option label="固定有效期天数" value="DAYS"></el-option>
+                <el-option label="固定时间段" value="TIME_BUCKET"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col style="width: 395px" v-if="form.effectiveType == 'DAYS'">
+            <el-form-item
+              prop="deadline"
+              :rules="[{ required: true, message: '请输入有效期天数' }]"
             >
-              <template slot="append">天</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col style="width: 395px" v-if="form.effectiveType == 'TIME_BUCKET'">
-          <el-form-item
-            prop="effectiveTime"
-            :rules="[{ required: true, message: '请选择有效期' }]"
-          >
-            <span style="color: #606266"
-              ><span style="color: #f56c6c">*</span>有效期
-              <el-tooltip placement="top" popper-class="mTooltip">
-                <div slot="content">优惠券可使用时间段</div>
-                <i
-                  class="el-icon-question"
-                  style="font-size: 18px; color: #f56c6c"
-                ></i> </el-tooltip
-            ></span>
-            <el-date-picker
-              style="width: 100%"
-              v-model="form.effectiveTime"
-              :picker-options="{ firstDayOfWeek: 1 }"
-              type="datetimerange"
-              :default-time="['00:00:00', '23:59:59']"
-              range-separator="-"
-              start-placeholder="活动开始日期"
-              end-placeholder="活动结束日期"
-              :disabled="isDisabled"
+              <span style="color: #606266"
+                ><span style="color: #f56c6c">*</span>有效期天数
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">自领取之日起多少天有效</div>
+                  <i
+                    class="el-icon-question"
+                    style="font-size: 18px; color: #f56c6c"
+                  ></i> </el-tooltip
+              ></span>
+              <el-input
+                v-model="form.deadline"
+                placeholder="请输入有效期天数"
+                :disabled="isDisabled"
+              >
+                <template slot="append">天</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col style="width: 395px" v-if="form.effectiveType == 'TIME_BUCKET'">
+            <el-form-item
+              prop="effectiveTime"
+              :rules="[{ required: true, message: '请选择有效期' }]"
             >
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col style="width: 395px">
-          <el-form-item
-            label="库存总量"
-            prop="stockCount"
-            :rules="[{ required: true, message: '请输入库存总量' }]"
-          >
-            <el-input
-              :disabled="form.stockCount == -1"
-              v-model="form.stockCount"
-              placeholder="请输入库存总量"
+              <span style="color: #606266"
+                ><span style="color: #f56c6c">*</span>有效期
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">优惠券可使用时间段</div>
+                  <i
+                    class="el-icon-question"
+                    style="font-size: 18px; color: #f56c6c"
+                  ></i> </el-tooltip
+              ></span>
+              <el-date-picker
+                style="width: 100%"
+                v-model="form.effectiveTime"
+                :picker-options="{ firstDayOfWeek: 1 }"
+                type="datetimerange"
+                :default-time="['00:00:00', '23:59:59']"
+                range-separator="-"
+                start-placeholder="活动开始日期"
+                end-placeholder="活动结束日期"
+                :disabled="isDisabled"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col style="width: 395px">
+            <el-form-item
+              label="库存总量"
+              prop="stockCount"
+              :rules="[{ required: true, message: '请输入库存总量' }]"
             >
-              <template slot="append">张</template>
-            </el-input>
-            <el-checkbox
-              v-model="form.stockCount"
-              :true-label="-1"
-              false-label=""
-              @change="
-                (val) => {
-                  checkNo(val, 'stockCount');
-                }
-              "
-              >不限制</el-checkbox
+              <el-input
+                :disabled="form.stockCount == -1"
+                v-model="form.stockCount"
+                placeholder="请输入库存总量"
+              >
+                <template slot="append">张</template>
+              </el-input>
+              <el-checkbox
+                v-model="form.stockCount"
+                :true-label="-1"
+                false-label=""
+                @change="
+                  (val) => {
+                    checkNo(val, 'stockCount');
+                  }
+                "
+                >不限制</el-checkbox
+              >
+            </el-form-item>
+          </el-col>
+          <!-- <el-col style="width: 395px">
+            <el-form-item
+              label="预警值"
+              prop="warningStockNum"
+              :rules="[{ required: true, message: '请输入预警值' }]"
             >
-          </el-form-item>
-        </el-col>
-        <!-- <el-col style="width: 395px">
-          <el-form-item
-            label="预警值"
-            prop="warningStockNum"
-            :rules="[{ required: true, message: '请输入预警值' }]"
-          >
-            <el-input :disabled='form.warningStockNum ==-1' v-model="form.warningStockNum" placeholder="请输入预警值">
-              <template slot="append">张</template>
-            </el-input>
-             <el-checkbox   v-model="form.warningStockNum" :true-label='-1' false-label=''	 @change="(val)=>{checkNo(val,'warningStockNum')}" >不限制</el-checkbox>
-          </el-form-item>
-        </el-col> -->
-        <el-col style="width: 395px">
-          <el-form-item
-            prop="limitExchangeNum"
-            :rules="[
-              { required: true, message: '请输入领取上限' },
-              {
-                pattern: /^[1-9][0-9]?$/,
-                message: '请输入1-99的正整数',
-                trigger: 'blur',
-              },
-            ]"
-          >
-            <span style="color: #606266">
-              <span style="color: #f56c6c">*</span> 领取上限
-              <el-tooltip placement="top" popper-class="mTooltip">
-                <div slot="content">用户可领取最大张数</div>
-                <i
-                  class="el-icon-question"
-                  style="font-size: 18px; color: #f56c6c"
-                ></i> </el-tooltip
-            ></span>
-            <el-input
-              :disabled="isDisabled"
-              v-model="form.limitExchangeNum"
-              placeholder="请输入领取上限"
+              <el-input :disabled='form.warningStockNum ==-1' v-model="form.warningStockNum" placeholder="请输入预警值">
+                <template slot="append">张</template>
+              </el-input>
+              <el-checkbox   v-model="form.warningStockNum" :true-label='-1' false-label=''	 @change="(val)=>{checkNo(val,'warningStockNum')}" >不限制</el-checkbox>
+            </el-form-item>
+          </el-col> -->
+          <el-col style="width: 395px">
+            <el-form-item
+              prop="limitExchangeNum"
+              :rules="[
+                { required: true, message: '请输入领取上限' },
+                {
+                  pattern: /^[1-9][0-9]?$/,
+                  message: '请输入1-99的正整数',
+                  trigger: 'blur',
+                },
+              ]"
             >
-              <template slot="append">张</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col style="width: 395px">
-          <el-form-item
-            label="领取时间"
-            prop="getTime"
-            :rules="[{ required: true, message: '请输入领取时间' }]"
-          >
-            <el-date-picker
-              style="width: 100%"
-              v-model="form.getTime"
-              :picker-options="{ firstDayOfWeek: 1 }"
-              type="datetimerange"
-              :default-time="['00:00:00', '23:59:59']"
-              range-separator="-"
-              start-placeholder="活动开始日期"
-              end-placeholder="活动结束日期"
+              <span style="color: #606266">
+                <span style="color: #f56c6c">*</span> 领取上限
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">用户可领取最大张数</div>
+                  <i
+                    class="el-icon-question"
+                    style="font-size: 18px; color: #f56c6c"
+                  ></i> </el-tooltip
+              ></span>
+              <el-input
+                :disabled="isDisabled"
+                v-model="form.limitExchangeNum"
+                placeholder="请输入领取上限"
+              >
+                <template slot="append">张</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col style="width: 395px">
+            <el-form-item
+              label="领取时间"
+              prop="getTime"
+              :rules="[{ required: true, message: '请输入领取时间' }]"
             >
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item>
-        <el-button type="primary" v-if="activeRow" @click="resetCoupon"
-          >保存</el-button
-        >
-        <el-button type="primary" v-else @click="addCoupon">提交</el-button>
-        <el-button type="danger" @click="resetForm">重置</el-button>
-      </el-form-item>
-    </el-form>
+              <el-date-picker
+                style="width: 100%"
+                v-model="form.getTime"
+                :picker-options="{ firstDayOfWeek: 1 }"
+                type="datetimerange"
+                :default-time="['00:00:00', '23:59:59']"
+                range-separator="-"
+                start-placeholder="活动开始日期"
+                end-placeholder="活动结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item>
+          <el-button type="primary" v-if="activeRow" @click="resetCoupon"
+            >保存</el-button
+          >
+          <el-button type="primary" v-else @click="addCoupon">提交</el-button>
+          <el-button type="danger" @click="resetForm">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
   </div>
 </template>
 <script>

src/views/luckyDraw/lotteryManager.vue

@@ -6,54 +6,56 @@
         </h2>
         <!-- <div class="newBand" v-permission="'luckDrawGroup/add'" @click="onOperationLottery('create')">添加</div> -->
         <!-- 搜索标题 -->
-        <save-form :inline="true"
+        <div class="m-core">
+            <save-form :inline="true"
                 class="searchForm"
                 @submit="getList"
                 :model="searchForm">
-        <el-form-item >
-            <el-input v-model.trim="searchForm.search" clearable
-                    placeholder="请输入活动名称"></el-input>
-        </el-form-item>
-        <el-form-item>
-            <el-button native-type="submit"
-                    type="danger">搜索</el-button>
-        </el-form-item>
-        </save-form>
-        <el-button
-            v-permission="'luckDrawGroup/add'" @click="onOperationLottery('create')"
-            type="primary"
-            style="margin-bottom:20px"
-        >
-            添加
-        </el-button>
-        <!-- 列表 -->
-        <div class="tableWrap">
-            <el-table :data="tableList"
-                        :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-                <el-table-column align="center"
-                                prop="name"
-                                label="活动名称"></el-table-column>
-                <el-table-column align="center"
-                                prop="startTime"
-                                label="活动开始时间">
-                </el-table-column>
-                <el-table-column align="center"
-                                prop="endTime"
-                                label="活动结束时间">
-                </el-table-column>
-                <el-table-column align="center" label="操作">
-                    <template slot-scope="scope">
-                        <el-button @click="onOperationLottery('update', scope.row)" v-permission="'luckDrawGroup/update'" type="text">修改</el-button>
-                        <el-button @click="onLook(scope.row)" v-permission="'/trophyManager'" type="text">奖品设置</el-button>
-                        <el-button @click="onLottery(scope.row)"  v-permission="'/lotteryRecord'"  type="text">抽奖记录</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination sync :total.sync="pageInfo.total"
-                        :page.sync="pageInfo.page"
-                        :limit.sync="pageInfo.limit"
-                        :page-sizes="pageInfo.page_size"
-                        @pagination="getList" />
+            <el-form-item >
+                <el-input v-model.trim="searchForm.search" clearable
+                        placeholder="请输入活动名称"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button native-type="submit"
+                        type="danger">搜索</el-button>
+            </el-form-item>
+            </save-form>
+            <el-button
+                v-permission="'luckDrawGroup/add'" @click="onOperationLottery('create')"
+                type="primary"
+                style="margin-bottom:20px"
+            >
+                添加
+            </el-button>
+            <!-- 列表 -->
+            <div class="tableWrap">
+                <el-table :data="tableList"
+                            :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+                    <el-table-column align="center"
+                                    prop="name"
+                                    label="活动名称"></el-table-column>
+                    <el-table-column align="center"
+                                    prop="startTime"
+                                    label="活动开始时间">
+                    </el-table-column>
+                    <el-table-column align="center"
+                                    prop="endTime"
+                                    label="活动结束时间">
+                    </el-table-column>
+                    <el-table-column align="center" label="操作">
+                        <template slot-scope="scope">
+                            <el-button @click="onOperationLottery('update', scope.row)" v-permission="'luckDrawGroup/update'" type="text">修改</el-button>
+                            <el-button @click="onLook(scope.row)" v-permission="'/trophyManager'" type="text">奖品设置</el-button>
+                            <el-button @click="onLottery(scope.row)"  v-permission="'/lotteryRecord'"  type="text">抽奖记录</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <pagination sync :total.sync="pageInfo.total"
+                            :page.sync="pageInfo.page"
+                            :limit.sync="pageInfo.limit"
+                            :page-sizes="pageInfo.page_size"
+                            @pagination="getList" />
+            </div>
         </div>
 
         <el-dialog :title="formTitle[formActionTitle]"

src/views/productService/components/serviceRenew.vue

@@ -28,7 +28,7 @@
         :rules="[{ required: true, message: '请输入续费期限', trigger: 'blur' },
         { required: true, validator: validPrice, trigger: 'blur' }]">
         <el-input v-model="form.val" placeholder="请输入续费期限"
-          oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value"
+          @keyup.native='keyupEvent($event)'
           type="number">
           <div slot="append">{{ unitSuffix }}</div>
         </el-input>

src/views/vipClass/vipList.vue

@@ -743,7 +743,6 @@ export default {
 <style lang="scss" scoped>
 .m-container {
   box-sizing: border-box;
-  background-color: #fff;
   // padding: 18px 95px 55px 60px;
 }
 .newBand {