From 6b6caa451e437ca0e1cf5ce613705906c6acee13 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 26 Feb 2024 14:27:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E5=95=86=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=202.=E5=AF=B9=E6=8E=A5=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/product.js                  | 13 +++++++
 src/components/skuModal.vue         | 13 +++++--
 src/views/home/components/goods.vue | 58 +++++++++++++++++++++++------
 src/views/home/index.vue            |  3 --
 4 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/src/api/product.js b/src/api/product.js
index 3f1113d..d5317a2 100644
--- a/src/api/product.js
+++ b/src/api/product.js
@@ -11,4 +11,17 @@ export function queryCategory(params) {
         url: "product/queryCategory",
         params
     });
+}
+
+/**
+ * 查询商品信息
+ * @param {*} params 
+ * @returns 
+ */
+export function productqueryCommodityInfo(params) {
+    return request({
+        method: "get",
+        url: "product/queryCommodityInfo",
+        params
+    });
 }
\ No newline at end of file
diff --git a/src/components/skuModal.vue b/src/components/skuModal.vue
index 5ad27e1..94e6a89 100644
--- a/src/components/skuModal.vue
+++ b/src/components/skuModal.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="选择规格" width="800" v-model="show">
+    <el-dialog title="选择规格" width="800" v-model="dialogVisible">
         <div class="header">选择规格</div>
         <div class="row">
             <div class="title">规格</div>
@@ -34,9 +34,16 @@
 </template>
 
 <script setup>
-import { ref } from 'vue'
-const show = ref(false)
+import { ref, defineExpose } from 'vue'
+const dialogVisible = ref(false)
 
+function show() {
+    dialogVisible.value = true
+}
+
+defineExpose({
+    show
+})
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/home/components/goods.vue b/src/views/home/components/goods.vue
index 81ac2d7..cf7d491 100644
--- a/src/views/home/components/goods.vue
+++ b/src/views/home/components/goods.vue
@@ -15,40 +15,53 @@
     </div>
     <div class="search_wrap">
         <div class="input">
-            <el-input placeholder="商品名称或首字母简称" prefix-icon="Search"></el-input>
+            <el-input placeholder="商品名称或首字母简称" prefix-icon="Search" v-model="commdityName"></el-input>
         </div>
         <el-button :icon="shopListType == 'text' ? 'PictureRounded' : 'PriceTag'" @click="changeShopListType"></el-button>
     </div>
     <div class="shop_list" :class="{ img: shopListType == 'img' }">
-        <div class="item_wrap" v-for="item in 7" :key="item">
+        <div class="item_wrap" v-for="item in shopList" :key="item.id" @click="showSkuHandle">
             <div class="item">
                 <div class="dot">2</div>
                 <div class="cover" v-if="shopListType == 'img'">
-                    <el-image
-                        src="https://img1.baidu.com/it/u=2183780444,2807225961&fm=253&fmt=auto&app=138&f=JPEG?w=600&h=400"
-                        style="width: 100%;height: 100%;" fit="cover"></el-image>
+                    <el-image :src="item.coverImg" style="width: 100%;height: 100%;" fit="cover"></el-image>
                 </div>
-                <div class="name"><el-text>酱香拿铁</el-text></div>
+                <div class="name"><el-text line-clamp="2">{{ item.name }}</el-text></div>
                 <div class="empty" v-if="shopListType == 'text'"></div>
                 <div class="price">
-                    <el-text>￥0.03</el-text>
+                    <el-text>￥{{ item.lowPrice }}</el-text>
                 </div>
             </div>
         </div>
     </div>
+    <!-- 选择规格 -->
+    <skuModal ref="skuModalRef" />
 </template>
 
 <script setup>
-import { queryCategory } from '@/api/product'
 import { ref, onMounted } from 'vue'
+import skuModal from '@/components/skuModal.vue'
 
+import { queryCategory, productqueryCommodityInfo } from '@/api/product'
 import { useUser } from "@/store/user.js"
 const store = useUser();
 
+const skuModalRef = ref(null)
+
 const shopListType = ref('text')
+
 const categorys = ref([])
 const categorysActive = ref(0)
 
+const commdityName = ref('')
+
+const shopList = ref([])
+
+// 显示sku
+function showSkuHandle() {
+    skuModalRef.value.show()
+}
+
 // 切换商品显示模式
 function changeShopListType() {
     if (shopListType.value == 'text') {
@@ -67,13 +80,34 @@ async function queryCategoryAjax() {
             pageSize: 100
         })
         categorys.value = res.list
+        categorys.value.unshift({
+            name: '全部',
+            id: ''
+        })
     } catch (error) {
         console.log(error)
     }
 }
 
-onMounted(() => {
-    queryCategoryAjax()
+// 查询商品信息
+async function productqueryCommodityInfoAjax() {
+    try {
+        const res = await productqueryCommodityInfo({
+            shopId: store.userInfo.shopId,
+            categoryId: categorys.value[categorysActive.value].id,
+            commdityName: commdityName.value,
+            page: 1,
+            pageSize: 1000
+        })
+        shopList.value = res
+    } catch (error) {
+        console.log(error)
+    }
+}
+
+onMounted(async () => {
+    await queryCategoryAjax()
+    await productqueryCommodityInfoAjax()
 })
 </script>
 
@@ -194,7 +228,9 @@ onMounted(() => {
         }
 
         .name {
-            padding: 14px 10px;
+            padding: 0 10px;
+            height: 50px;
+            margin-top: 20px;
 
             span {
                 font-weight: bold;
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index f47b54f..4590688 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -123,8 +123,6 @@
       <goods />
     </div>
   </div>
-  <!-- 选择规格 -->
-  <skuModal />
   <!-- 备注 -->
   <remarkModal ref="remarkRef" />
   <!-- 修改取餐号 -->
@@ -134,7 +132,6 @@
 <script setup>
 import { ref } from 'vue'
 
-import skuModal from '@/components/skuModal.vue'
 import remarkModal from '@/components/remarkModal.vue'
 import takeFoodCode from '@/components/takeFoodCode.vue'