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

http/yskApi/Instead.js

@@ -389,4 +389,27 @@ export function $calcDeDuctionPoints(data) {
       ...data
     }
   });
-}
+}
+
+//购物车-临时菜添加
+export function $temporaryDishes(data) {
+  return request({
+    url: '/api/place/temporaryDishes',
+    method: "post",
+    data:{
+      shopId: uni.getStorageSync("shopId"),
+      ...data
+    }
+  });
+}
+//单品改价
+export function $updatePrice(data) {
+  return request({
+    url: '/api/place/updatePrice',
+    method: "put",
+    data:{
+      shopId: uni.getStorageSync("shopId"),
+      ...data
+    }
+  });
+}

http/yskApi/goods.js

@@ -119,7 +119,10 @@ export const $productSpec=new $API('/api/tbProductSpec',http.req)
 
 
 // v2 api start
-
+// 商品列表 后台查询
+export function $tbProductList(data) {
+	return http.req('/api/tbProduct/list', {...data,shopId:uni.getStorageSync('shopId')}, 'GET')
+}
 /* 商品列表 V2 */
 export function $tbProductV2(data) {
 	return http.req('/api/tbProduct/list/v2', {...data,shopId:uni.getStorageSync('shopId')}, 'post')