计算购物车钱之前

common/api/api.js

@@ -1,20 +1,33 @@
 // 引入 request 文件
 import request from '@/common/api/request.js'
-
+const url = '/account'
 //根据经纬度获取信息
 export const APIgeocodelocation = (data) => {
 	return request({
-		url: '/location/geocode',
+		url: url + '/user/geo/geocode',
 		method: 'get',
 		data: data,
 		toast: false
 	})
 }
-//根据经纬度获取信息
-export const APIcustomlogin = (data) => {
+
+//登录
+export const APIuserlogin = (data) => {
 	return request({
-		url: '/login/auth/custom/login',
+		url: url + '/user/login',
 		method: 'post',
-		data: data
+		data: data,
+		toast: false
 	})
-}
+}
+
+
+//用户信息获取
+export const APIuser = (data) => {
+	return request({
+		url: url + '/user',
+		method: 'get',
+		data: data,
+		toast: false
+	})
+}

common/api/index/coupons.js

@@ -1,9 +1,10 @@
 // 引入 request 文件
 import request from '@/common/api/request.js'
 //获取优惠券参数列表
+const url = '/account'
 export const APIordergetYhqPara = (data) => {
 	return request({
-		url: '/order/getYhqPara',
+		url: url + '/order/getYhqPara',
 		method: 'get',
 		data: data
 	})
@@ -11,7 +12,7 @@ export const APIordergetYhqPara = (data) => {
 //系统优惠券
 export const APIorderfindCoupons = (data) => {
 	return request({
-		url: '/order/findCoupons',
+		url: url + '/order/findCoupons',
 		method: 'get',
 		data: data
 	})
@@ -19,7 +20,7 @@ export const APIorderfindCoupons = (data) => {
 // 我的优惠券
 export const APIordermineCoupons = (data) => {
 	return request({
-		url: '/order/mineCoupons',
+		url: url + '/order/mineCoupons',
 		method: 'post',
 		data: data,
 		toast: false

common/api/index/index.js

@@ -1,44 +1,28 @@
 // 引入 request 文件
+const url = '/account'
 import request from '@/common/api/request.js'
 //首页上半部分
 export const APIhomehomePageUp = (data) => {
 	return request({
-		url: '/home/homePageUp',
-		method: 'post',
+		url: url + '/user/home/homePageUp',
+		method: 'GET',
 		data: data
 	})
 }
-//首页上半部分
+//首页xia半部分
 export const APIhome = (data) => {
 	return request({
-		url: '/home',
-		method: 'post',
-		data: data,
-		toast: false
-	})
-}
-//首页上半部分
-export const APIshopUserInfo = (data) => {
-	return request({
-		url: '/user/shopUserInfo',
-		method: 'get',
-		data: data,
-		toast: false
-	})
-}
-//首页上半部分
-export const APIgeocodelocation = (data) => {
-	return request({
-		url: '/location/geocode',
-		method: 'get',
+		url: url + '/user/home/home',
+		method: 'GET',
 		data: data,
 		toast: false
 	})
 }
+
 ///商户登录后  shopId和autokey
 export const APIshopExtend = (data) => {
 	return request({
-		url: '/common/shopExtend',
+		url: url + '/common/shopExtend',
 		method: 'post',
 		data: data,
 		toast: false

common/api/index/tothestore.js

@@ -1,9 +1,10 @@
 // 引入 request 文件
 import request from '@/common/api/request.js'
+const url = '/account'
 //获取top部分(店铺列表)
 export const APIdistiricttopCommon = (data) => {
 	return request({
-		url: '/distirict/topCommon',
+		url: url + '/distirict/topCommon',
 		method: 'get',
 		data: data
 	})
@@ -11,7 +12,7 @@ export const APIdistiricttopCommon = (data) => {
 //预约到店(店铺列表)
 export const APIdistirictsubShopList = (data) => {
 	return request({
-		url: '/distirict/subShopList',
+		url: url + '/distirict/subShopList',
 		method: 'get',
 		data: data
 	})

common/api/order/index.js

@@ -0,0 +1,11 @@
+// 引入 request 文件
+import request from '@/common/api/request.js'
+const url = '/order'
+//订单列表
+export const APIuserorder = (data) => {
+	return request({
+		url: url + '/user/order',
+		method: 'post',
+		data: data
+	})
+}

common/api/product/product.js

@@ -1,10 +1,66 @@
 // 引入 request 文件
 import request from '@/common/api/request.js'
-
-//通过桌码获取店铺信息
+const urlAccount = '/account'
+const urlProduct = '/product'
+const urlOrder = '/order'
+//桌码换取详细店铺信息
 export const APIproductqueryShop = (data) => {
 	return request({
-		url: '/product/queryShop',
+		url: urlAccount + '/user/shopInfo',
+		method: 'get',
+		data: data
+	})
+}
+
+// 获取登录用户店铺会员信息 
+export const APIshopUserInfo = (data) => {
+	return request({
+		url: urlAccount + '/user/shopUser',
+		method: 'get',
+		data: data,
+		toast: false
+	})
+}
+
+//获取商品列表数据
+export const APIproductqueryProduct = (data) => {
+	return request({
+		url: urlProduct + '/user/product/miniApp/home/queryProduct',
+		method: 'get',
+		data: data
+	})
+}
+
+//小程序点餐-热销商品查询
+export const productminiApphotsquery = (data) => {
+	return request({
+		url: urlProduct + '/user/product/miniApp/hots/query',
+		method: 'get',
+		data: data
+	})
+}
+
+//小程序点餐-分组商品列表
+export const APIgroupquery = (data) => {
+	return request({
+		url: urlProduct + '/user/product/miniApp/group/query',
+		method: 'get',
+		data: data
+	})
+}
+
+//小程序点餐-分组商品列表
+export const APIminiAppinfo = (data) => {
+	return request({
+		url: urlProduct + '/user/product/miniApp/info/' + data,
+		method: 'get'
+	})
+}
+
+//小程序点餐-分组商品列表
+export const APIminiAppskuinfo = (data) => {
+	return request({
+		url: urlProduct + '/user/product/miniApp/sku/info',
 		method: 'get',
 		data: data
 	})

common/api/request.js

@@ -19,11 +19,10 @@ export default (params) => {
 		// #ifdef MP-ALIPAY
 		environment: 'alipay',
 		// #endif
-		token: uni.cache.get('token'),
-		openId: uni.cache.get('miniAppOpenId'),
-		id: uni.cache.get('userInfo').id,
-		shopId: uni.cache.get('shopId'),
-		userId: uni.cache.get('userInfo').id,
+		token: uni.cache.get('token') || '',
+		id: uni.cache.get('userInfo').id || '',
+		shopId: uni.cache.get('shopId') || '',
+		userId: uni.cache.get('userInfo').id || '',
 	}
 	if (toast) {
 		uni.showLoading({
@@ -41,10 +40,10 @@ export default (params) => {
 				const res = response.data
 				// 根据返回的状态码做出对应的操作
 				//获取成功
-				if (res.code == 0) {
+				if (res.code == 200) {
 					uni.hideLoading();
 					uni.hideToast();
-					resolve(res);
+					resolve(res.data);
 				} else {
 					switch (res.code) {
 						case '-4':