Merge branch 'master' into new/java/wm20231009

src/api/merchant/company.js

+import request from '@/utils/request'
+
+// 查询商户列表
+export function listCompany(query) {
+  return request({
+    url: '/merchant/company/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询商户详细
+export function getCompany(id) {
+  return request({
+    url: '/merchant/company/' + id,
+    method: 'get'
+  })
+}
+
+// 新增商户
+export function addCompany(data) {
+  return request({
+    url: '/merchant/company',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改商户
+export function updateCompany(data) {
+  return request({
+    url: '/merchant/company',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除商户
+export function delCompany(id) {
+  return request({
+    url: '/merchant/company/' + id,
+    method: 'delete'
+  })
+}

src/api/merchant/employees.js

+import request from '@/utils/request'
+
+// 查询陪诊员列表
+export function listEmployees(query) {
+  return request({
+    url: '/merchant/employees/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询陪诊员详细
+export function getEmployees(id) {
+  return request({
+    url: '/merchant/employees/' + id,
+    method: 'get'
+  })
+}
+
+// 新增陪诊员
+export function addEmployees(data) {
+  return request({
+    url: '/merchant/employees',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改陪诊员
+export function updateEmployees(data) {
+  return request({
+    url: '/merchant/employees',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除陪诊员
+export function delEmployees(id) {
+  return request({
+    url: '/merchant/employees/' + id,
+    method: 'delete'
+  })
+}

src/api/system/message.js

+import request from '@/utils/request'
+
+// 查询订单消息列表
+export function listMessage(query) {
+  return request({
+    url: '/system/message/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询订单消息详细
+export function getMessage(id) {
+  return request({
+    url: '/system/message/' + id,
+    method: 'get'
+  })
+}
+
+// 新增订单消息
+export function addMessage(data) {
+  return request({
+    url: '/system/message',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改订单消息
+export function updateMessage(data) {
+  return request({
+    url: '/system/message',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除订单消息
+export function delMessage(id) {
+  return request({
+    url: '/system/message/' + id,
+    method: 'delete'
+  })
+}

vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8089`,
-        target: `https://peizheng.shanpeikj.com/api`,
+        target: `http://localhost:8089`,
+        // target: `https://peizheng.shanpeikj.com/api`,
         // target: `http://192.168.0.169:8089`,
         // target: `http://192.168.0.137:8089`,
         // target: `http://192.168.0.125:8089`,