请求处理代理

商品管理
商品分类
用户管理
桌台
代客下单
进销存
交班
预定座位
充值管理
存酒管理

jeepay-ui-uapp-merchant/http/businessApiManger.js

@@ -0,0 +1,47 @@
+import request from './businessHttp.js'
+import useStorage from '@/commons/utils/useStroage.js'
+
+/**
+ * 登录
+ * @param {Object} data
+ */
+export function login(data) {
+	return request('/login/wx/merchant/login', data, 'post')
+}
+
+/**
+ * 桌台列表
+ * @param {Object} areaId
+ */
+export function tableList(areaId) {
+	return request('/table/list', {
+		shopId: useStorage.get('userInfo').shopId,
+		areaId: areaId
+	}, 'post')
+}
+
+/**
+ * 区域列表
+ * @param {Object} data
+ */
+export function areaList(data) {
+	return request('/table/area', {
+		shopId: useStorage.get('userInfo').shopId
+	})
+}
+
+/**
+ * 绑定桌码
+ * @param {Object} data
+ */
+export function tableBinding(data) {
+	return request('/table/binding', data, 'post')
+}
+
+/**
+ * 登录获取openid
+ * @param {Object} data
+ */
+export function wxlogin(data) {
+	return request('/login/wx/business/login', data)
+}

jeepay-ui-uapp-merchant/http/businessHttp.js

@@ -0,0 +1,46 @@
+/**
+ * 因为两个小程序接口不一致，餐饮商超商家端的接口使用该http
+ */
+import useStorage from '@/commons/utils/useStroage.js'
+
+// const baseURL = 'http://192.168.2.128:9000/cashierService'
+// const baseURL = 'http://192.168.2.41:9888/cashierService'
+let baseURL = 'https://wxcashiertest.sxczgkj.cn/cashierService'
+// #ifdef H5
+baseURL = '/shopApi'
+// #endif
+// const baseURL = 'https://cashier.sxczgkj.cn/cashierService'
+export default function(api = '', data = {}, method = 'GET') {
+	return new Promise((resolve, reject) => {
+		uni.request({
+			url: `${baseURL}${api}`,
+			method: method,
+			data: data,
+			header: {
+				'environment': 'wx',
+				'type': 'ios',
+				'version': '1.0.0',
+				'token': useStorage.get('token'),
+				'Content-Type': 'application/json'
+			},
+			success: res => {
+				if (res.data.code == 0) {
+					resolve(res.data)
+				} else {
+					uni.showToast({
+						icon: 'none',
+						"title": res.data.msg
+					})
+					reject(res.data.msg)
+				}
+			},
+			fail: err => {
+				uni.showToast({
+					icon: 'none',
+					"title": err.errMsg
+				})
+				reject(err)
+			}
+		})
+	})
+}

jeepay-ui-uapp-merchant/http/classApi.js

@@ -0,0 +1,22 @@
+ class API {
+	constructor(url,req) {
+		const map={
+			add:'POST',
+			del:'DELETE',
+			update:'PUT',
+			get:'GET'
+		} 
+		this.url=url
+		for(let key in map){
+			this[key]=function(data){
+				 data=Array.isArray(data)?data:{...data,shopId:uni.getStorageSync('shopId')}
+				 if(key==='del'){
+					 delete data.shopId
+				 }
+				return req(url, data,map[key])
+			}
+		}
+	}
+}
+
+export default API

jeepay-ui-uapp-merchant/http/http.js

@@ -13,6 +13,13 @@ import storageManage from '@/commons/utils/storageManage.js'
 import { sm4DecryptByResData } from '@/commons/utils/encryptUtil.js'
 import infoBox from "@/commons/utils/infoBox.js"
 import go from '@/commons/utils/go.js';
+let baseUrl = 'http://101.37.12.135:8080'
+// #ifdef H5
+baseUrl = '/server3/mch' 
+// #endif
+// #ifndef H5
+baseUrl = 'http://101.37.12.135:8080/mch' 
+// #endif
 
 // 多少 ms 以内， 不提示loading 
 const loadingShowTime = 200
@@ -82,6 +89,9 @@ function commonsProcess(showLoading, httpReqCallback){
 			if(bodyData.code == 5005){ // 密码已过期， 直接跳转到更改密码页面
 				uni.reLaunch({url: '/pageUser/setting/updatePwd'})
 			}
+			if(bodyData.code == 500){ // 密码已过期， 直接跳转到更改密码页面
+				uni.redirectTo({url: '/pages/login/index'})
+			}
 			return Promise.reject(bodyData)
 		}
 		
@@ -118,10 +128,11 @@ function req(uri, data, method = "GET", showLoading = true, extParams = {}){
 	// 放置token
 	let headerObject = {}
 	headerObject[appConfig.tokenKey] = storageManage.token()
+	headerObject["satoken"] = storageManage.token()
 	
 	return commonsProcess(showLoading, () => {
 			return uni.request(
-				Object.assign({url: appConfig.env.JEEPAY_BASE_URL + uri, data: data, method: method, header: headerObject}, extParams )	
+				Object.assign({url: baseUrl + uri, data: data, method: method, header: headerObject}, extParams )	
 			)
 		}
 	)
@@ -137,7 +148,7 @@ function upload(uri, data, file, showLoading = true, extParams = {}){
 	
 	return commonsProcess(showLoading, () => {
 			return uni.uploadFile(
-				Object.assign({url: appConfig.env.JEEPAY_BASE_URL + uri, formData: data, name: "file", filePath: file.path, header: headerObject}, extParams )	
+				Object.assign({url: baseUrl + uri, formData: data, name: "file", filePath: file.path, header: headerObject}, extParams )	
 			).then((httpData) => {
 				// uni.upload 返回bodyData 的是 string类型。 需要解析。 
 				httpData.data = JSON.parse(httpData.data)

jeepay-ui-uapp-merchant/http/newApi/http.js

@@ -0,0 +1,182 @@
+/**
+ * HTTP的封装， 基于uni.request
+ * 包括： 通用响应结果的处理 和 业务的增删改查函数
+ * 
+ * @author terrfly
+ * @site https://www.jeequan.com
+ * @date 2021/12/16 18:35
+ */
+
+// 导入全局属性
+import appConfig from '@/config/appConfig.js'
+import storageManage from '@/commons/utils/storageManage.js'
+import {
+	sm4DecryptByResData
+} from '@/commons/utils/encryptUtil.js'
+import infoBox from "@/commons/utils/infoBox.js"
+import go from '@/commons/utils/go.js';
+let baseUrl = 'http://101.37.12.135:8080'
+// #ifdef H5
+baseUrl = '/server3' 
+// #endif
+// 多少 ms 以内， 不提示loading 
+const loadingShowTime = 200
+
+// 通用处理逻辑 
+function commonsProcess(showLoading, httpReqCallback) {
+
+	// 判断是否请求完成（用作 是否loading ）
+	// 包括： 'ing', 'ingLoading', 'finish'
+	let reqState = 'ing'
+
+	// 是否已经提示的错误信息
+	let isShowErrorToast = false
+
+
+	// 请求完成， 需要处理的动作
+	let reqFinishFunc = () => {
+
+		if (reqState == 'ingLoading') { // 关闭loading弹层
+			infoBox.hideLoading()
+		}
+		reqState = 'finish' // 请求完毕
+	}
+
+	// 明确显示loading 
+	if (showLoading) {
+		// xx ms内响应完成，不提示loading
+		setTimeout(() => {
+			if (reqState == 'ing') {
+				reqState = 'ingLoading'
+				infoBox.showLoading()
+			}
+		}, loadingShowTime)
+	}
+
+	return httpReqCallback().then((httpData) => {
+		console.log(httpData);
+		reqFinishFunc(); // 请求完毕的动作
+
+		// 从http响应数据中解构响应数据 [ 响应码、 bodyData ]
+		let {
+			statusCode,
+			data
+		} = httpData
+		
+		// 避免混淆重新命名
+		let bodyData = data
+		if (statusCode == 401) {
+
+			// 清楚 token 
+			storageManage.token(null, true)
+
+			// 提示信息
+			isShowErrorToast = true
+			infoBox.showErrorToast('请登录').then(() => {
+				go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH)
+			})
+			return Promise.reject(bodyData) // 跳转到catch函数
+		}
+		// http响应码不正确
+		if (statusCode != 200) {
+			isShowErrorToast = true
+			infoBox.showErrorToast('服务器异常')
+			return Promise.reject(bodyData) // 跳转到catch函数
+		}
+
+		// 业务响应异常
+		if (bodyData.code != 200) {
+			isShowErrorToast = true
+			infoBox.showToast(bodyData.msg)
+			if (bodyData.code == 5005) { // 密码已过期， 直接跳转到更改密码页面
+				uni.reLaunch({
+					url: '/pageUser/setting/updatePwd'
+				})
+			}
+			if(bodyData.code == 500){ // 密码已过期， 直接跳转到更改密码页面
+				uni.redirectTo({url: '/pages/login/index'})
+			}
+			return Promise.reject(bodyData)
+		}
+
+		// 加密数据
+		if (!bodyData.data && bodyData.encryptData) {
+
+			return Promise.resolve({
+				bizData: sm4DecryptByResData(bodyData.encryptData),
+				code: bodyData.code
+			})
+		}
+
+		// 构造请求成功的响应数据 
+		return Promise.resolve({
+			bizData: bodyData.data,
+			code: bodyData.code
+		})
+
+	}).catch(res => {
+		reqFinishFunc(); // 请求完毕的动作
+
+		// 如果没有提示错误， 那么此处提示 异常。 
+		if (!isShowErrorToast) {
+			infoBox.showErrorToast(`请求网络异常`)
+		}
+
+		return Promise.reject(res)
+
+	}).finally(() => { // finally 是 then结束后再执行, 此处不适用。  需要在请求完成后立马调用： reqFinishFunc()
+
+	});
+
+}
+
+
+// 默认 显示loading(控制 xxs 内 不提示loading )
+function req(uri, data, method = "GET", showLoading = true, extParams = {}) {
+	let headerObject = {}
+	// headerObject[appConfig.tokenKey] = storageManage.token()
+	headerObject["satoken"] = storageManage.token()
+	headerObject["content-type"] = 'application/json'
+	
+	return commonsProcess(showLoading, () => {
+		return uni.request(
+			Object.assign({
+				url: baseUrl + uri,
+				data: data,
+				method: method,
+				header: headerObject
+			}, extParams)
+		)
+	})
+}
+
+
+// 上传
+function upload(uri, data, file, showLoading = true, extParams = {}) {
+
+	// 放置token
+	let headerObject = {}
+	// headerObject[appConfig.tokenKey] = storageManage.token()
+	headerObject["satoken"] = storageManage.token()
+
+	return commonsProcess(showLoading, () => {
+		return uni.uploadFile(
+			Object.assign({
+				url: appConfig.env.JEEPAY_BASE_URL + uri,
+				formData: data,
+				name: "file",
+				filePath: file.path,
+				header: headerObject
+			}, extParams)
+		).then((httpData) => {
+			// uni.upload 返回bodyData 的是 string类型。 需要解析。 
+			httpData.data = JSON.parse(httpData.data)
+			return Promise.resolve(httpData)
+		})
+	})
+}
+
+export default {
+	req: req,
+	upload: upload
+}

jeepay-ui-uapp-merchant/http/newApi/login.js

@@ -0,0 +1,11 @@
+import http from './http.js'
+import appConfig from '@/config/appConfig.js'
+import {
+	Base64
+} from 'js-base64'
+import infoBox from '@/commons/utils/infoBox.js'
+/* 登录 */
+export function $login(postData) {
+	// return http.req('/login', params, 'GET')
+	return http.req('/login', postData, 'POST')
+}

jeepay-ui-uapp-merchant/http/yskApi/Instead.js

@@ -0,0 +1,219 @@
+// 代课下单
+import http from './http.js'
+import $API from '@/http/classApi.js'
+import appConfig from '@/config/appConfig.js'
+import {
+	Base64
+} from 'js-base64'
+import infoBox from '@/commons/utils/infoBox.js'
+
+const request=http.request
+/**
+ * 获取当前台桌订单信息
+ * @returns
+ */
+export function getCart(params) {
+  return request({
+    url: `/api/place/cart`,
+    method: "get",
+    params:{
+      shopId: uni.getStorageSync('shopId'),
+      ...params
+    }
+  });
+}
+
+/**
+ * 已上架商品列表
+ * @returns
+ */
+export function getGoodsLists(params) {
+  return request({
+    url: `/api/place/activate`,
+    method: "get",
+    params:{
+      shopId: uni.getStorageSync('shopId'),
+      ...params
+    }
+  });
+}
+
+/**
+ * 点单
+ * @returns
+ */
+export function addCart(data) {
+  return request({
+    url: `/api/place/addCart`,
+    method: "post",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+
+/**
+ * 清空购物车/支付订单
+ * @returns
+ */
+export function $clearCart(data) {
+  return request({
+    url: `/api/place/clearCart`,
+    method: "delete",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+
+/**
+ * 删除购物车某个商品
+ * @returns
+ */
+export function $removeCart(data) {
+  return request({
+    url: `/api/place/removeCart`,
+    method: "delete",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+/**
+ * 更新规格
+ * @returns
+ */
+export function $updateCart(data) {
+  return request({
+    url: `/api/place/updateCart`,
+    method: "put",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+/**
+ * 批量打包
+ * @returns
+ */
+export function $allPack(data) {
+  return request({
+    url: `/api/place/pack`,
+    method: "put",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+/**
+ * 获取取餐号
+ * @returns
+ */
+export function $getMasterId(data) {
+  return request({
+    url: `/api/place/masterId`,
+    method: "get",
+    params:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+/**
+ * 支付方式获取
+ * @returns
+ */
+export function $getPayType(data) {
+  return request({
+    url: `/api/place/payType`,
+    method: "get",
+    params:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+/**
+ * 创建订单
+ * @returns
+ */
+export function $createOrder(data) {
+  return request({
+    url: `/api/place/order`,
+    method: "post",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+
+
+/**
+ * 挂起订单
+ * @returns
+ */
+export function $cacheOrder(data) {
+  return request({
+    url: `/api/place/pending`,
+    method: "post",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+
+/**
+ * 获取已挂起订单
+ * @returns
+ */
+export function $getCacheOrder(data) {
+  return request({
+    url: `/api/place/pending/cart`,
+    method: "get",
+    params:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+
+// 会员点单/取消会员点单
+export function $setUser(data) {
+  return request({
+    url: `/api/place/updateVip`,
+    method: "put",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+// 删除订单
+export function $delOrder(data) {
+  return request({
+    url: `/api/place/order`,
+    method: "delete",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}
+// 支付订单
+export function $payOrder(data) {
+  return request({
+    url: '/api/place/pay',
+    method: "put",
+    data:{
+      shopId: uni.getStorageSync('shopId'),
+      ...data
+    }
+  });
+}

jeepay-ui-uapp-merchant/http/yskApi/couponCategory.js

@@ -0,0 +1,30 @@
+import http from './http.js'
+import appConfig from '@/config/appConfig.js'
+import {
+	Base64
+} from 'js-base64'
+import infoBox from '@/commons/utils/infoBox.js'
+
+/* 查询团购卷分类 */
+export function $tbCouponCategory(data, mehtod = 'GET') {
+	return http.req('/api/tbCouponCategory', {
+		...data,
+		shopId: uni.getStorageSync('shopId')
+	}, 'GET')
+}
+
+
+export default {
+	add: function(data) {
+		return $tbCouponCategory(data, 'POST')
+	},
+	del: function(data) {
+		return $tbCouponCategory(data, 'DELETE')
+	},
+	update: function(data) {
+		return $tbCouponCategory(data, 'PUT')
+	},
+	get: function(data) {
+		return $tbCouponCategory(data)
+	}
+}

jeepay-ui-uapp-merchant/http/yskApi/file.js

@@ -0,0 +1,11 @@
+import http from './http.js'
+import appConfig from '@/config/appConfig.js'
+import {
+	Base64
+} from 'js-base64'
+import infoBox from '@/commons/utils/infoBox.js'
+
+/* 上传图片 */
+export function $uploadFile(file,data) {
+	return http.upload('/api/qiNiuContent', data,file)
+}

jeepay-ui-uapp-merchant/http/yskApi/goods.js

@@ -0,0 +1,109 @@
+import http from './http.js'
+import $API from '@/http/classApi.js'
+import appConfig from '@/config/appConfig.js'
+import {
+	Base64
+} from 'js-base64'
+import infoBox from '@/commons/utils/infoBox.js'
+
+/* 商品列表 */
+export function $tbProduct(data) {
+	return http.req('/api/tbProduct', {...data,shopId:uni.getStorageSync('shopId')}, 'GET')
+}
+
+/* 添加商品 */
+export function $addProduct(data) {
+	return http.req('/api/tbProduct', {...data,shopId:uni.getStorageSync('shopId')}, 'POST')
+}
+
+/* 删除商品 */
+export function $delProduct(ids) {
+	return http.req('/api/tbProduct', ids, 'DELETE')
+}
+
+
+/* 更新商品相关 */
+export function $updateProduct(data) {
+	return http.req('/api/tbProduct', {...data,shopId:uni.getStorageSync('shopId')}, 'PUT')
+}
+/* 修改商品排序 */
+export function $upProSort(data) {
+	return http.req('/api/tbProduct/upProSort', {...data,shopId:uni.getStorageSync('shopId')}, 'POST')
+}
+/* 商品详情（单个商品） */
+export function $getProductDetail(product,showLoading=true) {
+	return http.req('/api/tbProduct/'+product, {shopId:uni.getStorageSync('shopId')}, 'GET',showLoading)
+}
+
+/* 设置热销商品 */
+export function $goodsIsHot(data) {
+	return http.req('/api/tbProduct/isHot', {...data,shopId:uni.getStorageSync('shopId')}, 'GET')
+}
+
+
+
+/**
+ * 商品分类列表
+ */
+export function $tbShopCategory(data) {
+	return http.req('/api/tbShopCategory', {...data,shopId:uni.getStorageSync('shopId')}, 'GET')
+}
+/**
+ * 商品分类
+ */
+export const $productCategory=new $API('/api/tbShopCategory',http.req)
+
+
+/**
+ * 更新商品库存状态
+ */
+export function $updateProductStatus(data){
+	return http.req('/api/stock/productStatus', {...data,shopId:uni.getStorageSync('shopId')}, 'PUT')
+}
+
+/**
+ * 库存记录列表
+ */
+export function $getProductStockDetail(data){
+	return http.req('/api/tbProductStockDetail/stock', {...data,shopId:uni.getStorageSync('shopId')}, 'POST')
+}
+
+/**
+ * 库存记录变动数量
+ */
+export function $getProductStockDetailSum(data){
+	return http.req('/api/tbProductStockDetail/sum', {...data,shopId:uni.getStorageSync('shopId')}, 'GET')
+}
+/**
+ * 新增盘点
+ */
+export function $addStocktakin(data){
+	return http.req('/api/tbProductStocktakin', {...data,shopId:uni.getStorageSync('shopId')}, 'POST')
+}
+/**
+ * 盘点记录查询
+ */
+export function $getStocktakin(data){
+	return http.req('/api/tbProductStocktakin', {...data,shopId:uni.getStorageSync('shopId')}, 'GET')
+}
+
+
+/**
+ * 上下架商品
+ */
+export function $updateGrounding(data){
+	return http.req('/api/stock/grounding', {...data,shopId:uni.getStorageSync('shopId')}, 'PUT')
+}
+
+
+
+/* 商品单位列表 */
+export function $tbShopUnit(data) {
+	return http.req('/api/tbShopUnit', {...data,shopId:uni.getStorageSync('shopId')}, 'GET')
+}
+
+/* 商品规格 */
+export const $productSpec=new $API('/api/tbProductSpec',http.req)
+
+
+

jeepay-ui-uapp-merchant/http/yskApi/http.js

@@ -0,0 +1,225 @@
+/**
+ * HTTP的封装， 基于uni.request
+ * 包括： 通用响应结果的处理 和 业务的增删改查函数
+ * 
+ * @author terrfly
+ * @site https://www.jeequan.com
+ * @date 2021/12/16 18:35
+ */
+
+// 导入全局属性
+import appConfig from '@/config/appConfig.js'
+import storageManage from '@/commons/utils/storageManage.js'
+import {
+	sm4DecryptByResData
+} from '@/commons/utils/encryptUtil.js'
+import infoBox from "@/commons/utils/infoBox.js"
+import go from '@/commons/utils/go.js';
+let baseUrl = 'http://101.37.12.135:8080'
+// #ifdef H5
+baseUrl = '/server3/ysk'
+// #endif
+// #ifndef H5
+baseUrl = 'http://101.37.12.135:8080/ysk'
+// #endif
+// 多少 ms 以内， 不提示loading 
+const loadingShowTime = 200
+
+// 通用处理逻辑 
+function commonsProcess(showLoading, httpReqCallback) {
+
+	// 判断是否请求完成（用作 是否loading ）
+	// 包括： 'ing', 'ingLoading', 'finish'
+	let reqState = 'ing'
+
+	// 是否已经提示的错误信息
+	let isShowErrorToast = false
+
+
+	// 请求完成， 需要处理的动作
+	let reqFinishFunc = () => {
+
+		if (reqState == 'ingLoading') { // 关闭loading弹层
+			infoBox.hideLoading()
+		}
+		reqState = 'finish' // 请求完毕
+	}
+
+	// 明确显示loading 
+	if (showLoading) {
+		// xx ms内响应完成，不提示loading
+		setTimeout(() => {
+			if (reqState == 'ing') {
+				reqState = 'ingLoading'
+				infoBox.showLoading()
+			}
+		}, loadingShowTime)
+	}
+
+	return httpReqCallback().then((httpData) => {
+		reqFinishFunc(); // 请求完毕的动作
+
+		// 从http响应数据中解构响应数据 [ 响应码、 bodyData ]
+		let {
+			statusCode,
+			data
+		} = httpData
+		// 避免混淆重新命名
+		let bodyData = data
+		if (statusCode == 500) {
+			isShowErrorToast = true
+			return Promise.reject(bodyData) // 跳转到catch函数
+		}
+		if (statusCode == 401) {
+			// storageManage.token(null, true)
+			// 提示信息
+			isShowErrorToast = true
+			// infoBox.showErrorToast('请登录').then(() => {
+			// 	go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH)
+			// })
+			return Promise.reject(bodyData) // 跳转到catch函数
+		}
+		// http响应码不正确
+		if (statusCode != 200 && statusCode != 204 && statusCode != 201) {
+			isShowErrorToast = true
+			infoBox.showErrorToast(data.message || '服务器异常')
+			return Promise.reject(bodyData) // 跳转到catch函数
+		}
+
+		// 业务响应异常
+		if (bodyData.hasOwnProperty('code') && bodyData.code != 200) {
+			isShowErrorToast = true
+			infoBox.showToast(bodyData.msg)
+			if (bodyData.code == 5005) { // 密码已过期， 直接跳转到更改密码页面
+				uni.reLaunch({
+					url: '/pageUser/setting/updatePwd'
+				})
+			}
+			// if(bodyData.code == 500){ // 密码已过期， 直接跳转到更改密码页面
+			// 	uni.redirectTo({url: '/pages/login/index'})
+			// }
+			return Promise.reject(bodyData)
+		}
+
+		// 加密数据
+		if (!bodyData.data && bodyData.encryptData) {
+
+			return Promise.resolve({
+				bizData: sm4DecryptByResData(bodyData.encryptData),
+				code: bodyData.code
+			})
+		}
+
+		// 构造请求成功的响应数据 
+		return Promise.resolve(bodyData)
+
+	}).catch(res => {
+		if(res.code==401){
+			storageManage.token(null, true)
+			infoBox.showErrorToast('请登录').then(() => {
+				go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH)
+			})
+		}
+		if(res.code==500){
+			storageManage.token(null, true)
+			infoBox.showErrorToast('请登录').then(() => {
+				go.to("PAGES_LOGIN", {}, go.GO_TYPE_RELAUNCH)
+			})
+		}
+		// if(res&&res.msg){
+		// 	infoBox.showErrorToast(res.msg)
+		// }
+		reqFinishFunc(); // 请求完毕的动作
+
+		// 如果没有提示错误， 那么此处提示 异常。 
+		if (!isShowErrorToast) {
+			infoBox.showErrorToast(`请求网络异常`)
+		}
+
+		return Promise.reject(res)
+
+	}).finally(() => { // finally 是 then结束后再执行, 此处不适用。  需要在请求完成后立马调用： reqFinishFunc()
+
+	});
+
+}
+
+
+// 默认 显示loading(控制 xxs 内 不提示loading )
+function req(uri, data, method = "GET", showLoading = true, extParams = {}) {
+	let headerObject = {}
+	// headerObject[appConfig.tokenKey] = storageManage.token()
+	headerObject["satoken"] = storageManage.token()
+	headerObject["content-type"] = 'application/json'
+
+	return commonsProcess(showLoading, () => {
+		return uni.request(
+			Object.assign({
+				url: baseUrl + uri,
+				data: data,
+				method: method,
+				header: headerObject
+			}, extParams)
+		)
+	})
+}
+
+
+// 默认 显示loading(控制 xxs 内 不提示loading )
+function request(args) {
+	const {
+		url,
+		data,
+		params,
+		method = "GET",
+		showLoading = true,
+		extParams = {}
+	} = args
+	let headerObject = {}
+	// headerObject[appConfig.tokenKey] = storageManage.token()
+	headerObject["satoken"] = storageManage.token()
+	headerObject["content-type"] = 'application/json'
+
+	return commonsProcess(showLoading, () => {
+		return uni.request(
+			Object.assign({
+				url: baseUrl + url,
+				data: params||data,
+				method: method,
+				header: headerObject
+			}, extParams)
+		)
+	})
+}
+
+
+
+// 上传
+function upload(uri, data, file, showLoading = true, extParams = {}) {
+	// 放置token
+	let headerObject = {}
+	// headerObject[appConfig.tokenKey] = storageManage.token()
+	headerObject["satoken"] = storageManage.token()
+
+	return commonsProcess(showLoading, () => {
+		return uni.uploadFile(
+			Object.assign({
+				url: baseUrl + uri,
+				formData: data,
+				name: "file",
+				filePath: file.path,
+				header: headerObject
+			}, extParams)
+		).then((httpData) => {
+			// uni.upload 返回bodyData 的是 string类型。 需要解析。 
+			httpData.data = JSON.parse(httpData.data)
+			return Promise.resolve(httpData)
+		})
+	})
+}
+
+export default {
+	req: req,
+	request,
+	upload: upload
+}

jeepay-ui-uapp-merchant/http/yskApi/invoicing.js

@@ -0,0 +1,13 @@
+import http from './http.js'
+import $API from '@/http/classApi.js'
+import appConfig from '@/config/appConfig.js'
+import {
+	Base64
+} from 'js-base64'
+import infoBox from '@/commons/utils/infoBox.js'
+
+/* 操作记录 */
+export function $getStockOperate(data) {
+	return http.req('/api/tbProductStockOperate/list', {...data,shopId:uni.getStorageSync('shopId')}, 'POST')
+}
+

jeepay-ui-uapp-merchant/http/yskApi/shop-user.js

@@ -0,0 +1,47 @@
+// 用户管理
+import http from './http.js'
+import $API from '@/http/classApi.js'
+import appConfig from '@/config/appConfig.js'
+import {
+	Base64
+} from 'js-base64'
+import infoBox from '@/commons/utils/infoBox.js'
+
+const request=http.request
+
+// 获取店铺会员二维码
+export function getwxacode(data) {
+  return request({
+    url: `/shop/storage/getwxacode`,
+    method: "post",
+    data
+  });
+}
+/**
+ * 商家用户列表
+ * @returns
+ */
+export function queryAllShopUser(params) {
+  return request({
+    url: `/api/tbShopUser/queryAllShopUser`,
+    method: "get",
+    params: {
+      shopId: uni.getStorageSync('shopId'),
+      ...params
+    }
+  });
+}
+/**
+ * 查询商家用户概述信息
+ * @returns
+ */
+export function queryAllShopInfo(params) {
+  return request({
+    url: `/api/tbShopUser/summary`,
+    method: "get",
+    params: {
+      shopId: uni.getStorageSync('shopId'),
+      ...params
+    }
+  });
+}

jeepay-ui-uapp-merchant/http/yskApi/sku.js

@@ -0,0 +1,13 @@
+import http from './http.js'
+import $API from '@/http/classApi.js'
+import appConfig from '@/config/appConfig.js'
+import {
+	Base64
+} from 'js-base64'
+import infoBox from '@/commons/utils/infoBox.js'
+
+/* 查询库存 */
+export function $getProductSku(productId) {
+	return http.req('/api/stock/sku', {productId,shopId:uni.getStorageSync('shopId')}, 'GET')
+}
+

jeepay-ui-uapp-merchant/http/yskApi/table.js

@@ -0,0 +1,13 @@
+// 桌台管理
+import http from './http.js'
+import $API from '@/http/classApi.js'
+import appConfig from '@/config/appConfig.js'
+import {
+	Base64
+} from 'js-base64'
+import infoBox from '@/commons/utils/infoBox.js'
+
+/* 台桌区域 */
+export const $tableArea=new $API('/api/tbShopArea',http.req)
+/* 台桌 */
+export const $table=new $API('/api/tbShopTable',http.req)