自营券增加套餐券

src/views/system/coupon/durationIndex.vue

@@ -209,14 +209,28 @@
         <el-form-item label="优惠券名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入优惠券名称"/>
         </el-form-item>
+        <!--        <el-form-item label="优惠券类型" prop="couponType">-->
+        <!--          <el-select v-model="form.couponType" placeholder="请选择优惠券类型" disabled>-->
+        <!--            <el-option-->
+        <!--              v-for="dict in dict.type.duration_coupon_type"-->
+        <!--              :key="dict.value"-->
+        <!--              :label="dict.label"-->
+        <!--              :value="parseInt(dict.value)"-->
+        <!--            ></el-option>-->
+        <!--          </el-select>-->
+        <!--        </el-form-item>-->
         <el-form-item label="优惠券类型" prop="couponType">
-          <el-select v-model="form.couponType" placeholder="请选择优惠券类型" disabled>
+          <el-select v-model="form.couponType" clearable placeholder="请选择优惠券类型">
             <el-option
-              v-for="dict in dict.type.duration_coupon_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
+              key="4"
+              label="时长券"
+              value="4"
+            />
+            <el-option
+              key="5"
+              label="套餐券"
+              value="5"
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="优惠券原始金额" prop="originalPrice">
@@ -553,7 +567,6 @@ export default {
     handleAdd() {
       this.reset();
       this.form.platformType = 1;
-      this.form.couponType = 4;
       this.open = true;
       this.title = "添加优惠券";
     },
@@ -566,6 +579,9 @@ export default {
         if (response.data.orderType) {
           this.form.orderType = response.data.orderType.toString();
         }
+        if (response.data.couponType) {
+          this.form.couponType = response.data.couponType.toString();
+        }
         if (response.data.packageId) {
           this.form.packageId = response.data.packageId.toString();
         }

src/views/system/order/index.vue

@@ -298,7 +298,7 @@
       <!--          <dict-tag :options="dict.type.order_pay_status" :value="scope.row.payStatus"/>-->
       <!--        </template>-->
       <!--      </el-table-column>-->
-      <el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作" width="100">
+      <el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作" width="120px">
         <template slot-scope="scope">
           <el-button v-if="scope.row.payStatus == 1 && scope.row.status != 3"
             size="mini"