From 7244927127b2ef5b90076a2a4385811688724831 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 11 Jan 2023 17:47:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=80=E6=B3=A2=E5=8D=8A?=
 =?UTF-8?q?=E6=88=90=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wxmp/package.json       |  2 +-
 wxmp/src/App.vue        |  2 +-
 wxmp/src/manifest.json  |  6 +++++-
 wxmp/src/pages/home.vue | 36 +++++++++++++++++++++++++++++-------
 wxmp/vite.config.js     |  4 +---
 5 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/wxmp/package.json b/wxmp/package.json
index 63f1e03..4e2e793 100644
--- a/wxmp/package.json
+++ b/wxmp/package.json
@@ -22,7 +22,7 @@
     "@dcloudio/uni-mp-weixin": "3.0.0-3061420221215001",
     "@dcloudio/uni-quickapp-webview": "3.0.0-3061420221215001",
     "@dcloudio/uni-ui": "^1.4.23",
-    "axios": "^1.2.2",
+    "axios": "^0.27.2",
     "axios-miniprogram-adapter": "^0.3.5",
     "dayjs": "^1.11.7",
     "query-string": "^8.1.0",
diff --git a/wxmp/src/App.vue b/wxmp/src/App.vue
index 028b28e..f037934 100644
--- a/wxmp/src/App.vue
+++ b/wxmp/src/App.vue
@@ -14,7 +14,7 @@ export default {
 /*每个页面公共css */
 
 @each $padMar, $pm in (mar:margin, pad:padding) {
-  @each $v in (8, 10, 16, 20, 32, 48, 64) {
+  @each $v in (8, 10, 16, 20, 32, 48, 64, 80) {
     @each $pos, $p in (l:left, r:right, t:top, b:bottom) {
       .#{$padMar}-#{$pos+$v} {
         #{$pm}-#{$p}: #{$v}px
diff --git a/wxmp/src/manifest.json b/wxmp/src/manifest.json
index bb25919..8f491a4 100644
--- a/wxmp/src/manifest.json
+++ b/wxmp/src/manifest.json
@@ -8,7 +8,11 @@
   "mp-weixin": {
     "appid": "wx68ef6cfaa104652a",
     "setting": {
-      "urlCheck": false
+      "urlCheck": false,
+      "enhance": true
+    },
+    "optimization": {
+      "subPackages": true
     },
     "usingComponents": true
   },
diff --git a/wxmp/src/pages/home.vue b/wxmp/src/pages/home.vue
index 6f19ead..72b7823 100644
--- a/wxmp/src/pages/home.vue
+++ b/wxmp/src/pages/home.vue
@@ -2,8 +2,21 @@
   <section class="home">
     <uni-search-bar class="sticky-t" placeholder="搜索商品" cancelText="更多" @cancel="" radius="100" @input="handleSearch"/>
     <ai-tabs class="fixedTabs" :tabs="indexList" vertical v-model="currentType" @click="handleType"/>
-    <div class="pad-l64">
-
+    <div class="pad-l80 pad-t64">
+      <!--      <uni-card isFull :border="false" title="示例产品" subTitle="规格:8mmX10mm" extra="查看详情"-->
+      <!--                thumbnail="https://web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png"/>-->
+      <uni-list-item title="示例产品" note="规格:8mmX10mm" thumbSize="lg" thumb="https://web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png" @click="handleDetail"
+                     clickable>
+        <template v-slot:footer>
+          <div class="flex center">
+            <div class="mar-r8">2.60</div>
+            <uni-icons type="cart" size="28" @click.stop="handleAdd2Cart"/>
+          </div>
+        </template>
+      </uni-list-item>
+      <uni-list-item title="示例产品" note="规格:8mmX10mm" thumbSize="lg" thumb="https://web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png" rightText="2.60元"/>
+      <uni-list-item title="示例产品" note="规格:8mmX10mm" thumbSize="lg" thumb="https://web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png" rightText="2.60"/>
+      <uni-list-item title="示例产品" note="规格:8mmX10mm" thumbSize="lg" thumb="https://web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png" rightText="￥2.60"/>
     </div>
     <ai-gap h="50"/>
     <uni-goods-nav class="fixed-b" @click="handleGoodNav"/>
@@ -13,6 +26,7 @@
 <script>
 import AiTabs from "../components/AiTabs";
 import AiGap from "../components/AiGap";
+import List from "../utils/list";
 
 export default {
   name: "home",
@@ -21,12 +35,13 @@ export default {
     return {
       indexList: ["全部", "螺丝", "螺母", "平垫", "弹垫", "钢丝绳", "铆钉", "工具", "劳保", "其他"],
       currentType: 0,
-      list: []
+      products: null,
     }
   },
   methods: {
     getList() {
-
+      this.products = new List("/api/product/list")
+      this.products.init()
     },
     handleGoodNav() {
 
@@ -35,15 +50,20 @@ export default {
     },
     handleSearch() {
 
+    },
+    handleAdd2Cart() {
+      this.$toast("加入购物车")
+    },
+    handleDetail(e) {
+      console.log(e)
+      this.$toast("查看详情")
     }
   },
   onShow() {
-    this.current = 1
     this.getList()
   },
   onReachBottom() {
-    this.current++
-    this.getList()
+    this.products?.loadMore()
   }
 }
 </script>
@@ -58,6 +78,8 @@ export default {
     height: calc(100vh - 100px);
     overflow-y: auto;
     font-size: 12px;
+    z-index: 202301111557;
+    background: #fff;
   }
 }
 </style>
diff --git a/wxmp/vite.config.js b/wxmp/vite.config.js
index 1c63ae5..ef97458 100644
--- a/wxmp/vite.config.js
+++ b/wxmp/vite.config.js
@@ -3,7 +3,5 @@ import uni from '@dcloudio/vite-plugin-uni'
 
 export default defineConfig({
   optimizeDeps: ['@dcloudio/uni-ui'],
-  plugins: [
-    uni(),
-  ],
+  plugins: [uni()],
 })