Merge branch 'zyh' into zyj

.env.prod

@@ -5,12 +5,14 @@ ENV = 'production'
 VUE_APP_TITLE = 农场管理系统
 
 # 农场管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'https://bxg.api.cyjyyjy.com'
 
 # 根据服务器或域名修改
-PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+#PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+PUBLIC_PATH = '/'
 # 二级部署路径
-VUE_APP_APP_NAME ='yudao-admin'
+#VUE_APP_APP_NAME ='yudao-admin'
+VUE_APP_APP_NAME =''
 
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true

src/api/bxg/storeProductRule.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data, id) {
   return request({
-    url: `api/yxStoreProductRule/save/${id}`,
+    url: `/api/yxStoreProductRule/save/${id}`,
     method: 'post',
     data
   })
@@ -26,7 +26,7 @@ export function edit(data) {
 
 export function info (id) {
   return request({
-    url: `api/yxStoreProductRule/rule/${id}`,
+    url: `/bxg/api/yxStoreProductRule/rule/${id}`,
     method: 'get'
   });
 }

src/api/bxg/yxShippingTemplates.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data,id) {
   return request({
-    url: `api/yxShippingTemplates/save/${id}`,
+    url: `/bxg/api/yxShippingTemplates/save/${id}`,
     method: 'post',
     data
   })

src/api/bxg/yxSystemStore.js

@@ -9,6 +9,7 @@ export function add(data) {
 }
 
 export function get() {
+  console.log(123);
   return request({
     url: '/bxg/api/yxSystemStore',
     method: 'get'

src/api/system/cpUser.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建企业微信成员
+export function createCpUser(data) {
+  return request({
+    url: '/system/cp-user/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新企业微信成员
+export function updateCpUser(data) {
+  return request({
+    url: '/system/cp-user/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除企业微信成员
+export function deleteCpUser(id) {
+  return request({
+    url: '/system/cp-user/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得企业微信成员
+export function getCpUser(id) {
+  return request({
+    url: '/system/cp-user/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得企业微信成员分页
+export function getCpUserPage(query) {
+  return request({
+    url: '/system/cp-user/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出企业微信成员 Excel
+export function exportCpUserExcel(query) {
+  return request({
+    url: '/system/cp-user/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/tools/localStorage.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function add(data) {
   return request({
-    url: 'api/localStorage',
+    url: 'bxg/api/localStorage',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/localStorage/',
+    url: 'bxg/api/localStorage/',
     method: 'delete',
     data: ids
   })
@@ -18,7 +18,7 @@ export function del(ids) {
 
 export function edit(data) {
   return request({
-    url: 'api/localStorage',
+    url: 'bxg/api/localStorage',
     method: 'put',
     data
   })

src/api/tools/material.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getPage(query) {
   return request({
-    url: 'api/material/page',
+    url: 'bxg/api/material/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function getPage(query) {
 
 export function addObj(obj) {
   return request({
-    url: 'api/material',
+    url: 'bxg/api/material',
     method: 'post',
     data: obj
   })
@@ -18,21 +18,21 @@ export function addObj(obj) {
 
 export function getObj(id) {
   return request({
-    url: 'api/material/' + id,
+    url: 'bxg/api/material/' + id,
     method: 'get'
   })
 }
 
 export function delObj(id) {
   return request({
-    url: 'api/material/' + id,
+    url: 'bxg/api/material/' + id,
     method: 'delete'
   })
 }
 
 export function putObj(obj) {
   return request({
-    url: 'api/material',
+    url: 'bxg/api/material',
     method: 'put',
     data: obj
   })

src/api/tools/materialgroup.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getPage(query) {
   return request({
-    url: 'api/materialgroup/page',
+    url: 'bxg/api/materialgroup/page',
     method: 'get',
     params: query
   })
@@ -10,7 +10,7 @@ export function getPage(query) {
 
 export function getList(query) {
   return request({
-    url: 'api/materialgroup/list',
+    url: 'bxg/api/materialgroup/list',
     method: 'get',
     params: query
   })
@@ -18,7 +18,7 @@ export function getList(query) {
 
 export function addObj(obj) {
   return request({
-    url: 'api/materialgroup',
+    url: 'bxg/api/materialgroup',
     method: 'post',
     data: obj
   })
@@ -26,21 +26,21 @@ export function addObj(obj) {
 
 export function getObj(id) {
   return request({
-    url: 'api/materialgroup/' + id,
+    url: 'bxg/api/materialgroup/' + id,
     method: 'get'
   })
 }
 
 export function delObj(id) {
   return request({
-    url: 'api/materialgroup/' + id,
+    url: 'bxg/api/materialgroup/' + id,
     method: 'delete'
   })
 }
 
 export function putObj(obj) {
   return request({
-    url: 'api/materialgroup',
+    url: 'bxg/api/materialgroup',
     method: 'put',
     data: obj
   })

src/api/tools/qiniu.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function get() {
   return request({
-    url: 'api/qiNiuContent/config',
+    url: 'bxg/api/qiNiuContent/config',
     method: 'get'
   })
 }
 
 export function update(data) {
   return request({
-    url: 'api/qiNiuContent/config',
+    url: 'bxg/api/qiNiuContent/config',
     data,
     method: 'put'
   })
@@ -17,21 +17,21 @@ export function update(data) {
 
 export function download(id) {
   return request({
-    url: 'api/qiNiuContent/download/' + id,
+    url: 'bxg/api/qiNiuContent/download/' + id,
     method: 'get'
   })
 }
 
 export function sync() {
   return request({
-    url: 'api/qiNiuContent/synchronize',
+    url: 'bxg/api/qiNiuContent/synchronize',
     method: 'post'
   })
 }
 
 export function del(ids) {
   return request({
-    url: 'api/qiNiuContent',
+    url: 'bxg/api/qiNiuContent',
     method: 'delete',
     data: ids
   })

src/assets/styles/variables.scss

@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 250px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

src/components/Crud/crud.js

@@ -1,5 +1,7 @@
 import { initData, download } from '@/api/bxg/data'
-import { parseTime, downloadFile } from '@/utils/index'
+import {  downloadFile } from '@/utils/index'
+import { parseTime, resetForm, addDateRange, addBeginAndEndTime, handleTree} from "@/utils/ruoyi";
+
 import Vue from 'vue'
 
 /**

src/components/Permission/permission.js

@@ -3,7 +3,7 @@ import store from '@/store'
 export default {
   inserted(el, binding, vnode) {
     const { value } = binding
-    const roles = store.getters && store.getters.roles
+    const roles = store.getters && store.getters.permissions
     if (value && value instanceof Array && value.length > 0) {
       const permissionRoles = value
 

src/components/editorMaterial/index.vue

@@ -190,7 +190,7 @@ export default {
   data() {
     return {
       headers: {
-        Authorization: getToken()
+        Authorization: "Bearer " + getToken()
       },
       dialogVisible: true,
       url: '',

src/components/material/index.vue

@@ -190,7 +190,7 @@ export default {
   data() {
     return {
       headers: {
-        Authorization: getToken()
+        Authorization: "Bearer " + getToken()
       },
       dialogVisible: false,
       url: '',

src/components/singlematerial/index.vue

@@ -180,7 +180,7 @@ export default {
   data() {
     return {
       headers: {
-        Authorization: getToken()
+        Authorization: "Bearer " + getToken()
       },
       dialogVisible: false,
       myValue: this.value,

src/layout/components/Navbar.vue

@@ -9,9 +9,9 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />

src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '农场管理系统',
+      title: '回乡管理系统',
       logo: logoImg
     }
   }

src/main.js

@@ -13,6 +13,9 @@ import router from './router'
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
 
+// 权限指令
+import permission from './components/Permission'
+
 import './assets/icons' // icon
 import './permission' // permission control
 // import './tongji' // 百度统计
@@ -54,6 +57,7 @@ import VueMeta from 'vue-meta'
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
+Vue.use(permission)
 // Vue.use(hljs.vuePlugin);
 
 // bpmnProcessDesigner 需要引入

src/router/index.js

@@ -63,7 +63,7 @@ export const constantRoutes = [
     redirect: 'index',
     children: [{
         path: 'index',
-        component: (resolve) => require(['@/views/index'], resolve),
+        component: (resolve) => require(['@/views/bxg/home'], resolve),
         name: '首页',
         meta: {title: '首页', icon: 'dashboard', affix: true}
       }

src/store/getters.js

@@ -23,5 +23,13 @@ const getters = {
   terminal: state => state.container.terminal,
   activeComponent: state => state.container.activeComponent,
   componentsData: state => state.container.componentsData,
+
+
+  imagesUploadApi: state => state.api.imagesUploadApi,
+  baseApi: state => state.api.baseApi,
+  fileUploadApi: state => state.api.fileUploadApi,
+  uploadApi: state => state.api.uploadApi,
+  updateAvatarApi: state => state.api.updateAvatarApi,
+  qiNiuUploadApi: state => state.api.qiNiuUploadApi,
 }
 export default getters

src/store/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
+import api from './modules/api'
 import app from './modules/app'
 import user from './modules/user'
 import tagsView from './modules/tagsView'
@@ -7,17 +8,20 @@ import permission from './modules/permission'
 import settings from './modules/settings'
 import dict from './modules/dict'
 import getters from './getters'
+import container from "./modules/container"
 
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
   modules: {
+    api,
     app,
     user,
     tagsView,
     permission,
     settings,
-    dict
+    dict,
+    container
   },
   getters
 })

src/store/modules/api.js

@@ -0,0 +1,30 @@
+const baseUrl = process.env.VUE_APP_BASE_API + "/admin-api"
+
+const api = {
+  state: {
+    // 部署包上传
+    deployUploadApi: baseUrl + '/bxg/api/deploy/upload',
+    // SQL脚本上传
+    databaseUploadApi: baseUrl + '/bxg/api/database/upload',
+    // 实时控制台
+    socketApi: baseUrl + '/bxg/websocket?token=kl',
+    // 图片上传
+    imagesUploadApi: baseUrl + '/bxg/api/pictures',
+    // 修改头像
+    updateAvatarApi: baseUrl + '/bxg/api/users/updateAvatar',
+    // 上传文件到七牛云
+    qiNiuUploadApi: baseUrl + '/bxg/api/qiNiuContent',
+
+    uploadApi: baseUrl + '/bxg/api/upload',
+    // Sql 监控
+    sqlApi: baseUrl + '/bxg/druid',
+    // swagger
+    swaggerApi: baseUrl + '/bxg/doc.html',
+    // 文件上传
+    fileUploadApi: baseUrl + '/bxg/api/localStorage',
+    // baseUrl，
+    baseApi: baseUrl
+  }
+}
+
+export default api

src/store/modules/container.js

@@ -1,9 +1,12 @@
+
+
 const container = {
   state: {
     terminal: 3, // 画布选择的设备
     activeComponent: {}, // 选中模板数据
     componentsData: [] // 模板组件数据
   },
+
   mutations: {
     SET_TERMINAL: (state, terminal) => {
       state.terminal = terminal
@@ -17,6 +20,6 @@ const container = {
   }
 }
 
-console.log("333333333333333")
+
 
 export default container

src/store/modules/user.js

@@ -107,7 +107,7 @@ const user = {
 
           res = res.data; // 读取 data 数据
           const user = res.user
-          const avatar = user.avatar === "" ? require("@/assets/images/profile.jpg") : user.avatar;
+          const avatar = user.avatar === "" ? require("@/assets/images/logo.png") : user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)

src/utils/index.js

@@ -427,3 +427,89 @@ export function isNumberStr(str) {
   return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
 }
 
+
+// 替换邮箱字符
+export function regEmail(email) {
+  if (String(email).indexOf('@') > 0) {
+    const str = email.split('@')
+    let _s = ''
+    if (str[0].length > 3) {
+      for (var i = 0; i < str[0].length - 3; i++) {
+        _s += '*'
+      }
+    }
+    var new_email = str[0].substr(0, 3) + _s + '@' + str[1]
+  }
+  return new_email
+}
+
+
+
+// 替换手机字符
+export function regMobile(mobile) {
+  if (mobile.length > 7) {
+    var new_mobile = mobile.substr(0, 3) + '****' + mobile.substr(7)
+  }
+  return new_mobile
+}
+
+// 下载文件
+export function downloadFile(obj, name, suffix) {
+  const url = window.URL.createObjectURL(new Blob([obj]))
+  const link = document.createElement('a')
+  link.style.display = 'none'
+  link.href = url
+  const fileName = parseTime(new Date()) + '-' + name + '.' + suffix
+  link.setAttribute('download', fileName)
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+}
+
+export function RandomNumber() {
+  var min = 5; var max = 36
+  var randomStr = ''
+  var range = (max ? Math.round(Math.random() * (max - min)) + min : min)
+  var arr = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
+
+  for (var i = 0; i < range; i++) {
+    var index = Math.round(Math.random() * (arr.length - 1))
+    randomStr += arr[index]
+  }
+  return randomStr
+}
+
+
+ 
+
+export function formatTimeTwo(time) {
+  if (time == null) return '无'
+  // time = time * 1000
+  const d = new Date(time)
+  return (
+    d.getFullYear() + '年' +
+    (d.getMonth() + 1) +
+    '月' +
+    d.getDate() +
+    '日' +
+    d.getHours() +
+    '时' +
+    d.getMinutes() +
+    '分'
+  )
+}
+export function formatTimeThree(time) {
+  time = time * 1000
+  const d = new Date(time)
+  return (
+    d.getFullYear() + '年' +
+    (d.getMonth() + 1) +
+    '月' +
+    d.getDate() +
+    '日' +
+    d.getHours() +
+    '时' +
+    d.getMinutes() +
+    '分'
+  )
+}

src/utils/permission.js

@@ -48,4 +48,29 @@ export function checkRole(value) {
     console.error(`need roles! Like checkRole="['admin','editor']"`)
     return false
   }
-}
+}
+
+
+/**
+ * @param {Array} value
+ * @returns {Boolean}
+ * @example see @/views/permission/directive.vue
+ */
+ export default function checkPermission(value) {
+  if (value && value instanceof Array && value.length > 0) {
+    const roles = store.getters && store.getters.permissions
+    const permissionRoles = value
+
+    const hasPermission = roles.some(role => {
+      return permissionRoles.includes(role)
+    })
+    
+    if (!hasPermission) {
+      return false
+    }
+    return true
+  } else {
+    console.error(`need roles! Like v-permission="['admin','editor']"`)
+    return false
+  }
+}

src/views/bxg/activity/bargain/index.vue

@@ -88,7 +88,7 @@ import checkPermission from '@/utils/permission'
 import initData from '@/mixins/crud'
 import { del } from '@/api/bxg/yxStoreBargain'
 import eForm from './form'
-import { formatTimeTwo, parseTime } from '@/utils/index'
+import { formatTimeTwo } from '@/utils/index'
 export default {
   components: { eForm },
   mixins: [initData],
@@ -103,7 +103,6 @@ export default {
     })
   },
   methods: {
-    parseTime,
     formatTimeTwo,
     checkPermission,
     beforeInit() {

src/views/bxg/activity/combination/index.vue

@@ -103,7 +103,7 @@
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/crud'
 import { del, onsale } from '@/api/bxg/yxStoreCombination'
-import { formatTimeTwo, parseTime } from '@/utils/index'
+import { formatTimeTwo } from '@/utils/index'
 export default {
   components: { },
   mixins: [initData],
@@ -122,12 +122,11 @@ export default {
   },
   methods: {
     toAddURL(){
-      this.$router.push({ path: '/activity/combinationAdd' })
+      this.$router.push({ path: 'bxg/activity/combinationAdd' })
     },
     toUpdateURL(id){
-      this.$router.push({ path: '/activity/combinationEdit/'+id })
+      this.$router.push({ path: 'bxg/activity/combinationEdit/'+id })
     },
-    parseTime,
     formatTimeTwo,
     checkPermission,
     beforeInit() {

src/views/bxg/activity/combinlist/index.vue

@@ -77,7 +77,7 @@
   import initData from '@/mixins/crud'
   import { del } from '@/api/bxg/yxStorePink'
   import eForm from './form'
-  import { formatTimeTwo, parseTime } from '@/utils/index'
+  import { formatTimeTwo } from '@/utils/index'
   export default {
     components: { eForm },
     mixins: [initData],
@@ -95,7 +95,6 @@
       })
     },
     methods: {
-      parseTime,
       formatTimeTwo,
       checkPermission,
       beforeInit() {

src/views/bxg/activity/seckill/index.vue

@@ -88,7 +88,7 @@
 import checkPermission from '@/utils/permission'
 import initData from '@/mixins/crud'
 import { del } from '@/api/bxg/yxStoreSeckill'
-import { formatTimeTwo, parseTime } from '@/utils/index'
+import { formatTimeTwo } from '@/utils/index'
 export default {
   mixins: [initData],
   data() {
@@ -111,7 +111,6 @@ export default {
     toUpdateURL(id){
       this.$router.push({ path: '/activity/secKillEdit/'+id })
     },
-    parseTime,
     formatTimeTwo,
     checkPermission,
     beforeInit() {

src/views/bxg/dashboard/PanelGroupT.vue

@@ -3,7 +3,7 @@
       <el-row :gutter="24" class="dashboard-console-grid">
         <el-col v-bind="grid" class="ivu-mb">
           <el-card :bordered="false">
-            <router-link :to="{ path: '/shop/cate' }">
+            <router-link :to="{ path: 'bxg/shop/goods' }">
               <i class="el-icon-goods" style="color: #69c0ff" />
               <p>商品管理</p>
             </router-link>
@@ -11,7 +11,7 @@
         </el-col>
         <el-col v-bind="grid" class="ivu-mb">
           <el-card :bordered="false">
-            <router-link :to="{ path: '/member/member' }">
+            <router-link :to="{ path: 'bxg/member/member' }">
               <i class="el-icon-user" style="color: #95de64" />
               <p>会员管理</p>
             </router-link>
@@ -19,7 +19,7 @@
         </el-col>
         <el-col v-bind="grid" class="ivu-mb">
           <el-card :bordered="false">
-            <router-link :to="{ path: '/order/order' }">
+            <router-link :to="{ path: 'bxg/order/order' }">
               <i class="el-icon-s-order" style="color: #ff9c6e" />
               <p>订单管理</p>
             </router-link>
@@ -27,7 +27,7 @@
         </el-col>
         <el-col v-bind="grid" class="ivu-mb">
           <el-card :bordered="false">
-            <router-link :to="{ path: '/syscoupon/coupon' }">
+            <router-link :to="{ path: 'bxg/syscoupon/coupon' }">
               <i class="el-icon-s-ticket" style="color: #b37feb" />
               <p>电子券管理</p>
             </router-link>
@@ -35,7 +35,7 @@
         </el-col>
         <el-col v-bind="grid" class="ivu-mb">
           <el-card :bordered="false">
-            <router-link :to="{ path: '/activity/combination' }">
+            <router-link :to="{ path: 'bxg/activity/combination' }">
               <i class="el-icon-postcard" style="color: #ffd666" />
               <p>营销管理</p>
             </router-link>
@@ -43,7 +43,7 @@
         </el-col>
         <el-col v-bind="grid" class="ivu-mb">
           <el-card :bordered="false">
-            <router-link :to="{ path: '/promoter/promoterconfig' }">
+            <router-link :to="{ path: 'bxg/promoter/promoterconfig' }">
               <i class="el-icon-notebook-1" style="color: #5cdbd3" />
               <p>分销管理</p>
             </router-link>
@@ -51,7 +51,7 @@
         </el-col>
         <el-col v-bind="grid" class="ivu-mb">
           <el-card :bordered="false">
-            <router-link :to="{ path: '/price/extract' }">
+            <router-link :to="{ path: 'bxg/price/extract' }">
               <i class="el-icon-s-finance" style="color: #ff85c0" />
               <p>财务管理</p>
             </router-link>
@@ -59,7 +59,7 @@
         </el-col>
         <el-col v-bind="grid" class="ivu-mb">
           <el-card :bordered="false">
-            <router-link :to="{ path: '/store/storeinfo' }">
+            <router-link :to="{ path: 'bxg/store/storeinfo' }">
               <i class="el-icon-office-building" style="color: #ffc069" />
               <p>门店管理</p>
             </router-link>

src/views/bxg/shop/cate/index.vue

@@ -74,7 +74,7 @@ import picUpload from '@/components/pic-upload'
 import MaterialList from '@/components/material'
 
 // crud交由presenter持有
-const defaultCrud = CRUD({ title: '分类', url: 'api/yxStoreCategory', sort: 'sort,desc', crudMethod: { ...crudDept }})
+const defaultCrud = CRUD({ title: '分类', url: 'bxg/api/yxStoreCategory', sort: 'sort,desc', crudMethod: { ...crudDept }})
 const defaultForm = { id: null, cateName: null, pid: 0, isShow: 1 , sort:  1}
 export default {
   name: 'Dept',

src/views/bxg/shop/goods/form.vue

@@ -736,7 +736,7 @@ export default {
               type: 'success'
             });
             setTimeout(() => {
-              this.$router.push({ path: '/shop/goods' });
+              this.$router.push({ path: '/bxg/goods' });
             }, 500);
           }).catch(res => {
             // this.$message({

src/views/bxg/shop/goods/index.vue

@@ -130,10 +130,10 @@ export default {
   },
   methods: {
     toAddURL(){
-      this.$router.push({ path: '/shop/goodsAdd' })
+      this.$router.push({ path: '/bxg/shop/goodsAdd' })
     },
     toUpdateURL(id){
-      this.$router.push({ path: '/shop/goodsEdit/'+id })
+      this.$router.push({ path: '/bxg/shop/goodsEdit/'+id })
     },
     dataFilter(val){
       this.value=val

src/views/bxg/shop/goods/index2.vue

@@ -48,7 +48,7 @@
       <el-table-column v-if="checkPermission(['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT','YXSTOREPRODUCT_DELETE'])" label="操作" width="150px" align="center">
         <template slot-scope="scope">
           <el-button v-permission="['admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT']" size="mini" type="primary" icon="el-icon-edit">
-            <router-link :to="'/shop/goodsEdit/'+scope.row.id">
+            <router-link :to="'/bxg/shop/goodsEdit/'+scope.row.id">
               编辑
             </router-link>
           </el-button>

src/views/bxg/shop/order/detail.vue

@@ -401,7 +401,9 @@ import eRemark from './remark'
     components: {eForm, eRefund, editOrder, eRemark},
     data() {
       return {
-        orderStatus:null,
+        orderStatus:{
+          cacheKeyCreateOrder:""
+        },
         isAdd: false,
         id: null,
         order: {

src/views/bxg/shop/order/detail1.vue

@@ -89,7 +89,7 @@
 <script>
 import { add, edit, express,
   getNowOrderStatus } from '@/api/bxg/yxStoreOrder'
-import {formatTimeTwo, parseTime} from '@/utils/index'
+import {formatTimeTwo} from '@/utils/index'
 export default {
   props: {
     isAdd: {
@@ -99,7 +99,9 @@ export default {
   },
   data() {
     return {
-      orderStatus:null,
+      orderStatus:{
+        cacheKeyCreateOrder:""
+      },
       loading: false, dialog: false, expressInfo: [],
       form: {
         id: '',
@@ -168,7 +170,6 @@ export default {
     }
   },
   methods: {
-    parseTime,
     cancel() {
       this.dialog = false
     },

src/views/bxg/shop/order/index.vue

@@ -339,7 +339,7 @@
     },
     methods: {
       toDetailURL(id){
-        this.$router.push({ path: '/order/detail/'+id })
+        this.$router.push({ path: '/bxg/order/detail/'+id })
       },
       formatTime,
       checkPermission,

src/views/bxg/shop/order/print.vue

@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import { formatTime, parseTime, formatTimeTwo } from '@/utils/index'
+import { formatTime, formatTimeTwo } from '@/utils/index'
 export default {
  props: {
     printList: {
@@ -77,7 +77,6 @@ export default {
   },
   methods: {
     formatTime,
-    parseTime,
     formatTimeTwo,
     cancel() {
       this.dialog = false

src/views/bxg/shop/shippingTemplates/index.vue

@@ -55,7 +55,7 @@ import MaterialList from "@/components/material";
 import add from './form'
 
 // crud交由presenter持有
-const defaultCrud = CRUD({ title: '运费模板', url: 'api/yxShippingTemplates', sort: 'id,desc', crudMethod: { ...crudYxShippingTemplates }})
+const defaultCrud = CRUD({ title: '运费模板', url: 'bxg/api/yxShippingTemplates', sort: 'id,desc', crudMethod: { ...crudYxShippingTemplates }})
 const defaultForm = { id: null, name: null, type: null, regionInfo: null, appoint: null, appointInfo: null, createTime: null, updateTime: null, isDel: null, sort: null }
 export default {
   name: 'YxShippingTemplates',

src/views/bxg/shop/store/index.vue

@@ -109,10 +109,9 @@
   import udOperation from '@crud/UD.operation'
   import pagination from '@crud/Pagination'
   import MaterialList from '@/components/material'
-  import { parseTime } from '@/utils/index'
 
   // crud交由presenter持有
-  const defaultCrud = CRUD({ title: '门店', url: 'api/yxSystemStore', sort: 'id,desc', crudMethod: { ...crudYxSystemStore }})
+  const defaultCrud = CRUD({ title: '门店', url: 'bxg/api/yxSystemStore', sort: 'id,desc', crudMethod: { ...crudYxSystemStore }})
   const defaultForm = { id: null, name: null, introduction: null, phone: null, address: null, detailedAddress: null, image: null, latitude:
   null, longitude: null, validTime: null, dayTime: null, addTime: null, isShow: 1, imageArr: [], validTimeArr: [],  dayTimeArr: [new Date(),new Date()] }
   export default {

src/views/bxg/shop/storeProductRule/index.vue

@@ -47,7 +47,7 @@ import MaterialList from "@/components/material"
 import add from './form'
 
 // crud交由presenter持有
-const defaultCrud = CRUD({ title: 'sku规则', url: 'api/yxStoreProductRule', sort: 'id,desc', crudMethod: { ...crudYxStoreProductRule }})
+const defaultCrud = CRUD({ title: 'sku规则', url: 'bxg/api/yxStoreProductRule', sort: 'id,desc', crudMethod: { ...crudYxStoreProductRule }})
 const defaultForm = { id: null, ruleName: null, ruleValue: null, createTime: null, updateTime: null, isDel: null }
 export default {
   name: 'YxStoreProductRule',

src/views/bxg/shop/storestaff/index.vue

@@ -98,7 +98,7 @@ import crudYxSystemStore from '@/api/bxg/yxSystemStore'
 import { formatTimeTwo } from '@/utils/index'
 
 // crud交由presenter持有
-const defaultCrud = CRUD({ title: '门店店员', url: 'api/yxSystemStoreStaff', sort: 'id,desc', crudMethod: { ...crudYxSystemStoreStaff }})
+const defaultCrud = CRUD({ title: '门店店员', url: 'bxg/api/yxSystemStoreStaff', sort: 'id,desc', crudMethod: { ...crudYxSystemStoreStaff }})
 const defaultForm = { user: {uid: null,nickname: null,avatar: null}, id: null, uid: null, avatar: null, storeId: null, staffName: null, phone: null, verifyStatus: 1, status: null, addTime: null, nickname: null, storeName: null }
 export default {
   name: 'YxSystemStoreStaff',

src/views/bxg/shop/user/detail.vue

@@ -60,7 +60,6 @@
 
 <script>
 import { add, edit, getSpread } from '@/api/bxg/yxUser'
-import { parseTime } from '@/utils/index'
 export default {
   props: {
     // isAdd: {
@@ -91,7 +90,6 @@ export default {
     handleClick(tab, event) {
       this.spread(this.form.uid)
     },
-    parseTime,
     cancel() {
       this.dialog = false
     },

src/views/bxg/tools/storage/local/index.vue

@@ -125,7 +125,7 @@ import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 
 // crud交由presenter持有
-const defaultCrud = CRUD({ title: '文件', url: 'api/localStorage', crudMethod: { ...crudFile }})
+const defaultCrud = CRUD({ title: '文件', url: 'bxg/api/localStorage', crudMethod: { ...crudFile }})
 const defaultForm = { id: null, name: '' }
 export default {
   components: { pagination, crudOperation, rrOperation },

src/views/bxg/tools/storage/qiniu/index.vue

@@ -90,7 +90,7 @@ import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 
 // crud交由presenter持有
-const defaultCrud = CRUD({ title: '七牛云文件', url: 'api/qiNiuContent', crudMethod: { ...crudQiNiu }})
+const defaultCrud = CRUD({ title: '七牛云文件', url: 'bxg/api/qiNiuContent', crudMethod: { ...crudQiNiu }})
 export default {
   components: { eForm, pagination, crudOperation, rrOperation },
   mixins: [presenter(defaultCrud), header(), crud()],

src/views/components/good/index.vue

@@ -97,7 +97,7 @@ export default {
   methods: {
     checkPermission,
     beforeInit() {
-      this.url = 'api/yxStoreProduct'
+      this.url = 'bxg/api/yxStoreProduct'
       const sort = 'id,desc'
       this.params = { page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0 ,isIntegral:0}
       const query = this.query

src/views/components/goods/index.vue

@@ -179,7 +179,7 @@ export default {
     },
     checkPermission,
     beforeInit() {
-      this.url = 'api/yxStoreProduct'
+      this.url = 'bxg/api/yxStoreProduct'
       const sort = 'id,desc'
       this.params = {page: this.page, size: this.size, sort: sort, isShow: 1, isDel: 0,isIntegral:0}
       const query = this.query

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">芋道后台管理系统</h3>
+      <h3 class="title">后台管理系统</h3>
       <el-form-item prop="tenantName" v-if="tenantEnable">
         <el-input v-model="loginForm.tenantName" type="text" auto-complete="off" placeholder='租户'>
           <svg-icon slot="prefix" icon-class="tree" class="el-input__icon input-icon" />
@@ -44,7 +44,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2020-2021 iocoder.cn All Rights Reserved.</span>
+      <span>Copyright © 2020-2022 回乡.com All Rights Reserved.</span>
     </div>
   </div>
 </template>
@@ -60,17 +60,25 @@ import { getTenantEnable } from "@/utils/ruoyi";
 export default {
   name: "Login",
   data() {
+
+    // username: "admin",
+    //     password: "admin123",
+    //     rememberMe: false,
+    //     code: "",
+    //     uuid: "",
+    //     tenantName: "芋道源码",
+
     return {
       codeUrl: "",
       captchaEnable: true,
       tenantEnable: true,
       loginForm: {
-        username: "admin",
+        username: "",
-        password: "admin123",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: "",
-        tenantName: "芋道源码",
+        tenantName: "",
       },
       loginRules: {
         username: [
@@ -199,7 +207,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("http://static.yudao.iocoder.cn/login-background.jpg");
+  background-image: url("https://pos.upload.lotus-wallet.com/0000/hx.jpg");
   background-size: cover;
 }
 .title {

src/views/socialLogin.vue

@@ -22,7 +22,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2020-2021 iocoder.cn All Rights Reserved.</span>
+      <span>Copyright © 2020-2022 回乡.com All Rights Reserved.</span>
     </div>
   </div>
 </template>

src/views/system/cpUser/index.vue

@@ -0,0 +1,294 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="姓名" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input v-model="queryParams.mobile" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
+      
+      <!-- <el-form-item label="部门" prop="department">
+        <el-input v-model="queryParams.department" placeholder="请输入部门" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="职位" prop="position">
+        <el-input v-model="queryParams.position" placeholder="请输入职位" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item> -->
+      <el-form-item label="邮件" prop="email">
+        <el-input v-model="queryParams.email" placeholder="请输入邮件" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="企业邮件" prop="bizMail">
+        <el-input v-model="queryParams.bizMail" placeholder="请输入企业邮件" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['system:cp-user:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['system:cp-user:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="用户昵称" align="center" prop="nickname" />
+      <el-table-column label="头像" align="center" prop="avatar" >
+        <template slot-scope="scope">
+          <el-avatar :src="scope.row.avatar"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="手机号" align="center" prop="mobile" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      
+      <el-table-column label="部门" align="center" prop="department" />
+      <el-table-column label="职位" align="center" prop="position" />
+      <el-table-column label="邮件" align="center" prop="email" />
+      <el-table-column label="企业邮件" align="center" prop="bizMail" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['system:cp-user:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['system:cp-user:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户昵称" prop="nickname">
+          <el-input v-model="form.nickname" placeholder="请输入用户昵称" />
+        </el-form-item>
+        <el-form-item label="头像" prop="avatar">
+          <el-input v-model="form.avatar" placeholder="请输入头像" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="手机号" prop="mobile">
+          <el-input v-model="form.mobile" placeholder="请输入手机号" />
+        </el-form-item>
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名" />
+        </el-form-item>
+        <el-form-item label="部门" prop="department">
+          <el-input v-model="form.department" placeholder="请输入部门" />
+        </el-form-item>
+        <el-form-item label="职位" prop="position">
+          <el-input v-model="form.position" placeholder="请输入职位" />
+        </el-form-item>
+        <el-form-item label="邮件" prop="email">
+          <el-input v-model="form.email" placeholder="请输入邮件" />
+        </el-form-item>
+        <el-form-item label="企业邮件" prop="bizMail">
+          <el-input v-model="form.bizMail" placeholder="请输入企业邮件" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createCpUser, updateCpUser, deleteCpUser, getCpUser, getCpUserPage, exportCpUserExcel } from "@/api/system/cpUser";
+
+export default {
+  name: "CpUser",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 企业微信成员列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        userid: null,
+        avatar: null,
+        status: null,
+        mobile: null,
+        name: null,
+        department: null,
+        position: null,
+        email: null,
+        bizMail: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userid: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+        avatar: [{ required: true, message: "头像不能为空", trigger: "blur" }],
+        status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
+        mobile: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getCpUserPage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        userid: undefined,
+        avatar: undefined,
+        status: undefined,
+        mobile: undefined,
+        name: undefined,
+        department: undefined,
+        position: undefined,
+        email: undefined,
+        bizMail: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加企业微信成员";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getCpUser(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改企业微信成员";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateCpUser(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createCpUser(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除企业微信成员编号为"' + id + '"的数据项?').then(function() {
+          return deleteCpUser(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有企业微信成员数据项?').then(() => {
+          this.exportLoading = true;
+          return exportCpUserExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '${table.classComment}.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

vue.config.js

@@ -33,17 +33,18 @@ module.exports = {
     host: '0.0.0.0',
     port: port,
     open: false,
-    proxy: {
+    // proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
+    //   // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
+    //   [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:48080`,
+    //     // target: `http://localhost:48080`,
-        // target: `http://api-dashboard.yudao.iocoder.cn`,
+    //     // target: `http://api-dashboard.yudao.iocoder.cn`,
-        changeOrigin: true,
+    //     target: `https://bxg.api.cyjyyjy.com`,
-        pathRewrite: {
+    //     changeOrigin: true,
-          ['^' + process.env.VUE_APP_BASE_API]: ''
+    //     pathRewrite: {
-        }
+    //       ['^' + process.env.VUE_APP_BASE_API]: ''
-      }
+    //     }
-    },
+    //   }
+    // },
     disableHostCheck: true
   },
   css: {