Просмотр исходного кода

查询当前商品是否有参与抽奖活动

Xiao_123 6 месяцев назад
Родитель
Сommit
0bee321982

+ 5 - 5
src/api/mall/cart.js

@@ -2,14 +2,14 @@ import request from '@/config/axios'
 
 
 // 获取购物车列表
 // 获取购物车列表
 export const getMallUserCartList = async () => {
 export const getMallUserCartList = async () => {
-  return request.get({
+  return await request.get({
     url: '/app-api/trade/cart/list'
     url: '/app-api/trade/cart/list'
   })
   })
 }
 }
 
 
 // 从购物车中删除商品
 // 从购物车中删除商品
 export const deleteCartGoods = async (ids) => {
 export const deleteCartGoods = async (ids) => {
-  return request.delete({
+  return await request.delete({
     url: '/app-api/trade/cart/delete',
     url: '/app-api/trade/cart/delete',
     params: { ids }
     params: { ids }
   })
   })
@@ -17,7 +17,7 @@ export const deleteCartGoods = async (ids) => {
 
 
 // 更新购物车商品选中状态
 // 更新购物车商品选中状态
 export const updateCartSelected = async (data) => {
 export const updateCartSelected = async (data) => {
-  return request.put({
+  return await request.put({
     url: '/app-api/trade/cart/update-selected',
     url: '/app-api/trade/cart/update-selected',
     data
     data
   })
   })
@@ -25,7 +25,7 @@ export const updateCartSelected = async (data) => {
 
 
 // 更新购物车商品数量
 // 更新购物车商品数量
 export const updateCartCount = async (data) => {
 export const updateCartCount = async (data) => {
-  return request.put({
+  return await request.put({
     url: '/app-api/trade/cart/update-count',
     url: '/app-api/trade/cart/update-count',
     data
     data
   })
   })
@@ -33,7 +33,7 @@ export const updateCartCount = async (data) => {
 
 
 // 添加商品到购物车
 // 添加商品到购物车
 export const addCart = async (data) => {
 export const addCart = async (data) => {
-  return request.post({
+  return await request.post({
     url: '/app-api/trade/cart/add',
     url: '/app-api/trade/cart/add',
     data
     data
   })
   })

+ 4 - 4
src/api/mall/index.js

@@ -2,21 +2,21 @@ import request from '@/config/axios'
 
 
 // 获取装修模版
 // 获取装修模版
 export const getDiyTemplate = async () => {
 export const getDiyTemplate = async () => {
-  return request.get({
+  return await request.get({
     url: '/app-api/promotion/diy-template/used'
     url: '/app-api/promotion/diy-template/used'
   })
   })
 }
 }
 
 
 // 获取id获取商品列表
 // 获取id获取商品列表
 export const getProductByIds = async (ids) => {
 export const getProductByIds = async (ids) => {
-  return request.get({
+  return await request.get({
     url: `/app-api/product/spu/list-by-ids?ids=${ids}`
     url: `/app-api/product/spu/list-by-ids?ids=${ids}`
   })
   })
 }
 }
 
 
 // 提交积分商品兑换
 // 提交积分商品兑换
 export const redeemSubmit = async (data) => {
 export const redeemSubmit = async (data) => {
-  return request.post({
+  return await request.post({
     url: '/app-api/menduner/system/redeem/submit',
     url: '/app-api/menduner/system/redeem/submit',
     openEncryption: true,
     openEncryption: true,
     data
     data
@@ -25,7 +25,7 @@ export const redeemSubmit = async (data) => {
 
 
 // 获取积分兑换记录
 // 获取积分兑换记录
 export const getRedeemPage = async (params) => {
 export const getRedeemPage = async (params) => {
-  return request.get({
+  return await request.get({
     url: '/app-api/menduner/system/redeem/page',
     url: '/app-api/menduner/system/redeem/page',
     params
     params
   })
   })

+ 8 - 0
src/api/mall/prize.js

@@ -0,0 +1,8 @@
+import request from '@/config/axios'
+
+// 根据商品id获取抽奖活动
+export const getPrizeByGoodsId = async (spuId) => {
+  return await request.get({
+		url: `/app-api/promotion/luck-lottery/get/by-spu-id?spuId=${spuId}`
+	})
+}

+ 2 - 2
src/api/mall/product.js

@@ -2,7 +2,7 @@ import request from '@/config/axios'
 
 
 // 获取商品详情
 // 获取商品详情
 export const getProductDetail = async (params) => {
 export const getProductDetail = async (params) => {
-  return request.get({
+  return await request.get({
     url: '/app-api/product/spu/get-detail',
     url: '/app-api/product/spu/get-detail',
     params
     params
   })
   })
@@ -10,7 +10,7 @@ export const getProductDetail = async (params) => {
 
 
 // 获得商品评价分页
 // 获得商品评价分页
 export const getCommentPage = async (spuId, pageNo, pageSize, type) => {
 export const getCommentPage = async (spuId, pageNo, pageSize, type) => {
-  return request.get({
+  return await request.get({
     url: '/app-api/product/comment/page',
     url: '/app-api/product/comment/page',
     params: {
     params: {
       spuId,
       spuId,

+ 6 - 6
src/api/mall/user.js

@@ -2,7 +2,7 @@ import request from '@/config/axios'
 
 
 // 获取订单分页
 // 获取订单分页
 export const getMallOrderPage = async (params) => {
 export const getMallOrderPage = async (params) => {
-  return request.get({
+  return await request.get({
     url: '/app-api/trade/order/page',
     url: '/app-api/trade/order/page',
     params
     params
   })
   })
@@ -10,7 +10,7 @@ export const getMallOrderPage = async (params) => {
 
 
 // 获取订单详情
 // 获取订单详情
 export const getMallOrderDetail = async (id) => {
 export const getMallOrderDetail = async (id) => {
-  return request.get({
+  return await request.get({
     url: '/app-api/trade/order/get-detail',
     url: '/app-api/trade/order/get-detail',
     params: {
     params: {
       id
       id
@@ -20,7 +20,7 @@ export const getMallOrderDetail = async (id) => {
 
 
 // 确认收货
 // 确认收货
 export const receiveOrder = async (id) => {
 export const receiveOrder = async (id) => {
-  return request.put({
+  return await request.put({
     url: '/app-api/trade/order/receive',
     url: '/app-api/trade/order/receive',
     params: {
     params: {
       id
       id
@@ -30,7 +30,7 @@ export const receiveOrder = async (id) => {
 
 
 // 删除订单
 // 删除订单
 export const deleteTradeOrder = async (id) => {
 export const deleteTradeOrder = async (id) => {
-  return request.delete({
+  return await request.delete({
     url: '/app-api/trade/order/delete',
     url: '/app-api/trade/order/delete',
     params: { id }
     params: { id }
   })
   })
@@ -38,7 +38,7 @@ export const deleteTradeOrder = async (id) => {
 
 
 // 取消订单
 // 取消订单
 export const cancelTradeOrder = async (id) => {
 export const cancelTradeOrder = async (id) => {
-  return request.delete({
+  return await request.delete({
     url: '/app-api/trade/order/cancel',
     url: '/app-api/trade/order/cancel',
     params: { id }
     params: { id }
   })
   })
@@ -46,7 +46,7 @@ export const cancelTradeOrder = async (id) => {
 
 
 // 创建单个商品评论
 // 创建单个商品评论
 export const createOrderItemComment = async (data) => {
 export const createOrderItemComment = async (data) => {
-  return request.post({
+  return await request.post({
     url: '/app-api/trade/order/item/create-comment',
     url: '/app-api/trade/order/item/create-comment',
     data
     data
   })
   })

+ 8 - 1
src/views/mall/components/details.vue

@@ -53,7 +53,7 @@
           <v-tabs v-model="describeTab" align-tabs="start" color="primary" bg-color="#f7f8fa" @update:model-value="null">
           <v-tabs v-model="describeTab" align-tabs="start" color="primary" bg-color="#f7f8fa" @update:model-value="null">
             <v-tab :value="0">商品介绍</v-tab>
             <v-tab :value="0">商品介绍</v-tab>
             <v-tab :value="1">商品评价</v-tab>
             <v-tab :value="1">商品评价</v-tab>
-            <v-tab :value="2" v-if="(id-0)=== 648">房券抽奖活动</v-tab>
+            <v-tab :value="2" v-if="showPrize">房券抽奖活动</v-tab>
           </v-tabs>
           </v-tabs>
         </div>
         </div>
         <describe v-if="describeTab === 0 && state.goodsInfo?.description" :content="state.goodsInfo.description"></describe>
         <describe v-if="describeTab === 0 && state.goodsInfo?.description" :content="state.goodsInfo.description"></describe>
@@ -93,6 +93,7 @@ import Snackbar from '@/plugins/snackbar'
 import { getToken } from '@/utils/auth'
 import { getToken } from '@/utils/auth'
 import loginPage from '@/views/common/loginDialog.vue'
 import loginPage from '@/views/common/loginDialog.vue'
 import pay from '@/views/mall/components/details/order/pay.vue'
 import pay from '@/views/mall/components/details/order/pay.vue'
+import { getPrizeByGoodsId } from '@/api/mall/prize'
 
 
 const router = useRouter()
 const router = useRouter()
 const { id } = router.currentRoute.value.params
 const { id } = router.currentRoute.value.params
@@ -104,6 +105,8 @@ const selectedSkuMarketPrice = ref('')
 const showSelectSku = ref(false)
 const showSelectSku = ref(false)
 const carouselHover = ref(false)
 const carouselHover = ref(false)
 const showSelectedSkuImg = ref(false)
 const showSelectedSkuImg = ref(false)
+
+const showPrize = ref(false)
 // 获取商品详情
 // 获取商品详情
 const getData = async () => {
 const getData = async () => {
   const obj = await getProductDetail({ id })
   const obj = await getProductDetail({ id })
@@ -114,6 +117,10 @@ const getData = async () => {
   state.skeletonLoading = false;
   state.skeletonLoading = false;
   state.goodsInfo = obj
   state.goodsInfo = obj
   showSelectSku.value = true
   showSelectSku.value = true
+
+  // 查询当前商品是否参与抽奖活动
+  const data = await getPrizeByGoodsId(id)
+  showPrize.value = data && Object.keys(data).length
 }
 }
 getData()
 getData()