@@ -323,7 +326,11 @@ const typeId = ref(0)
const getOrderStat = () => {
badgeApi.getOrderStat({}).then((res: any) => {
orderStat.value = res
- prodId.value = res.type_id == 3 ? 8 : res.prod_id
+ if (res.type_id == 4) {
+ prodId.value = res.prod_id == 1 ? 1 : 2
+ } else {
+ prodId.value = res.type_id == 3 ? 8 : res.prod_id
+ }
prop.value = res.prop
typeId.value = res.type_id
getSundryList()
@@ -331,11 +338,16 @@ const getOrderStat = () => {
}
const prodChange = (id: number) => {
- if (typeId.value == 3) {
+ console.log('prodChange', id)
+ if (typeId.value == 3 && id == 7) {
showToast('人物3D冰箱贴暂未开放')
return
}
- prodId.value = id
+ if (typeId.value == 4 && id == 8) {
+ showToast('宠物卡通手办暂未开放')
+ return
+ }
+ prodId.value = typeId.value == 4 ? id == 8 ? 2 : 1 : id == 7 ? 7 : 8
picture.value = null
}
@@ -421,7 +433,7 @@ function getbase64Data(data) {
return false;
}
imgurl.value = blob;
- if (prodId.value == 7) {
+ if (prodId.value == 7 || prodId.value == 1) {
getUploadUrl()
}
}
@@ -490,7 +502,7 @@ const sendFaceToOss = async (src: string, url: string, path: string) => {
badgeApi.faceCheck({
path: path,
prop: prop.value,
- prod_id: 7
+ prod_id: prodId.value
}).then((res: any) => {
console.log('faceCheck', res)
showSuccessToast({
diff --git a/src/views/badge/orderDetail.vue b/src/views/badge/orderDetail.vue
index f015b62..c9e2eb1 100644
--- a/src/views/badge/orderDetail.vue
+++ b/src/views/badge/orderDetail.vue
@@ -44,6 +44,7 @@
{{ order.prod_id == 7 ? '人物立体徽章' : '宠物立体徽章' }}
{{ order.prod_id == 7 ? '人物浮雕相框' : '宠物浮雕相框' }}
{{ order.prod_id == 7 ? '人物冰箱贴' : '宠物冰箱贴' }}
+ {{ order.prod_id == 1 ? '人物卡通手办' : '宠物卡通手办' }}
尺寸
diff --git a/src/views/badge/preview.vue b/src/views/badge/preview.vue
index 6809557..dc3c1e8 100644
--- a/src/views/badge/preview.vue
+++ b/src/views/badge/preview.vue
@@ -53,6 +53,7 @@
{{ prodId == 7 ? '人物立体徽章' : '宠物立体徽章' }}
{{ prodId == 7 ? '人物浮雕相框' : '宠物浮雕相框' }}
{{ prodId == 7 ? '人物3D冰箱贴' : '宠物3D冰箱贴' }}
+
{{ prodId == 1 ? '人物卡通手办' : '宠物卡通手办' }}
产品类型
@@ -68,7 +69,7 @@
-
+
@@ -331,7 +332,9 @@ const getSizeList = () => {
badgeApi.getOrderPrice({}).then((res: any) => {
console.log('getSizeList', res);
sizeList.value = res
- getShapeList()
+ if (typeId.value != 4) {
+ getShapeList()
+ }
})
}
@@ -702,7 +705,7 @@ const limitCount = ref(0)
const getShapeList = () => {
badgeApi.getShapeList({
prod_id: prodId.value,
- type_id: orderStat.value.type_id
+ type_id: typeId.value
}).then((res: any) => {
console.log('getShapeList', res)
shapeList.value = res.list
@@ -879,6 +882,7 @@ onMounted(() => {
if (route.query.prod_id) {
prodId.value = route.query.prod_id
}
+ getTrialCode()
// pid.value = 281505;
// group.value = 1;
@@ -886,8 +890,9 @@ onMounted(() => {
// getTypesList()
getImageList()
progressList()
- getCompareImage()
- getTrialCode()
+ setTimeout(() => {
+ getCompareImage()
+ }, 1000)
timer.value = setInterval(() => {
getImageList()
}, 10000)