Browse Source

refactor:API文件修改

zhanghui 2 years ago
parent
commit
76f38ae3d8

+ 0 - 16
api/coupon/coupon.js

@@ -1,16 +0,0 @@
-const http = uni.$u.http
-
-// get请求 查询可领取的优惠劵列表
-export const getUserDiscountsList = (params, config = {}) => http.get('/business/wechat/getUserDiscountsList', params, config)
-
-// get请求 我的优惠卷列表(0未使用, 1已使用, 2已过期 null查询全部)
-export const getMyCouponList = (params, config = {}) => http.get('/member/wechat/getCoupon', params, config)
-
-// get请求 查询可使用的优惠券
-export const getCanUseCouponList = (params, config = {}) => http.post('/member/wechat/getMemberCoupon', params, config)
-
-// post请求 领取优惠券
-export const claimCoupon = (params, config = {}) => http.post('/member/wechat/claimCoupon', params, config)
-
-
-

+ 0 - 21
api/goods/goods.js

@@ -1,21 +0,0 @@
-const http = uni.$u.http
-
-// get请求 获取门店所有服务列表
-export const storeAllServiceList = (params, config = {}) => http.get('/business/wechat/sp/all/'+params.data.storeId, params, config)
-
-// get请求 获取门店列表  
-export const storeList = (params, config = {}) => http.get('/store/uniapp/store-list/distance', params, config)
-
-// get请求 获取门店工作人员列表 关联岗位、工作时段、服务项目
-export const workPersonList = (params, config = {}) => http.get('/store/uniapp/work-person-ist/'+params.data.storeId, params, config)
-
-// get请求 根据服务日期及服务时段查询排班人员
-export const serviceWorkPersonList = (params, config = {}) => http.get('/business/wechat/scheduling/crewPageList', params, config)
-
-// get请求 根据门店查询排班日期
-export const selectDate = (params, config = {}) => http.post('/business/wechat/scheduling/selectDate', params, config)
-
-// get请求 根据门店、排班日期查询可用时段
-export const selectPeriodByDate = (params, config = {}) => http.post('/business/wechat/scheduling/selectPeriodByDate', params, config)
-
- 

+ 0 - 21
api/index/index.js

@@ -1,21 +0,0 @@
-const http = uni.$u.http
-
-// post请求,用户绑定门店
-export const userBindStore = (params, config = {}) => http.post('/member/wechat/bindStore', params, config)
-
-// get请求 获取门店列表
-// export const storeList = (params, config = {}) => http.get('/store/uniapp/store-list', params, config)
-
-// get请求 获取公告列表
-export const noticeList = (params, config = {}) => http.get('/system/openapi/notice/list', params, config)
-
-// get请求 获取公告详情
-export const getNoticeDetail = (params, config = {}) => http.get('/system/openapi/notice/'+params.data.noticeId, params, config)
-
-// get请求 获取banner图列表
-export const getSlideshowList = (params, config = {}) => http.get('/system/openapi/getSlideshowList', params, config)
-
-
-
-
-

+ 0 - 8
api/integral/integral.js

@@ -1,8 +0,0 @@
-const http = uni.$u.http
-
-// post请求,获取积分列表信息
-export const getIntegralRecordList = (params, config = {}) => http.post('/member/wechat/getIntegralRecordVo', params, config)
-
-
-
-

+ 0 - 36
api/login/login.js

@@ -1,36 +0,0 @@
-const http = uni.$u.http
-
-
-// post请求,保存用户信息
-export const saveWechatUser = (params, config = {}) => http.post('/auth/wechat/saveWeChatUserInfo', params, config)
-
-// post请求,获取微信电话号码
-export const getWechatUserPhoneNumber = (params, config = {}) => http.post('/auth/wechat/getWechatUserPhoneNumber', params, config)
-
-// post请求,验证手机号码是否被注册
-export const phoneIsExist = (params, config = {}) => http.post('/member/wechat/phoneIsExist', params, config)
-
-// post请求,新微新手机绑定
-export const wechatRegister = (params, config = {}) => http.post('/auth/xcxRegister', params, config)
-
-// get请求,获取手机验证码
-export const getSmsCode = (params, config = {}) => http.get('/resource/sms/code', params, config)
-
-// post请求,验证手机验证码
-export const validateSmsCode = (params, config = {}) => http.post('/member/wechat/validateSmsCode', params, config)
-
-// post请求,找回账号密码登录
-export const wechatRetrieveAccountPwdLogin = (params, config = {}) => http.post('/auth/xcxRetrieveMemberByPwd', params, config)
-
-// post请求,实名认证登录(新微信老手机)
-export const realNameAuthLogin = (params, config = {}) => http.post('/auth/xcxRetrieveMember', params, config)
-
-// post请求,验证身份证是滞存在
-export const idCardIsExist = (params, config = {}) => http.post('/member/wechat/idCardIsExist', params, config)
-
-// post请求验证手机找回密码
-export const passwordByPhone = (params, config = {}) => http.post('/member/wechat/passwordByPhone', params, config)
-
-
-
-

+ 0 - 32
api/me/me.js

@@ -1,32 +0,0 @@
-const http = uni.$u.http
-
-// post请求,用户实名认证
-export const userRealNameAuth = (params, config = {}) => http.post('/member/wechat/idCardAuthentication', params, config)
-
-// post请求,用户信息保存
-export const saveUserInfo = (params, config = {}) => http.post('/member/wechat/saveUserInfo', params, config)
-
-// post请求,修改用户账号密码
-export const updateUserAccountPassword = (params, config = {}) => http.post('/member/wechat/setPassword', params, config)
-
-// post请求,修改用户交易密码
-export const updateUserTransactionPassword = (params, config = {}) => http.post('/member/wechat/setTransactionPassword', params, config)
-
-// post请求,绑定微信
-export const bindWechat = (params, config = {}) => http.post('/member/wechat/setOpenId', params, config)
-
-// get请求,获取服务条款协议
-export const getTermOfServiceByType = (params, config = {}) => http.get('/system/openapi/getAboutByType', params, config)
-
-// get请求,获取公共文件路径
-export const getCommonFile = (params, config = {}) => http.get('/resource/oss/listByIds/'+params.data.ossId, params, config)
-
-// post请求,重新设置手机号
-export const setPhone = (params, config = {}) => http.post('/member/wechat/setPhone', params, config)
-
-// get请求,获取用户信息
-export const getUserInfo = (params, config = {}) => http.get('/member/wechat/getUserInfo', params, config)
-
-
-
-

+ 0 - 26
api/object/service-object.js

@@ -1,26 +0,0 @@
-const http = uni.$u.http
-
-// post请求,识别人脸  
-export const verifyFace = (params, config = {}) => http.post('/member/wechat/verifyFace', params, config)
-
-// post请 查询服务对象列表
-export const listServiceObject = (params, config = {}) => http.post('/member/wechat/listServiceObject', params, config)
-
-// post请 获取服务对象协议
-export const getServiceDealFile = (params, config = {}) => http.post('/member/wechat/getServiceDealFile', params, config)
-
-// post请求 服务对象签名
-export const serviceObjectSignPdf = (params, config = {}) => http.post('/member/wechat/signPdf', params, config)
-
-// post请求 保存服务对象
-export const saveServiceObject = (params, config = {}) => http.post('/member/wechat/saveServiceObject', params, config)
-
-// post请求 绑定服务对象
-export const bindServiceObject = (params, config = {}) => http.post('/member/wechat/bindServiceObject', params, config)
-
-// post请求 修改服务对象
-export const updateServiceObject = (params, config = {}) => http.post('/member/wechat/updateServiceObject', params, config)
-
-
-
-

+ 0 - 60
api/order/order.js

@@ -1,60 +0,0 @@
-const http = uni.$u.http
-
-// get请求,获取订单列表
-export const getOrderList = (params, config = {}) => http.get('/business/wechat/order/list', params, config)
-
-// get请求,获取订单详情
-export const getOrderDetailByOrderId = (params, config = {}) => http.get('/business/wechat/order/detail', params, config)
-
-// get请求,保存订单评价
-export const saveOrderComment = (params, config = {}) => http.post('/business/wechat/order/comment', params, config)
-
-// post请求,再来一单
-export const comeOrder = (params, config = {}) => http.post('/business/wechat/order/copy/'+params.data.orderId, params, config)
-
-// post请求  删除订单
-export const deleteOrder = (params, config = {}) => http.delete('/business/wechat/order/'+params.data.orderId, params, config)
-
-// put请求  取消订单
-export const cancelOrder = (params, config = {}) => http.put('/business/wechat/order/cancel/'+params.data.orderId, params, config)
-
-// post请求,通用下单接口
-export const commonGeneralOrder  = (params, config = {}) => http.post('/business/wechat/order/common', params, config)
-
-// post请求,查询充值订单列表
-export const orderRechargeList  = (params, config = {}) => http.get('/business/wechat/orderRecharge/list', params, config)
-
-// post请求,充值订单退款
-export const orderRechargeRefund  = (params, config = {}) => http.post('/business/wechat/orderRecharge/refund', params, config)
-
-// post请求,获取用户余额
-export const getUserBalance  = (params, config = {}) => http.post('/business/wechat/orderRecharge/getBalance', params, config)
-
-// get请求,订单签到
-export const orderSign  = (params, config = {}) => http.get('/business/wechat/scheduling/orderSign', params, config)
-
-// get请求,查看订单排号情况
-export const getOrderSign  = (params, config = {}) => http.get('/business/wechat/scheduling/getOrderSign', params, config)
-
-// post请求,微信支付(根据订单ID)
-export const wechatPay  = (params, config,requestConfig = {}) => http.post('/business/wxPay/jsapiPay', params, config,requestConfig)
-
-// post请求,余额支付(根据订单ID)
-export const balancePay  = (params, config = {}) => http.post('/business/balancePay/pay', params, config)
-
-// get请求,查询交易记录列表
-export const transactionRecordsList  = (params, config = {}) => http.get('/business/wechat/transactionFlow/list', params, config)
-
-// get请求,查询充值优惠列表
-export const getRechargeList  = (params, config = {}) => http.get('/business/wechat/getRechargeList', params, config)
-
-// get请求,查询交易流水统计
-export const transactionFlowstatistic  = (params, config = {}) => http.get('/business/wechat/transactionFlow/statistic', params, config)
-
-// get请求 获取预约价格
-export const getAppointmentPrice  = (params, config = {}) => http.get('/business/wechat/sp/subPrice', params, config)
-
-
-
-
-

+ 0 - 19
api/system/system.js

@@ -1,19 +0,0 @@
-const http = uni.$u.http
-
-
-// get请求 通过电话及名称获取老系统会员信息
-export const getOldMember = (params, config = {}) => http.get('/member/wechat/getOldMember', params, config)
-
-// get请求 通过会员编号获取老系统充值记录
-export const getOrderRechargeOldList = (params, config = {}) => http.get('/member/wechat/getOrderRechargeOldList', params, config)
-
-// get请求,通过会员编号获取老系统消费记录
-export const getOrderConsumeLogOld = (params, config = {}) => http.get('/member/wechat/getOrderConsumeLogOld', params, config)
-
-// post请求 通过会员编号提交迁移申请,默认迁移到当前迁移账户上
-export const submitOldData = (params, config = {}) => http.post('/member/wechat/submitOldData', params, config)
-
-
-
-
-

+ 593 - 85
common/js/api.js

@@ -1,97 +1,605 @@
 // 引用网络请求中间件
 import request from '../js/request.js';
 
+export default {
 
+	// get请求 通过电话及名称获取老系统会员信息
+	getOldMember(data) {
+		return request({
+			url: '/member/wechat/getOldMember',
+			method: 'GET',
+			data: data
+		})
+	},
 
+	// get请求 通过会员编号获取老系统充值记录
+	getOrderRechargeOldList(data) {
+		return request({
+			url: '/member/wechat/getOrderRechargeOldList',
+			method: 'GET',
+			data: data
+		})
+	},
 
-export default {
+	// get请求,通过会员编号获取老系统消费记录
+	getOrderConsumeLogOld(data) {
+		return request({
+			url: '/member/wechat/getOrderConsumeLogOld',
+			method: 'GET',
+			data: data
+		})
+	},
 
-    getImgUrlByOssId(data){
-        return request({
-            url: '/resource/oss/listByIds/'+data.ossId,
-            method: 'GET'
-
-        })
-
-    },
-
-    /**
-     * 微信静默登录
-     */
-    wxAuthLogin(data){
-        return request({
-            url: '/auth/xcxLogin',
-            method: 'POST',
-            data: data
-        })
-    },
-    /**
-     * 查询电话是否存在
-     */
-    phoneIsExist(data){
-        return request({
-            url: '/member/wechat/phoneIsExist',
-            method: 'POST',
-            data: data
-        })
-    },
-
-    getSmsCode(data){
-        return request({
-            url: '/resource/sms/code?phonenumber='+data.phonenumber+'&auth='+data.auth,
-            method: 'GET',
-            data: data
-        })
-    },
-
-    wechatRetrieveAccountPwdLogin(data){
-        return request({
-            url: '/auth/xcxRetrieveMemberByPwd',
-            method: 'POST',
-            data: data
-        })
-    },
-
-
-    /**
-     * post请求,验证身份证是滞存在
-     * @param data
-     * @returns {Promise | Promise<unknown>}
-     */
-    idCardIsExist(data){
-        return request({
-            url: '/member/wechat/idCardIsExist',
-            method: 'POST',
-            data: data
-        })
-    },
-
-    /**
-     *  get请求 通过电话及名称获取老系统会员信息
-      */
-    getOldMember (data){
-        return request({
-            url:'/member/wechat/getOldMember',
-            method:'GET',
-            params:data
-        })
-    } ,
-
-    /**
-     * get请求 通过会员编号获取老系统充值记录
-     * @param data
-     * @returns {Promise<unknown>}
-     */
-    getOrderRechargeOldList(data){
-        return request({
-            url:'/member/wechat/getOrderRechargeOldList',
-            method:'GET',
-            params:data
-        })
-    },
+	// post请求 通过会员编号提交迁移申请,默认迁移到当前迁移账户上
+	submitOldData(data) {
+		return request({
+			url: '/member/wechat/submitOldData',
+			method: 'POST',
+			data: data
+		})
+	},
+	// get请求,获取订单列表
+	getOrderList(data) {
+		return request({
+			url: '/business/wechat/order/list',
+			method: 'GET',
+			data: data
+		})
+	},
+	// get请求,获取订单详情
+	getOrderDetailByOrderId(data) {
+		return request({
+			url: '/business/wechat/order/detail',
+			method: 'GET',
+			data: data
+		})
+	},
+	// get请求,保存订单评价
+	saveOrderComment(data) {
+		return request({
+			url: '/business/wechat/order/comment' + data.orderId,
+			method: 'GET',
+			data: data
+		})
+	},
+	// post请求,再来一单
+	comeOrder(data) {
+		return request({
+			url: '/business/wechat/order/copy/' + data.orderId,
+			method: 'POST',
+			data: data
+		})
+	},
 
+	// post请求  删除订单
+	deleteOrder(data) {
+		return request({
+			url: '/business/wechat/order/' + data.orderId,
+			method: 'POST',
+			data: data
+		})
+	},
+	// put请求  取消订单
+	cancelOrder(data) {
+		return request({
+			url: '/business/wechat/order/cancel/' + data.orderId,
+			method: 'PUT',
+			data: data
+		})
+	},
 
-}
+	// post请求,通用下单接口
+	commonGeneralOrder(data) {
+		return request({
+			url: '/business/wechat/order/common',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,查询充值订单列表
+	orderRechargeList(data) {
+		return request({
+			url: '/business/wechat/orderRecharge/list',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,充值订单退款
+	orderRechargeRefund(data) {
+		return request({
+			url: '/business/wechat/orderRecharge/refund',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,获取用户余额
+	getUserBalance(data) {
+		return request({
+			url: '/business/wechat/orderRecharge/getBalance',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// get请求,订单签到
+	orderSign(data) {
+		return request({
+			url: '/business/wechat/scheduling/orderSign',
+			method: 'GET',
+			data: data
+		})
+	},
+	// get请求,查看订单排号情况
+	getOrderSign(data) {
+		return request({
+			url: '/business/wechat/scheduling/getOrderSign',
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// post请求,微信支付(根据订单ID)
+	wechatPay(data) {
+		return request({
+			url: '/business/wxPay/jsapiPay',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,余额支付(根据订单ID)
+	balancePay(data) {
+		return request({
+			url: '/business/balancePay/pay',
+			method: 'POST',
+			data: data
+		})
+	},
+	// get请求,查询交易记录列表
+	transactionRecordsList(data) {
+		return request({
+			url: '/business/wechat/transactionFlow/list',
+			method: 'GET',
+			data: data
+		})
+	},
+	// get请求,查询充值优惠列表
+	getRechargeList(data) {
+		return request({
+			url: '/business/wechat/getRechargeList',
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// get请求,查询交易流水统计
+	transactionFlowstatistic(data) {
+		return request({
+			url: '/business/wechat/transactionFlow/statistic',
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// get请求 获取预约价格
+	getAppointmentPrice(data) {
+		return request({
+			url: '/business/wechat/sp/subPrice',
+			method: 'GET',
+			data: data
+		})
+	},
+	// post请求,识别人脸
+	verifyFace(data) {
+		return request({
+			url: '/member/wechat/verifyFace',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请 查询服务对象列表
+	listServiceObject(data) {
+		return request({
+			url: '/member/wechat/listServiceObject',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请 获取服务对象协议
+	getServiceDealFile(data) {
+		return request({
+			url: '/member/wechat/getServiceDealFile',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求 服务对象签名
+	serviceObjectSignPdf(data) {
+		return request({
+			url: '/member/wechat/signPdf',
+			method: 'POST',
+			data: data
+		})
+	},
+	// post请求 保存服务对象
+	saveServiceObject(data) {
+		return request({
+			url: '/member/wechat/saveServiceObject',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求 绑定服务对象
+	bindServiceObject(data) {
+		return request({
+			url: '/member/wechat/bindServiceObject',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求 修改服务对象
+	updateServiceObject(data) {
+		return request({
+			url: '/member/wechat/updateServiceObject',
+			method: 'POST',
+			data: data
+		})
+	},
+	// post请求,用户实名认证
+	userRealNameAuth(data) {
+		return request({
+			url: '/member/wechat/idCardAuthentication',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,用户信息保存
+	saveUserInfo(data) {
+		return request({
+			url: '/member/wechat/saveUserInfo',
+			method: 'POST',
+			data: data
+		})
+	},
+	// post请求,修改用户账号密码
+	updateUserAccountPassword(data) {
+		return request({
+			url: '/member/wechat/setPassword',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,修改用户交易密码
+	updateUserTransactionPassword(data) {
+		return request({
+			url: '/member/wechat/setTransactionPassword',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,绑定微信
+	bindWechat(data) {
+		return request({
+			url: '/member/wechat/setOpenId',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// get请求,获取服务条款协议
+	getTermOfServiceByType(data) {
+		return request({
+			url: '/system/openapi/getAboutByType',
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// get请求,获取公共文件路径
+	getCommonFile(data) {
+		return request({
+			url: '/resource/oss/listByIds/' + data.ossId,
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// post请求,重新设置手机号
+	setPhone(data) {
+		return request({
+			url: '/member/wechat/setPhone',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// get请求,获取用户信息
+	getUserInfo(data) {
+		return request({
+			url: '/member/wechat/getUserInfo',
+			method: 'GET',
+			data: data
+		})
+	},
+	// post请求,保存用户信息
+	saveWechatUser(data) {
+		return request({
+			url: '/auth/wechat/saveWeChatUserInfo',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,获取微信电话号码
+
+	getWechatUserPhoneNumber(data) {
+		return request({
+			url: '/auth/wechat/getWechatUserPhoneNumber',
+			method: 'POST',
+			data: data
+		})
+	},
+	// post请求,验证手机号码是否被注册
+	phoneIsExist(data) {
+		return request({
+			url: '/member/wechat/phoneIsExist',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,新微新手机绑定
+	wechatRegister(data) {
+		return request({
+			url: '/auth/xcxRegister',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// get请求,获取手机验证码
+	getSmsCode(data) {
+		return request({
+			url: '/resource/sms/code',
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// post请求,验证手机验证码
+	validateSmsCode(data) {
+		return request({
+			url: '/member/wechat/validateSmsCode',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,找回账号密码登录
+	wechatRetrieveAccountPwdLogin(data) {
+		return request({
+			url: '/auth/xcxRetrieveMemberByPwd',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,实名认证登录(新微信老手机)
+	realNameAuthLogin(data) {
+		return request({
+			url: '/auth/xcxRetrieveMember',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,验证身份证是滞存在
+	idCardIsExist(data) {
+		return request({
+			url: '/member/wechat/idCardIsExist',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求验证手机找回密码
+	passwordByPhone(data) {
+		return request({
+			url: '/member/wechat/passwordByPhone',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求,获取积分列表信息
+
+	getIntegralRecordList(data) {
+		return request({
+			url: '/member/wechat/getIntegralRecordVo',
+			method: 'POST',
+			data: data
+		})
+	},
+	// post请求,用户绑定门店
+	userBindStore(data) {
+		return request({
+			url: '/member/wechat/bindStore',
+			method: 'POST',
+			data: data
+		})
+	},
 
+	// get请求 获取门店列表
+	// storeList(data) {
+	// 	return request({
+	// 		url: '/store/uniapp/store-list',
+	// 		method: 'GET',
+	// 		data: data
+	// 	})
+	// },
 
+	// get请求 获取公告列表
+	noticeList(data) {
+		return request({
+			url: '/system/openapi/notice/list',
+			method: 'GET',
+			data: data
+		})
+	},
 
+	// get请求 获取公告详情
+
+	getNoticeDetail(data) {
+		return request({
+			url: '/system/openapi/notice/' + data.noticeId,
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// get请求 获取banner图列表
+
+	getSlideshowList(data) {
+		return request({
+			url: '/system/openapi/getSlideshowList',
+			method: 'GET',
+			data: data
+		})
+	},
+	// get请求 获取门店所有服务列表
+
+	storeAllServiceList(data) {
+		return request({
+			url: '/business/wechat/sp/all/' + data.storeId,
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// get请求 获取门店列表
+
+	storeList(data) {
+		return request({
+			url: '/store/uniapp/store-list/distance',
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// get请求 获取门店工作人员列表 关联岗位、工作时段、服务项目
+
+
+	workPersonList(data) {
+		return request({
+			url: '/store/uniapp/work-person-ist/' + data.storeId,
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// get请求 根据服务日期及服务时段查询排班人员
+	serviceWorkPersonList(data) {
+		return request({
+			url: '/business/wechat/scheduling/crewPageList',
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// get请求 根据门店查询排班日期
+
+	selectDate(data) {
+		return request({
+			url: '/business/wechat/scheduling/selectDate',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// get请求 根据门店、排班日期查询可用时段
+	selectPeriodByDate(data) {
+		return request({
+			url: '/business/wechat/scheduling/selectPeriodByDate',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// get请求 查询可领取的优惠劵列表
+	getUserDiscountsList(data) {
+		return request({
+			url: '/business/wechat/getUserDiscountsList',
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// get请求 我的优惠卷列表(0未使用, 1已使用, 2已过期 null查询全部)
+	getMyCouponList(data) {
+		return request({
+			url: '/member/wechat/getCoupon',
+			method: 'GET',
+			data: data
+		})
+	},
+
+	// get请求 查询可使用的优惠券
+	getCanUseCouponList(data) {
+		return request({
+			url: '/member/wechat/getMemberCouponn',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	// post请求 领取优惠券
+	claimCoupon(data) {
+		return request({
+			url: '/member/wechat/claimCoupon',
+			method: 'POST',
+			data: data
+		})
+	},
+
+	getImgUrlByOssId(data) {
+		return request({
+			url: '/resource/oss/listByIds/' + data.ossId,
+			method: 'GET'
+
+		})
+
+	},
+
+	/**
+	 * 微信静默登录
+	 */
+	wxAuthLogin(data) {
+		return request({
+			url: '/auth/xcxLogin',
+			method: 'POST',
+			data: data
+		})
+	},
+
+
+
+
+
+
+
+
+
+
+
+}

+ 0 - 26
config/http-requst.js

@@ -1,26 +0,0 @@
-
-// 引入vuex
-// import store from '@/common/store';
-// 引入拦截器配置
-import {requestInterceptors,responseInterceptors} from './interceptors.js'
-
-//  初始化请求配置
-const initRequest=(vm)=>{
-	uni.$u.http.setConfig((defaultConfig) => {
-		/* defaultConfig 为默认全局配置 */
-		// defaultConfig.baseURL = "http://222.85.201.140:10001/" /* 根域名 */
-		// 域名
-		defaultConfig.baseURL = "https://jje.admin.xinyuekj.com.cn/" /* 根域名 */
-		
-		return defaultConfig;
-	})
-	requestInterceptors()
-	responseInterceptors()
-}
-export {
-	initRequest
-}
-
-
-
-

+ 0 - 73
config/interceptors.js

@@ -1,73 +0,0 @@
-// 引入vuex
-import store from '@/common/store';
-
-const requestInterceptors=(vm)=>{
-	/**
-	 * 请求拦截
-	 * @param {Object} http
-	 */
-	uni.$u.http.interceptors.request.use((config) => { // 可使用async await 做异步操作
-		// 初始化请求拦截器时,会执行此方法,此时data为undefined,赋予默认{}
-		config.data = config.data || {}
-		// 可以在此通过vm引用vuex中的变量,具体值在vm.$store.state中
-		// console.log(vm.$store.state);
-		// console.log("----------------------------------")
-		if(config?.data?.auth) {
-			// 获取请数据token
-			const token = uni.getStorageSync('accessToken');
-			// console.log("token:"+token)
-			// 可以在此通过vm引用vuex中的变量,具体值在vm.$store.state中
-			// config.header.token = vm.$store.state.userInfo.token
-			if(config?.data?.requstForm){
-				config.header = {
-					'Content-Type': 'application/x-www-form-urlencoded'
-				}
-			}
-			config.header.Authorization = 'Bearer ' + token
-		}
-		// console.log("----------------------------------")
-		return config
-	}, (config) => // 可使用async await 做异步操作
-		Promise.reject(config))
-}
-const responseInterceptors=(vm)=>{
-	/**
-	 * 响应拦截
-	 * @param {Object} http
-	 */
-	uni.$u.http.interceptors.response.use((response) => { /* 对响应成功做点什么 可使用async await 做异步操作*/
-		const data = response.data
-		// 自定义参数
-		const custom = response.config?.custom
-		if (data.code !== 200) { // 服务端返回的状态码不等于200,则reject()
-			if (data.msg) {
-				uni.$u.toast(data.msg)
-			}
-			// 如果没有显式定义custom的toast参数为false的话,默认对报错进行toast弹出提示
-			if (custom.toast !== false) {
-				uni.$u.toast(data.msg)
-			}
-			// 如果需要catch返回,则进行reject
-			if (custom?.catch) {
-				return Promise.reject(data)
-			} else {
-				// 否则返回一个pending中的promise
-				return new Promise(() => { })
-			}
-
-		} else if(data.rows){
-			return data;
-		}
-
-		return data.data || {}
-	}, (response) => { /*  对响应错误做点什么 (statusCode !== 200)*/
-		return Promise.reject(response)
-	})
-}
-
-export {
-	requestInterceptors,
-	responseInterceptors
-}
-
-

+ 73 - 20
pages.json

@@ -40,35 +40,89 @@
 				"navigationBarTitleText": "我的"
 			}
 		}
+
 	],
-	"subPackages": [
 
+	"subPackages": [{
+			"root": "orderPages",
+			"pages": [{
+				"path": "orderDetail/index",
+				"style": {
+					"navigationBarTitleText": "订单详情",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "goodsDetail/index",
+				"style": {
+					"navigationBarTitleText": "商品详情",
+					"enablePullDownRefresh": false
+				}
+			}]
+		},
 		{
-			"root": "myPages",
-			"pages": [
-				{
-					"path": "recharge/index",
+			"root": "loginPages",
+			"pages": [{
+				"path": "login/bind-account",
+				"style": {
+					"navigationBarTitleText": "账号绑定",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "login/bind-account-password",
+				"style": {
+					"navigationBarTitleText": "绑定账号密码",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "login/bind-transaction-password",
+				"style": {
+					"navigationBarTitleText": "绑定账号支付密码",
+					"enablePullDownRefresh": false
+				}
+
+			}
+			, {
+					"path": "login/login-old-account",
+					"style": {
+						"navigationBarTitleText": "输入账号密码",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "login/login-real-name-auth",
 					"style": {
-						"navigationBarTitleText": "储值服务",
+						"navigationBarTitleText": "实名认证",
 						"enablePullDownRefresh": false
 					}
-				},
-				{
-					"path": "coupon/index",
+
+				}, {
+					"path": "login/retrieve-account",
 					"style": {
-						"navigationBarTitleText": "优惠券",
+						"navigationBarTitleText": "账号密码找回",
 						"enablePullDownRefresh": false
 					}
+
 				}
-			]
-		},
-		{
-			"root": "loginPages",
-			"pages": [
-				{
-					"path": "bindAccount/index",
+			, {
+					"path": "login/retrieve-account-password",
 					"style": {
-						"navigationBarTitleText": "绑定手机号",
+						"navigationBarTitleText": "账号密码找回",
+						"enablePullDownRefresh": false
+					}
+
+				}	, {
+					"path": "login/retrieve-account-phone",
+					"style": {
+						"navigationBarTitleText": "账号找回",
+						"enablePullDownRefresh": false
+					}
+
+				}
+			, {
+					"path": "login/retrieve-method",
+					"style": {
+						"navigationBarTitleText": "账号找回方式",
 						"enablePullDownRefresh": false
 					}
 				}
@@ -80,8 +134,7 @@
 		"selectedColor": "#B22338",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
-		"list": [
-			{
+		"list": [{
 				"pagePath": "pages/index/index"
 			},
 			{