zhangdan 4 年之前
父節點
當前提交
850bdaf74e

+ 6 - 6
src/api/bannerSetting.js

@@ -2,17 +2,17 @@ import { axios } from '@/utils/request'
 
 // 列表查询
 export const getBannerSettingList = (params) => {
-  const url = `/zycar-mgr/banner/query`
+  const url = `banner/query`
   return axios({
     url: url,
-    data: {bannerType:params.bannerType},
+    data: {},
     method: 'post'
   })
 }
 
 // 更改状态
 export const changeStatus = (params) => {
-  const url = `/zycar-mgr/banner/enable/${params.id}/${params.flag}`
+  const url = `banner/enable/${params.id}/${params.flag}`
   return axios({
     url: url,
     data: {},
@@ -22,7 +22,7 @@ export const changeStatus = (params) => {
 
 // 确认保存
 export const saveItem = (params) => {
-  const url = `/zycar-mgr/banner/save`
+  const url = `banner/save`
   return axios({
     url: url,
     data: params,
@@ -32,10 +32,10 @@ export const saveItem = (params) => {
 
 // 删除
 export const deleteItem = (params) => {
-  const url = `/zycar-mgr/banner/del/${params.id}`
+  const url = `banner/del/${params.id}`
   return axios({
     url: url,
     data: {},
     method: 'get'
   })
-}
+}

+ 5 - 7
src/api/editionSetting.js

@@ -2,21 +2,19 @@ import { axios } from '@/utils/request'
 
 // 列表查询
 export const getEditionSettingList = (params) => {
-  const url = `/zycar-mgr/sysVersion/query/${params.pageNo}/${params.pageSize}`
+  const url = `version/query/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
     url: url,
-    data: {applyCode:params.applyCode},
+    data: params,
     method: 'post'
   })
 }
 
-
-
 // 新建保存
 export const saveItem = (params) => {
-  const url = `/zycar-mgr/sysVersion/save`
+  const url = `version/save`
   return axios({
     url: url,
     data: params,
@@ -26,10 +24,10 @@ export const saveItem = (params) => {
 
 // 根据id查询
 export const editItem = (params) => {
-  const url = `/zycar-mgr/sysVersion/${params.id}`
+  const url = `version/${params.id}`
   return axios({
     url: url,
     data: params,
     method: 'get'
   })
-}
+}

+ 3 - 3
src/api/menu.js

@@ -31,7 +31,7 @@ export const deleteMenu = params => {
 
 // 获取门店菜单树数据
 export const getMdMenuList = params => {
-  const url = `/mdmenu/findAll`
+  const url = `/ddmenu/findAll`
   return axios({
     url: url,
     data: params,
@@ -41,7 +41,7 @@ export const getMdMenuList = params => {
 
 // 门店菜单保存
 export const saveMdMenu = params => {
-  const url = `/mdmenu/save`
+  const url = `/ddmenu/save`
   return axios({
     url: url,
     data: params,
@@ -50,7 +50,7 @@ export const saveMdMenu = params => {
 }
 // 门店菜单删除
 export const deleteMdMenu = params => {
-  const url = `/mdmenu/delete/${params.id}`
+  const url = `/ddmenu/delete/${params.id}`
   return axios({
     url: url,
     method: 'get'

+ 32 - 32
src/config/router.config.js

@@ -101,8 +101,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '平台设置',
-      icon: 'security-scan'
-      // permission: 'M_bnSetting_0'
+      icon: 'security-scan',
+      permission: 'M_bnSetting_0'
     },
     children: [{
       path: '/bnSetting/menusAuth',
@@ -110,8 +110,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "bnSetting" */ '@/views/bnSetting/menusAuthTab.vue'),
       meta: {
         title: '菜单授权',
-        icon: 'property-safety'
-        // permission: 'M_bnSetting_0'
+        icon: 'property-safety',
+        permission: 'M_bnSetting_0'
       }
     }]
   },
@@ -121,8 +121,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: 'APP设置',
-      icon: 'appstore'
-      // permission: 'M_appSetting'
+      icon: 'appstore',
+      permission: 'M_appSetting'
     },
     children: [{
       path: '/appSetting/bannerSetting',
@@ -130,8 +130,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "appSetting" */ '@/views/appSetting/bannerSetting.vue'),
       meta: {
         title: '营销图设置',
-        icon: 'file-image'
-        // permission: 'M_banner'
+        icon: 'file-image',
+        permission: 'M_banner'
       }
     },
     {
@@ -141,8 +141,8 @@ export const asyncRouterMap = [{
       component: RouteView,
       meta: {
         title: '版本设置',
-        icon: 'info-circle'
-        // permission: 'M_banben'
+        icon: 'info-circle',
+        permission: 'M_banben'
       },
       hideChildrenInMenu: true,
       children: [{
@@ -152,8 +152,8 @@ export const asyncRouterMap = [{
           '@/views/appSetting/editionSetting.vue'),
         meta: {
           title: '版本设置列表',
-          icon: 'interaction'
-          // permission: 'M_banben'
+          icon: 'interaction',
+          permission: 'M_banben'
         }
       },
       {
@@ -178,8 +178,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '菜单管理',
-      icon: 'bars'
-      // permission: 'M_menusAuth_0'
+      icon: 'bars',
+      permission: 'M_menusAuth_0'
     },
     children: [{
       path: '/menusAuth/storeMenus',
@@ -187,8 +187,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "bnSetting" */ '@/views/bnSetting/menu/storeMenus.vue'),
       meta: {
         title: '门店菜单管理',
-        icon: 'shop'
-        // permission: 'M_menusAuth_storeMenus'
+        icon: 'shop',
+        permission: 'M_menusAuth_storeMenus'
       }
     },
     {
@@ -197,8 +197,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "bnSetting" */ '@/views/bnSetting/menu/adminMenus.vue'),
       meta: {
         title: '运营菜单管理',
-        icon: 'appstore'
-        // permission: 'M_menusAuth_adminMenus'
+        icon: 'appstore',
+        permission: 'M_menusAuth_adminMenus'
       }
     },
     {
@@ -207,8 +207,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "auth" */ '@/views/power/menu/menu.vue'),
       meta: {
         title: 'IT菜单管理',
-        icon: 'profile'
-        // permission: 'M_menusAuth_menu'
+        icon: 'profile',
+        permission: 'M_menusAuth_menu'
       }
     }
     ]
@@ -220,8 +220,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: 'IT权限管理',
-      icon: 'lock'
-      // permission: 'M_auth_0'
+      icon: 'lock',
+      permission: 'M_auth_0'
     },
     children: [{
       path: '/auth/userList',
@@ -229,8 +229,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "auth" */ '@/views/power/user/userList.vue'),
       meta: {
         title: '用户管理',
-        icon: 'user'
-        // permission: 'M_auth_userList'
+        icon: 'user',
+        permission: 'M_auth_userList'
       }
     },
     {
@@ -239,8 +239,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "auth" */ '@/views/power/role/roleList.vue'),
       meta: {
         title: '角色管理',
-        icon: 'solution'
-        // permission: 'M_auth_roleList'
+        icon: 'solution',
+        permission: 'M_auth_roleList'
       }
     }
     ]
@@ -251,8 +251,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '系统设置',
-      icon: 'setting'
-      // permission: 'M_setting_0'
+      icon: 'setting',
+      permission: 'M_setting_0'
     },
     children: [{
       path: '/setting/dataDictionary',
@@ -261,8 +261,8 @@ export const asyncRouterMap = [{
         '@/views/power/dataDictionary/dataDictionary.vue'),
       meta: {
         title: '数据字典管理',
-        icon: 'database'
-        // permission: 'M_sys_dataDictionary'
+        icon: 'database',
+        permission: 'M_sys_dataDictionary'
       }
     },
     {
@@ -292,8 +292,8 @@ export const asyncRouterMap = [{
         '@/views/power/OperateJournal/OperateJournal.vue'),
       meta: {
         title: '操作日志',
-        icon: 'read'
-        // permission: 'M_operateJournal'
+        icon: 'read',
+        permission: 'M_operateJournal'
       }
     }
     ]

+ 2 - 1
src/permission.js

@@ -10,7 +10,8 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
-const whiteList = ['login', 'register', 'registerResult', 'EvaluationPlan', 'EvaluationItem', 'tenantsList'] // no redirect whitelist
+// const whiteList = ['login', 'register', 'registerResult', 'EvaluationPlan', 'EvaluationItem', 'tenantsList'] // no redirect whitelist
+const whiteList = ['login', 'register', 'registerResult'] // no redirect whitelist
 const defaultRoutePath = '/home'
 
 router.beforeEach((to, from, next) => {

+ 49 - 51
src/views/appSetting/bannerSetting.vue

@@ -14,9 +14,9 @@
       :data="loadData"
       bordered>
       <!-- 广告图位置 -->
-      <span slot="position" slot-scope="text,record">
+      <!-- <span slot="position" slot-scope="text,record">
         {{ $refs.position.getNameByCode(text) }}
-      </span>
+      </span> -->
       <span slot="action" slot-scope="text, record">
         <template>
           <a-icon type="eye" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="handleEdit(record, 1)" />
@@ -50,7 +50,7 @@
             :disabled="disabled"
             placeholder="请输入轮播图名称32个字以内" />
         </a-form-item>
-        <a-form-item required label="广告图位置" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
+        <!-- <a-form-item required label="广告图位置" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <v-select
             ref="position"
             code="ADVERT_POSITION"
@@ -58,7 +58,7 @@
             allowClear
             placeholder="请选择广告图位置"
             :disabled="disabled"></v-select>
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item label="跳转链接" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
           <a-input
             v-decorator="['formData.url', { initialValue:formData.url,rules: [{ required: false, message: '请填写跳转链接!' }] }]"
@@ -83,13 +83,13 @@
           </a-radio-group>
         </a-form-item>
         <a-form-item label="上传图片" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-          <div style="border: 1px solid #eee;overflow: hidden;padding: 8px 8px  0;">
+          <div style="border: 1px solid #eee;overflow: hidden;padding: 8px;">
             <Upload
               v-if="title != '查看详情'"
               v-decorator="[
-                'formData.photo',
+                'photo',
                 {
-                  initialValue: formData.photo,
+                  initialValue: photo,
                   rules: [{required: true,message: '请上传轮播图!'}]
                 }]"
               ref="bannerImage"
@@ -99,7 +99,7 @@
               listType="picture-card"
               upText="上传图片">
             </Upload>
-            <img v-else :src="formData.photo" style="width:100px ;height: auto; margin-bottom: 8px;" />
+            <img v-else :src="photo" style="width:100px ;height: auto;" />
           </div>
         </a-form-item>
         <a-form-item :wrapper-col="{ span: 12, offset: 5 }" style="text-align: center;">
@@ -144,33 +144,15 @@ export default {
         minWidth: '40',
         align: 'center'
       },
-      {
-        title: '操作',
-        // dataIndex: 'action',
-        minWidth: '100',
-        align: 'center',
-        scopedSlots: {
-          customRender: 'action'
-        }
-      },
-      {
-        title: '状态',
-        minWidth: '100',
-        dataIndex: 'status',
-        align: 'center',
-        scopedSlots: {
-          customRender: 'status'
-        }
-      },
-      {
-        title: '广告图位置',
-        minWidth: '100',
-        dataIndex: 'position',
-        align: 'center',
-        scopedSlots: {
-          customRender: 'position'
-        }
-      },
+      // {
+      //   title: '广告图位置',
+      //   minWidth: '100',
+      //   dataIndex: 'position',
+      //   align: 'center',
+      //   scopedSlots: {
+      //     customRender: 'position'
+      //   }
+      // },
       {
         title: '名称',
         minWidth: '100',
@@ -188,13 +170,29 @@ export default {
         minWidth: '200',
         dataIndex: 'url',
         align: 'center'
-      }
+      },
+	  {
+	    title: '状态',
+	    minWidth: '100',
+	    dataIndex: 'status',
+	    align: 'center',
+	    scopedSlots: {
+	      customRender: 'status'
+	    }
+	  },
+	  {
+	    title: '操作',
+	    // dataIndex: 'action',
+	    minWidth: '100',
+	    align: 'center',
+	    scopedSlots: {
+	      customRender: 'action'
+	    }
+	  }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return getBannerSettingList({
-          bannerType: 'app'
-        })
+        return getBannerSettingList()
           .then(res => {
             // console.log(res, '1111')
             const no = 0
@@ -224,12 +222,12 @@ export default {
       },
       formData: {
         title: '', // 标题
-        photo: '', // banner图片
         url: '', // 图片路径
         status: '', // 状态
-        sort: '', // 排序
-        position: '' // 广告图位置
+        sort: '' // 排序
+        // position: '' // 广告图位置
       },
+	  photo: '', // banner图片
       bannerType: 'app',
       disabled: false,
       value: '',
@@ -251,7 +249,7 @@ export default {
 	  this.hideRequiredMark = false
     },
     getbannerImage (data) {
-      this.formData.photo = data
+      this.photo = data
     },
     // 点击保存;
     handleSubmit (e) {
@@ -260,9 +258,8 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           console.log('Received values of form: ', values, this.formData)
-          const formData = Object.assign({}, this.formData, values.formData, {
-            bannerType: 'app'
-          })
+
+          const formData = Object.assign({}, this.formData, values.formData)
           console.log(formData, _this.radioGroup)
           saveItem(formData, _this.radioGroup).then(res => {
             console.log(res, 'rrrrrrrrr')
@@ -280,7 +277,7 @@ export default {
     close () {
       this.visible = false
       this.formData.title = ''
-      this.formData.photo = ''
+      this.photo = ''
       this.formData.url = ''
       this.formData.status = ''
       this.formData.sort = ''
@@ -293,7 +290,10 @@ export default {
     assignment (row) {
       this.formData.id = row.id
       this.formData.title = row.title
-      this.formData.photo = row.photo
+	  this.photo = row.photoBasePath + row.photoPath
+	  console.log(this.photo)
+      //    this.formData.photoBasePath = row.photoBasePath
+	  // this.formData.photoBasePath = row.photoPath
       this.formData.url = row.url
       this.formData.status = row.status
       this.formData.sort = row.sort
@@ -302,7 +302,6 @@ export default {
     // 0 修改,1 查看详情
     handleEdit (row, type) {
       console.log(row)
-      const _this = this
       if (type == 1) {
         this.title = '查看详情'
         this.hideRequiredMark = true
@@ -313,9 +312,8 @@ export default {
       this.assignment(row)
       this.disabled = type == 1
       this.visible = true
-      console.log(this.formData.photo)
       setTimeout(() => {
-        _this.$refs.bannerImage.setFileList(this.formData.photo)
+        this.$refs.bannerImage.setFileList(this.photo)
       }, 500)
     },
     // 删除

+ 1 - 1
src/views/appSetting/editionSetting.vue

@@ -99,7 +99,7 @@ export default {
       applyName: 'IT后台',
       // 获取列表数据
       loadData: parameter => {
-        return getEditionSettingList(Object.assign(parameter, { applyCode: 'zyit' }))
+        return getEditionSettingList(Object.assign(parameter))
           .then(res => {
             // console.log(res,'1111')
             const no = (res.data.pageNo - 1) * res.data.pageSize

+ 8 - 8
src/views/bnSetting/menu/childModal.vue

@@ -127,7 +127,7 @@
           />
         </a-form-item>
         <!-- 连锁可用 -->
-        <a-form-item v-if="parentType=='store'" label="连锁可用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
+        <!-- <a-form-item v-if="parentType=='store'" label="连锁可用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-radio-group
             name="radioGroup"
             v-decorator="[
@@ -140,9 +140,9 @@
             <a-radio :value="1">是</a-radio>
             <a-radio :value="0">否</a-radio>
           </a-radio-group>
-        </a-form-item>
+        </a-form-item> -->
         <!-- 单店可用 -->
-        <a-form-item v-if="parentType=='store'" label="单店可用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
+        <!-- <a-form-item v-if="parentType=='store'" label="单店可用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-radio-group
             name="radioGroup"
             v-decorator="[
@@ -155,7 +155,7 @@
             <a-radio :value="1">是</a-radio>
             <a-radio :value="0">否</a-radio>
           </a-radio-group>
-        </a-form-item>
+        </a-form-item> -->
         <!-- 状态 -->
         <a-form-item label="启用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
           <a-radio-group
@@ -230,8 +230,8 @@ export default {
         urlPath: '',
         sort: '',
         type: undefined,
-        chainOrgUse: 1,
-        singleOrgUse: 1,
+        // chainOrgUse: 1,
+        // singleOrgUse: 1,
         status: 1 // 活动状态
       }
     }
@@ -295,8 +295,8 @@ export default {
       this.formData.sort = ''
       this.formData.type = ''
       this.formData.status = 1
-      this.formData.chainOrgUse = 1
-      this.formData.singleOrgUse = 1
+      // this.formData.chainOrgUse = 1
+      // this.formData.singleOrgUse = 1
       this.formData.code = ''
       this.formData.permission = ''
     }

+ 12 - 12
src/views/bnSetting/menu/storeMenus.vue

@@ -151,7 +151,7 @@
             />
           </a-form-item>
           <!-- 连锁可用 -->
-          <a-form-item label="连锁可用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
+          <!-- <a-form-item label="连锁可用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
             <a-radio-group
               name="radioGroup"
               v-decorator="[
@@ -164,9 +164,9 @@
               <a-radio :value="1">是</a-radio>
               <a-radio :value="0">否</a-radio>
             </a-radio-group>
-          </a-form-item>
+          </a-form-item> -->
           <!-- 单店可用 -->
-          <a-form-item label="单店可用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
+         <!-- <a-form-item label="单店可用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
             <a-radio-group
               name="radioGroup"
               v-decorator="[
@@ -179,7 +179,7 @@
               <a-radio :value="1">是</a-radio>
               <a-radio :value="0">否</a-radio>
             </a-radio-group>
-          </a-form-item>
+          </a-form-item> -->
           <!-- 状态 -->
           <a-form-item label="启用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
             <a-radio-group
@@ -249,8 +249,8 @@ export default {
         sort: '',
         type: '0',
         isLeaf: true,
-        chainOrgUse: '',
-        singleOrgUse: '',
+        // chainOrgUse: '',
+        // singleOrgUse: '',
         status: '' // 活动状态
       }
     }
@@ -287,16 +287,16 @@ export default {
           permission: data.permission,
           sort: data.sort,
           type: data.type,
-          chainOrgUse: data.chainOrgUse,
-          singleOrgUse: data.singleOrgUse,
+          // 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)
+        // this.formData.chainOrgUse = Number(this.formData.chainOrgUse)
+        // this.formData.singleOrgUse = Number(this.formData.singleOrgUse)
       } else {
         this.selectedMenu = ''
         this.clear()
@@ -388,8 +388,8 @@ export default {
       this.formData.urlPath = ''
       this.formData.sort = ''
       this.formData.type = ''
-	    this.formData.chainOrgUse = ''
-	    this.formData.singleOrgUse = ''
+	    // this.formData.chainOrgUse = ''
+	    // this.formData.singleOrgUse = ''
       this.formData.status = ''
       this.formData.code = ''
       this.formData.permission = ''

+ 20 - 20
src/views/bnSetting/menusAuthTab.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="menusAuth-cons">
     <a-tabs @change="tabChange" type="card">
-      <a-tab-pane tab="单店菜单设置" key="1">
+      <!-- <a-tab-pane tab="单店菜单设置" key="1">
         <menusAuth types="dd"></menusAuth>
-      </a-tab-pane>
+      </a-tab-pane> -->
       <a-tab-pane tab="连锁店菜单设置" key="2">
         <menusAuth types="ls"></menusAuth>
       </a-tab-pane>
@@ -12,25 +12,25 @@
 </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 => {
-      })
-    },
+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>

+ 8 - 8
src/views/user/Login.vue

@@ -184,14 +184,14 @@ export default {
     },
     handleSubmit (e) {
       e.preventDefault()
-      this.$router.push({ name: 'EvaluationItem' }, () => {
-			  console.log('onComplete')
-			  this.$notification.success({
-			    message: '欢迎',
-			    description: `${timeFix()},欢迎回来`
-			  })
-      })
-      return
+      //  this.$router.push({ name: 'bannerSetting' }, () => {
+			  // console.log('onComplete')
+			  // this.$notification.success({
+			  //   message: '欢迎',
+			  //   description: `${timeFix()},欢迎回来`
+			  // })
+      //  })
+      //  return
       const {
         form: { validateFields },
         state,