From cfa35b2c6ff90589bc48b121f4aa6214da08c483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=BD=E6=97=A5=E6=99=9A=E9=A3=8E?= <1811466536@qq.com>
Date: Fri, 3 Nov 2023 18:04:17 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sheep/api/user.js | 14 ++++++++++++--
sheep/components/s-user-card/s-user-card.vue | 1 +
sheep/store/user.js | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/sheep/api/user.js b/sheep/api/user.js
index 5cd9ae77..de38de64 100644
--- a/sheep/api/user.js
+++ b/sheep/api/user.js
@@ -1,16 +1,26 @@
import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
import $platform from '@/sheep/platform';
export default {
profile: () =>
- request({
- url: '/user/api/user/profile',
+ request2({
+ url: 'member/user/get',
method: 'GET',
custom: {
showLoading: false,
auth: true,
},
}),
+ // profile: () =>
+ // request({
+ // url: '/user/api/user/profile',
+ // method: 'GET',
+ // custom: {
+ // showLoading: false,
+ // auth: true,
+ // },
+ // }),
update: (data) =>
request({
url: '/user/api/user/update',
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
index 2a19e1c8..186e6d77 100644
--- a/sheep/components/s-user-card/s-user-card.vue
+++ b/sheep/components/s-user-card/s-user-card.vue
@@ -62,6 +62,7 @@
// 用户信息
const userInfo = computed(() => sheep.$store('user').userInfo);
+ console.log(userInfo)
// 是否登录
const isLogin = computed(() => sheep.$store('user').isLogin);
diff --git a/sheep/store/user.js b/sheep/store/user.js
index 889009be..e2ce8175 100644
--- a/sheep/store/user.js
+++ b/sheep/store/user.js
@@ -44,8 +44,8 @@ const user = defineStore({
actions: {
// 获取个人信息
async getInfo() {
- const { error, data } = await userApi.profile();
- if (error !== 0) return;
+ const { code, data } = await userApi.profile();
+ if (code !== 0) return;
this.userInfo = data;
return Promise.resolve(data);
From 627b3d015fe33f4e4441cdc76b71b7e19b9f5cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=BD=E6=97=A5=E6=99=9A=E9=A3=8E?= <1811466536@qq.com>
Date: Mon, 6 Nov 2023 17:50:55 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=95=B0=E9=87=8F?=
=?UTF-8?q?=EF=BC=8C=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=EF=BC=8C=E6=94=B6=E8=97=8F=EF=BC=8C=E6=94=B6=E8=B4=A7=E5=9C=B0?=
=?UTF-8?q?=E5=9D=80=EF=BC=8C=E5=85=A8=E9=83=A8=E8=AE=A2=E5=8D=95=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E7=AE=80=E5=8D=95=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/list.vue | 1040 ++++++++---------
pages/user/address/edit.vue | 481 ++++----
pages/user/goods-collect.vue | 31 +-
pages/user/info.vue | 11 +-
sheep/api/app.js | 10 +-
sheep/api/data.js | 10 +-
sheep/api/order.js | 14 +-
sheep/api/user.js | 733 ++++++------
.../s-address-item/s-address-item.vue | 9 +-
.../components/s-order-card/s-order-card.vue | 1 +
sheep/store/user.js | 13 +-
11 files changed, 1207 insertions(+), 1146 deletions(-)
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 7e57bb1f..c0ec7b16 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -1,121 +1,85 @@
-
-
-
-
-
-
-
-
-
- 0" :status="state.loadStatus" :content-text="{
contentdown: '上拉加载更多',
- }"
- @tap="loadmore"
- />
-
+ }" @tap="loadmore" />
+
+ .more-btn {
+ color: $dark-9;
+ font-size: 24rpx;
+ }
+
+ .content {
+ width: 154rpx;
+ color: #333333;
+ font-size: 26rpx;
+ font-weight: 500;
+ }
+ }
+ }
+
+ :deep(.uni-tooltip-popup) {
+ background: var(--ui-BG);
+ }
+
+ .warning-color {
+ color: #faad14;
+ }
+
+ .danger-color {
+ color: #ff3000;
+ }
+
+ .success-color {
+ color: #52c41a;
+ }
+
+ .info-color {
+ color: #999999;
+ }
+
\ No newline at end of file
diff --git a/pages/user/address/edit.vue b/pages/user/address/edit.vue
index e8420491..eb5e8929 100644
--- a/pages/user/address/edit.vue
+++ b/pages/user/address/edit.vue
@@ -1,264 +1,261 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 设为默认地址
-
-
-
-
-
-
-
-
-
-
+
+ 设为默认地址
+
+
+
+
+
+
+
+
+
+
+ .cancel-btn {
+ width: 710rpx;
+ height: 80rpx;
+ border-radius: 40rpx;
+ background: var(--ui-BG);
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/user/goods-collect.vue b/pages/user/goods-collect.vue
index 20c98d2c..2af9b219 100644
--- a/pages/user/goods-collect.vue
+++ b/pages/user/goods-collect.vue
@@ -35,25 +35,26 @@
+
@@ -126,15 +127,17 @@
async function getData(page = 1, list_rows = 6) {
state.loadStatus = 'loading';
let res = await sheep.$api.user.favorite.list({
- list_rows,
- page,
+ pageSize:list_rows,
+ pageNo:page,
});
- if (res.error === 0) {
- let orderList = _.concat(state.pagination.data, res.data.data);
+ if (res.code === 0) {
+ console.log(res)
+ let orderList = _.concat(state.pagination.data, res.data.list);
state.pagination = {
...res.data,
data: orderList,
};
+ // 没有原接口文档不太理解这字段意思
if (state.pagination.current_page < state.pagination.last_page) {
state.loadStatus = 'more';
} else {
@@ -173,8 +176,8 @@
async function onCancel() {
if (state.selectedCollectList) {
state.selectedCollectList = state.selectedCollectList.toString();
- const { error } = await sheep.$api.user.favorite.cancel(state.selectedCollectList);
- if (error === 0) {
+ const { code } = await sheep.$api.user.favorite.cancel(state.selectedCollectList);
+ if (code === 0) {
state.editMode = false;
state.selectedCollectList = [];
state.selectAll = false;
diff --git a/pages/user/info.vue b/pages/user/info.vue
index 5bb6b641..eb37bb6d 100644
--- a/pages/user/info.vue
+++ b/pages/user/info.vue
@@ -312,12 +312,17 @@
// 保存信息
async function onSubmit() {
- const { error, data } = await sheep.$api.user.update({
+ // const { error, data } = await sheep.$api.user.update({
+ // avatar: state.model.avatar,
+ // nickname: state.model.nickname,
+ // gender: state.model.gender,
+ // });
+ const { code, data } = await sheep.$api.user.update({
avatar: state.model.avatar,
nickname: state.model.nickname,
- gender: state.model.gender,
+ // gender: state.model.gender,
});
- if (error === 0) {
+ if (code === 0) {
getUserInfo();
}
}
diff --git a/sheep/api/app.js b/sheep/api/app.js
index 7099047c..2bb92c6c 100644
--- a/sheep/api/app.js
+++ b/sheep/api/app.js
@@ -107,16 +107,20 @@ export default {
title: '上传中',
});
return new Promise((resolve, reject) => {
+ // 此处先换成yudao
uni.uploadFile({
- url: baseUrl + '/file/api/upload',
+ url: 'http://api-dashboard.yudao.iocoder.cn' + '/app-api/infra/file/upload',
filePath: file,
name: 'file',
formData: {
group,
},
header: {
- Accept: 'text/json',
- Authorization: token,
+ // Accept: 'text/json',
+ // Authorization: token,
+ Accept : '*/*',
+ 'tenant-id' :'1',
+ Authorization: 'Bearer test247',
},
success: (uploadFileRes) => {
let result = JSON.parse(uploadFileRes.data);
diff --git a/sheep/api/data.js b/sheep/api/data.js
index 0863a85d..6a5b08b1 100644
--- a/sheep/api/data.js
+++ b/sheep/api/data.js
@@ -1,11 +1,17 @@
import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
export default {
area: () =>
- request({
- url: 'data/area',
+ request2({
+ url: 'system/area/tree',
method: 'GET',
}),
+ // area: () =>
+ // request({
+ // url: 'data/area',
+ // method: 'GET',
+ // }),
faq: () =>
request({
url: 'data/faq',
diff --git a/sheep/api/order.js b/sheep/api/order.js
index 48ba737d..acb16418 100644
--- a/sheep/api/order.js
+++ b/sheep/api/order.js
@@ -1,4 +1,5 @@
import request from '@/sheep/request';
+import request2 from '@/sheep/request2';
export default {
// 订单详情
@@ -33,14 +34,23 @@ export default {
}),
// 订单列表
list: (params) =>
- request({
- url: 'order/order',
+ request2({
+ url: 'trade/order/page',
method: 'GET',
params,
custom: {
showLoading: false,
},
}),
+ // list: (params) =>
+ // request({
+ // url: 'order/order',
+ // method: 'GET',
+ // params,
+ // custom: {
+ // showLoading: false,
+ // },
+ // }),
// 计算订单信息
calc: (data) =>
request({
diff --git a/sheep/api/user.js b/sheep/api/user.js
index de38de64..8a258b17 100644
--- a/sheep/api/user.js
+++ b/sheep/api/user.js
@@ -3,339 +3,414 @@ import request2 from '@/sheep/request2';
import $platform from '@/sheep/platform';
export default {
- profile: () =>
- request2({
- url: 'member/user/get',
- method: 'GET',
- custom: {
- showLoading: false,
- auth: true,
- },
- }),
- // profile: () =>
- // request({
- // url: '/user/api/user/profile',
- // method: 'GET',
- // custom: {
- // showLoading: false,
- // auth: true,
- // },
- // }),
- update: (data) =>
- request({
- url: '/user/api/user/update',
- method: 'POST',
- custom: {
- showSuccess: true,
- auth: true,
- },
- data,
- }),
- // 账号登录
- accountLogin: (data) =>
- request({
- url: '/user/api/user/accountLogin',
- method: 'POST',
- data,
- custom: {
- showSuccess: true,
- loadingMsg: '登录中',
- },
- }),
- // 短信登录
- smsLogin: (data) =>
- request({
- url: '/user/api/user/smsLogin',
- method: 'POST',
- data,
- custom: {
- showSuccess: true,
- loadingMsg: '登录中',
- },
- }),
- // 短信注册
- smsRegister: (data) =>
- request({
- url: '/user/api/user/smsRegister',
- method: 'POST',
- data,
- custom: {
- showSuccess: true,
- loadingMsg: '正在注册',
- },
- }),
- // 重置密码
- resetPassword: (data) =>
- request({
- url: '/user/api/user/resetPassword',
- method: 'POST',
- data,
- custom: {
- showSuccess: true,
- loadingMsg: '验证中',
- },
- }),
+ profile: () =>
+ request2({
+ url: 'member/user/get',
+ method: 'GET',
+ custom: {
+ showLoading: false,
+ auth: true,
+ },
+ }),
+ // profile: () =>
+ // request({
+ // url: '/user/api/user/profile',
+ // method: 'GET',
+ // custom: {
+ // showLoading: false,
+ // auth: true,
+ // },
+ // }),
+ // update: (data) =>
+ // request({
+ // url: '/user/api/user/update',
+ // method: 'POST',
+ // custom: {
+ // showSuccess: true,
+ // auth: true,
+ // },
+ // data,
+ // }),
+ update: (data) =>
+ request2({
+ url: 'member/user/update',
+ method: 'PUT',
+ custom: {
+ showSuccess: true,
+ auth: true,
+ },
+ data,
+ }),
+ // 账号登录
+ accountLogin: (data) =>
+ request({
+ url: '/user/api/user/accountLogin',
+ method: 'POST',
+ data,
+ custom: {
+ showSuccess: true,
+ loadingMsg: '登录中',
+ },
+ }),
+ // 短信登录
+ smsLogin: (data) =>
+ request({
+ url: '/user/api/user/smsLogin',
+ method: 'POST',
+ data,
+ custom: {
+ showSuccess: true,
+ loadingMsg: '登录中',
+ },
+ }),
+ // 短信注册
+ smsRegister: (data) =>
+ request({
+ url: '/user/api/user/smsRegister',
+ method: 'POST',
+ data,
+ custom: {
+ showSuccess: true,
+ loadingMsg: '正在注册',
+ },
+ }),
+ // 重置密码
+ resetPassword: (data) =>
+ request({
+ url: '/user/api/user/resetPassword',
+ method: 'POST',
+ data,
+ custom: {
+ showSuccess: true,
+ loadingMsg: '验证中',
+ },
+ }),
- // 修改密码
- changePassword: (data) =>
- request({
- url: '/user/api/user/changePassword',
- method: 'POST',
- data,
- custom: {
- showSuccess: true,
- loadingMsg: '验证中',
- },
- }),
+ // 修改密码
+ changePassword: (data) =>
+ request({
+ url: '/user/api/user/changePassword',
+ method: 'POST',
+ data,
+ custom: {
+ showSuccess: true,
+ loadingMsg: '验证中',
+ },
+ }),
- // 绑定、更换手机号
- changeMobile: (data) =>
- request({
- url: '/user/api/user/changeMobile',
- method: 'POST',
- data,
- custom: {
- showSuccess: true,
- loadingMsg: '验证中',
- },
- }),
+ // 绑定、更换手机号
+ changeMobile: (data) =>
+ request({
+ url: '/user/api/user/changeMobile',
+ method: 'POST',
+ data,
+ custom: {
+ showSuccess: true,
+ loadingMsg: '验证中',
+ },
+ }),
- // 修改用户名
- changeUsername: (data) =>
- request({
- url: '/user/api/user/changeUsername',
- method: 'POST',
- data,
- custom: {
- showSuccess: true,
- loadingMsg: '验证中',
- },
- }),
+ // 修改用户名
+ changeUsername: (data) =>
+ request({
+ url: '/user/api/user/changeUsername',
+ method: 'POST',
+ data,
+ custom: {
+ showSuccess: true,
+ loadingMsg: '验证中',
+ },
+ }),
- // 更新小程序信息
- updateMpUserInfo: (data) =>
- request({
- url: '/user/api/user/updateMpUserInfo',
- method: 'POST',
- data,
- }),
+ // 更新小程序信息
+ updateMpUserInfo: (data) =>
+ request({
+ url: '/user/api/user/updateMpUserInfo',
+ method: 'POST',
+ data,
+ }),
- // 第三方授权信息
- thirdOauthInfo: () =>
- request({
- url: '/user/api/user/thirdOauth',
- method: 'GET',
- params: {
- provider: $platform.provider,
- platform: $platform.platform,
- },
- custom: {
- showLoading: false,
- },
- }),
+ // 第三方授权信息
+ thirdOauthInfo: () =>
+ request({
+ url: '/user/api/user/thirdOauth',
+ method: 'GET',
+ params: {
+ provider: $platform.provider,
+ platform: $platform.platform,
+ },
+ custom: {
+ showLoading: false,
+ },
+ }),
- // 添加分享记录
- addShareLog: (data) =>
- request({
- url: 'share/add',
- method: 'POST',
- data,
- custom: {
- showError: false,
- },
- }),
- share: {
- list: (params) =>
- request({
- url: 'share/list',
- method: 'GET',
- params,
- }),
- },
- // 账号登出
- logout: (data) =>
- request({
- url: '/user/api/user/logout',
- method: 'POST',
- data,
- }),
- // 账号注销
- logoff: (data) =>
- request({
- url: '/user/api/user/logoff',
- method: 'POST',
- data,
- }),
+ // 添加分享记录
+ addShareLog: (data) =>
+ request({
+ url: 'share/add',
+ method: 'POST',
+ data,
+ custom: {
+ showError: false,
+ },
+ }),
+ share: {
+ list: (params) =>
+ request({
+ url: 'share/list',
+ method: 'GET',
+ params,
+ }),
+ },
+ // 账号登出
+ logout: (data) =>
+ request({
+ url: '/user/api/user/logout',
+ method: 'POST',
+ data,
+ }),
+ // 账号注销
+ logoff: (data) =>
+ request({
+ url: '/user/api/user/logoff',
+ method: 'POST',
+ data,
+ }),
- address: {
- default: () =>
- request({
- url: 'user/address/default',
- method: 'GET',
- custom: {
- showError: false,
- },
- }),
- list: () =>
- request({
- url: 'user/address',
- method: 'GET',
- custom: {},
- }),
- create: (data) =>
- request({
- url: 'user/address',
- method: 'POST',
- data,
- custom: {
- showSuccess: true,
- },
- }),
- update: (id, data) =>
- request({
- url: 'user/address/' + id,
- method: 'PUT',
- data,
- custom: {
- showSuccess: true,
- },
- }),
- detail: (id) =>
- request({
- url: 'user/address/' + id,
- method: 'GET',
- }),
- delete: (id) =>
- request({
- url: 'user/address/' + id,
- method: 'DELETE',
- }),
- },
- invoice: {
- list: () =>
- request({
- url: 'user/invoice',
- method: 'GET',
- custom: {},
- }),
- create: (data) =>
- request({
- url: 'user/invoice',
- method: 'POST',
- data,
- custom: {
- showSuccess: true,
- },
- }),
- update: (id, data) =>
- request({
- url: 'user/invoice/' + id,
- method: 'PUT',
- data,
- custom: {
- showSuccess: true,
- },
- }),
- detail: (id) =>
- request({
- url: 'user/invoice/' + id,
- method: 'GET',
- }),
- delete: (id) =>
- request({
- url: 'user/invoice/' + id,
- method: 'DELETE',
- }),
- },
- favorite: {
- list: (params) =>
- request({
- url: 'user/goodsLog/favorite',
- method: 'GET',
- params,
- }),
- do: (id) =>
- request({
- url: 'user/goodsLog/favorite',
- method: 'POST',
- data: {
- goods_id: id,
- },
- custom: {
- showSuccess: true,
- auth: true,
- },
- }),
- cancel: (id) =>
- request({
- url: 'user/goodsLog/favorite',
- method: 'POST',
- data: {
- goods_ids: id,
- },
- custom: {
- showSuccess: true,
- auth: true,
- },
- }),
- },
- view: {
- list: (params) =>
- request({
- url: 'user/goodsLog/views',
- method: 'GET',
- params,
- custom: {},
- }),
- delete: (data) =>
- request({
- url: 'user/goodsLog/viewDel',
- method: 'DELETE',
- data,
- custom: {
- showSuccess: true,
- },
- }),
- },
- wallet: {
- log: (params) =>
- request({
- url: '/user/api/walletLog',
- method: 'GET',
- params,
- custom: {},
- }),
- },
- account: {
- info: (params) =>
- request({
- url: 'user/account',
- method: 'GET',
- params,
- custom: {
- showError: false,
- auth: true,
- },
- }),
- save: (data) =>
- request({
- url: 'user/account',
- method: 'POST',
- data,
- custom: {
- showSuccess: true,
- auth: true,
- },
- }),
- },
- //数量接口
- data: () =>
- request({
- url: 'user/user/data',
- method: 'GET',
- custom: {
- showLoading: false,
- auth: true,
- },
- }),
-};
+ address: {
+ default: () =>
+ request({
+ url: 'user/address/default',
+ method: 'GET',
+ custom: {
+ showError: false,
+ },
+ }),
+ list: () =>
+ request2({
+ url: 'member/address/list',
+ method: 'GET',
+ custom: {},
+ }),
+ // list: () =>
+ // request({
+ // url: 'user/address',
+ // method: 'GET',
+ // custom: {},
+ // }),
+ create: (data) =>
+ request2({
+ url: 'member/address/create',
+ method: 'POST',
+ data,
+ custom: {
+ showSuccess: true,
+ },
+ }),
+ // create: (data) =>
+ // request({
+ // url: 'user/address',
+ // method: 'POST',
+ // data,
+ // custom: {
+ // showSuccess: true,
+ // },
+ // }),
+ update: ( data) =>
+ request2({
+ url: 'member/address/update',
+ method: 'PUT',
+ data,
+ custom: {
+ showSuccess: true,
+ },
+ }),
+ // update: (id, data) =>
+ // request({
+ // url: 'user/address/' + id,
+ // method: 'PUT',
+ // data,
+ // custom: {
+ // showSuccess: true,
+ // },
+ // }),
+ detail: (id) =>
+ request2({
+ url: 'member/address/get?id=' + id,
+ method: 'GET',
+ }),
+ // detail: (id) =>
+ // request({
+ // url: 'user/address/' + id,
+ // method: 'GET',
+ // }),
+ delete: (id) =>
+ request2({
+ url: 'member/address/delete?id=' + id,
+ method: 'DELETE',
+ }),
+ // delete: (id) =>
+ // request({
+ // url: 'user/address/' + id,
+ // method: 'DELETE',
+ // }),
+ },
+ invoice: {
+ list: () =>
+ request({
+ url: 'user/invoice',
+ method: 'GET',
+ custom: {},
+ }),
+ create: (data) =>
+ request({
+ url: 'user/invoice',
+ method: 'POST',
+ data,
+ custom: {
+ showSuccess: true,
+ },
+ }),
+ update: (id, data) =>
+ request({
+ url: 'user/invoice/' + id,
+ method: 'PUT',
+ data,
+ custom: {
+ showSuccess: true,
+ },
+ }),
+ detail: (id) =>
+ request({
+ url: 'user/invoice/' + id,
+ method: 'GET',
+ }),
+ delete: (id) =>
+ request({
+ url: 'user/invoice/' + id,
+ method: 'DELETE',
+ }),
+ },
+ favorite: {
+ list: (params) =>
+ request2({
+ url: 'product/favorite/page',
+ method: 'GET',
+ params,
+ }),
+ do: (id) =>
+ request({
+ url: 'user/goodsLog/favorite',
+ method: 'POST',
+ data: {
+ goods_id: id,
+ },
+ custom: {
+ showSuccess: true,
+ auth: true,
+ },
+ }),
+ // 取消收藏
+ cancel: (id) =>
+ request2({
+ url: 'product/favorite/delete-list',
+ method: 'DELETE',
+ data: {
+ spuIds: id.split(','),
+ },
+ custom: {
+ showSuccess: true,
+ auth: true,
+ },
+ }),
+ // cancel: (id) =>
+ // request({
+ // url: 'user/goodsLog/favorite',
+ // method: 'POST',
+ // data: {
+ // goods_ids: id,
+ // },
+ // custom: {
+ // showSuccess: true,
+ // auth: true,
+ // },
+ // }),
+ },
+ view: {
+ list: (params) =>
+ request({
+ url: 'user/goodsLog/views',
+ method: 'GET',
+ params,
+ custom: {},
+ }),
+ delete: (data) =>
+ request({
+ url: 'user/goodsLog/viewDel',
+ method: 'DELETE',
+ data,
+ custom: {
+ showSuccess: true,
+ },
+ }),
+ },
+ wallet: {
+ log: (params) =>
+ request({
+ url: '/user/api/walletLog',
+ method: 'GET',
+ params,
+ custom: {},
+ }),
+ },
+ account: {
+ info: (params) =>
+ request({
+ url: 'user/account',
+ method: 'GET',
+ params,
+ custom: {
+ showError: false,
+ auth: true,
+ },
+ }),
+ save: (data) =>
+ request({
+ url: 'user/account',
+ method: 'POST',
+ data,
+ custom: {
+ showSuccess: true,
+ auth: true,
+ },
+ }),
+ },
+ //数量接口
+ // data: () =>
+ // request({
+ // url: 'user/user/data',
+ // method: 'GET',
+ // custom: {
+ // showLoading: false,
+ // auth: true,
+ // },
+ // }),
+ data: () =>
+ request2({
+ url: 'trade/order/get-count',
+ method: 'GET',
+ custom: {
+ showLoading: false,
+ auth: true,
+ },
+ }),
+ data2: () =>
+ request2({
+ url: 'trade/after-sale/get-applying-count',
+ method: 'GET',
+ custom: {
+ showLoading: false,
+ auth: true,
+ },
+ }),
+};
\ No newline at end of file
diff --git a/sheep/components/s-address-item/s-address-item.vue b/sheep/components/s-address-item/s-address-item.vue
index cdb2d8c5..37c2a9aa 100644
--- a/sheep/components/s-address-item/s-address-item.vue
+++ b/sheep/components/s-address-item/s-address-item.vue
@@ -9,13 +9,14 @@
class="ss-m-r-10"
size="small"
custom-style="background-color: var(--ui-BG-Main); border-color: var(--ui-BG-Main); color: #fff;"
- v-if="props.item.is_default"
+ v-if="props.item.defaultStatus"
text="默认"
>
- {{ props.item.province_name }} {{ props.item.city_name }} {{ props.item.district_name }}
+ {{ props.item.areaName }}
+
- {{ props.item.address }}
- {{ props.item.consignee }} {{ props.item.mobile }}
+ {{ props.item.detailAddress }}
+ {{ props.item.name }} {{ props.item.mobile }}
请选择收货地址
diff --git a/sheep/components/s-order-card/s-order-card.vue b/sheep/components/s-order-card/s-order-card.vue
index 66f80722..e49c7270 100644
--- a/sheep/components/s-order-card/s-order-card.vue
+++ b/sheep/components/s-order-card/s-order-card.vue
@@ -64,6 +64,7 @@
];
const numData = computed(() => sheep.$store('user').numData);
+ console.log(numData)
+ .add {
+ color: var(--ui-BG-Main);
+ }
+
+ .minus {
+ color: $dark-3;
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/sheep/api/index2.js b/sheep/api/index2.js
index 60fa605a..1c068bf8 100644
--- a/sheep/api/index2.js
+++ b/sheep/api/index2.js
@@ -6,4 +6,9 @@ export default {
url: 'promotion/decorate/list?page=1',
method: 'GET',
}),
+ spids: () =>
+ request2({
+ url: 'product/spu/page?recommendType=best&pageNo=1&pageSize=10',
+ method: 'GET',
+ }),
};
diff --git a/sheep/api/user.js b/sheep/api/user.js
index 8a258b17..3f16f237 100644
--- a/sheep/api/user.js
+++ b/sheep/api/user.js
@@ -12,6 +12,15 @@ export default {
auth: true,
},
}),
+ balance: () =>
+ request2({
+ url: '/app-api/pay/wallet/get',
+ method: 'GET',
+ custom: {
+ showLoading: false,
+ auth: true,
+ },
+ }),
// profile: () =>
// request({
// url: '/user/api/user/profile',
@@ -316,7 +325,8 @@ export default {
url: 'product/favorite/delete-list',
method: 'DELETE',
data: {
- spuIds: id.split(','),
+ spuIds: id.split(',').map(item=>item*1),
+ // spuIds: id.split(',').join(','),
},
custom: {
showSuccess: true,
@@ -356,12 +366,19 @@ export default {
},
wallet: {
log: (params) =>
- request({
- url: '/user/api/walletLog',
+ request2({
+ url: 'pay/wallet-transaction/page',
method: 'GET',
params,
custom: {},
}),
+ // log: (params) =>
+ // request({
+ // url: '/user/api/walletLog',
+ // method: 'GET',
+ // params,
+ // custom: {},
+ // }),
},
account: {
info: (params) =>
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 80f10c55..31559cb2 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -65,7 +65,7 @@
-
+
- {{ data.title }}
+ {{ data.title||data.name }}
{{ priceUnit }}
- {{ data.original_price }}
+ {{ data.original_price||data.marketPrice }}
@@ -141,7 +141,7 @@
拼团
-
+
- {{ data.title }}
+ {{ data.title||data.name }}
{{ priceUnit }}
- {{ data.original_price }}
+ {{ data.original_price||data.marketPrice }}
@@ -204,7 +204,7 @@
-
+
@@ -213,7 +213,7 @@
class="sl-goods-title ss-line-1"
:style="[{ color: titleColor }]"
>
- {{ data.title }}
+ {{ data.title||data.name }}
{{ priceUnit }}
- {{ data.original_price }}
+ {{ data.original_price||data.marketPrice }}
@@ -313,6 +313,7 @@
original_price: { show: true },
sales: { show: true },
stock: { show: true },
+ salesCount: { show: true },
};
},
},
@@ -396,8 +397,8 @@
// 格式化销量、库存信息
const salesAndStock = computed(() => {
let text = [];
- if (props.goodsFields.sales?.show) {
- text.push(formatSales(props.data.sales_show_type, props.data.sales));
+ if (props.goodsFields.salesCount?.show) {
+ text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
}
if (props.goodsFields.stock?.show) {
text.push(formatStock(props.data.stock_show_type, props.data.stock));
diff --git a/sheep/components/s-order-card/s-order-card.vue b/sheep/components/s-order-card/s-order-card.vue
index e49c7270..8ed36473 100644
--- a/sheep/components/s-order-card/s-order-card.vue
+++ b/sheep/components/s-order-card/s-order-card.vue
@@ -64,7 +64,7 @@
];
const numData = computed(() => sheep.$store('user').numData);
- console.log(numData)
+ console.log('更换后的yuda订单数量',numData)