瀏覽代碼

修复角色管理404

1
mo 3 年之前
父節點
當前提交
59301f67e0

+ 13 - 1
src/constant/index.js

@@ -382,4 +382,16 @@ export const chargingStatus = {
   0: '冻结',
   1: '扣费',
   2: '取消冻结'
-}
+}
+
+export const coupontypeDetail = {
+  OTHER:'其他',
+  MUSICAL:'乐器',
+  ACCESSORIES:'辅件',
+  MAINTENANCE:'乐保服务',
+  TEACHING:'教材',
+  PRACTICE:'网管课',
+  SINGLE:'声部课',
+  MIX:'合奏课',
+  VIP:'VIP'
+}

+ 3 - 1
src/utils/searchArray.js

@@ -1,5 +1,5 @@
 // 搜索用的下拉数据列表
-import { payOrderType, auditType, auditPaymentType, orderServerType, orderAuditType, rewardModeType,classTime,musicClassType,ProbationPeriodStatus,downListType,musicGroupType,conclusion,vipResetType,courseViewType,clientType,couponType,backType,memberEnum } from '../constant'
+import { payOrderType, auditType, auditPaymentType, orderServerType, orderAuditType, rewardModeType,classTime,musicClassType,ProbationPeriodStatus,downListType,musicGroupType,conclusion,vipResetType,courseViewType,clientType,couponType,backType,memberEnum,coupontypeDetail } from '../constant'
 // 课程类型
 export const courseType = [
   { label: "声部课", value: "SINGLE" },
@@ -247,6 +247,8 @@ export const clientList = getValueForKey(clientType)
 export const couponTypeList = getValueForKey(couponType)
 export const backTypeList =  getValueForKey(backType)
 export const memberEnumList =getValueForKey(memberEnum)
+export const coupontypeDetailList =getValueForKey(coupontypeDetail)
+
 //downListType
 function getValueForKey (obj) {
   let arr = []

+ 2 - 0
src/utils/vueFilter.js

@@ -203,6 +203,8 @@ Vue.filter('organPayState',val=>constant.organPayState[val])
 Vue.filter('clientType',val=>constant.clientStatus[val])
 // 会员周期
 Vue.filter('memberEnumType',val=>constant.memberEnum[val])
+// 优惠券类型
+Vue.filter('coupontypeDetailType',val=>constant.coupontypeDetail[val])
 
 // 时间处理
 Vue.filter('timer', (value) => {

+ 3 - 3
src/views/categroyManager/insideSetting/adminOperation.vue

@@ -43,7 +43,7 @@
             <div slot-scope="{ node, data }">
               {{ node.label }}
               <el-tag v-if="data.type == 1"
-                      
+
                       effect="dark">按钮</el-tag>
             </div>
           </el-tree>
@@ -135,7 +135,7 @@ export default {
       if (res.code == 200) {
         this.$message.success('修改成功')
         this.$store.dispatch('delVisitedViews', this.$route)
-        this.$router.push({ path: '/parameter/adminManager', query: { page: this.page } })
+        this.$router.push({ path: '/adminManager', query: { page: this.page } })
       } else {
         this.$message.error(res.msg)
       }
@@ -239,7 +239,7 @@ export default {
     onCancel () {
       this.$store.dispatch('delVisitedViews', this.$route)
       this.$router.push({
-        path: '/parameter/adminManager',
+        path: '/adminManager',
         query: {
           page: this.$route.query.page
         }

+ 47 - 33
src/views/couponManager/couponUpdate.vue

@@ -39,6 +39,50 @@
         </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.type"
+              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: '请选择优惠券类型' }]"
+          >
+            <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="优惠券类型"
@@ -109,38 +153,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col style="width: 395px" >
-          <el-form-item
-            label="面值"
-            prop="faceValue"
-            :rules="[{ required: true, message: '请输入面值' }]"
-          >
-            <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 == '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-row>
+
       <el-row :gutter="20">
         <el-col style="width: 395px">
           <el-form-item
@@ -294,12 +307,13 @@
 </template>
 <script>
 import { addSysCoupon, resetSysCoupon } from "./api.js";
-import { couponTypeList } from "@/utils/searchArray";
+import { couponTypeList ,coupontypeDetailList} from "@/utils/searchArray";
 import { getTimes } from "@/utils";
 export default {
   data() {
     return {
       couponTypeList,
+      coupontypeDetail:coupontypeDetailList,
       form: {
         name: "",
         description: "",