新增激活码开通套餐管理模块 -zzx

src/api/common.js

@@ -11,6 +11,15 @@
 
 import request from '@/utils/request'
 
+// 后台激活指定账号
+export function labourActivation(params) {
+  return request({
+    url: '/vipserver/group/activation',
+    method: 'post',
+    params
+  })
+}
+
 // 查看激活码列表
 export function checkoutActivationCode(data) {
   return request({

src/views/operationManage/comboManage/checkoutCode.vue

@@ -1,281 +1,153 @@
-
 <template>
   <div class="orderManage app-container">
     <div class="search">
       <div>
-        <el-input
-          v-model="query.noOrGName"
-          size="small"
-          placeholder="请输入激活ID"
-          class="item-width-200"
-        ></el-input>
-        <el-input
-          v-model="query.noOrGName"
-          size="small"
-          placeholder="请输入激活码"
-          class="item-width-200 ml10"
-        ></el-input>
-        <el-input
-          v-model="query.noOrGName"
-          size="small"
-          placeholder="请输入激活手机号"
-          class="item-width-200 ml10"
-        ></el-input>
-        <el-date-picker
-            v-model="date"
-            size="small"
-            value-format="yyyy-MM-dd"
-            class="item-width-350 ml10"
-            type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期">
-            </el-date-picker>
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-select
-          v-model="query.orderType"
-          size="small"
-          clearable
-          class="item-width-200 ml10"
-          placeholder="请选择状态"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
+        <el-input v-model="query.id" size="small" placeholder="请输入激活ID" class="item-width-200"></el-input>
+        <el-input v-model="query.serialNumber" size="small" placeholder="请输入激活码" class="item-width-200 ml10"></el-input>
+        <el-input v-model="query.phone" size="small" placeholder="请输入激活手机号" class="item-width-200 ml10"></el-input>
+        <el-date-picker v-model="date" size="small" value-format="yyyy-MM-dd" class="item-width-350 ml10"
+          type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
+        <el-select v-model="query.state" size="small" clearable class="item-width-200 ml10" placeholder="请选择状态">
+          <el-option label="待使用" value="1"></el-option>
+          <el-option label="激活成功" value="2"></el-option>
         </el-select>
-        <el-button
-          class="ml10"
-          type="primary"
-          size="small"
-          icon="el-icon-search"
-          @click="handleSearch"
-        >
+        <el-button class="ml10" type="primary" size="small" icon="el-icon-search" @click="handleSearch">
           搜索
         </el-button>
       </div>
-      <el-button
-          class="ml10"
-          type="info"
-          size="small"
-          plain
-          icon="el-icon-back"
-          @click="comeBack"
-        >
-          返回
-        </el-button>
+      <el-button class="ml10" type="info" size="small" plain icon="el-icon-back" @click="comeBack">
+        返回
+      </el-button>
     </div>
-    <el-descriptions class="margin-top" :column="3" :size="size" border>
-        <el-descriptions-item>
-          <template slot="label"> 计费号 </template>
-          {{ groupInfos.billId }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label"> 集团名称 </template>
-          {{ groupInfos.groupName }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label"> 订购数量 </template>
-          {{ groupInfos.orderNum }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label"> 所属平台 </template>
-          慧研学惠生活
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label"> 订购产品策划名称 </template>
-          {{ groupInfos.groupPlanName }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label"> 激活码数量 </template>
-          {{ groupInfos.orderNum }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label"> 已使用数量 </template>
-          {{ groupInfos.useTicket }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label"> 未使用数量 </template>
-          {{ groupInfos.totalTicket }}
-        </el-descriptions-item>
-        <el-descriptions-item>
-          <template slot="label"> 激活失败 </template>
-          {{ '--' }}
-        </el-descriptions-item>
-      </el-descriptions>
-      <div style="height: 20px;"></div>
-    <el-table
-      :data="tableData"
-      tooltip-effect="dark"
-      border
-      v-loading="loading"
-      style="width: 100%"
-    >
-      <el-table-column
-        align="center"
-        label="激活ID"
-        prop="phone"
-        show-overflow-tooltip
-      >
+    <el-descriptions class="margin-top" :column="3" border>
+      <el-descriptions-item>
+        <template slot="label"> 计费号 </template>
+        {{ groupInfos.billId||'--' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 集团名称 </template>
+        {{ groupInfos.groupName||'--' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 订购数量 </template>
+        {{ groupInfos.orderNum||'--' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 所属平台 </template>
+        慧研学惠生活
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 订购产品策划名称 </template>
+        {{ groupInfos.groupPlanName||'--' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 激活码数量 </template>
+        {{ groupInfos.totalTicket||'--' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 已使用数量 </template>
+        {{ groupInfos.useTicket||'--' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 未使用数量 </template>
+        {{ groupInfos.totalTicket-groupInfos.useTicket||'--' }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 激活失败 </template>
+        {{ '--' }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <div style="height: 20px;"></div>
+    <el-table :data="tableData" tooltip-effect="dark" border v-loading="loading" style="width: 100%">
+      <el-table-column align="center" label="激活ID" prop="id" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column
-        prop="serialNumber"
-        align="center"
-        label="激活码"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          {{ formatData(scope.row.goodsModelList).goodsName }}
-        </template>
+      <el-table-column prop="serialNumber" align="center" label="激活码" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column
-        prop="planningName"
-        align="center"
-        label="会员套餐"
-        show-overflow-tooltip
-      >
+      <el-table-column prop="planningName" align="center" label="会员套餐" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column
-        prop="goodsAmount"
-        align="center"
-        label="有效期类型"
-        show-overflow-tooltip
-      >
+      <el-table-column prop="goodsAmount" align="center" label="有效期类型" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span v-if="scope.row.activationType==1">时间段</span>
+          <span v-if="scope.row.activationType == 1">时间段</span>
           <span v-else>天数</span>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="activationDay"
-        align="center"
-        label="时间段/天数"
-        show-overflow-tooltip
-      >
+      <el-table-column prop="activationDay" align="center" label="时间段/天数" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row.activationDay||'--' }}
+        </template>
       </el-table-column>
-      <el-table-column
-        prop="payAmount"
-        align="center"
-        label="创建时间"
-        show-overflow-tooltip
-      >
-      <template slot-scope="scope">
-        {{ formatData(scope.row.targetStartTime) }}
-      </template>
+      <el-table-column prop="startTime" align="center" label="创建时间" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ timeFormat(scope.row.targetStartTime) }}
+        </template>
       </el-table-column>
-      <el-table-column
-        prop="payAmount"
-        align="center"
-        label="状态"
-        show-overflow-tooltip
-      >
+      <el-table-column align="center" label="状态" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span v-if="scope.row.phone == null">待使用</span>
+          <span v-else>激活成功</span>
+        </template>
       </el-table-column>
-      <el-table-column
-        prop="payAmount"
-        align="center"
-        label="推送状态"
-        show-overflow-tooltip
-      >
+      <el-table-column align="center" label="推送状态" show-overflow-tooltipphone>
+        <template slot-scope="scope">
+          <span>--</span>
+        </template>
       </el-table-column>
-      <el-table-column
-        prop="payAmount"
-        align="center"
-        label="激活手机号"
-        show-overflow-tooltip
-      >
+      <el-table-column prop="phone" align="center" label="激活手机号" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column
-        prop="createTime"
-        align="center"
-        label="激活时间"
-        show-overflow-tooltip
-      >
+      <el-table-column align="center" label="激活时间" show-overflow-tooltip>
         <template slot-scope="scope">
-          {{ scope.row.goodsModelList[0] | filterType }}
+          {{ timeFormat(scope.row.useTime) }}
         </template>
       </el-table-column>
       <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="vipDialogVisible = true"
-            >激活</el-button
-          >
+          <el-button type="text" size="small" v-if="scope.row.phone == null"
+            @click="activationVip(scope.row)">激活</el-button>
+          <el-button type="text" size="small" v-else @click="synchronization">同步</el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="page-box">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        background
-        :current-page="query.page"
-        :page-sizes="[10, 20, 30, 40]"
-        :page-size="query.size"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      >
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" background
+        :current-page="query.page" :page-sizes="[10, 20, 30, 40]" :page-size="query.size"
+        layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>
-    <el-dialog
-      title="激活"
-      :visible.sync="vipDialogVisible"
-      width="30%"
-      :before-close="handleClose"
-      center
-    >
-    <div style="margin-left: 32px;margin-bottom: 30px;font-weight: 600;">激活码:JTTSdfaS783YI</div>
-    <el-form
-        :model="setQuery"
-        ref="setQuery"
-        :rules="rules"
-        label-width="130px"
-        size="small"
-      >
-      <el-form-item label="激活手机号：" prop="menuName">
-          <el-input
-            v-model="setQuery.menuName"
-            class="item-width-200"
-            placeholder="请输入激活手机号"
-          ></el-input>
+    <el-dialog title="激活" :visible.sync="vipDialogVisible" width="30%" center>
+      <div style="margin-left: 32px;margin-bottom: 30px;font-weight: 600;">激活码:{{ vipCode }}</div>
+      <el-form :model="updataPhone" ref="updataPhone" :rules="rules" label-width="130px" size="small">
+        <el-form-item label="激活手机号：" prop="num">
+          <el-input v-model="updataPhone.num" class="item-width-200" placeholder="请输入激活手机号"></el-input>
         </el-form-item>
-    </el-form>
+      </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="vipDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="vipDialogVisible = false"
-          >确 定</el-button
-        >
+        <el-button @click="Cancel">取 消</el-button>
+        <el-button type="primary" :loading="updataLoading" @click="confirmActivation('updataPhone')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
-  <script>
+<script>
 import { debounce } from "@/utils/index";
-import { checkoutActivationCode } from "@/api/common";
+import { checkoutActivationCode, labourActivation } from "@/api/common";
 import { timeFormat } from "@/utils/index";
 
 export default {
   name: "orderManage",
   data() {
     return {
-      groupInfos:{},
-      setQuery: {
-        menuName: "",
-        vipSetmenu: "",
-        endTime: [],
+      updataLoading: false,
+      date: '',
+      vipCode: '',
+      groupInfos: {},
+      updataPhone: {
+        num: '',
       },
       rules: {
-        menuName: [
-          { required: true, message: "请输入激活手机号", trigger: "blur" },
+        num: [
+          { required: true, pattern: /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/, message: "请正确输入手机号", trigger: "blur" },
         ],
       },
       vipDialogVisible: false,
@@ -283,14 +155,15 @@ export default {
       tableData: [],
       loading: false,
       query: {
-        groupOrderNo:'',
+        id: '',
+        phone: "",
+        serialNumber: "",
+        groupOrderNo: '',
+        startTime: "",
         endTime: "",
-        noOrGName: "",
-        orderType: "",
+        state:'',
         page: 1,
         size: 10,
-        sort: "",
-        startTime: "",
       },
       title: "",
       total: 0,
@@ -318,8 +191,46 @@ export default {
 
   },
   methods: {
+    synchronization(){
+      this.getList();
+    },
+
+    Cancel(){
+      this.vipDialogVisible = false;
+      this.updataPhone.num = ''
+    },
+    // 确认激活
+    confirmActivation(formName) {
+      this.$refs[formName].validate((valid) => {
+        let updata = {
+          phone:this.updataPhone.num,
+          serialNumber: this.vipCode
+        }
+        if (valid) {
+          this.updataLoading = true;
+          labourActivation({ ...updata }).then((res) => {
+            this.updataLoading = false
+            if (res.state == "Success") {
+              this.vipDialogVisible = false
+              this.updataPhone.num = ''
+              this.getList()
+            } else {
+            }
+          })
+        } else {
+          return false;
+        }
+      });
+    },
+
+    // 激活弹窗
+    activationVip(item) {
+      this.vipDialogVisible = true
+      this.vipCode = item.serialNumber
+    },
+
     // 返回上一级
-    comeBack(){
+    comeBack() {
       this.$router.back()
     },
     handleSearch() {
@@ -345,7 +256,7 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.groupInfos=JSON.parse(this.$route.query.groupInfo)
+      this.groupInfos = JSON.parse(this.$route.query.groupInfo)
       this.query.groupOrderNo = this.groupInfos.orderNo;
       let obj = JSON.parse(JSON.stringify(this.query));
       obj.page = obj.page - 1;
@@ -356,7 +267,6 @@ export default {
         this.loading = false;
         if (res.state == "Success") {
           this.tableData = res.content.content;
-          console.log(this.tableData);
           this.total = res.content.totalElements;
         }
       });
@@ -368,5 +278,4 @@ export default {
 };
 </script>
 
-<style lang="scss" >
-</style>
+<style lang="scss"></style>

src/views/operationManage/comboManage/vipActivation.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div class="orderManage app-container">
     <div class="search">
@@ -154,25 +153,26 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="finish"
+        prop="groupType"
         align="center"
         label="状态"
         show-overflow-tooltip
       >
+        <template slot-scope="scope">
+          <span v-if="scope.row.groupType === 1">已生成</span>
+          <span v-if="scope.row.groupType === 2">待生成</span>
+          <span v-if="scope.row.groupType == 3">全部激活</span>
+        </template>
       </el-table-column>
-      <el-table-column
-        prop="totalTicket"
-        align="center"
-        label="未激活数量"
-        show-overflow-tooltip
-      >
+      <el-table-column align="center" label="未激活数量" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row.totalTicket-scope.row.useTicket || "--" }}
+        </template>
       </el-table-column>
-      <el-table-column
-        prop="useTicket"
-        align="center"
-        label="已激活数量"
-        show-overflow-tooltip
-      >
+      <el-table-column align="center" label="已激活数量" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row.useTicket || "--" }}
+        </template>
       </el-table-column>
       <el-table-column align="center" label="所属小程序" show-overflow-tooltip>
         <template slot-scope="scope">{{ "慧研学惠生活" }}</template>
@@ -192,10 +192,18 @@
       </el-table-column>
       <el-table-column prop="address" align="center" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="gotoGenerating(scope.row)"
+          <el-button
+            type="text"
+            size="small"
+            v-if="scope.row.groupType === 2"
+            @click="gotoGenerating(scope.row)"
             >生成激活码</el-button
           >
-          <el-button type="text" size="small" @click="codeDetails(scope.row)"
+          <el-button
+            type="text"
+            size="small"
+            v-else
+            @click="codeDetails(scope.row)"
             >查看激活码</el-button
           >
         </template>
@@ -215,26 +223,26 @@
       </el-pagination>
     </div>
     <el-dialog title="生成激活码" :visible.sync="vipDialogVisible" width="50%">
-      <el-descriptions class="margin-top" :column="3" :size="size" border>
+      <el-descriptions class="margin-top" :column="3" border>
         <el-descriptions-item>
           <template slot="label"> 计费号 </template>
-          {{ codeData.billId||'--' }}
+          {{ codeData.billId || "--" }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 集团名称 </template>
-          {{ codeData.groupName||'--' }}
+          {{ codeData.groupName || "--" }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 订购时间 </template>
-          {{ codeData.orderDate||'--' }}
+          {{ codeData.orderDate || "--" }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 失效时间 </template>
-          {{ codeData.invalidDate||'--' }}
+          {{ codeData.invalidDate || "--" }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 订购数量 </template>
-          {{ codeData.orderNum||'--' }}
+          {{ codeData.orderNum || "--" }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 所属平台 </template>
@@ -256,19 +264,30 @@
           ></el-input>
           天
         </el-form-item>
-        <el-form-item label="会员套餐：" prop="activationType">
-          <el-select v-model="setQuery.activationType" placeholder="请选择套餐">
-            <el-option label="普通会员" value="2023110101"></el-option>
-            <el-option label="优享会员" value="2023110102"></el-option>
-            <el-option label="尊享会员" value="2023110103"></el-option>
+        <el-form-item label="会员套餐：" prop="selectType">
+          <el-select
+            v-model="setQuery.selectType"
+            @change="selectChange"
+            placeholder="请选择套餐"
+          >
+            <el-option
+              v-for="(item, index) in optionsList"
+              :key="item.value"
+              :label="item.setMealName"
+              :value="{ value: item.setMealCode, label: item.setMealName }"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="会员有效期：" prop="selectType">
-          <el-radio-group v-model="setQuery.selectType">
-            <el-radio label="时间段"></el-radio>
-            <el-radio label="天数"></el-radio>
+        <el-form-item label="会员有效期：" prop="activationType">
+          <el-radio-group v-model="setQuery.activationType">
+            <el-radio
+              v-for="item in radioOptions"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            ></el-radio>
           </el-radio-group>
-          <div v-if="setQuery.selectType == '时间段'">
+          <div v-if="setQuery.activationType == '时间段'">
             <el-date-picker
               v-model="date"
               type="daterange"
@@ -278,7 +297,7 @@
             >
             </el-date-picker>
           </div>
-          <div v-if="setQuery.selectType == '天数'">
+          <div v-if="setQuery.activationType == '天数'">
             <el-input
               v-model="setQuery.activationDay"
               class="item-width-100"
@@ -286,9 +305,16 @@
             天
           </div>
         </el-form-item>
-        <div style="color: red; font-size: 12px; line-height: 16px;margin-left: 40px;">
-            注：会员有效期为用户使用激活码后会员生效时间。时间段为用户使用激活码后仅在对应时间段内拥有会员权益；天数为用户使用激活码后对应天数内拥有会员权益。时间段激活码无法叠加使用，天数激活码可叠加使用累计天数。
-          </div>
+        <div
+          style="
+            color: red;
+            font-size: 12px;
+            line-height: 16px;
+            margin-left: 40px;
+          "
+        >
+          注：会员有效期为用户使用激活码后会员生效时间。时间段为用户使用激活码后仅在对应时间段内拥有会员权益；天数为用户使用激活码后对应天数内拥有会员权益。时间段激活码无法叠加使用，天数激活码可叠加使用累计天数。
+        </div>
         <el-form-item label="激活码数量：" prop="totalTicket">
           <el-input
             v-model="setQuery.totalTicket"
@@ -310,7 +336,10 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="vipDialogVisible = false">取 消</el-button>
-        <el-button type="primary" :loading="updataLoading" @click="vipsubmitForm('setQuery')"
+        <el-button
+          type="primary"
+          :loading="updataLoading"
+          @click="vipsubmitForm('setQuery')"
           >生成</el-button
         >
       </span>
@@ -318,18 +347,29 @@
   </div>
 </template>
 
-  <script>
+<script>
 import { debounce } from "@/utils/index";
-import { getGroupList,generateCode } from "@/api/common";
+import { getGroupList, generateCode, getList } from "@/api/common";
 import { timeFormat } from "@/utils/index";
 
 export default {
   name: "orderManage",
   data() {
     return {
-      date:'',
-      updataLoading:false,
-      codeData:{},
+      date: "",
+      updataLoading: false,
+      codeData: {},
+      optionsList: [],
+      radioOptions: [
+        {
+          value: 1,
+          label: "时间段",
+        },
+        {
+          value: 2,
+          label: "天数",
+        },
+      ],
       orderStatusoptions: [
         {
           value: 1,
@@ -346,7 +386,7 @@ export default {
         {
           value: 4,
           label: "暂停",
-        }
+        },
       ],
       statusOptions: [
         {
@@ -365,15 +405,15 @@ export default {
       setQuery: {
         validDay: "",
         activationType: "",
-        activationDay:'',
-        totalTicket:'',
-        planningName:'',
-        planningId:'',
-        groupOrderNo:'',
-        startString:'',
-        startTime:'',
-        endTime: '',
-        selectType:'',
+        activationDay: "",
+        totalTicket: "",
+        planningName: "",
+        planningId: "",
+        groupOrderNo: "",
+        startString: "",
+        startTime: "",
+        endTime: "",
+        selectType: "",
       },
       rules: {
         validDay: [
@@ -382,9 +422,19 @@ export default {
         vipSetmenu: [
           { required: true, message: "请选择会员套餐", trigger: "change" },
         ],
-        endTime: [ { required: true, message: "请至少选择一个有效期类型", trigger: "change",}],
-        totalTicket:[{ required: true, message: "请输入激活码数量", trigger: "blur" }],
-        startString:[{ required: true, message: "请输入激活码开头", trigger: "blur" }]
+        endTime: [
+          {
+            required: true,
+            message: "请至少选择一个有效期类型",
+            trigger: "change",
+          },
+        ],
+        totalTicket: [
+          { required: true, message: "请输入激活码数量", trigger: "blur" },
+        ],
+        startString: [
+          { required: true, message: "请输入激活码开头", trigger: "blur" },
+        ],
       },
       vipDialogVisible: false,
 
@@ -413,7 +463,7 @@ export default {
     // },
     date(val) {
       if (val) {
-        this.setQuery.startTime =new Date(val[0]).getTime();
+        this.setQuery.startTime = new Date(val[0]).getTime();
         this.setQuery.endTime = new Date(val[1]).getTime();
       } else {
         this.setQuery.startTime = "";
@@ -423,29 +473,45 @@ export default {
   },
   filters: {},
   methods: {
-  //  生成弹窗
-  gotoGenerating(item) {
-    this.vipDialogVisible = true;
-    this.codeData=item
-    this.setQuery.planningId = item.planningId;
-    this.setQuery.planningName = item.planningName;
-    this.setQuery.groupOrderNo = item.orderNo;
-  },
+    //  生成弹窗
+    gotoGenerating(item) {
+      this.get_setmealList();
+      this.vipDialogVisible = true;
+      this.codeData = item;
+      this.setQuery.groupOrderNo = item.orderNo;
+    },
+
+    // 套餐选择
+    selectChange(item) {
+      const { value, label } = item;
+      this.setQuery.planningId = value;
+      this.setQuery.planningName = label;
+    },
 
     // 提交生成
     vipsubmitForm(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          delete this.setQuery.selectType
+          delete this.setQuery.selectType;
           this.updataLoading = true;
-          generateCode(this.setQuery).then((res)=>{
-            if(res.state=="Success"){
-              this.updataLoading = false;
+          if (this.setQuery.activationType == "时间段") {
+            this.setQuery.activationType = 1;
+          } else {
+            this.setQuery.activationType = 2;
+          }
+      console.log(this.setQuery.activationType, "-----type");
+          generateCode(this.setQuery).then((res) => {
+            this.updataLoading = false;
+            if (res.state == "Success") {
               this.vipDialogVisible = false;
+              this.setQuery.validDay = "";
+              this.setQuery.activationType = "";
+              this.date = "";
+              this.setQuery.totalTicket = "";
+              setQuery.startString = "";
               this.getList();
-
             }
-          })
+          });
         } else {
           console.log("error submit!!");
           return false;
@@ -458,10 +524,23 @@ export default {
       this.$router.push({
         path: "/operationManage/comboManage/checkoutCode",
         query: {
-          groupInfo:JSON.stringify(item),
+          groupInfo: JSON.stringify(item),
         },
       });
     },
+
+    // 套餐列表
+    get_setmealList() {
+      this.loading = true;
+      getList().then((res) => {
+      this.loading = false;
+        if (res.state == "Success") {
+          this.optionsList = res.content.records;
+          this.total = res.content.total;
+        }
+      });
+    },
+
     handleSearch() {
       this.query.page = 1;
       this.getList();
@@ -503,7 +582,7 @@ export default {
 };
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 .codeInfo {
   height: 50px;
   line-height: 50px;