feat:添加开通ai店铺订单接口、添加分类(店铺订单)
This commit is contained in:
+10
-6
@@ -95,26 +95,23 @@
|
||||
import sheep from '@/sheep';
|
||||
import { onLoad, onShow } from '@dcloudio/uni-app';
|
||||
import { reactive, ref } from 'vue';
|
||||
import { isEmpty } from 'lodash-es';
|
||||
import {
|
||||
fen2yuan,
|
||||
formatOrderStatus,
|
||||
formatOrderStatusDescription,
|
||||
handleOrderButtons,
|
||||
} from '@/sheep/hooks/useGoods';
|
||||
import OrderApi from '@/sheep/api/trade/order';
|
||||
import { getOpenOrderDetail } from '@/sheep/api/ai';
|
||||
import DeliveryApi from '@/sheep/api/trade/delivery';
|
||||
import PickUpVerify from '@/pages/order/pickUpVerify.vue';
|
||||
import card_order from '@/components/orderItem/card_order.vue';
|
||||
import truckLine from '@/components/truckLine/truckLine.vue'
|
||||
|
||||
const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
|
||||
const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
|
||||
|
||||
const state = reactive({
|
||||
orderInfo: {},
|
||||
merchantTradeNo: '', // 商户订单号
|
||||
comeinType: '', // 进入订单详情的来源类型
|
||||
orderType: '',
|
||||
});
|
||||
|
||||
// ========== 门店自提(核销) ==========
|
||||
@@ -137,7 +134,11 @@
|
||||
merchant_trade_no: state.merchantTradeNo,
|
||||
});
|
||||
} else {
|
||||
res = await OrderApi.getOrderDetail(id);
|
||||
if (String(state.orderType) === '5') {
|
||||
res = await getOpenOrderDetail({ id });
|
||||
} else {
|
||||
res = await OrderApi.getOrderDetail(id);
|
||||
}
|
||||
}
|
||||
if (res.code === 0) {
|
||||
state.orderInfo = res.data;
|
||||
@@ -170,6 +171,9 @@
|
||||
if (state.comeinType === 'wechat') {
|
||||
state.merchantTradeNo = options.merchant_trade_no;
|
||||
}
|
||||
if (options.type !== undefined) {
|
||||
state.orderType = options.type;
|
||||
}
|
||||
state.orderInfo.id = id;
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user