Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/api/mall copy.js

@@ -0,0 +1,18 @@
+import request from '@/config/axios'
+
+// 提交积分商品兑换
+export const redeemSubmit = async (data) => {
+  return request.post({
+    url: '/app-api/menduner/system/redeem/submit',
+    openEncryption: true,
+    data
+  })
+}
+
+// 获取兑换记录
+export const getRedeemPage = async (params) => {
+  return request.get({
+    url: '/app-api/menduner/system/redeem/page',
+    params
+  })
+}

src/api/mall.js

@@ -1,18 +1,18 @@
 import request from '@/config/axios'
 
-// 提交积分商品兑换
-export const redeemSubmit = async (data) => {
-  return request.post({
-    url: '/app-api/menduner/system/redeem/submit',
-    openEncryption: true,
-    data
-  })
-}
+// // 提交积分商品兑换
+// export const redeemSubmit = async (data) => {
+//   return request.post({
+//     url: '/app-api/product/spu/get-detail',
+//     openEncryption: true,
+//     data
+//   })
+// }
 
 // 获取兑换记录
-export const getRedeemPage = async (params) => {
+export const getProductDetail = async (params) => {
   return request.get({
-    url: '/app-api/menduner/system/redeem/page',
+    url: '/app-api/product/spu/get-detail',
     params
   })
 }

src/views/mall/components/details.vue

@@ -1,10 +1,31 @@
 <!-- 商品详情 -->
 <template>
-  <div>vue3PageInit</div>
+  <div class="default-width px-10">
+    <v-card height="392px" class="carousel mr-3" style="width: 792px; border-radius: 8px;">
+      <!-- <div></div> -->
+      <v-carousel show-arrows="hover" cycle :model-value="0">
+        <v-carousel-item v-for="(item, i) in carouselList" :key="i" @click="null">
+          <div style="height: 392px; overflow: hidden;" :class="{'cursor-pointer': item.link}">
+            <v-img :src="item.img" :lazy-src="item.src" cover style="height: 100%; overflow: hidden;">
+              <template v-slot:placeholder>
+                <v-row align="center" class="fill-height ma-0" justify="center">
+                  <v-progress-circular color="grey-lighten-5" indeterminate></v-progress-circular>
+                </v-row>
+              </template>
+            </v-img>
+          </div>
+        </v-carousel-item>
+      </v-carousel>
+    </v-card>
+  </div>
 </template>
 
 <script setup>
 defineOptions({name: 'wares-details'})
+import { getProductDetail } from '@/api/mall'
+import { ref } from 'vue'
+
+const carouselList = ref([])
 </script>
 <style lang="scss" scoped>
 </style>

src/views/mall/home/components/copy.js

@@ -0,0 +1,3 @@
+
+import { useRouter } from 'vue-router'; const router = useRouter()
+router.push({ path: '/wareDetails/646' })