From 0ace7845930cbeb5b57193d9f3a1378ca6391f22 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 23 Jan 2025 02:13:16 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3116=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=85=A8=E5=9B=BD=E7=89=B9?=
 =?UTF-8?q?=E4=BA=A7=EF=BC=8C=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8F=B3?=
 =?UTF-8?q?=E4=B8=8A=E8=A7=92=E7=BA=A2=E7=82=B9=E6=98=BE=E7=A4=BA=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=95=86=E5=93=81=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E8=BF=9B=E5=85=A5=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/product.less          |  5 ++--
 pages/shop/GoodSearch/index.vue  | 48 +++++++++++++++++++++++++++++--
 pkg_product/views/nativeList.vue | 49 ++++++++++++++++++++++++++++++--
 3 files changed, 94 insertions(+), 8 deletions(-)

diff --git a/assets/css/product.less b/assets/css/product.less
index 94111c4..6bc2c93 100644
--- a/assets/css/product.less
+++ b/assets/css/product.less
@@ -17,16 +17,15 @@
   }
 
   .search-box {
-    width: 686rpx;
+    width: 90%;
     height: 60rpx;
-    margin: 0 auto;
     padding: 0 24rpx 0 32rpx;
     box-sizing: border-box;
     background: #F7F7F7;
     border-radius: 30rpx;
 
     input {
-      width: 560rpx;
+      width: 540rpx;
       font-size: 24rpx;
     }
 
diff --git a/pages/shop/GoodSearch/index.vue b/pages/shop/GoodSearch/index.vue
index 8bd7a4f..138a669 100644
--- a/pages/shop/GoodSearch/index.vue
+++ b/pages/shop/GoodSearch/index.vue
@@ -20,7 +20,11 @@
           <u-notice-bar duration="4000" @change="change" :text="recommendKeyword" :icon="' '" color="#999" fontSize="12" bgColor="transparent" direction="column"></u-notice-bar>
         </view>
       </view>
-     
+     <view @click="goShoppingCart()"  class="item animated bounceIn">
+        <view class="iconfont icon-gouwuche1">
+          <text class="num bg-color-lightred" v-if="CartCount > 0">{{ CartCount > 99 ? '99+' : CartCount }}</text>
+        </view>
+      </view>
     </view>
     <view v-if="historyKey.length" class="page-content">
       <view
@@ -113,6 +117,10 @@
 import {
   getSearchPageConfig
 } from '@/api/search'
+import {
+  getCartCount,
+} from '@/api/store'
+import { mapGetters } from 'vuex'
 import {trim} from '@/utils'
 export default {
   name: 'GoodSearch',
@@ -124,16 +132,33 @@ export default {
       search: '',
       historyKey: [],
       rankingArr: [],
-      recommendKeyword: []
+      recommendKeyword: [],
+      CartCount:  0
     }
   },
+  computed: mapGetters(['isLogin', 'location', 'userInfo']),
   mounted: function () {
     this.getData()
+    this.getCartCount()
   },
   onShow() {
     this.getHistory()
   },
   methods: {
+    // 获取购物车数量
+    getCartCount () {
+      const isLogin = this.isLogin
+      if (isLogin) {
+        getCartCount({
+          numType: 0
+        }).then(res => {
+          this.CartCount = res.data.count
+        })
+      }
+    },
+    goShoppingCart() {
+      this.$yrouter.switchTab('/pages/cart')
+    },
     showHistory() {
       if(this.search) {
         this.showkey = false
@@ -225,6 +250,22 @@ export default {
 </script>
 
 <style lang="less">
+.iconfont{
+  position: relative;
+}
+.item .iconfont.icon-gouwuche1 .num {
+  right: -15rpx !important;
+  top: -15rpx!important;
+  font-size: 20rpx;
+  position: absolute;
+  width: 30rpx;
+  height: 30rpx;
+  background: #C52733 !important;
+  color: #fff;
+  border-radius: 50%;
+  text-align: center;
+  padding: 2rpx;
+}
 .good-search {
   min-height: 100vh;
   background: #fff !important;
@@ -232,7 +273,8 @@ export default {
   .header {
     padding: 40rpx 32rpx 32rpx;
     background: #F9F9F9;
-    
+    display: flex;
+    align-items: center;
     .search-box {
       width: 686rpx;
       height: 72rpx;
diff --git a/pkg_product/views/nativeList.vue b/pkg_product/views/nativeList.vue
index 14782fb..5b134bf 100644
--- a/pkg_product/views/nativeList.vue
+++ b/pkg_product/views/nativeList.vue
@@ -15,6 +15,11 @@
           mode="scaleToFill"
           @click="searchHandle"></image>
       </view>
+      <view @click="goShoppingCart()"  class="item animated bounceIn">
+        <view class="iconfont icon-gouwuche1">
+          <text class="num bg-color-lightred" v-if="CartCount > 0">{{ CartCount > 99 ? '99+' : CartCount }}</text>
+        </view>
+      </view>
     </view>
     <view class="line-location flex ai-center">
       <image :src="webUrl+'/20220903142929759087.png'" mode="scaleToFill"></image>
@@ -84,6 +89,10 @@ import { fetchNormal, getCategory } from "@/api/store"
 import { pageListenMixins } from '@/mixins/pageListenMixins'
 import ProductWindow from '@/components/ProductWindow'
 import goCartMixin from '@/mixins/goCartMixins'
+import { mapGetters } from 'vuex'
+import {
+  getCartCount,
+} from '@/api/store'
 export default {
   name: 'NativeListPage',
   components: {
@@ -92,6 +101,7 @@ export default {
   mixins: [pageListenMixins, goCartMixin],
   data() {
     return {
+      CartCount:  0,
       webUrl: this.$VUE_APP_RESOURCES_URL,
       keyword: '',
       dataList: [],
@@ -103,13 +113,29 @@ export default {
       pageKeyId: ''
     }
   },
+  computed: mapGetters(['isLogin', 'location', 'userInfo']),
   onLoad(option) {
     const cityId = option.cityId
     this.cityId = cityId
     this.pageKeyId = `goodsProductList_cityId_${cityId}`
     this.init()
+    this.getCartCount()
   },
   methods: {
+    // 获取购物车数量
+    getCartCount () {
+      const isLogin = this.isLogin
+      if (isLogin) {
+        getCartCount({
+          numType: 0
+        }).then(res => {
+          this.CartCount = res.data.count
+        })
+      }
+    },
+    goShoppingCart() {
+      this.$yrouter.switchTab('/pages/cart')
+    },
     init() {
       const memCityName = uni.getStorageSync('cityName')
       if (memCityName.length) {
@@ -181,14 +207,33 @@ export default {
 
 <style scoped lang="less">
 @import "@/assets/css/product.less";
-
+.iconfont{
+  position: relative;
+}
+.item .iconfont.icon-gouwuche1 .num {
+  right: -15rpx !important;
+  top: -15rpx!important;
+  font-size: 20rpx;
+  position: absolute;
+  width: 30rpx;
+  height: 30rpx;
+  background: #C52733 !important;
+  color: #fff;
+  border-radius: 50%;
+  text-align: center;
+  padding: 2rpx;
+}
 .pkg-product-list {
   height: 100vh;
   overflow-y: hidden;
 
   .top-box {
     height: 82rpx;
-    background: #FF564A;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    background-color: #fff;
+    box-sizing: border-box;
   }
 
   .line-location {