From c80e33f87dcb9724fd2e877d9e304d00f6d3435c Mon Sep 17 00:00:00 2001
From: mactj <tottimctj@163.com>
Date: Wed, 20 Jan 2021 11:51:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8F=AF=E7=9C=8B=E5=88=B0=E5=85=A8=E9=83=A8=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/goods/GoodsMainController.java |  6 +++-
 mini-app/src/apis/xiao4rApis.js               |  5 +---
 .../src/components/mall/tab/mall-home.wpy     |  2 +-
 .../src/components/mall/tab/mall-shopping.wpy | 30 ++++++++-----------
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java
index dda988aa0..83bf7405a 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java
@@ -59,7 +59,11 @@ public class GoodsMainController extends BaseController {
         startPage();
         LambdaQueryWrapper<GoodsMain> lqw = Wrappers.lambdaQuery(goodsMain);
 
-        lqw.eq(!isAdmin(), GoodsMain::getDeptId, getDeptId());
+
+        // 不是系统管理员且不是小程序用户的时候仅能看到自己部门的
+        lqw.eq(!isAdmin() && !getUsername().contains("mini-"),
+                GoodsMain::getDeptId, getDeptId());
+
 
         if (StringUtils.isNotBlank(goodsMain.getGoodsName())) {
             lqw.like(GoodsMain::getGoodsName, goodsMain.getGoodsName());
diff --git a/mini-app/src/apis/xiao4rApis.js b/mini-app/src/apis/xiao4rApis.js
index c9a7a7281..5efc55892 100644
--- a/mini-app/src/apis/xiao4rApis.js
+++ b/mini-app/src/apis/xiao4rApis.js
@@ -1,4 +1,3 @@
-
 import request from '../js/request'
 import { baseUrl } from '../baseDefine'
 
@@ -10,7 +9,6 @@ export const formHeader = {
   'Content-Type': 'application/x-www-form-urlencoded'
 }
 
-
 /**
  * 接口
  */
@@ -34,10 +32,9 @@ class Xiao4rApis {
   // 根据字典类型查询字典数据信息
   getDicts(dictType) {
     return request.get({
-      url: '/system/dict/data/type/' + dictType,
+      url: baseUrl + 'system/dict/data/type/' + dictType
     })
   }
-
 }
 
 export default new Xiao4rApis()
diff --git a/mini-app/src/components/mall/tab/mall-home.wpy b/mini-app/src/components/mall/tab/mall-home.wpy
index c6fe3e8cd..12bd15915 100644
--- a/mini-app/src/components/mall/tab/mall-home.wpy
+++ b/mini-app/src/components/mall/tab/mall-home.wpy
@@ -127,7 +127,7 @@
         </van-col>
 
 
-        <van-col offset="2" span="11">
+        <van-col offset="1" span="11">
           <div class="menu-desc" @tap="onNavItem(navDefine.HOME_MENU2)">
             <div class="fxc">
               <span style="font-size: 16px;">购买庄酒</span>
diff --git a/mini-app/src/components/mall/tab/mall-shopping.wpy b/mini-app/src/components/mall/tab/mall-shopping.wpy
index e1c594bd5..998c23afb 100644
--- a/mini-app/src/components/mall/tab/mall-shopping.wpy
+++ b/mini-app/src/components/mall/tab/mall-shopping.wpy
@@ -29,8 +29,8 @@ module.exports.parseImage = parseImage;
 
     <div style="display: flex;flex-wrap: wrap;">
       <div class="filter-button" v-for="(item,index) in filterButtons">
-        <van-button round size="small" :color=" currentFilter === item ? '#7232dd' : '#7232dd' "
-                    :plain="currentFilter === item ? false : true" @tap="onFilterBtn(item)">{{item}}
+        <van-button round size="small" :color="currentFilter.dictLabel === item.dictLabel ? '#7232dd' : '#7232dd' "
+                    :plain="currentFilter.dictLabel === item.dictLabel ? false : true" @tap="onFilterBtn(item)">{{item.dictLabel}}
         </van-button>
       </div>
     </div>
@@ -67,6 +67,7 @@ import appManager from '../../../appManager'
 import mallApis from '../../../apis/mallApis'
 import defaultMix from '../../../mixins/defaultMix'
 import { goodsDetailPage } from '../../../store/constant/nav/pages'
+import xiao4rApis from '../../../apis/xiao4rApis'
 
 wepy.component({
   store,
@@ -75,8 +76,10 @@ wepy.component({
   data: {
     active: 0,
     records: [],
-    currentFilter: '全部',
-    filterButtons: ['全部']
+    currentFilter: {
+      dictLabel: '全部'
+    },
+    filterButtons: []
 
   },
 
@@ -95,16 +98,15 @@ wepy.component({
     },
 
     onFilterBtn(item) {
-      console.log(item)
       this.currentFilter = item
     },
-    parseImage(imageKey) {
-      return 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' + imageKey
-    },
-
     async init() {
-
       this.isInit = false
+
+      const dict = await xiao4rApis.getDicts('goods_type')
+
+      this.filterButtons = dict.data
+
       const req = await mallApis.getGoodsList()
 
       this.records = req.rows
@@ -114,14 +116,6 @@ wepy.component({
   },
 
   ready() {
-    let i = 0
-    while (true) {
-      this.filterButtons.push('按钮按钮' + i)
-      i++
-      if (i > 8) {
-        break
-      }
-    }
     this.init()
   }
 })