diff --git a/pages/order/list.vue b/pages/order/list.vue
index 7e57bb1..c0ec7b1 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 e842049..eb5e892 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 20c98d2..2af9b21 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 5bb6b64..eb37bb6 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 7099047..2bb92c6 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 0863a85..6a5b08b 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 48ba737..acb1641 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 de38de6..8a258b1 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 cdb2d8c..37c2a9a 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 66f8072..e49c727 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)