diff --git a/.env b/.env
index c15eb28..b67a5b6 100644
--- a/.env
+++ b/.env
@@ -8,7 +8,7 @@ MALL_BASE_URL = http://api-dashboard.yudao.iocoder.cn
MALL_DEV_BASE_URL = http://mall-backend-dev.jiandyb.cn:7001
# 后端接口前缀(一般不建议调整)
-MALL_API_PATH = /app-api
+MALL_API_PATH = /merchant-api
# 开发环境运行端口
MALL_DEV_PORT = 3000
diff --git a/pages.json b/pages.json
index e3978f7..79e10aa 100644
--- a/pages.json
+++ b/pages.json
@@ -14,7 +14,7 @@
"navigationBarTitleText": "订单"
},
"meta": {
- "auth": true
+ "auth": false
}
},
{
diff --git a/pages/index/product.vue b/pages/index/product.vue
index 5c3d9ff..7ab5aa7 100644
--- a/pages/index/product.vue
+++ b/pages/index/product.vue
@@ -1,19 +1,34 @@
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/pages/order/list.vue b/pages/order/list.vue
index f528425..d34f7ce 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -1,5 +1,12 @@
-
+
@@ -109,7 +116,7 @@ import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
import { fen2yuan, formatOrderColor, formatOrderStatus, handleOrderButtons } from '@/peach/hooks/useGoods'
import peach from '@/peach'
import _, { isEmpty } from 'lodash'
-import { resetPagination } from '@/peach/util'
+import { resetPagination } from '@/peach/utils'
const bgStyle = {
backgroundColor: '#fff',
@@ -181,6 +188,32 @@ function onOrderDetail(id) {
})
}
+// 获取订单列表
+async function getOrderList() {
+ state.loadStatus = 'loading'
+ // let { code, data } = await OrderApi.getOrderPage({
+ // pageNo: state.pagination.pageNo,
+ // pageSize: state.pagination.pageSize,
+ // status: tabMaps[state.currentTab].value,
+ // })
+ // if (code !== 0) {
+ // return
+ // }
+
+ data.list.forEach((item) => {
+ item.order.forEach((sitem) => {
+ handleOrderButtons(sitem)
+ })
+ })
+ state.pagination.list = _.concat(state.pagination.list, data.list)
+ console.log(state.pagination.list)
+ state.pagination.total = data.total
+ let currentPageTotal = state.pagination.list.reduce((pre, cur) => {
+ return pre + cur.order.length
+ }, 0)
+ state.loadStatus = currentPageTotal < state.pagination.total ? 'more' : 'noMore'
+}
+
onLoad(async (options) => {
if (options.type) {
state.value.currentTab = options.type
diff --git a/peach/api/member/auth.js b/peach/api/member/auth.js
index 86b549e..5245982 100644
--- a/peach/api/member/auth.js
+++ b/peach/api/member/auth.js
@@ -3,7 +3,7 @@ import request from '@/peach/request'
const AuthUtil = {
login: (data) => {
return request({
- url: '/member/auth/login',
+ url: '/particulars/member/auth/sms-login',
method: 'POST',
data,
custom: {
diff --git a/peach/hooks/useGoods.js b/peach/hooks/useGoods.js
index 8cb666d..088e6f7 100644
--- a/peach/hooks/useGoods.js
+++ b/peach/hooks/useGoods.js
@@ -1,5 +1,5 @@
-import { ref } from "vue";
-import dayjs from "dayjs";
+import { ref } from 'vue'
+import dayjs from 'dayjs'
/**
* 将分转成元
@@ -8,7 +8,7 @@ import dayjs from "dayjs";
* @returns {string} 元,例如说 1.00 元
*/
export function fen2yuan(price) {
- return (price / 100.0).toFixed(2);
+ return (price / 100.0).toFixed(2)
}
/**
@@ -18,8 +18,8 @@ export function fen2yuan(price) {
* @return {string} 格式化后的销量字符串
*/
export function formatSales(type, num) {
- let prefix = type !== "exact" && num < 10 ? "销量" : "已售";
- return formatNum(prefix, type, num);
+ let prefix = type !== 'exact' && num < 10 ? '销量' : '已售'
+ return formatNum(prefix, type, num)
}
/**
@@ -29,5 +29,82 @@ export function formatSales(type, num) {
* @return {string} 格式化后的销量字符串
*/
export function formatStock(type, num) {
- return formatNum("库存", type, num);
+ return formatNum('库存', type, num)
+}
+
+export function formatOrderStatus(order) {
+ if (order.status === 0) {
+ return '待付款'
+ }
+ if (order.status === 10 && order.deliveryType === 1) {
+ return '待发货'
+ }
+ if (order.status === 10 && order.deliveryType === 2) {
+ return '待核销'
+ }
+ if (order.status === 20) {
+ return '待收货'
+ }
+ if (order.status === 30 && !order.commentStatus) {
+ return '待评价'
+ }
+ if (order.status === 30 && order.commentStatus) {
+ return '已完成'
+ }
+ if (order.status === 50) {
+ return '待核销'
+ }
+ if (order.status === 60) {
+ return '待配送'
+ }
+ return '已关闭'
+}
+
+export function formatOrderColor(order) {
+ if (order.status === 0) {
+ return 'info-color'
+ }
+ if (
+ order.status === 10 ||
+ order.status === 20 ||
+ (order.status === 30 && !order.commentStatus) ||
+ order.status === 50 ||
+ order.status === 60
+ ) {
+ return 'warning-color'
+ }
+ if (order.status === 30 && order.commentStatus) {
+ return 'success-color'
+ }
+
+ return 'danger-color'
+}
+
+export function handleOrderButtons(order) {
+ order.buttons = []
+ if (order.type === 3) {
+ // 查看拼团
+ order.buttons.push('combination')
+ }
+ if (order.status === 20) {
+ // 确认收货
+ order.buttons.push('confirm')
+ }
+ if (order.logisticsId > 0) {
+ // 查看物流
+ order.buttons.push('express')
+ }
+ if (order.status === 0) {
+ // 取消订单 / 发起支付
+ order.buttons.push('cancel')
+ // order.buttons.push('pay');
+ }
+ if (order.status === 30 && !order.commentStatus) {
+ // 发起评价
+ order.buttons.push('comment')
+ }
+ if (order.status === 40) {
+ // 删除订单
+ order.buttons.push('delete')
+ }
}
diff --git a/peach/ui/pb-sticky/pb-sticky.vue b/peach/ui/pb-sticky/pb-sticky.vue
index d6ff272..1214fe2 100644
--- a/peach/ui/pb-sticky/pb-sticky.vue
+++ b/peach/ui/pb-sticky/pb-sticky.vue
@@ -37,7 +37,7 @@ export default {
default: 44,
// #endif
// #ifndef H5
- default: peach.$platform.navbar,
+ default: peach.$platform.navBar,
// #endif
},
// 是否开启吸顶功能
diff --git a/peach/utils/index.js b/peach/utils/index.js
new file mode 100644
index 0000000..7b31a2c
--- /dev/null
+++ b/peach/utils/index.js
@@ -0,0 +1,5 @@
+export function resetPagination(pagination) {
+ pagination.list = []
+ pagination.total = 0
+ pagination.pageNo = 1
+}