소스 검색

删除多余的页面

lilei 4 년 전
부모
커밋
ec68557a70

+ 24 - 94
src/config/router.config.js

@@ -62,27 +62,6 @@ export const asyncRouterMap = [
         }
       }]
     },
-    // 优惠券中心
-    {
-      path: '/CouponCenter',
-      redirect: '/CouponCenter/CreateCoupons',
-      component: PageView,
-      meta: {
-        title: '优惠券中心',
-        icon: 'setting'
-        // permission: 'M_setting_0'
-      },
-      children: [{
-        path: '/CouponCenter/CreateCoupons',
-        name: 'CouponCenter',
-        component: () => import('@/views/CouponCenter/CreateCoupons.vue'),
-        meta: {
-          title: '创建优惠券',
-          icon: 'database'
-          // permission: 'M_sys_dataDictionary'
-        }
-      }]
-    },
     {
       path: '/Order',
       redirect: '/Order/OrderCenter',
@@ -106,81 +85,32 @@ export const asyncRouterMap = [
         }
       ]
     },
-    {
-      path: '/RefundRecord',
-      redirect: '/RefundRecord/RefundRecord',
-      component: PageView,
-      meta: {
-        title: '退单记录',
-        icon: 'setting'
-        // permission: 'M_setting_0'
-      },
-      children: [{
-        path: '/RefundRecord/RefundRecord',
-        name: 'RefundRecord',
-        component: () => import('@/views/RefundRecord/RefundRecord.vue'),
-        meta: {
-          title: '退单记录',
-          icon: 'setting'
-          // permission: 'M_sys_dataDictionary'
-        }
-      }
-      ]
-    },
-    {
-      path: '/CouponStatistics',
-      redirect: '/CouponStatistics/CouponStatistics',
-      component: PageView,
-      meta: {
-        title: '优惠券统计',
-        icon: 'setting'
-        // permission: 'M_setting_0'
-      },
-      children: [{
-        path: '/CouponStatistics/CouponStatisticsList',
-        name: 'CouponStatisticsList',
-        component: () => import('@/views/CouponStatistics/CouponStatisticsList.vue'),
-        meta: {
-          title: '优惠券统计',
-          icon: 'setting'
-          // permission: 'M_sys_dataDictionary'
-        }
-      },
-      {
-        path: '/CouponStatistics/CouponStatisticsDetail',
-        name: 'CouponStatisticsDetail',
-        component: () => import('@/views/CouponStatistics/CouponStatisticsDetail.vue'),
-        meta: {
-          title: '优惠券领取详情',
-          icon: 'setting'
-          // permission: 'M_sys_dataDictionary'
-        }
-      }
-      ]
-    },
-    {
-      path: '/AvailableCoupon',
-      redirect: '/AvailableCoupon/AvailableCoupon',
-      component: PageView,
-      meta: {
-        title: '可使用优惠券',
-        icon: 'setting'
-        // permission: 'M_setting_0'
-      },
-      children: [
-        {
-          path: '/AvailableCoupon/AvailableCoupon',
-          name: 'AvailableCoupon',
-          component: () => import(/* webpackChunkName: "auth" */ '@/views/AvailableCoupon/AvailableCoupon.vue'),
-          meta: { title: '可使用优惠券', icon: 'user' }
-        }
-      ]
-    },
+    // {
+    //   path: '/RefundRecord',
+    //   redirect: '/RefundRecord/RefundRecord',
+    //   component: PageView,
+    //   meta: {
+    //     title: '退单记录',
+    //     icon: 'setting'
+    //     // permission: 'M_setting_0'
+    //   },
+    //   children: [{
+    //     path: '/RefundRecord/RefundRecord',
+    //     name: 'RefundRecord',
+    //     component: () => import('@/views/RefundRecord/RefundRecord.vue'),
+    //     meta: {
+    //       title: '退单记录',
+    //       icon: 'setting'
+    //       // permission: 'M_sys_dataDictionary'
+    //     }
+    //   }
+    //   ]
+    // },
     {
       path: '/auth',
       redirect: '/auth/userList',
       component: PageView,
-      meta: { title: '后台权限管理', icon: 'lock'
+      meta: { title: '权限管理', icon: 'lock'
         // permission: 'M_auth_0' ,
       },
       children: [
@@ -206,8 +136,8 @@ export const asyncRouterMap = [
           component: () => import(/* webpackChunkName: "auth" */ '@/views/power/menu/menu.vue'),
           meta: {
             title: '菜单管理',
-            icon: 'profile',
-            permission: 'M_menusAuth_menu'
+            icon: 'profile'
+            // permission: 'M_menusAuth_menu'
           }
         }
       ]

+ 0 - 88
src/views/AvailableCoupon/AvailableCoupon.vue

@@ -1,88 +0,0 @@
-<template>
-  <!-- <a-card class="card-content">
-    <div class="AvailableCoupon-content">
-      <div class="coupon-type">
-        <div class="arc-left"></div>
-        <div class="arc-right"></div>
-      </div>
-      <div class="coupon-content">
-        <div class="arc-top"></div>
-        <div class="arc-bottom"></div>
-      </div>
-    </div>
-  </a-card> -->
-  <a-card hoverable style="width: 240px">
-      <!-- <img
-        slot="cover"
-        alt="example"
-        src="https://os.alipayobjects.com/rmsportal/QBnOOoLaAfKPirc.png"
-      /> -->
-      <a-card-meta title="Europe Street beat">
-        <template slot="description">
-          www.instagram.com
-        </template>
-      </a-card-meta>
-      <a-card-meta title="Europe Street beat">
-        <template slot="description">
-          www.instagram.com
-        </template>
-      </a-card-meta>
-    </a-card>
-</template>
-
-<script>
-</script>
-
-<style lang="less">
-  .card-content{
-    height:100vh;
-    padding: 20px;
-    background-color: #fff;
-    .coupon-type{
-      width:200px;
-      height:100px;
-      background-color: red;
-      position: absolute;
-      top: 0;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      border-radius:10px 10px 0 0;
-      .arc-left{
-        width: 15px;
-        height: 15px;
-        background-color: #fff;
-        /*四分之一圆*/
-        border-radius: 0 100% 0  0;
-        /*定位*/
-        position: absolute;
-        left: 0;
-        bottom: 0;
-      }
-      .arc-right{
-        width: 15px;
-        height: 15px;
-        background-color: #fff;
-        /*四分之一圆*/
-        border-radius: 100%  0 0  0;
-        /*定位*/
-        position: absolute;
-        right: 0;
-        bottom: 0;
-      }
-    }
-    .coupon-content{
-      width:200px;
-      height:100px;
-      background-color: #fff;
-      border:1px soild #FF0000;
-      border-radius:0 0 10px 10px;
-      position: absolute;
-      top: 100px;
-      bottom: 0;
-      left: 200px;
-      right: 0;
-    }
-  }
-   
-</style>

+ 0 - 336
src/views/CouponCenter/AddCouponModal.vue

@@ -1,336 +0,0 @@
-<template>
-  <a-modal class="CouponModal" :title="mtitle" :width="1020" :footer="null" :destroyOnClose="true" @cancel="isShow=false" v-model="isShow">
-    <!-- 表单 -->
-    <a-form-model ref="ruleForm" :model="form" :rules="rules" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-      <a-row>
-        <a-col :span="24">
-          <div class="c-title">
-            基本信息
-            <a-divider type="vertical" class="bold-divider" />
-          </div>
-        </a-col>
-        <a-col :span="12">
-          <a-form-model-item label="优惠券名称" prop="name">
-            <a-input v-model="form.name" :maxLength="20" placeholder="请输入优惠券名称,20个字以内" />
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-model-item label="发放总量" prop="name">
-            <a-row :gutter="20">
-              <a-col :span="7">
-                <a-select v-model="form.isQuota" placeholder="请选择">
-                  <a-select-option :value="item.code" v-for="(item, index) in isFlagList" :key="index">{{item.code == '0' ? '不限' : '限制'}}</a-select-option>
-                </a-select>
-              </a-col>
-              <a-col :span="17" v-show="form.isQuota == '1'">
-                <a-input-number v-model="form.quota" :min="0" :max="999999" placeholder="请输入限制发放份数, 0-999999" class="input-number-s" />
-                <span class="unit">份</span>
-              </a-col>
-            </a-row>
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-model-item label="优惠券类型" prop="couponType">
-            <!-- <v-select ref="couponType" v-model="form.couponType" showArrow placeholder="请选择优惠券类型" code="CHECK_ENABLE_STATE"></v-select> -->
-            <a-select v-model="form.couponType" placeholder="请选择">
-              <a-select-option :value="item.code" v-for="(item, index) in couponTypeList" :key="index">{{item.dispName}}</a-select-option>
-            </a-select>
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-model-item label="优惠券面额" prop="name">
-            <a-input-number v-model="form.quota" :min="0" :max="999999" placeholder="请输入优惠券面额, 0-999999" class="input-number-s" />
-            <span class="unit">元</span>
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-model-item label="是否限额使用" prop="name">
-            <a-select v-model="form.isQuota" placeholder="请选择">
-              <a-select-option :value="item.code" v-for="(item, index) in isFlagList" :key="index">{{item.dispName}}</a-select-option>
-            </a-select>
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-model-item label="优惠券说明" prop="name" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
-            <a-textarea v-model="form.name" :maxLength="256" :auto-size="{ minRows: 3, maxRows: 5 }" placeholder="请输入优惠券说明,256个字以内" />
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="24">
-          <div class="c-title">
-            领用规则
-            <a-divider type="vertical" class="bold-divider" />
-          </div>
-        </a-col>
-        <a-col :span="24">
-          <a-form-model-item label="持卡会员" prop="name" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
-            <a-row :gutter="20">
-              <a-col :span="6">
-                <a-select v-model="form.isQuota" placeholder="请选择">
-                  <a-select-option :value="item.code" v-for="(item, index) in isFlagList" :key="index">{{item.code == '0' ? '不限领' : '限领'}}</a-select-option>
-                </a-select>
-              </a-col>
-              <a-col :span="16">
-                <a-row>
-                  <a-col :span="10">
-                    <a-input-number v-model="form.quota" :min="0" :max="999999" placeholder="请输入限领份数, 0-999999" class="input-number-s" />
-                  </a-col>
-                  <a-col :span="3">
-                    份/每
-                  </a-col>
-                  <a-col :span="6">
-                    <a-select v-model="form.restrictedUnit" placeholder="请选择">
-                      <a-select-option :value="item.code" v-for="(item, index) in isUnitList" :key="index">{{item.dispName}}</a-select-option>
-                    </a-select>
-                  </a-col>
-                </a-row>
-              </a-col>
-            </a-row>
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-model-item label="未持卡会员" prop="name" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
-            <a-row :gutter="20">
-              <a-col :span="6">
-                <a-select v-model="form.isQuota" placeholder="请选择">
-                  <a-select-option :value="item.code" v-for="(item, index) in isFlagList" :key="index">{{item.code == '0' ? '不限领' : '限领'}}</a-select-option>
-                </a-select>
-              </a-col>
-              <a-col :span="16">
-                <a-row>
-                  <a-col :span="10">
-                    <a-input-number v-model="form.quota" :min="0" :max="999999" placeholder="请输入限领份数, 0-999999" class="input-number-s" />
-                  </a-col>
-                  <a-col :span="3">
-                    份/每
-                  </a-col>
-                  <a-col :span="6">
-                    <a-select v-model="form.restrictedUnit" placeholder="请选择">
-                      <a-select-option :value="item.code" v-for="(item, index) in isUnitList" :key="index">{{item.dispName}}</a-select-option>
-                    </a-select>
-                  </a-col>
-                </a-row>
-              </a-col>
-            </a-row>
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-model-item label="有效期" prop="name">
-            <a-row :gutter="20">
-              <a-col :span="9">
-                <a-select v-model="form.validType" placeholder="请选择">
-                  <a-select-option :value="item.code" v-for="(item, index) in couponValidityList" :key="index">{{item.dispName}}</a-select-option>
-                </a-select>
-              </a-col>
-              <a-col :span="15" v-show="form.validType == 'ABSOLUTE'">
-                <a-range-picker @change="validDateChange" :disabled-date="disabledDate" format="YYYY-MM-DD" />
-              </a-col>
-              <a-col :span="15" v-show="form.validType == 'RELATIVE'">
-                <a-row>
-                  <a-col :span="16">
-                    <a-input-number v-model="form.quota" :min="0" :max="999999" placeholder="请输入" class="input-number-s" />
-                  </a-col>
-                  <a-col :span="8">天内有效</a-col>
-                </a-row>
-              </a-col>
-            </a-row>
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-model-item label="是否允许优惠叠加" prop="name">
-            <a-select v-model="form.isQuota" placeholder="请选择">
-              <a-select-option :value="item.code" v-for="(item, index) in isFlagList" :key="index">{{item.dispName}}</a-select-option>
-            </a-select>
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-model-item label="适用洗车类型" prop="name">
-            <v-select ref="serviceType" v-model="form.isQuota" showArrow mode="multiple" placeholder="请选择适用洗车类型" code="CHECK_ENABLE_STATE"></v-select>
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-model-item label="适用洗车网点" prop="isOutletsLimit">
-            <a-row :gutter="20">
-              <a-col :span="12">
-                <a-select v-model="form.isOutletsLimit" placeholder="请选择">
-                  <a-select-option :value="item.code" v-for="(item, index) in isAllList" :key="index">{{item.dispName}}</a-select-option>
-                </a-select>
-              </a-col>
-              <a-col :span="12" v-show="form.isOutletsLimit == 1">
-                <a-row :gutter="20">
-                  <a-col :span="12">
-                    已选 <strong>4</strong> 个
-                  </a-col>
-                  <a-col :span="12">
-                    <a-button type="primary" size="small" class="small-btn" @click="openOutletsModal=true">选择</a-button>
-                  </a-col>
-                </a-row>
-              </a-col>
-            </a-row>
-          </a-form-model-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-model-item :label-col="{ span: 0 }" :wrapper-col="{ span: 24 }" class="btn-cont">
-            <a-button type="primary" @click="onSubmit('ruleForm')">保存</a-button>
-            <a-button class="resetForm" @click="resetForm">取消</a-button>
-          </a-form-model-item>
-        </a-col>
-      </a-row>
-    </a-form-model>
-    
-    <!-- 选择网点 -->
-    <choose-outlets
-      :openOutletsModal="openOutletsModal"
-      @close="closeChooseOutlets"
-    />
-    
-  </a-modal>
-</template>
-
-<script>
-  import { VSelect } from '@/components'
-  import moment from 'moment'
-  import ChooseOutlets from './ChooseOutlets.vue'
-  export default{
-    name: 'AddCouponModal',
-    components: { VSelect, ChooseOutlets },
-    props: {
-      openModal: {  //  弹框是否展示
-        type: Boolean,
-        default: false
-      },
-      mtitle: {  //  弹框标题
-        type: String,
-        default: ''
-      }
-    },
-    data(){
-      return{
-        isShow: this.openModal,  //  弹框是否展示
-        form: {
-          name: '',  //  优惠券名称
-          isQuota: '0',  //  发放总量  不限,限制
-          quota: '',  //  发放总量  份数
-          couponType: 'VOUCHER',  //  优惠券类型
-          restrictedUnit: '0',  //  限领单位     自然月
-          validType: 'NONE', //  有效期类型:ABSOLUTE绝对时效(时间区间)/RELATIVE相对时效(领取后多少天内有效)/NONE不限制
-          startTime: '', //  有效期 开始
-          endTime: '', //  有效期 结束
-          validDate: '', //  有效期有效时长  (领取后多少天内有效)
-          isOutletsLimit: '0',  //  适用洗车网点限制   0全部(不限)  1部分(限制)
-        },
-        rules: {
-          name: [
-            { required: true, message: '请输入优惠券名称', trigger: 'blur' }
-          ]
-        },
-        isFlagList: [ //  是否  下拉数据列表
-          {dispName: '是', code: '1'},
-          {dispName: '否', code: '0'}
-        ],
-        couponTypeList: [ //  优惠券类型数据列表
-          {dispName: '满减券', code: 'FULLSUB'},
-          {dispName: '代金券', code: 'VOUCHER'}
-        ],
-        isUnitList: [  //  限领份数单位  下拉数据列表
-          {dispName: '自然月', code: '0'},
-        ],
-        couponValidityList: [ //  有效期  下拉数据列表
-          {dispName: '不限', code: 'NONE'},
-          {dispName: '固定日期', code: 'ABSOLUTE'},
-          {dispName: '领取后', code: 'RELATIVE'}
-        ],
-        isAllList: [ //  适用洗车网点  全部 部分 下拉数据列表
-          {dispName: '全部', code: '0'},
-          {dispName: '部分', code: '1'}
-        ],
-        openOutletsModal: false  ,//  选择网点  弹框展示状态
-      }
-    },
-    methods: {
-      moment,
-      range(start, end) {
-        const result = []
-        for (let i = start; i < end; i++) {
-          result.push(i)
-        }
-        return result
-      },
-      //  有效期  固定日期  禁用范围
-      disabledDate(current) {
-        // 不能选择今天之前的日期
-        return current && current < moment().subtract(1, 'days')
-      },
-      //  有效期  固定日期  change
-      validDateChange(date, dateString){
-        console.log(date, dateString)
-      },
-      //  保存
-      onSubmit(formName){
-        console.log(this.form, '表单数据')
-        this.$refs[formName].validate(valid => {
-          if (valid) {
-            let formData = JSON.parse(JSON.stringify(this.form))
-            
-            //  提交前时间格式还需转换
-            console.log(formData,'-----提交的表单数据')
-          } else {
-            return false
-          }
-        })
-      },
-      // 取消
-      resetForm(){
-        this.$refs.ruleForm.resetFields()
-        this.isShow = false
-      },
-      //  选择网点
-      closeChooseOutlets(val, name){
-        // if(val){
-        //   this.form.equipment = val
-        //   this.equipmentName = name
-        // }
-        this.openOutletsModal = false
-      },
-    },
-    watch: {
-      //  父页面传过来的弹框状态
-      openModal (newValue, oldValue) {
-        this.isShow = newValue
-      },
-      //  重定义的弹框状态
-      isShow (val){
-        if (!val){
-          this.$emit('close')
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="less">
-  .CouponModal{
-    .c-title{
-      padding: 0 0 10px;
-      margin-bottom: 20px;
-      border-bottom: 1px solid #e8e8e8;
-      .bold-divider{
-        width: 3px;
-        background-color: #1890ff;
-      }
-    }
-    .input-number-s{
-      width: 90%;
-    }
-    .unit{
-      display: inline-block;
-      width: 10%;
-      text-align: right;
-    }
-    .btn-cont{
-      text-align: center;
-      .resetForm{
-        margin-left: 10px;
-      }
-    }
-  }
-</style>

+ 0 - 81
src/views/CouponCenter/ChooseOutlets.vue

@@ -1,81 +0,0 @@
-<template>
-  <a-modal class="CouponOutletsModal" title="选择网点" :width="600" :footer="null" :destroyOnClose="true" @cancel="modalIsShow=false" v-model="modalIsShow">
-    <a-input-search placeholder="请输入网点名称" enter-button="查询" @search="onSearch" class="input-search" />
-    <a-checkbox-group @change="onChange" class="checkbox-group">
-      <a-checkbox value="A" class="checkbox-item">A</a-checkbox>
-      <a-checkbox value="B" class="checkbox-item">B</a-checkbox>
-      <a-checkbox value="C" class="checkbox-item">C</a-checkbox>
-      <a-checkbox value="D" class="checkbox-item">D</a-checkbox>
-    </a-checkbox-group>
-  </a-modal>
-</template>
-
-<script>
-  export default{
-    name: 'ChooseOutlets',
-    props: {
-      openOutletsModal: {  //  弹框是否展示
-        type: Boolean,
-        default: false
-      },
-    },
-    data(){
-      return{
-        modalIsShow: this.openEquipmentModal,  //  弹框是否展示
-        checkedList: [],  //  选中的网点
-        outletsDataList: [  //  网点列表数据
-          { name: '网点1', value: '1' },
-          { name: '网点2', value: '2' },
-          { name: '网点3', value: '3' },
-          { name: '网点4', value: '4' },
-          { name: '网点5', value: '5' },
-          { name: '网点6', value: '6' },
-        ]
-      }
-    },
-    methods: {
-      //  查询
-      onSearch(value) {
-        console.log(value)
-      },
-      //  多选框 change
-      onChange(e){
-        console.log(e)
-        this.checkedList = e
-      },
-    },
-    watch: {
-      //  父页面传过来的弹框状态
-      openOutletsModal (newValue, oldValue) {
-        this.modalIsShow = newValue
-      },
-      //  重定义的弹框状态
-      modalIsShow (val){
-        if (!val){
-          this.$emit('close')
-        }
-      }
-    }
-  }
-</script>
-
-<style lang="less">
-  .CouponOutletsModal{
-    .input-search{
-      margin-bottom: 15px;
-    }
-    .checkbox-group{
-      display: block;
-      .checkbox-item{
-        display: block;
-        margin: 15px 0 0;
-        padding: 10px 15px;
-        border: 1px solid rgb(228, 228, 228);
-        border-radius: 6px;
-        .ant-checkbox{
-          display: none;
-        }
-      }
-    }
-  }
-</style>

+ 0 - 131
src/views/CouponCenter/CreateCoupons.vue

@@ -1,131 +0,0 @@
-<template>
-  <a-card class="CreateCoupons" :bordered="false">
-    <!-- 搜索条件 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="48">
-          <a-col :span="6">
-            <a-form-item class="search-item" label="优惠券名称">
-              <a-input v-model.trim="queryParam.name" placeholder="请输入优惠券名称" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item class="search-item" label="优惠券类型">
-              <v-select ref="yyzt" allowClear placeholder="请选择优惠券类型" v-model="queryParam.type" code="CHECK_ENABLE_STATE"></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-button type="primary" class="search-btn" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button type="" @click="reset">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 新建 -->
-    <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="modalHandle('add')">新建</a-button>
-    </div>
-    <!-- 表格列表 -->
-    <s-table ref="table" size="default" rowKey="id" :columns="columns" :data="loadData" bordered >
-      <!-- 操作 -->
-      <template slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" :style="{ fontSize: '20px', color: '#1890FF', padding: '0 10px' }" />
-        <a-icon type="eye" title="查看详情" @click="openDetailsModal=true" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" />
-        <a-icon type="delete" title="删除" @click="del(record)" :style="{ fontSize: '20px', color: 'red', padding: '0 10px' }" />
-      </template>
-    </s-table>
-    
-    <!-- 新增/编辑 优惠券 -->
-    <add-coupon-modal
-      :openModal="openModal"
-      :mtitle="mtitle"
-      @close="openModal=false"
-    />
-    
-  </a-card>
-</template>
-
-<script>
-  import { STable, VSelect } from '@/components'
-  import AddCouponModal from './AddCouponModal.vue'
-  export default{
-    name: 'CreateCoupons',
-    components: { STable, VSelect, AddCouponModal },
-    data(){
-      return{
-        queryParam: {
-          name: '',  //  优惠券名称
-          type: '',  //  优惠券类型
-        },
-        columns: [
-          { title: '序号', dataIndex: 'index', width: '100', align: 'center' },
-          { title: '创建时间', dataIndex: 'createDate', width: '100', align: 'center' },
-          { title: '优惠券名称', dataIndex: 'name', width: '100', align: 'center' },
-          { title: '到期时间', dataIndex: 'endDate', width: '100', align: 'center' },
-          { title: '类型', dataIndex: 'couponType', width: '100', align: 'center' },
-          { title: '状态', dataIndex: 'status', width: '100', align: 'center' },
-          { title: '操作', scopedSlots: {customRender: 'action'}, width: '200', align: 'center' }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          // return activeList(Object.assign(parameter, this.queryParam)).then(res => {
-          //   const no = (res.data.pageNo - 1) * res.data.pageSize
-          //   for (let i = 0; i < res.data.list.length; i++) {
-          //     const _item = res.data.list[i]
-          //     _item.no = no + i + 1
-          //     _item.releaseStatus = _item.releaseStatus + '' === 'FB'
-          //   }
-          //   return res.data
-          // })
-          // let data = [
-          //   { createDate: '2020-07-31 15:09', equipment: 'ID585787887', name: '网点A', addrProvince: '陕西省', addrCity: '西安市', addrDetail: '华帝金座', businessHours: '8:30 - 22:00', equipmentStatus: '在线', businessStatus: '正常营业', wechatCode: '' },
-          //   { createDate: '2020-07-31 15:09', equipment: 'ID585787887', name: '网点A', addrProvince: '陕西省', addrCity: '西安市', addrDetail: '华帝金座', businessHours: '8:30 - 22:00', equipmentStatus: '在线', businessStatus: '正常营业', wechatCode: '' },
-          //   { createDate: '2020-07-31 15:09', equipment: 'ID585787887', name: '网点A', addrProvince: '陕西省', addrCity: '西安市', addrDetail: '华帝金座', businessHours: '8:30 - 22:00', equipmentStatus: '在线', businessStatus: '正常营业', wechatCode: '' },
-          // ]
-          // return new Promise((resolve, reject) => {
-          //   resolve(data)
-          // }).catch(() => console.log('Oops errors!'))
-        },
-        openModal: false,  //  新增/编辑 优惠券  弹框展示状态
-        mtitle: '',  //  新增/编辑 优惠券  弹框标题
-        openDetailsModal: false,  //  查看详情 优惠券  弹框展示状态
-      }
-    },
-    methods: {
-      //  新建
-      modalHandle(type){
-        this.mtitle = type == 'add' ? '新增' : '编辑'
-        this.openModal = true
-      },
-      // 删除
-      del(item){
-        console.log(item)
-        this.$confirm({
-          title: '提示',
-          content: '确定要删除吗?',
-          onOk () {
-            
-          }
-        })
-      },
-      //  重置
-      reset(){
-        this.queryParam = {
-          name: '',  //  优惠券名称
-          type: '',  //  优惠券类型
-        }
-        this.$refs.table.refresh(true)
-      }
-    }
-  }
-</script>
-
-<style lang="less">
-  .CreateCoupons{
-    .table-page-search-wrapper{
-      .search-btn{
-        margin-right: 10px;
-      }
-    }
-  }
-</style>

+ 0 - 146
src/views/CouponStatistics/CouponStatisticsDetail.vue

@@ -1,146 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 搜索条件 -->
-    <h3 class="coupon-detail-title" v-model="title">{{title}},领取详情</h3>
-    <a-divider />
-    <div class="CouponStatisticsDetail-searchForm">
-      <a-form ref="searchForm" labelAlign="left">
-        <a-row :gutter="48">
-          <a-col :span="6">
-            <a-form-item label="领券时间" :label-col="{ span:6 }" :wrapper-col="{ span:14 }">
-              <a-range-picker v-model="time" :format="dateFormat" :placeholder="['开始时间','结束时间']" @change="onChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="手机号码" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <a-input v-model.trim="searchForm.name" placeholder="请输入" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="领券网点" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <a-input v-model.trim="searchForm.name" placeholder="请输入" allowClear/>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="48">
-          <a-col :span="6">
-            <a-form-item label="用券时间" :label-col="{ span:6 }" :wrapper-col="{ span:14 }">
-              <a-range-picker v-model="time" :format="dateFormat" :placeholder="['开始时间','结束时间']" @change="onChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="使用状态" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <v-select v-model="searchForm.couponType" placeholder="请选择" allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="用券网点" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <a-input v-model.trim="searchForm.name" placeholder="请输入" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button type="" @click="resetForm">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 列表 -->
-    <s-table ref="table" size="default" :rowKey="(record) => record.id" :columns="columns" :data="loadData" bordered>
-      <!-- 状态 -->
-      <span slot="status" slot-scope="text, record">
-        <template></template>
-      </span>
-    </s-table>
-  </a-card>
-</template>
-
-<script>
-  import {
-    STable,
-    VSelect
-  } from '@/components'
-  export default{
-    components:{ STable,VSelect },
-    data(){
-      return{
-        searchForm:{
-          name:'',
-        },
-        title:"3元代金券",
-        columns: [{
-            title: '序号',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-        
-          {
-            title: '领券时间',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '领券手机号码',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '使用状态',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '用券网点',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '用券时间',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '关联消费金额',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          // return getTenantsList(Object.assign(parameter, this.searchForm)).then(res => {
-          //   if (res.status == 200) {
-          //     const no = (res.data.pageNo - 1) * res.data.pageSize
-          //     for (let i = 0; i < res.data.list.length; i++) {
-          //       const _item = res.data.list[i]
-          //       _item.no = no + i + 1
-          //       _item.status = _item.status + '' === '1'
-          //     }
-          //     return res.data
-          //   }
-          // })
-        }
-      }
-    },
-    methods:{
-      // 重置
-      resetForm(){
-        this.$refs.searchForm.resetFields()
-        this.$refs.table.refresh(true)
-      }
-    }
-  }
-</script>
-
-<style lang="less">
-  .coupon-detail-title{
-    margin-bottom: 20px;
-    margin-left: 20px;
-  }
-</style>

+ 0 - 161
src/views/CouponStatistics/CouponStatisticsList.vue

@@ -1,161 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 搜索条件 -->
-    <div class="CouponStatistics-searchForm">
-      <a-form ref="searchForm">
-        <a-row :gutter="48">
-          <a-col :span="6">
-            <a-form-item label="发券网点" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <a-input v-model.trim="searchForm.area" placeholder="请输入" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="优惠券名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <a-input v-model.trim="searchForm.name" placeholder="请输入" allowClear/>
-
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item label="优惠券类型" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
-              <v-select v-model="searchForm.couponType" placeholder="请选择" allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-button style="margin-right: 10px;" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button type="" @click="resetForm">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 列表 -->
-    <s-table ref="table" size="default" :rowKey="(record) => record.id" :columns="columns" :data="loadData" bordered>
-      <!-- 状态 -->
-      <span slot="status" slot-scope="text, record">
-        <template></template>
-      </span>
-      <!-- 操作 -->
-      <span slot="action" slot-scope="text, record">
-        <template>
-          <a-icon type="eye" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="handleEdit(record)" />
-        </template>
-      </span>
-    </s-table>
-  </a-card>
-</template>
-
-<script>
-  import {
-    STable,
-    VSelect
-  } from '@/components'
-  export default {
-    components: {
-      STable,
-      VSelect
-    },
-    data() {
-      return {
-        searchForm: {
-          name: '',      // 优惠券名称
-          area: '',      // 网点名称
-          couponType:''  // 优惠券类型
-        },
-        columns: [{
-            title: '序号',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-
-          {
-            title: '发券网点',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '优惠券名称',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '优惠券类型',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '已发数量',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '使用数量',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '关联消费金额',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '转化率',
-            dataIndex: 'no',
-            minWidth: '40',
-            align: 'center'
-          },
-          {
-            title: '状态',
-            dataIndex: 'status',
-            minWidth: '40',
-            align: 'center',
-            scopedSlots: {
-              customRender: 'status'
-            }
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            minWidth: '40',
-            align: 'center',
-            scopedSlots: {
-              customRender: 'action'
-            }
-          }
-        ],
-        // 加载数据方法 必须为 Promise 对象
-        loadData: parameter => {
-          // return getTenantsList(Object.assign(parameter, this.searchForm)).then(res => {
-          //   if (res.status == 200) {
-          //     const no = (res.data.pageNo - 1) * res.data.pageSize
-          //     for (let i = 0; i < res.data.list.length; i++) {
-          //       const _item = res.data.list[i]
-          //       _item.no = no + i + 1
-          //       _item.status = _item.status + '' === '1'
-          //     }
-          //     return res.data
-          //   }
-          // })
-        }
-      }
-    },
-    methods: {
-      // 重置
-      resetForm() {
-        this.$refs.searchForm.resetFields()
-        this.$refs.table.refresh(true)
-      }
-    }
-  }
-</script>
-
-<style>
-  .CouponStatistics-searchForm .ant-form-inline .ant-form-item {
-    margin-bottom: 50px;
-  }
-</style>

+ 0 - 453
src/views/bnSetting/menu/adminMenus.vue

@@ -1,453 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <a-row :gutter="24">
-      <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addChild">添加子菜单</a-button>
-      <a-button style="margin-right: 10px;background-color: #19be6b;color: #fff;" type="" icon="plus" @click="addTitle">添加顶部菜单</a-button>
-      <a-button style="margin-right: 10px;background-color: red;color: #fff;" type="" icon="delete" @click="delect()">删除</a-button>
-
-    </a-row>
-    <a-row :gutter="24">
-      <!-- 左侧菜单树列表 -->
-      <a-col :span="8">
-        <a-row :gutter="24" class="textCount">
-          <a-icon type="info-circle" style="color: #1890FF;margin-right: 10px;" />
-          <span>当前选择:<span style="color: #40a9ff;font-weight: 600;">{{ selectedMenu }}</span><span v-if="selectedKeys.length" class="imgSize" @click="cancelSel">取消选择</span></span>
-        </a-row>
-
-        <a-row :gutter="24" >
-          <a-input-search placeholder="输入搜索菜单名搜索" style="width: 100%" @change="onChange" />
-          <a-tree
-            @expand="onExpand"
-            :treeData="getMenus"
-            :expandedKeys="expandedKeys"
-            :autoExpandParent="autoExpandParent"
-            @select="onSelect"
-            :selectedKeys="selectedKeys"
-            showIcon
-          >
-            <template slot="title" slot-scope="{title}">
-              <span v-if="title.indexOf(searchValue) > -1">
-                {{ title.substr(0, title.indexOf(searchValue)) }}
-                <span style="color: #f50">{{ searchValue }}</span>
-                {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
-              </span>
-              <span v-else>{{ title }}</span>
-            </template>
-            <a-icon slot="file" type="file" />
-            <a-icon slot="pushpin" type="pushpin" />
-          </a-tree>
-        </a-row>
-      </a-col>
-      <!-- 右侧 -->
-      <a-col :span="16" >
-        <a-form :form="form" @submit="handleSubmit">
-          <!-- 类型 -->
-          <a-form-item label="类型" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <div v-if="!formData.type||formData.type=='0'">
-              <a-icon type="file" style="margin-right: 10px;" /><span >页面菜单</span>
-            </div>
-            <div v-if="formData.type=='1'">
-              <a-icon type="pushpin" style="margin-right: 10px;" /><span >操作按钮</span>
-            </div>
-          </a-form-item>
-
-          <!-- 名称 -->
-          <a-form-item label="名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入名称"
-              v-decorator="['formData.name', {
-                initialValue: formData.name,
-                rules: [{ required: true, message: '请输入名称!' },{pattern:'^[^<|>]{1,20}$',message:'请输入不含<或>的字符,最多20个字符'}] }]"
-            />
-          </a-form-item>
-          <!-- 路由英文名 -->
-          <!-- <a-form-item v-if="!formData.type||formData.type=='0'" label="路由英文名" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入路由英文名"
-              v-decorator="['formData.routeName', {
-                initialValue: formData.routeName,
-                rules: [{ required: true, message: '请输入路由英文名!' }] }]"
-            />
-          </a-form-item> -->
-          <!-- 路径 -->
-          <!-- <a-form-item v-if="!formData.type||formData.type=='0'" label="路径" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入路径"
-              v-decorator="['formData.routePath', {
-                initialValue: formData.routePath,
-                rules: [{ required: true, message: '请输入路径!' }] }]"
-            />
-          </a-form-item> -->
-          <!-- 请求路径 -->
-          <!-- <a-form-item v-if="formData.type==1" label="请求路径" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入请求路径"
-              v-decorator="['formData.urlPath', {
-                initialValue: formData.urlPath,
-                rules: [{ required: true, message: '请输入请求路径!' }] }]"
-            />
-          </a-form-item> -->
-          <!-- 前端权限编码 -->
-          <a-form-item label="前端权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入前端权限编码"
-              v-decorator="[
-                'formData.code',
-                {
-                  initialValue: formData.code,
-                  rules: [{ required: true, message: '请输入前端权限编码!' }] },
-              ]"
-            />
-          </a-form-item>
-          <!-- 后台权限编码 -->
-          <a-form-item label="后台权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入后台权限编码"
-              v-decorator="[
-                'formData.permission',
-                {
-                  initialValue: formData.permission,
-                  rules: [{ required: formData.isLeaf, message: '请输入后台权限编码!' }] },
-              ]"
-            />
-          </a-form-item>
-          <!-- 图标 -->
-          <!-- <a-form-item v-if="!formData.type ||formData.type=='0' " label="图标" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入图标名称"
-              v-decorator="['formData.icon', {
-                initialValue: formData.icon,
-                rules: [] }]"
-            />
-          </a-form-item> -->
-          <!-- 前端组件 -->
-          <!-- <a-form-item v-if="!formData.type ||formData.type=='0'" label="前端组件" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入前端组件路径"
-              v-decorator="['formData.componentPath', {
-                initialValue: formData.componentPath,
-                rules: [{ required: true, message: '请输入前端组件路径!' }] }]"
-            />
-          </a-form-item> -->
-
-          <!-- 第三方链接 -->
-          <!-- <a-form-item v-if="!formData.type ||formData.type=='0'" label="第三方链接" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入第三方链接地址"
-              v-decorator="['formData.urlPath', {
-                initialValue: formData.urlPath,
-                rules: [] }]"
-            />
-          </a-form-item> -->
-
-          <!-- 排序值 -->
-          <a-form-item label="排序值" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              type="number"
-              placeholder="请输入排序值"
-              v-decorator="['formData.sort', {
-                initialValue: formData.sort,
-                rules: [] }]"
-            />
-          </a-form-item>
-          <!-- 状态 -->
-          <a-form-item label="启用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-radio-group
-              name="radioGroup"
-              v-decorator="[
-                'formData.status',
-                {
-                  initialValue: formData.status,
-                  rules: [{ required: true, message: '请选择状态!' }] },
-              ]"
-            >
-              <a-radio :value="1">是</a-radio>
-              <a-radio :value="0">否</a-radio>
-            </a-radio-group>
-          </a-form-item>
-
-          <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-            <a-button type="primary" @click="handleSubmit()">
-              保存
-            </a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="clear">
-              重置
-            </a-button>
-          </a-form-item>
-        </a-form>
-
-      </a-col>
-    </a-row>
-    <childModal parentType="admin" :visible="showChildModal" @refresh="getYyMenuList" :data="parentData" @close="showChildModal = false"></childModal>
-  </a-card>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-import childModal from './childModal.vue'
-import { getYyMenuList, saveYyMenu, deleteYyMenu } from '@/api/menu.js'
-
-export default {
-  name: 'Menu',
-  components: {
-    STable, VSelect, childModal
-  },
-  props: {},
-  data () {
-    return {
-      treeData: [],
-      dataList: [],
-      searchValue: '',
-      expandedKeys: [],
-      autoExpandParent: true,
-      selectedKeys: [],
-      selectedMenu: '', // 选择的树节点名
-      formLayout: 'horizontal',
-      form: this.$form.createForm(this, { name: 'menu' }),
-      showChildModal: false,
-      parentData: {}, // 父级菜单
-      formData: {
-        id: '',
-        name: '',
-        routePath: '',
-        icon: '',
-        routeName: '',
-        componentPath: '',
-        urlPath: '',
-        code: '',
-        permission: '',
-        sort: '',
-        type: '0',
-        isLeaf: true,
-        status: '' // 活动状态
-      }
-    }
-  },
-  computed: {
-    getMenus () {
-      this.generateList(this.treeData)
-      return this.treeData
-    }
-  },
-  methods: {
-    onExpand (expandedKeys) {
-      this.expandedKeys = expandedKeys
-      this.autoExpandParent = false
-    },
-
-    onSelect (selectedKeys, info) {
-      this.selectedKeys = selectedKeys
-      if (info.selected) {
-        const data = info.selectedNodes[0].data.props
-        const isLeaf = data.dataRef.children
-        this.formData = {
-          id: data.id,
-          name: data.name,
-          routePath: data.routePath,
-          icon: data.icon,
-          routeName: data.routeName,
-          componentPath: data.componentPath,
-          urlPath: data.urlPath,
-          code: data.code,
-          permission: data.permission,
-          sort: data.sort,
-          type: data.type,
-          status: data.status,
-          isLeaf: !(isLeaf && isLeaf.length)
-        }
-        this.selectedMenu = this.formData.name
-        this.formData.status = Number(this.formData.status)
-      } else {
-        this.selectedMenu = ''
-        this.clear()
-      }
-    },
-    generateList (data) {
-      for (let i = 0; i < data.length; i++) {
-        const node = data[i]
-        const key = node.title
-        this.dataList.push({ key, title: key })
-        node.scopedSlots = { title: 'title' }
-        node.slots = { icon: node.type == '0' ? 'file' : 'pushpin' }
-
-        if (node.children) {
-          this.generateList(node.children)
-        }
-      }
-    },
-    getParentKey (key, tree) {
-      let parentKey
-      for (let i = 0; i < tree.length; i++) {
-        const node = tree[i]
-        if (node.children) {
-          if (node.children.some(item => item.title == key)) {
-            parentKey = node.key
-          } else if (this.getParentKey(key, node.children)) {
-            parentKey = this.getParentKey(key, node.children)
-          }
-        }
-      }
-      return parentKey
-    },
-    onChange (e) {
-      const value = e.target.value
-      const expandedKeys = this.dataList
-        .map(item => {
-          if (item.title.indexOf(value) > -1) {
-            return this.getParentKey(item.title, this.treeData)
-          }
-          return null
-        })
-        .filter((item, i, self) => item && self.indexOf(item) === i)
-      Object.assign(this, {
-        expandedKeys,
-        searchValue: value,
-        autoExpandParent: true
-      })
-    },
-    // 获取菜单树列表
-    getYyMenuList () {
-      getYyMenuList().then(res => {
-        console.log(res, 'res1111111')
-        if (res.status == 200) {
-          this.treeData = res.data
-          console.log(this.treeData, 'this.treeData')
-        }
-      })
-    },
-    // 添加子节点
-    addChild () {
-      if (!this.selectedMenu) {
-        return this.$message.warning('请先选择一个父级菜单')
-      } else if (this.formData.type == '1') {
-        return this.$message.warning('请选择一个页面级菜单')
-      }
-      this.showChildModal = true
-      this.parentData = this.formData
-    },
-    // 添加顶部菜单
-    addTitle () {
-      this.showChildModal = true
-      this.parentData = {}
-    },
-
-    //  取消选择
-    cancelSel () {
-      this.selectedKeys = []
-      this.selectedMenu = ''
-      this.clear()
-    },
-    // 清空列表
-    clear () {
-      this.form.resetFields()
-      this.formData.id = ''
-      this.formData.name = ''
-      this.formData.routePath = ''
-      this.formData.icon = ''
-      this.formData.routeName = ''
-      this.formData.componentPath = ''
-      this.formData.urlPath = ''
-      this.formData.sort = ''
-      this.formData.type = ''
-      this.formData.status = ''
-      this.formData.code = ''
-      this.formData.permission = ''
-      this.formData.isLeaf = true
-    },
-
-    // 删除数据
-    delect () {
-      if (!this.selectedKeys.length) {
-        return this.$message.warning('您还未选择要删除的数据')
-      }
-      const _this = this
-      console.log(_this.formData.id, '_this.formData.id')
-      this.$confirm({
-        title: '警告',
-        content: `确定要删除您选择的 ${_this.formData.name} 的数据吗?`,
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          deleteYyMenu({
-            id: _this.formData.id
-          }).then(res => {
-            if (res.status == 200) {
-              _this.$message.success('删除成功')
-              _this.getYyMenuList()
-            }
-          }).catch(() => {
-            _this.$message.success('删除失败, 请稍后重试')
-          })
-        }
-      })
-    },
-
-    // 保存提交
-    handleSubmit () {
-      const _this = this
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          console.log(values.formData, ' formData.type222222222')
-          saveYyMenu(Object.assign({ id: this.formData.id }, values.formData)).then(res => {
-            console.log(res, 'res--save')
-            if (res.status + '' === '200') {
-              this.$message.success(res.message ? res.message : '保存成功')
-              _this.getYyMenuList()
-              _this.clear()
-            } else {
-              // this.$message.warning(res.message)
-            }
-          })
-        }
-      })
-    },
-    handleCancel () {
-      this.clear()
-    }
-
-  },
-  mounted () {
-  },
-  beforeCreate () {
-    this.form = this.$form.createForm(this, { name: 'menu' })
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getYyMenuList()
-    })
-  },
-  watch: {
-
-  }
-}
-</script>
-
-<style>
-  .menu-box::-webkit-scrollbar{
-    width: 6px;
-    height: 6px ;
-  }
-
-  .menu-box::-webkit-scrollbar-thumb{
-    width: 6px;
-    height: 6px ;
-    border-radius: 4px;
-    -webkit-box-shadow: inset 0 0 2px #d1d1d1;
-    background: #e4e4e4;
-  }
-
-  .textCount{
-    border: 1px solid #91d5ff;
-    background-color: #e6f7ff;
-    border-radius: 5px;
-    padding: 5px 10px 5px 20px;
-    margin: 10px 0;
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .imgSize{
-    color: #2d8cf0;
-    margin-left: 10px;
-    font-size: 14px;
-  }
-
-</style>

+ 0 - 340
src/views/bnSetting/menu/childModal.vue

@@ -1,340 +0,0 @@
-<template>
-  <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel">
-      <a-form :form="form" @submit="handleSubmit">
-        <!-- 上级菜单 -->
-        <a-form-item label="上级菜单" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <div >
-            <span >{{ parentTitle }}</span>
-          </div>
-
-        </a-form-item>
-        <!-- 类型 -->
-        <a-form-item label="类型" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-select
-            @change="selectChange"
-            :disabled="disabled"
-            v-decorator="[
-              'formData.type',
-              {
-                initialValue: formData.type,
-                rules: [{ required: true, message: '请选择状态!' }] },
-            ]"
-            style="width: 100%"
-            placeholder="请选择菜单类型"
-          >
-            <a-select-option :value="0">页面类型</a-select-option>
-            <a-select-option :value="1">按钮类型</a-select-option>
-          </a-select>
-        </a-form-item>
-
-        <!-- 名称 -->
-        <a-form-item label="名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            placeholder="请输入名称"
-            v-decorator="['formData.name', {
-              initialValue: formData.name,
-              rules: [{ required: true, message: '请输入名称!' },{pattern:'^[^<|>]{1,20}$',message:'请输入不含<或>的字符,最多20个字符'}] }]"
-          />
-        </a-form-item>
-        <!-- 路由英文名 -->
-        <!-- <a-form-item v-if="!formData.type" label="路由英文名" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            placeholder="请输入路由英文名"
-            v-decorator="['formData.routeName', {
-              initialValue: formData.routeName,
-              rules: [{ required: true, message: '请输入路由英文名!' }] }]"
-          />
-        </a-form-item> -->
-        <!-- 路径 -->
-        <!-- <a-form-item v-if="!formData.type" label="路径" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-             <a-input placeholder="请输入路径"
-                      v-decorator="['formData.routePath', {
-                        initialValue: formData.routePath,
-                        rules: [{ required: true, message: '请输入路径!' }] }]"
-             />
-           </a-form-item> -->
-        <!-- 请求路径 -->
-        <!-- <a-form-item v-if="formData.type==1" label="请求路径" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-             <a-input placeholder="请输入请求路径"
-                      v-decorator="['formData.urlPath', {
-                        initialValue: formData.urlPath,
-                        rules: [{ required: true, message: '请输入请求路径!' }] }]"
-             />
-           </a-form-item> -->
-        <!-- 前端权限编码 -->
-        <a-form-item label="前端权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            placeholder="请输入前端权限编码"
-            v-decorator="[
-              'formData.code',
-              {
-                initialValue: formData.code,
-                rules: [{ required: true, message: '请输入前端权限编码!' }] },
-            ]"
-          />
-
-        </a-form-item>
-        <!-- 后台权限编码 -->
-        <a-form-item label="后台权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            placeholder="请输入后台权限编码"
-            v-decorator="[
-              'formData.permission',
-              {initialValue: formData.permission},
-            ]"
-          />
-
-        </a-form-item>
-
-        <!-- 图标 -->
-        <!-- <a-form-item v-if="!formData.type" label="图标" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            placeholder="请输入图标名称"
-            v-decorator="['formData.icon', {
-              initialValue: formData.icon,
-              rules: [] }]"
-          />
-        </a-form-item> -->
-        <!-- 前端组件 -->
-        <!-- <a-form-item v-if="!formData.type" label="前端组件" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            placeholder="请输入前端组件路径"
-            v-decorator="['formData.componentPath', {
-              initialValue: formData.componentPath,
-              rules: [{ required: true, message: '请输入前端组件路径!' }] }]"
-          />
-        </a-form-item> -->
-
-        <!-- 第三方链接 -->
-        <!-- <a-form-item v-if="!formData.type" label="第三方链接" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            placeholder="请输入第三方链接地址"
-            v-decorator="['formData.urlPath', {
-              initialValue: formData.urlPath,
-              rules: [] }]"
-          />
-        </a-form-item> -->
-
-        <!-- 排序值 -->
-        <a-form-item label="排序值" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            type="number"
-            placeholder="请输入排序值"
-            v-decorator="['formData.sort', {
-              initialValue: formData.sort,
-              rules: [] }]"
-          />
-        </a-form-item>
-        <!-- 连锁可用 -->
-        <a-form-item v-if="parentType=='store'" label="连锁可用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-radio-group
-            name="radioGroup"
-            v-decorator="[
-              'formData.chainOrgUse',
-              {
-                initialValue: formData.chainOrgUse,
-                rules: [{ required: true, message: '请选择!' }] },
-            ]"
-          >
-            <a-radio :value="1">是</a-radio>
-            <a-radio :value="0">否</a-radio>
-          </a-radio-group>
-        </a-form-item>
-        <!-- 单店可用 -->
-        <a-form-item v-if="parentType=='store'" label="单店可用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-radio-group
-            name="radioGroup"
-            v-decorator="[
-              'formData.singleOrgUse',
-              {
-                initialValue: formData.singleOrgUse,
-                rules: [{ required: true, message: '请选择!' }] },
-            ]"
-          >
-            <a-radio :value="1">是</a-radio>
-            <a-radio :value="0">否</a-radio>
-          </a-radio-group>
-        </a-form-item>
-        <!-- 状态 -->
-        <a-form-item label="启用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-radio-group
-            name="radioGroup"
-            v-decorator="[
-              'formData.status',
-              {
-                initialValue: formData.status,
-                rules: [{ required: true, message: '请选择状态!' }] },
-            ]"
-          >
-            <a-radio :value="1">是</a-radio>
-            <a-radio :value="0">否</a-radio>
-          </a-radio-group>
-        </a-form-item>
-
-        <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-          <a-button type="primary" @click="handleSubmit()">
-            保存
-          </a-button>
-          <a-button :style="{ marginLeft: '8px' }" @click="handleCancel()">
-            取消
-          </a-button>
-        </a-form-item>
-      </a-form>
-
-    </a-modal>
-  </div>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-import { saveYyMenu, saveMdMenu } from '@/api/menu.js'
-export default {
-  name: 'ChildModal',
-  components: {
-    STable, VSelect
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    parentType: {
-      type: String,
-      default: ''
-    },
-    data: {
-      type: Object,
-      default: function () {
-        return {}
-      }
-    }
-  },
-  data () {
-    return {
-      isshow: this.visible,
-      titleText: '',
-      disabled: false,
-      parentTitle: '',
-      formLayout: 'horizontal',
-      form: this.$form.createForm(this, { name: 'childModal' }),
-      formData: {
-        parentId: '',
-        name: '',
-        routePath: '',
-        icon: '',
-        routeName: '',
-        code: '',
-        permission: '',
-        componentPath: '',
-        urlPath: '',
-        sort: '',
-        type: undefined,
-        chainOrgUse: 1,
-        singleOrgUse: 1,
-        status: 1 // 活动状态
-      }
-    }
-  },
-  methods: {
-    cancel (e) {
-      this.clear()
-      this.$emit('close')
-    },
-
-    selectChange (val) {
-      this.formData.type = val
-      console.log(val)
-    },
-    // 保存提交
-    handleSubmit () {
-      const _this = this
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          const saveRequest = this.parentType == 'store' ? saveMdMenu : saveYyMenu
-          saveRequest(Object.assign(this.formData, values.formData)).then(res => {
-            console.log(res, 'res--save')
-            if (res.status + '' === '200') {
-              this.$message.success(res.message ? res.message : '保存成功')
-              this.$emit('refresh')
-              setTimeout(function () {
-                _this.cancel()
-              }, 300)
-            } else {
-              // this.$message.warning(res.message)
-            }
-          })
-        }
-      })
-    },
-    // 取消
-    handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
-    },
-    clear () {
-      this.form.resetFields()
-      this.parentTitle = ''
-      this.formData.parentId = ''
-      this.formData.name = ''
-      this.formData.routePath = ''
-      this.formData.icon = ''
-      this.formData.routeName = ''
-      this.formData.componentPath = ''
-      this.formData.urlPath = ''
-      this.formData.sort = ''
-      this.formData.type = ''
-      this.formData.status = 1
-      this.formData.chainOrgUse = 1
-      this.formData.singleOrgUse = 1
-      this.formData.code = ''
-      this.formData.permission = ''
-    }
-
-  },
-  mounted () {
-  },
-  beforeCreate () {
-    this.form = this.$form.createForm(this, { name: 'childModal' })
-  },
-  watch: {
-    visible (newValue, oldValue) {
-      this.isshow = newValue
-    },
-    isshow (newValue, oldValue) {
-      if (newValue) {
-        if (this.data.id) { // 添加子菜单
-          this.titleText = '添加子菜单'
-          this.disabled = false
-          console.log(this.data, 'this.data')
-          this.formData.parentId = this.data.id
-          this.parentTitle = this.data.name
-        } else { // 添加顶菜单
-          this.titleText = '添加顶菜单'
-          this.formData.type = 0
-          this.disabled = true
-        }
-      } else {
-        this.cancel()
-      }
-    }
-  }
-}
-</script>
-
-<style >
-  .modalBox{
-  }
-  .ant-modal-footer {
-    display: none;
-  }
-</style>

+ 0 - 162
src/views/bnSetting/menusAuth.vue

@@ -1,162 +0,0 @@
-<template>
-  <div>
-    <a-form class="form-box" style="height: 500px;overflow: auto;margin-bottom: 15px;" :form="form" @submit="handleSubmit">
-      <a-tree
-        checkable
-        @check="onCheck"
-        @expand="onExpand"
-        :autoExpandParent="autoExpandParent"
-        v-model="checkedKeys"
-        :treeData="treeData"
-      />
-    </a-form>
-    <a-form-item :wrapper-col="{ offset: 3 }">
-      <a-button type="primary" @click="handleSubmit()">
-        保存
-      </a-button>
-    </a-form-item>
-  </div>
-</template>
-
-<script>
-import { findLsMenu, saveLsMouldMenu, findDdMenu, saveDdMouldMenu } from '@/api/menuSet'
-export default {
-  name: 'MenusAuth',
-  props: {
-    types: {
-      type: String,
-      default: 'dd'
-    }
-  },
-  data () {
-    return {
-      menuIds: '',
-      treeData: [],
-      expandedKeys: [],
-      autoExpandParent: false,
-      checkedKeys: [],
-      checkedData: [],
-      formLayout: 'horizontal',
-      form: this.$form.createForm(this, { name: 'menuModal' })
-    }
-  },
-  methods: {
-    tabChange (v) {
-      console.log(v)
-    },
-    // 初始化树
-    treeInit (dr) {
-      this.treeData = dr.menuList
-      this.menuIds = dr.mould.menuIds
-      if (this.menuIds) {
-        const arr = this.menuIds.split(',')
-        const temp = []
-        arr.map(item => {
-          temp.push(Number(item))
-        })
-        this.checkedData = temp
-        this.expandedKeys = temp
-        // 找出叶子节点
-        this.findLeaf(this.treeData, temp)
-      }
-    },
-    // 获取连锁树数据
-    getfindLsMenu () {
-      findLsMenu().then(res => {
-        console.log(res, '+++++++++连锁+++++++++')
-        if (res.status == 200) {
-          this.treeInit(res.data)
-        }
-      })
-    },
-    // 获取单店树数据
-    getfindDdMenu () {
-      findDdMenu().then(res => {
-        console.log(res, '+++++++++单店+++++++++')
-        if (res.status == 200) {
-          this.treeInit(res.data)
-        }
-      })
-    },
-    onExpand (expandedKeys) {
-      console.log('onExpand', expandedKeys)
-      this.expandedKeys = expandedKeys
-      this.autoExpandParent = false
-    },
-    onCheck (checkedKeys, info) {
-      this.checkedData = [...checkedKeys, ...info.halfCheckedKeys]
-      this.checkedKeys = checkedKeys
-    },
-    // 勾选已选的菜单
-    findLeaf (data, arr) {
-      for (let i = 0; i < data.length; i++) {
-        const node = data[i]
-        if (node.children) {
-          this.findLeaf(node.children, arr)
-        } else {
-          const hasNode = arr.find(item => {
-            return item == node.id
-          })
-          if (hasNode) {
-            this.checkedKeys.push(node.id)
-          }
-        }
-      }
-    },
-    // 保存提交
-    handleSubmit () {
-      const _this = this
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          // console.log(this.checkedData)
-          if (this.checkedData.length == 0) {
-            return this.$message.warning('请先选择菜单')
-          }
-          const arr = this.checkedData.join(',')
-          if (this.types == 'dd') {
-            this.ddSave({ menuIds: arr })
-          } else {
-            this.lsSave({ menuIds: arr })
-          }
-        }
-      })
-    },
-    // 保存单店
-    ddSave (pars) {
-      saveDdMouldMenu(pars).then(res => {
-        console.log(res, 'res--save')
-        if (res.status + '' === '200') {
-          this.$message.success(res.message ? res.message : '保存成功')
-        } else {
-          // this.$message.warning(res.message)
-        }
-      })
-    },
-    // 保存连锁
-    lsSave (pars) {
-      saveLsMouldMenu(pars).then(res => {
-        console.log(res, 'res--save')
-        if (res.status + '' === '200') {
-          this.$message.success(res.message ? res.message : '保存成功')
-        } else {
-          // this.$message.warning(res.message)
-        }
-      })
-    }
-  },
-  mounted () {
-    // 单店
-    if (this.types == 'dd') {
-      this.getfindDdMenu()
-    } else {
-      this.getfindLsMenu()
-    }
-  },
-  beforeCreate () {
-    this.form = this.$form.createForm(this, { name: 'menu' })
-  }
-}
-</script>
-
-<style>
-</style>

+ 0 - 41
src/views/bnSetting/menusAuthTab.vue

@@ -1,41 +0,0 @@
-<template>
-  <div class="menusAuth-cons">
-    <a-tabs @change="tabChange" type="card">
-      <a-tab-pane tab="单店菜单设置" key="1">
-        <menusAuth types="dd"></menusAuth>
-      </a-tab-pane>
-      <a-tab-pane tab="连锁店菜单设置" key="2">
-        <menusAuth types="ls"></menusAuth>
-      </a-tab-pane>
-    </a-tabs>
-  </div>
-</template>
-
-<script>
-  import menusAuth from './menusAuth.vue'
-  export default {
-    name: 'menusAuthTab',
-    components: {
-      menusAuth
-    },
-    data() {
-      return {}
-    },
-    methods: {
-      tabChange(v) {
-        console.log(v)
-      },
-    },
-    beforeRouteEnter (to, from, next) {
-      next(vm => {
-      })
-    },
-  }
-</script>
-
-<style>
-  .menusAuth-cons{
-    background: #fff;
-    padding: 10px;
-  }
-</style>