diff --git a/common/api/market/vip.js b/common/api/account/vip.js
similarity index 100%
rename from common/api/market/vip.js
rename to common/api/account/vip.js
diff --git a/common/api/index/index.js b/common/api/index/index.js
index f12ef26..17d5e87 100644
--- a/common/api/index/index.js
+++ b/common/api/index/index.js
@@ -32,7 +32,7 @@ export const userdict = (data) => {
// 获取当前店铺会员开通配置信息
export const getMemberConfig = (data) => {
return request({
- url: '/market/user/member/config',
+ url: '/account/user/member/config',
method: 'GET',
data: data,
toast: false
diff --git a/common/api/account/points.js b/common/api/market/points.js
similarity index 80%
rename from common/api/account/points.js
rename to common/api/market/points.js
index 7532d25..960fdb0 100644
--- a/common/api/account/points.js
+++ b/common/api/market/points.js
@@ -4,7 +4,7 @@ import {prveUrl} from './config.js'
export const pointsShopList = (data) => {
return request({
- url: prveUrl + '/user/shopUser/pointsShopList',
+ url: prveUrl + '/user/point/shopList',
method: 'get',
data: data
})
diff --git a/common/api/member.js b/common/api/member.js
index 44101b9..309a149 100644
--- a/common/api/member.js
+++ b/common/api/member.js
@@ -99,7 +99,7 @@ export const APIshopUsermoneyRecord = (data) => {
//获取积分明细
export const APIshopUserpointsRecord = (data) => {
return request({
- url: urlAccount + '/user/shopUser/pointsRecord',
+ url: urlMarket + '/user/point/userRecord',
method: 'get',
data: data
})
diff --git a/common/api/order/pointGoods.js b/common/api/order/pointGoods.js
new file mode 100644
index 0000000..6adf16f
--- /dev/null
+++ b/common/api/order/pointGoods.js
@@ -0,0 +1,24 @@
+// 引入 request 文件
+import request from '@/common/api/request.js'
+const url = '/order'
+
+let platformType = '';
+let payType='';
+// #ifdef MP-WEIXIN
+platformType = 'wechat'
+payType='wechatPay'
+// #endif
+// #ifdef MP-ALIPAY
+platformType = 'alipay'
+payType='aliPay'
+// #endif
+
+//订单列表
+export const pointGoodsPage = (data) => {
+ return request({
+ url: url + '/user/pointGoods/page',
+ method: 'get',
+ data: data
+ })
+}
+
diff --git a/pages/index/indexs.vue b/pages/index/indexs.vue
index d6929ec..a1570e1 100644
--- a/pages/index/indexs.vue
+++ b/pages/index/indexs.vue
@@ -1,315 +1,385 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 点餐
- 在线点不排队
-
-
-
-
-
-
- 会员
- 入会享权益
-
-
-
-
-
-
- 充值
- 充值享更多优惠
-
-
-
-
-
-
-
-
-
+
+
+
+ 充值
+ 充值享更多优惠
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/user/member/list.vue b/pages/user/member/list.vue
index 7c6ab1d..c223ebd 100644
--- a/pages/user/member/list.vue
+++ b/pages/user/member/list.vue
@@ -41,7 +41,7 @@
import {
APIusershopUservipCard
} from '@/common/api/member.js'
- import * as vipApi from '@/common/api/market/vip.js'
+ import * as vipApi from '@/common/api/account/vip.js'
const orderForm = reactive({
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 5267e1a..8251732 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -255,9 +255,11 @@ import devetools from "@/components/devetools.vue";
import { ref, computed, onMounted, reactive, watch } from "vue";
import { onLoad, onReady, onShow } from "@dcloudio/uni-app";
import { productStore } from "@/stores/user.js";
-import * as vipApi from "@/common/api/market/vip.js";
+import * as vipApi from "@/common/api/account/vip.js";
import * as rechargeApi from "@/common/api/market/recharge.js";
-import { pointsShopList } from "@/common/api/account/points.js";
+import { pointsShopList } from '@/common/api/market/points.js'
+
+
function qrcodeResult(res) {
qrcode.value = res;
diff --git a/scoreShop/index/index.vue b/scoreShop/index/index.vue
index e698c76..1463aec 100644
--- a/scoreShop/index/index.vue
+++ b/scoreShop/index/index.vue
@@ -5,6 +5,7 @@
bgColor="transparent"
leftIconColor="#333"
titleStyle="color:#333"
+ @leftClick="back"
>
@@ -22,7 +23,7 @@
- 积分订单
+ 积分订单
积分明细
@@ -48,7 +49,7 @@
>
-
+
@@ -56,6 +57,7 @@