Browse Source

删除多余页面

lilei 4 years ago
parent
commit
97c120a36e

+ 1 - 1
.env

@@ -2,4 +2,4 @@ NODE_ENV=production
 VUE_APP_PREVIEW=false
 VUE_APP_API_BASE_URL=https://aitour-it.zyucgj.com/at-it
 VUE_APP_VERSION=V1.0.1
-VUE_APP_PRO_NAME=智能巡店IT后台
+VUE_APP_PRO_NAME=可回收资源运营后台

+ 1 - 1
.env.development

@@ -2,4 +2,4 @@ NODE_ENV=development
 VUE_APP_PREVIEW=true
 VUE_APP_API_BASE_URL=/api
 VUE_APP_VERSION=V1.0.1
-VUE_APP_PRO_NAME=智能巡店IT后台-dev
+VUE_APP_PRO_NAME=可回收资源运营后台-dev

+ 1 - 1
.env.preview

@@ -2,4 +2,4 @@ NODE_ENV=production
 VUE_APP_PREVIEW=true
 VUE_APP_API_BASE_URL=https://aitour-it.test.zyucgj.com/at-it
 VUE_APP_VERSION=V1.0.1
-VUE_APP_PRO_NAME=智能巡店IT后台-pro
+VUE_APP_PRO_NAME=可回收资源运营后台-pro

+ 1 - 1
public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>logo.png">
-    <title>智能巡店IT后台</title>
+    <title>可回收资源运营后台</title>
     <style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
     <!-- require cdn assets css -->
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>

+ 53 - 151
src/config/router.config.js

@@ -52,8 +52,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '租户管理',
-      icon: 'team',
-      permission: 'M_tenants_list'
+      icon: 'team'
+      // permission: 'M_tenants_list'
     },
     children: [{
       path: '/tenants/list',
@@ -61,8 +61,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "tenants" */ '@/views/tenants/tenantsList.vue'),
       meta: {
         title: '租户列表',
-        icon: 'team',
-        permission: 'M_tenants_list'
+        icon: 'team'
+        // permission: 'M_tenants_list'
       }
     }]
   },
@@ -73,8 +73,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '考评管理',
-      icon: 'block',
-      permission: 'M_evaluation_0'
+      icon: 'block'
+      // permission: 'M_evaluation_0'
     },
     children: [{
       path: '/evaluation/evaluationItem',
@@ -83,8 +83,8 @@ export const asyncRouterMap = [{
         '@/views/evaluation/evaluationItem/EvaluationItem.vue'),
       meta: {
         title: '考评项目',
-        icon: 'save',
-        permission: 'M_evaluationItem_list'
+        icon: 'save'
+        // permission: 'M_evaluationItem_list'
       }
     }, {
       path: '/evaluation/evaluationPlan',
@@ -93,29 +93,8 @@ export const asyncRouterMap = [{
         '@/views/evaluation/evaluationPlan/EvaluationPlan.vue'),
       meta: {
         title: '考评方案',
-        icon: 'switcher',
-        permission: 'M_evaluationPlan_list'
-      }
-    }]
-  },
-  // 业务 设置setting
-  {
-    path: '/bnSetting',
-    redirect: '/bnSetting/menusAuth',
-    component: PageView,
-    meta: {
-      title: '平台设置',
-      icon: 'security-scan',
-      permission: 'M_bnSetting_0'
-    },
-    children: [{
-      path: '/bnSetting/menusAuth',
-      name: 'menusAuth',
-      component: () => import(/* webpackChunkName: "bnSetting" */ '@/views/bnSetting/menusAuthTab.vue'),
-      meta: {
-        title: '菜单授权',
-        icon: 'property-safety',
-        permission: 'M_bnSetting_0'
+        icon: 'switcher'
+        // permission: 'M_evaluationPlan_list'
       }
     }]
   },
@@ -124,9 +103,9 @@ export const asyncRouterMap = [{
     redirect: '/appSetting/bannerSetting',
     component: PageView,
     meta: {
-      title: 'APP设置',
-      icon: 'appstore',
-      permission: 'M_appSetting'
+      title: '小程序设置',
+      icon: 'appstore'
+      // permission: 'M_appSetting'
     },
     children: [{
       path: '/appSetting/bannerSetting',
@@ -134,96 +113,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "appSetting" */ '@/views/appSetting/bannerSetting.vue'),
       meta: {
         title: '营销图设置',
-        icon: 'file-image',
-        permission: 'M_banner'
-      }
-    },
-    {
-      path: '/editionSetting',
-      redirect: '/editionSetting/list',
-      name: 'editionSetting',
-      component: RouteView,
-      meta: {
-        title: '版本设置',
-        icon: 'info-circle',
-        permission: 'M_banben'
-      },
-      hideChildrenInMenu: true,
-      children: [{
-        path: '/editionSetting/list',
-        name: 'editionSetting_list',
-        component: () => import(/* webpackChunkName: "appSetting" */
-          '@/views/appSetting/editionSetting.vue'),
-        meta: {
-          title: '列表',
-          icon: 'interaction',
-          permission: 'M_banben'
-        }
-      },
-      {
-        path: '/editionSetting/add',
-        name: 'editionSetting_add',
-        component: () => import(/* webpackChunkName: "appSetting" */
-          '@/views/appSetting/addEditionSetting.vue'),
-        meta: {
-          title: '新增',
-          icon: 'crown',
-          hidden: true
-        }
-      },
-      {
-        path: '/editionSetting/add',
-        name: 'editionSetting_edit',
-        component: () => import(/* webpackChunkName: "appSetting" */
-          '@/views/appSetting/addEditionSetting.vue'),
-        meta: {
-          title: '编辑',
-          icon: 'crown',
-          hidden: true
-        }
-      }
-      ]
-    }
-    ]
-
-  },
-  {
-    path: '/menusAuth',
-    redirect: '/bnSetting/menusAuth',
-    component: PageView,
-    meta: {
-      title: '菜单管理',
-      icon: 'bars',
-      permission: 'M_menusAuth_0'
-    },
-    children: [{
-      path: '/menusAuth/storeMenus',
-      name: 'storeMenus',
-      component: () => import(/* webpackChunkName: "bnSetting" */ '@/views/bnSetting/menu/storeMenus.vue'),
-      meta: {
-        title: '巡店菜单管理',
-        icon: 'shop',
-        permission: 'M_menusAuth_storeMenus'
-      }
-    },
-    {
-      path: '/menusAuth/adminMenus',
-      name: 'adminMenus',
-      component: () => import(/* webpackChunkName: "bnSetting" */ '@/views/bnSetting/menu/adminMenus.vue'),
-      meta: {
-        title: '运营菜单管理',
-        icon: 'appstore',
-        permission: 'M_menusAuth_adminMenus'
-      }
-    },
-    {
-      path: '/menusAuth/menu',
-      name: 'powerMenu',
-      component: () => import(/* webpackChunkName: "auth" */ '@/views/power/menu/menu.vue'),
-      meta: {
-        title: 'IT菜单管理',
-        icon: 'profile',
-        permission: 'M_menusAuth_menu'
+        icon: 'file-image'
+        // permission: 'M_banner'
       }
     }
     ]
@@ -235,29 +126,40 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: 'IT权限管理',
-      icon: 'lock',
-      permission: 'M_auth_0'
-    },
-    children: [{
-      path: '/auth/userList',
-      name: 'powerUserList',
-      component: () => import(/* webpackChunkName: "auth" */ '@/views/power/user/userList.vue'),
-      meta: {
-        title: '用户管理',
-        icon: 'user',
-        permission: 'M_auth_userList'
-      }
+      icon: 'lock'
+      // permission: 'M_auth_0'
     },
-    {
-      path: '/auth/roleList',
-      name: 'powerRoleList',
-      component: () => import(/* webpackChunkName: "auth" */ '@/views/power/role/roleList.vue'),
-      meta: {
-        title: '角色管理',
-        icon: 'solution',
-        permission: 'M_auth_roleList'
+    children: [
+      {
+        path: '/menusAuth/menu',
+        name: 'powerMenu',
+        component: () => import(/* webpackChunkName: "auth" */ '@/views/power/menu/menu.vue'),
+        meta: {
+          title: '菜单管理',
+          icon: 'profile'
+        // permission: 'M_menusAuth_menu'
+        }
+      },
+      {
+        path: '/auth/userList',
+        name: 'powerUserList',
+        component: () => import(/* webpackChunkName: "auth" */ '@/views/power/user/userList.vue'),
+        meta: {
+          title: '用户管理',
+          icon: 'user'
+        // permission: 'M_auth_userList'
+        }
+      },
+      {
+        path: '/auth/roleList',
+        name: 'powerRoleList',
+        component: () => import(/* webpackChunkName: "auth" */ '@/views/power/role/roleList.vue'),
+        meta: {
+          title: '角色管理',
+          icon: 'solution'
+        // permission: 'M_auth_roleList'
+        }
       }
-    }
     ]
   },
   {
@@ -266,8 +168,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '系统设置',
-      icon: 'setting',
-      permission: 'M_setting_0'
+      icon: 'setting'
+      // permission: 'M_setting_0'
     },
     children: [{
       path: '/setting/dataDictionary',
@@ -276,8 +178,8 @@ export const asyncRouterMap = [{
         '@/views/power/dataDictionary/dataDictionary.vue'),
       meta: {
         title: '数据字典管理',
-        icon: 'database',
-        permission: 'M_sys_dataDictionary'
+        icon: 'database'
+        // permission: 'M_sys_dataDictionary'
       }
     },
     // {
@@ -307,8 +209,8 @@ export const asyncRouterMap = [{
         '@/views/power/OperateJournal/OperateJournal.vue'),
       meta: {
         title: '操作日志',
-        icon: 'read',
-        permission: 'M_operateJournal'
+        icon: 'read'
+        // permission: 'M_operateJournal'
       }
     }
     ]

+ 1 - 1
src/utils/domUtil.js

@@ -16,4 +16,4 @@ export const setDocumentTitle = function (title) {
   }
 }
 
-export const domTitle = '智能巡店IT后台'
+export const domTitle = '可回收资源运营后台'

+ 1 - 1
src/utils/request.js

@@ -38,7 +38,7 @@ const err = (error) => {
 // request interceptor
 service.interceptors.request.use(config => {
   const token = store.getters.token
-  config.headers['App-Type'] = 9 // 平台类型
+  config.headers['App-Type'] = 1 // 平台类型
   if (token) {
     config.headers['access-token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
   }

+ 1 - 1
src/views/Home.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="home">
-    <a-alert message="欢迎登录智能巡店IT后台系统" type="info" showIcon />
+    <a-alert message="欢迎登录可回收资源运营系统" type="info" showIcon />
  </div>
 </template>
 

+ 0 - 266
src/views/appSetting/addEditionSetting.vue

@@ -1,266 +0,0 @@
-<template>
-  <div class="addPage">
-    <div class="formBox">
-      <a-form :form="form" @submit="handleSubmit">
-        <a-row>
-          <a-col :span="24">
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="版本号">
-              <a-input
-                v-decorator="[
-                  'formData.version',
-                  { initialValue: formData.version,getValueFromEvent: $filterEmpty,
-                    rules: [{ required: true, message: '请输入(0~999999)之间的版本号' }]
-                  },
-                ]"
-                oninput="if(value.length>6)value=value.slice(0,6);if(value<0)value=0"
-                id="addEditionSetting-version"
-                placeholder="请输入(0~999999)之间的版本号"
-                allowClear
-                type="number" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="请选择更新时间">
-              <a-date-picker
-                show-time
-                id="addEditionSetting-publicDate"
-                placeholder="年/月/日 时/分/秒"
-                :disabled-date="disabledDate"
-                v-decorator="['formData.publicDate', { initialValue: formData.publicDate, rules: [{ required: true, message: '请选择更新时间!' }] }]" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="强制升级">
-              <a-radio-group
-                name="radioGroup"
-                id="addEditionSetting-forceUpgrade"
-                @change="onChange"
-                v-decorator="[
-                  'formData.forceUpgrade',
-                  {
-                    initialValue: formData.forceUpgrade,
-                    rules: [{ required: true, type: 'number', message: '请选择是否强制升级!' }] },
-                ]">
-                <a-radio :value="1">是</a-radio>
-                <a-radio :value="0">否</a-radio>
-              </a-radio-group>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="下载链接">
-              <a-textarea
-                :maxLength="300"
-                v-decorator="[
-                  'formData.downloadUrl',
-                  { initialValue: formData.downloadUrl,getValueFromEvent: $filterEmpty,
-                    rules: [{ message: '请输入下载链接(最长为300字符)' }]
-                  },
-                ]"
-                id="addEditionSetting-downloadUrl"
-                placeholder="请输入下载链接(最长为300字符)"
-                allowClear />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol" label="升级内容">
-              <a-textarea
-                placeholder="请输入升级内容(最多500个字符)"
-                :maxLength="500"
-                id="addEditionSetting-upgradeContent"
-                auto-size
-                v-decorator="[
-                  'formData.upgradeContent',
-                  { initialValue: formData.upgradeContent,getValueFromEvent: $filterEmpty,
-                    rules: [{ required: true, message: '请输入升级内容(最多500个字符)' }]
-                  },
-                ]" />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="24">
-            <a-form-item label="附件" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <div style="display: block;">
-                <Upload
-                  ref="upfile"
-                  id="addEditionSetting-attachment"
-                  :maxNums="1"
-                  :fileSize="100"
-                  v-decorator="[
-                    'formData.attachment',
-                    { initialValue: formData.attachment,
-                      rules: [{ required: true, message: '请上传app安装文件' }]
-                    },
-                  ]"
-                  fileType="application/vnd.android.package-archive"
-                  upText="附件上传">
-                </Upload>
-              </div>
-              <div style="line-height: 16px;clear: both;padding-top: 10px;color: #999;">(上传apk格式文件)</div>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-form-item :label-col="formTailLayout.labelCol" :wrapper-col="formTailLayout.wrapperCol">
-          <a-button htmlType="submit" type="primary" id="addEditionSetting-submit">
-            保存
-          </a-button>
-          <a-button style="margin-left: 20px;" @click="cansel" id="addEditionSetting-cansel">
-            取消
-          </a-button>
-        </a-form-item>
-      </a-form>
-    </div>
-  </div>
-</template>
-
-<script>
-import {
-  Upload
-} from '@/components'
-import {
-  saveItem,
-  editItem
-} from '@/api/editionSetting.js'
-import moment from 'moment'
-
-const formItemLayout = {
-  labelCol: {
-    span: 3
-  },
-  wrapperCol: {
-    span: 6
-  }
-}
-const formTailLayout = {
-  wrapperCol: {
-    offset: 5
-  }
-}
-export default {
-  name: 'AddeditionSetting',
-  components: {
-    Upload
-  },
-
-  data () {
-    return {
-      formItemLayout,
-      formTailLayout,
-      form: this.$form.createForm(this),
-      formData: {
-        version: '',
-        publicDate: null,
-        downloadUrl: '',
-        forceUpgrade: '0',
-        upgradeContent: '',
-        attachment: ''
-      },
-      applyName: 'IT后台',
-      applyCode: 'atit',
-      mode1: 'time'
-    }
-  },
-  methods: {
-    moment,
-    // 禁止当前之前的日期选择
-    range (start, end) {
-      const result = []
-      for (let i = start; i < end; i++) {
-        result.push(i)
-      }
-      return result
-    },
-
-    disabledDate (current) {
-      // Can not select days before today and today
-      return current && current < moment().subtract(1, 'days')
-    },
-    // disabledDateTime () {
-    //   return {
-    //     disabledHours: () => this.range(0, moment().hour()),
-    //     disabledMinutes: () => this.range(0, moment().minute()),
-    //     disabledSeconds: () => this.range(0, moment().second())
-    //   }
-    // },
-    // 保存
-    handleSubmit (e) {
-      e.preventDefault()
-      const _this = this
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          const query = this.$route.query
-          const formData = Object.assign({}, this.formData, values.formData, {
-            applyName: 'IT后台'
-          }, {
-            applyCode: 'atit'
-          })
-          formData.publicDate = formData.publicDate.format('YYYY-MM-DD HH:mm:ss')
-          saveItem(formData).then(res => {
-            // console.log(res, 'rrrrrrrrr')
-            if (res.status == 200) {
-              _this.$message.success(res.message ? res.message : '保存成功')
-              _this.$router.push({
-                name: 'editionSetting_list'
-              })
-            } else {
-              _this.$message.error(res.message)
-            }
-          })
-        }
-      })
-    },
-    // 返回列表
-    cansel () {
-      this.$router.push({
-        name: 'editionSetting_list'
-      })
-    },
-    // 选择时间
-    handleOpenChange1 (open) {
-      console.log(open)
-      if (open) {
-        this.mode1 = 'time'
-      }
-    },
-    // 改变默认选项
-    onChange (e) {
-      console.log('radio checked', e.target.value)
-    }
-  },
-
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      console.log(111)
-      // vm.loading = false
-      const params = vm.$route.query
-      console.log(params.id)
-      if (params.id) {
-        editItem({
-          id: params.id
-        }).then(res => {
-          console.log(res)
-          if (res.status == 200) {
-            const page = res.data
-            vm.formData = Object.assign(vm.formData, page)
-            vm.formData.forceUpgrade = Number(vm.formData.forceUpgrade)
-            vm.formData.publicDate = moment(vm.formData.publicDate)
-            vm.$refs.upfile.setFileList(vm.formData.attachment)
-          }
-        })
-      }
-    })
-  }
-}
-</script>
-
-<style lang="less">
-	.addPage {
-		.formBox {
-			padding: 34px 0 10px;
-			flex-grow: 1;
-			background: #fff;
-			border-radius: 5px;
-
-		}
-	}
-</style>

+ 0 - 140
src/views/appSetting/editionSetting.vue

@@ -1,140 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 新建 -->
-    <div class="add">
-      <a-button type="primary" icon="plus" class="addBtn" @click="openModal()" id="editionSetting-openModal">新增</a-button>
-    </div>
-    <!-- table列表 -->
-    <s-table
-      ref="table"
-      size="default"
-      :rowKey="(row)=> row.id"
-      :columns="columns"
-      :data="loadData"
-      bordered
-    >
-      <!-- 操作 -->
-      <span slot="action" slot-scope="text, record">
-        <template>
-          <a-icon v-if="currentDate < new Date(record.publicDate).getTime()" type="edit" id="editionSetting-handleEdit" style="font-size: 20px;color: #1890FF;padding: 0 10px;" @click="handleEdit(record)" />
-          <span v-if="currentDate > new Date(record.publicDate).getTime()">--</span>
-        </template>
-      </span>
-      <template slot="upgradeContent" slot-scope="text, record">
-        <span :title="record.upgradeContent" style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ record.upgradeContent }}</span>
-
-      </template>
-      <span slot="forceUpgrade" slot-scope="text">
-        <template>
-          <span v-if=" text == '1'">是</span>
-          <span v-if=" text == '0'">否</span>
-        </template>
-      </span>
-    </s-table>
-  </a-card>
-</template>
-
-<script>
-import { STable } from '@/components'
-import { getEditionSettingList } from '@/api/editionSetting.js'
-export default {
-  name: 'EditionSetting',
-  components: { STable },
-  data () {
-    return {
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'no',
-          width: 60,
-          align: 'center'
-        },
-        {
-          title: '创建时间',
-          width: 100,
-          dataIndex: 'createDate',
-          align: 'center'
-        },
-        {
-          title: '版本号',
-          width: 100,
-          dataIndex: 'version',
-          align: 'center'
-        },
-        {
-          title: '强制升级',
-          width: 100,
-          dataIndex: 'forceUpgrade',
-          align: 'center',
-          scopedSlots: { customRender: 'forceUpgrade' }
-        },
-        {
-          title: '升级内容',
-          width: 100,
-          dataIndex: 'upgradeContent',
-          align: 'center',
-          ellipsis: true, // 内容超过宽度 自动出现省略号
-          scopedSlots: { customRender: 'upgradeContent' }
-
-        },
-        {
-          title: '下载地址',
-          width: 100,
-          dataIndex: 'downloadUrl',
-          align: 'center',
-          customRender: (text) => {
-            return text || '--'
-          }
-        },
-        {
-          title: '更新时间',
-          width: 100,
-          dataIndex: 'publicDate',
-          align: 'center'
-        },
-        {
-          title: '操作',
-          // dataIndex: 'action',
-          width: 100,
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      applyCode: 'atit',
-      applyName: 'IT后台',
-      currentDate: new Date().getTime(),	// 当前时间
-      // 获取列表数据
-      loadData: parameter => {
-        return getEditionSettingList(Object.assign(parameter))
-          .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
-            }
-            return res.data
-          })
-      },
-      id: ''
-    }
-  },
-  methods: {
-	 // 新增
-    openModal () {
-      this.$router.push({ name: 'editionSetting_add' })
-    },
-    // 编辑
-    handleEdit (row) {
-      console.log(row)
-      this.$router.push({ name: 'editionSetting_edit', query: { id: row.id } })
-    }
-  }
-}
-</script>
-
-<style scoped>
-  .addBtn{
-    margin-bottom: 20px;
-  }
-
-</style>

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

@@ -1,468 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <a-row :gutter="24">
-      <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addChild" id="adminMenus-addChild">新增子菜单</a-button>
-      <a-button style="margin-right: 10px;background-color: #19be6b;color: #fff;" type="" icon="plus" @click="addTitle" id="adminMenus-addTitle">新增顶部菜单</a-button>
-      <a-button style="margin-right: 10px;background-color: red;color: #fff;" type="" icon="delete" @click="delect()" id="adminMenus-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" id="adminMenus-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
-              id="adminMenus-name"
-              allowClear
-              :maxLength="30"
-              placeholder="请输入名称30个字以内"
-              v-decorator="['formData.name', {
-                initialValue: formData.name,getValueFromEvent: $filterEmpty,
-                rules: [{ required: true, message: '请输入名称30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
-            />
-          </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
-              id="adminMenus-code"
-              allowClear
-              placeholder="请输入前端权限编码"
-              v-decorator="[
-                'formData.code',
-                {
-                  initialValue: formData.code,getValueFromEvent: $filterEmpty,
-                  rules: [{ required: true, message: '请输入前端权限编码!' }] },
-              ]"
-            />
-          </a-form-item>
-          <!-- 后台权限编码 -->
-          <a-form-item label="后台权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              id="adminMenus-permission"
-              allowClear
-              placeholder="请输入后台权限编码"
-              v-decorator="[
-                'formData.permission',
-                {
-                  initialValue: formData.permission,getValueFromEvent: $filterEmpty,
-                  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
-              id="adminMenus-sort"
-              allowClear
-              type="number"
-              oninput="if(value.length>6)value=value.slice(0,6);if(value<0)value=0"
-              placeholder="请输入(0~999999)之间的排序值"
-              v-decorator="['formData.sort', {
-                initialValue: formData.sort,getValueFromEvent: $filterEmpty,
-                rules: [] }]"
-            />
-          </a-form-item>
-          <!-- 状态 -->
-          <a-form-item label="启用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-radio-group
-              id="adminMenus-status"
-              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()" id="adminMenus-handleSubmit">
-              保存
-            </a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="clear" id="adminMenus-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) {
-      // console.log('onExpand', expandedKeys)
-      this.expandedKeys = expandedKeys
-      this.autoExpandParent = false
-    },
-
-    onSelect (selectedKeys, info) {
-      console.log('onSelect', info)
-      this.selectedKeys = selectedKeys
-      if (info.selected) {
-        const data = info.selectedNodes[0].data.props
-        const isLeaf = data.dataRef.children
-        // this.formData = Object.assign({}, this.formData, info.selectedNodes[0].data.props)
-        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 - 344
src/views/bnSetting/menu/childModal.vue

@@ -1,344 +0,0 @@
-<template>
-  <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel" :centered="true">
-      <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
-            id="childModal-type"
-            allowClear
-            @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="请输入名称(最多30个字符)"
-            :maxLength="30"
-            id="childModal-name"
-            allowClear
-            v-decorator="['formData.name', {
-              initialValue: formData.name,getValueFromEvent: $filterEmpty,
-              rules: [{ required: true, message: '请输入名称(最多30个字符)!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
-          />
-        </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="请输入前端权限编码"
-            allowClear
-            id="childModal-code"
-            v-decorator="[
-              'formData.code',
-              {
-                initialValue: formData.code,getValueFromEvent: $filterEmpty,
-                rules: [{ required: true, message: '请输入前端权限编码!' }] },
-            ]"
-          />
-
-        </a-form-item>
-        <!-- 后台权限编码 -->
-        <a-form-item label="后台权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            placeholder="请输入后台权限编码"
-            allowClear
-            id="childModal-permission"
-            v-decorator="[
-              'formData.permission',
-              {initialValue: formData.permission,getValueFromEvent: $filterEmpty,},
-            ]"
-          />
-
-        </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"
-			oninput="if(value.length>6)value=value.slice(0,6);if(value<0)value=0"
-            placeholder="请输入(0~999999)之间的排序值"
-            allowClear
-            id="childModal-sort"
-            v-decorator="['formData.sort', {
-              initialValue: formData.sort,getValueFromEvent: $filterEmpty,
-              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"
-            id="childModal-status"
-            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: 6 }">
-          <a-button type="primary" @click="handleSubmit()" id="childModal-handleSubmit">
-            保存
-          </a-button>
-          <a-button :style="{ marginLeft: '8px' }" @click="handleCancel()" id="childModal-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) {
-          console.log(values.formData, ' formData.type222222222')
-          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 () {
-      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 - 505
src/views/bnSetting/menu/storeMenus.vue

@@ -1,505 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <a-row :gutter="24">
-      <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addChild" id="storeMenus-addChild">新增子菜单</a-button>
-      <a-button style="margin-right: 10px;background-color: #19be6b;color: #fff;" type="" icon="plus" @click="addTitle" id="storeMenus-addTitle">新增顶部菜单</a-button>
-      <a-button style="margin-right: 10px;background-color: red;color: #fff;" type="" icon="delete" @click="delect()" id="storeMenus-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" id="storeMenus-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
-              id="storeMenus-name"
-              allowClear
-              :maxLength="30"
-              placeholder="请输入名称30个字以内"
-              v-decorator="['formData.name', {
-                initialValue: formData.name,getValueFromEvent: $filterEmpty,
-                rules: [{ required: true, message: '请输入名称30个字以内!' },{pattern:'^[^<|>]{1,30}$',message:'请输入不含<或>的字符,最多30个字符'}] }]"
-            />
-          </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
-              id="storeMenus-code"
-              allowClear
-              placeholder="请输入前端权限编码"
-              v-decorator="[
-                'formData.code',
-                {
-                  initialValue: formData.code,getValueFromEvent: $filterEmpty,
-                  rules: [{ required: true, message: '请输入前端权限编码!' }] },
-              ]"
-            />
-          </a-form-item>
-          <!-- 后台权限编码 -->
-          <a-form-item label="后台权限编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              id="storeMenus-permission"
-              allowClear
-              placeholder="请输入后台权限编码"
-              v-decorator="[
-                'formData.permission',
-                {
-                  initialValue: formData.permission,getValueFromEvent: $filterEmpty,
-                  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"
-              oninput="if(value.length>6)value=value.slice(0,6);if(value<0)value=0"
-              allowClear
-              id="storeMenus-sort"
-              placeholder="请输入(0~999999)之间的排序值"
-              v-decorator="['formData.sort', {
-                initialValue: formData.sort,getValueFromEvent: $filterEmpty,
-                rules: [] }]"
-            />
-          </a-form-item>
-          <!-- 连锁可用 -->
-          <!-- <a-form-item 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 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
-              id="storeMenus-status"
-              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()" id="storeMenus-handleSubmit">
-              保存
-            </a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="clear" id="storeMenus-clear">
-              重置
-            </a-button>
-          </a-form-item>
-        </a-form>
-
-      </a-col>
-    </a-row>
-    <childModal parentType="store" :visible="showChildModal" @refresh="getMdMenuList" :data="parentData" @close="showChildModal = false"></childModal>
-  </a-card>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-import childModal from './childModal.vue'
-import { getMdMenuList, saveMdMenu, deleteMdMenu } 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,
-        // chainOrgUse: '',
-        // singleOrgUse: '',
-        status: '' // 活动状态
-      }
-    }
-  },
-  computed: {
-    getMenus () {
-      this.generateList(this.treeData)
-      return this.treeData
-    }
-  },
-  methods: {
-    onExpand (expandedKeys) {
-      // console.log('onExpand', expandedKeys)
-      this.expandedKeys = expandedKeys
-      this.autoExpandParent = false
-    },
-
-    onSelect (selectedKeys, info) {
-      console.log('onSelect', info)
-      this.selectedKeys = selectedKeys
-      if (info.selected) {
-        const data = info.selectedNodes[0].data.props
-        const isLeaf = data.dataRef.children
-        // this.formData = Object.assign({}, this.formData, info.selectedNodes[0].data.props)
-        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,
-          // chainOrgUse: data.chainOrgUse,
-          // singleOrgUse: data.singleOrgUse,
-          status: data.status,
-          isLeaf: !(isLeaf && isLeaf.length)
-        }
-
-        this.selectedMenu = this.formData.name
-        this.formData.status = Number(this.formData.status)
-        // this.formData.chainOrgUse = Number(this.formData.chainOrgUse)
-        // this.formData.singleOrgUse = Number(this.formData.singleOrgUse)
-      } 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
-      })
-    },
-    // 获取菜单树列表
-    getMdMenuList () {
-      getMdMenuList().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.chainOrgUse = ''
-	    // this.formData.singleOrgUse = ''
-      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 () {
-          deleteMdMenu({
-            id: _this.formData.id
-          }).then(res => {
-            if (res.status == 200) {
-              _this.$message.success('删除成功')
-              _this.getMdMenuList()
-            }
-          }).catch(() => {
-            _this.$message.success('删除失败, 请稍后重试')
-          })
-        }
-      })
-    },
-
-    // 保存提交
-    handleSubmit () {
-      const _this = this
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          console.log(values.formData, ' formData.type222222222')
-          saveMdMenu(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.getMdMenuList()
-              _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.getMdMenuList()
-    })
-  },
-  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 - 156
src/views/bnSetting/menusAuth.vue

@@ -1,156 +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"
-        :expandedKeys="expandedKeys"
-        :autoExpandParent="autoExpandParent"
-        v-model="checkedKeys"
-        :treeData="treeData"
-      />
-    </a-form>
-    <a-form-item :wrapper-col="{ offset: 3 }">
-      <a-button id="menusAuth-handleSubmit" 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(',')
-        this.checkedData = arr
-        // 找出叶子节点
-        this.findLeaf(this.treeData, arr)
-      }
-    },
-    // 获取连锁树数据
-    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) {
-      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.expandedKeys.push(node.id)
-            this.checkedKeys.push(node.id)
-          }
-        }
-      }
-    },
-    // 保存提交
-    handleSubmit () {
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          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>

+ 1 - 1
vue.config.js

@@ -109,7 +109,7 @@ const vueConfig = {
     proxy: {
       '/api': {
         // target: 'http://192.168.16.100:9102/at-it/',
-        target: 'https://aitour-it.test.zyucgj.com/at-it',
+        target: 'https://zyyc.chelingzhu.com/zyyc-admin/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {