Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

http/yskApi/devices.js

@@ -7,7 +7,7 @@ const request=http.request
  */
 export function tbPrintMachine(data, method = 'post') {
     return request({
-        url: '/api/tbPrintMachine',
+        url: '/api/shop-config/printer',
         method: method,
         data: {
             shopId: uni.getStorageSync('shopId'),
@@ -22,7 +22,7 @@ export function tbPrintMachine(data, method = 'post') {
  */
 export function tbPrintMachineGet(params) {
     return request({
-        url: '/api/tbPrintMachine',
+        url: '/api/shop-config/printer/list',
         method: 'get',
         params: {
             shopId: uni.getStorageSync('shopId'),
@@ -30,4 +30,28 @@ export function tbPrintMachineGet(params) {
             ...params
         }
     })
-}
+}
+// 修改打印机状态
+export function shopConfigprinter(params) {
+    return request({
+        url: '/api/shop-config/printer',
+        method: 'put',
+        params 
+    })
+}
+
+//  * 打印机详情
+export function printerd(id) {
+    return request({
+        url: '/api/shop-config/printer/' + id,
+        method: 'get',
+
+    })
+}
+// 删除
+export function delTableHandle(id) {
+    return request({
+        url: '/api/shop-config/printer/' + id,
+        method: 'DELETE',
+    })
+}

http/yskApi/http.js

@@ -104,7 +104,8 @@ function commonsProcess(showLoading, httpReqCallback) {
 			// if(bodyData.code == 500){ // 密码已过期， 直接跳转到更改密码页面
 			// 	uni.redirectTo({url: '/pages/login/index'})
 			// }
-			return Promise.reject(bodyData)
+			return bodyData
+			// return Promise.reject(bodyData)
 		}
 
 		// 加密数据

http/yskApi/requestAll.js

@@ -18,6 +18,21 @@ export function dateProduct(params) {
 		params
 	})
 }
+// 是否开启
+export function updateStatus(data) {
+	return request({
+		url: `/api/tbPlussShopStaff/updateStatus`,
+		method: "put",
+		data
+	});
+}
+// 编辑
+export function tbPlussShopStaffDetail(id) {
+	return request({
+		url: `/api/tbPlussShopStaff/${id}`,
+		method: "get"
+	});
+}
 // 桌型列表
 export function callTable(params) {
 	return request({
@@ -66,4 +81,41 @@ export function callTablecall(data) {
 		method: 'post',
 		data
 	});
-}
+}
+// 获取员工列表
+export function rolesGet() {
+	return request({
+		url: `/api/tbPlussShopStaff`,
+		method: "get"
+	});
+}
+// 删除员工
+export function shopStaffDelete(data) {
+	return request({
+		url: `/api/tbPlussShopStaff`,
+		method: "delete",
+		data
+	});
+}
+// 新增员工获取权限
+export function tbShopPermissionList() {
+	return request({
+		url: `/api/tbShopPermission/list`,
+		method: "get"
+	});
+}
+
+// 获取角色权限
+export function getroles() {
+	return request({
+		url: `/api/roles`,
+		method: "get"
+	});
+}
+export function tbPlussShopStaff(data) {
+	return request({
+		url: `/api/tbPlussShopStaff`,
+		method: data.id ? "put" : "post",
+		data
+	});
+}