Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf

src/api/consumable.js

@@ -39,12 +39,19 @@ export function puttbConsType(data) {
  * @returns
  */
 export function gettbConsInfo(params) {
+    // return request({
+    //     url: '/api/tbConsInfo',
+    //     method: "get",
+    //     params
+    // });
     return request({
-        url: '/api/tbConsInfo',
+        url: "/api/viewConInfoFlow",
         method: "get",
-        params
-    });
+        params 
+      });
 }
+
+
 /**
  * 耗材入库
  * @returns

src/api/notifications.js

@@ -0,0 +1,42 @@
+import request from "@/utils/request";
+
+
+// 推送店铺消息开关
+export function shopState(data) {
+    return request({
+      url: "/api/msg/shopState",
+      method: "put",
+      data
+    });
+  }
+
+export function msgall(params) {
+  return request({
+    url: "/api/msg/all",
+    method: "get",
+    params
+  });
+}
+
+export function msginfo(data) {
+  return request({
+    url: '/api/msg/info',
+    method: 'put',
+    data
+  })
+}
+export function state(params) {
+  return request({
+    url: "/api/msg/state",
+    method: "get",
+    params
+  });
+}
+
+export function delmsg(ids) {
+  return request({
+    url: '/api/msg',
+    method: 'delete',
+    data: ids
+  })
+}

src/api/shop.js

@@ -428,7 +428,14 @@ export function findActivate(params) {
     params
   });
 }
-
+// 获取店铺会员二维码
+export function getwxacode(data) {
+  return request({
+    url: `/shop/storage/getwxacode`,
+    method: "post",
+    data
+  });
+}
 /**
  * 商家用户列表
  * @returns