From 7cbd2b698c06c8ac65fd26352634e8f540416844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 15 Oct 2021 18:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=B5=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/goods/goods-manage/parameter.vue    |  11 +-
 .../views/promotion/fullCut/fullCutDetail.vue |   1 +
 .../src/views/promotion/fullCut/fullCut.vue   | 123 ++++++------------
 .../views/promotion/fullCut/newFullCut.vue    |   3 +-
 4 files changed, 46 insertions(+), 92 deletions(-)

diff --git a/manager/src/views/goods/goods-manage/parameter.vue b/manager/src/views/goods/goods-manage/parameter.vue
index 229de985..624c8ac2 100644
--- a/manager/src/views/goods/goods-manage/parameter.vue
+++ b/manager/src/views/goods/goods-manage/parameter.vue
@@ -12,7 +12,7 @@
       </Card>
       <div class="paramsGroup" v-else>
 
-        <Card style="width: 350px; margin:7px;" v-for="group in paramsGroup" :key="group.groupId" :bordered="false">
+        <Card style="width: 350px; margin:7px;" v-for="(group,index) in paramsGroup" :key="index" :bordered="false">
           <p slot="title">
             <Icon type="ios-film-outline"></Icon>&nbsp;{{ group.groupName }}
           </p>
@@ -30,7 +30,7 @@
             <Icon type="arrow-down-b"></Icon>
           </p>
           <template v-if="group.params && group.params.length > 0">
-            <div v-for="param in group.params" :key="param.param_id" class="params">
+            <div v-for="(param,paramId) in group.params" :key="paramId" class="params">
               <span>{{ param.paramName }}</span>
 
               <span>
@@ -67,9 +67,9 @@
               style="width: 100%; text-align: left; margin-right: 10px"
             >
               <Option
-                v-for="item in ops"
+                v-for="(item,itemIndex) in ops.options"
                 :value="item"
-                :key="item"
+                :key="itemIndex"
                 :label="item"
               >
                 {{ item }}
@@ -94,7 +94,7 @@
 
     <div>
       <Modal :title="modalTitle" v-model="dialogParamsGroupVisible" :mask-closable="false" :width="500">
-        <Form ref="paramGroupForm" :model="paramGroupForm" :label-width="100" :rules="paramGroupValidate">
+        <Form   @submit.native.prevent   @keydown.enter.native='submitParamGroupForm'   ref="paramGroupForm" :model="paramGroupForm" :label-width="100" :rules="paramGroupValidate">
           <FormItem label="参数名称" prop="groupName">
             <Input v-model="paramGroupForm.groupName" style="width: 100%"/>
           </FormItem>
@@ -125,6 +125,7 @@ export default {
   name: "categoryParams",
   data() {
     return {
+      submitLoading:false,
       /** 分类ID */
       categoryId: this.$route.query.id,
       /** 参数组 */
diff --git a/manager/src/views/promotion/fullCut/fullCutDetail.vue b/manager/src/views/promotion/fullCut/fullCutDetail.vue
index 47958182..538b1d61 100644
--- a/manager/src/views/promotion/fullCut/fullCutDetail.vue
+++ b/manager/src/views/promotion/fullCut/fullCutDetail.vue
@@ -271,6 +271,7 @@ export default {
         pageSize: 10,
         pageNumber: 0,
         couponName: query,
+        promotionStatus:"START"
       };
       this.couponLoading = true;
       getPlatformCouponList(params).then((res) => {
diff --git a/seller/src/views/promotion/fullCut/fullCut.vue b/seller/src/views/promotion/fullCut/fullCut.vue
index cce9024a..4cb470ab 100644
--- a/seller/src/views/promotion/fullCut/fullCut.vue
+++ b/seller/src/views/promotion/fullCut/fullCut.vue
@@ -3,21 +3,10 @@
     <Card>
       <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
         <Form-item label="活动名称">
-          <Input
-            type="text"
-            v-model="searchForm.promotionName"
-            placeholder="请输入活动名称"
-            clearable
-            style="width: 200px"
-          />
+          <Input type="text" v-model="searchForm.promotionName" placeholder="请输入活动名称" clearable style="width: 200px" />
         </Form-item>
         <Form-item label="活动状态" prop="promotionStatus">
-          <Select
-            v-model="searchForm.promotionStatus"
-            placeholder="请选择"
-            clearable
-            style="width: 200px"
-          >
+          <Select v-model="searchForm.promotionStatus" placeholder="请选择" clearable style="width: 200px">
             <Option value="NEW">未开始</Option>
             <Option value="START">已开始/上架</Option>
             <Option value="END">已结束/下架</Option>
@@ -25,13 +14,8 @@
           </Select>
         </Form-item>
         <Form-item label="活动时间">
-          <DatePicker
-            v-model="selectDate"
-            type="daterange"
-            clearable
-            placeholder="选择起始时间"
-            style="width: 200px"
-          ></DatePicker>
+          <DatePicker v-model="selectDate" type="daterange" clearable placeholder="选择起始时间" style="width: 200px">
+          </DatePicker>
         </Form-item>
         <Form-item>
           <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
@@ -41,13 +25,7 @@
       <Row class="operation">
         <Button type="primary" @click="newAct">新增</Button>
       </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-      >
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table">
         <template slot-scope="{ row }" slot="applyEndTime">
           {{ unixDate(row.applyEndTime) }}
         </template>
@@ -61,67 +39,40 @@
         </template>
         <template slot-scope="{ row }" slot="action">
           <div>
-            <Button
-              type="primary"
-              v-if="row.promotionStatus == 'NEW'"
-              size="small"
-              @click="edit(row)"
-              >编辑</Button>
+            <Button type="primary" v-if="row.promotionStatus == 'NEW'" size="small" @click="edit(row)">编辑</Button>
             <Button type="info" v-else size="small" @click="edit(row)">查看</Button>
-            <Button
-              type="success"
-              v-if="row.promotionStatus === 'START'"
-              ghost
-              style="margin-left:5px"
-              size="small"
-              @click="openOrClose(row)"
-              >关闭</Button>
-            <Button
-              type="success"
-              v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
-              ghost
-              style="margin-left:5px"
-              size="small"
-              @click="openOrClose(row)"
-              >开启</Button>
-            <Button
-              type="error"
-              :disabled="row.promotionStatus == 'START'"
-              ghost
-              style="margin-left:5px"
-              size="small"
-              @click="del(row)"
-              >删除</Button>
+            <Button type="success" v-if="row.promotionStatus === 'START'" style="margin-left:5px" size="small"
+              @click="openOrClose(row)">关闭</Button>
+            <Button type="success" v-if="row.promotionStatus === 'CLOSE' || row.promotionStatus === 'NEW'"
+              style="margin-left:5px" size="small" @click="openOrClose(row)">开启</Button>
+            <Button type="error" :disabled="row.promotionStatus == 'START'" style="margin-left:5px" size="small"
+              @click="del(row)">删除</Button>
           </div>
         </template>
       </Table>
       <Row type="flex" justify="end" class="page operation">
-        <Page
-          :current="searchForm.pageNumber"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
+          @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator
+          show-sizer></Page>
       </Row>
     </Card>
   </div>
 </template>
 <script>
-import { getFullDiscountList, delFullDiscount, updateFullDiscount } from "@/api/promotion.js";
+import {
+  getFullDiscountList,
+  delFullDiscount,
+  updateFullDiscount,
+} from "@/api/promotion.js";
 export default {
-  name: 'full-cut',
+  name: "full-cut",
   data() {
     return {
-      total:0,
-      selectDate:[],
+      total: 0,
+      selectDate: [],
       loading: false, // 表单加载状态
-      searchForm: { // 列表请求参数
+      searchForm: {
+        // 列表请求参数
         pageNumber: 1,
         pageSize: 10,
         sort: "startTime",
@@ -218,8 +169,8 @@ export default {
     },
     // 重置
     handleReset() {
-      this.selectDate = ''
-      this.searchForm = {}
+      this.selectDate = "";
+      this.searchForm = {};
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getDataList();
@@ -248,12 +199,12 @@ export default {
       });
     },
     // 开启或关闭活动
-    openOrClose (row) {
-      let name = '开启'
-      let status = 'START'
-      if (row.promotionStatus === 'START') {
-        name = '关闭'
-        status = 'CLOSE'
+    openOrClose(row) {
+      let name = "开启";
+      let status = "START";
+      if (row.promotionStatus === "START") {
+        name = "关闭";
+        status = "CLOSE";
       }
       this.$Modal.confirm({
         title: "提示",
@@ -291,14 +242,14 @@ export default {
       });
     },
   },
-  mounted () {
+  mounted() {
     this.init();
   },
   // 页面缓存处理，从该页面离开时，修改KeepAlive为false，保证进入该页面是刷新
   beforeRouteLeave(to, from, next) {
-    from.meta.keepAlive = false
-    next()
-  }
+    from.meta.keepAlive = false;
+    next();
+  },
 };
 </script>
 <style lang="scss" scoped>
diff --git a/seller/src/views/promotion/fullCut/newFullCut.vue b/seller/src/views/promotion/fullCut/newFullCut.vue
index 826eb52f..d8b67d58 100644
--- a/seller/src/views/promotion/fullCut/newFullCut.vue
+++ b/seller/src/views/promotion/fullCut/newFullCut.vue
@@ -54,7 +54,7 @@
               </Select>
             </FormItem>
             <FormItem v-if="form.isPoint" label="赠积分" prop="point">
-              <Input :disabled="form.promotionStatus != 'NEW'" v-model="form.point" type="number" :min="0" style="width: 280px" />
+              <InputNumber :min="0" :disabled="form.promotionStatus != 'NEW'" v-model="form.point" type="number"  style="width: 280px" />
             </FormItem>
             <FormItem label="使用范围" prop="scopeType">
               <RadioGroup type="button" button-style="solid" v-model="form.scopeType">
@@ -376,6 +376,7 @@ export default {
         pageNumber: 0,
         getType: "ACTIVITY",
         couponName: query,
+        promotionStatus:"START"
       };
       this.couponLoading = true;
       getShopCouponList(params).then((res) => {