1.去掉pc端登录弹窗

2.页脚请求路径修改 3.增加页脚对应的全局方法、类、控制器
2025-04-09 17:44:55 +08:00 · 2025-04-09 17:44:55 +08:00 · 2a061df05d
commit 2a061df05d
parent 922c822746
14 changed files with 516 additions and 55 deletions
--- a/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java
+++ b/crmeb/crmeb-common/src/main/java/com/zbkj/common/constants/SysConfigConstants.java
@ -76,4 +76,11 @@ public class SysConfigConstants {
    public static final String CONFIG_YUE_PAY_STATUS  = "yue_pay_status";
    /** 支付宝支付状态 */
    public static final String CONFIG_ALI_PAY_STATUS = "ali_pay_status";
+
+
+
+
+
+
+
 }
--- a/crmeb/crmeb-front/src/main/java/com/zbkj/pc/controlller/PcController.java
+++ b/crmeb/crmeb-front/src/main/java/com/zbkj/pc/controlller/PcController.java
@ -1,7 +1,7 @@
 package com.zbkj.pc.controlller;

 import com.zbkj.common.response.CommonResult;
-import com.zbkj.pc.entity.PcHomeBannerVo;
+import com.zbkj.pc.entity.PcShoppingConfigResponse;
 import com.zbkj.pc.service.PcService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@ -11,18 +11,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

-import java.util.List;
-
@Slf4j
@RestController("PcController")
-@RequestMapping("api/pc")
+@RequestMapping("api/pc/home")
@Api(tags = "商品")
 public class PcController {
    @Autowired
    PcService pcService;
-    @ApiOperation(value = "获取首页banner")
-    @RequestMapping(value = "/get/banner", method = RequestMethod.GET)
-    public CommonResult<List<PcHomeBannerVo>> getHomeBanner() {
-        return CommonResult.success(pcService.getHomeBanner());
+
+    @ApiOperation(value = "获取首页配置信息")
+    @RequestMapping(value = "/get/config", method = RequestMethod.GET)
+    public CommonResult<PcShoppingConfigResponse> getHomeConfig() {
+        return CommonResult.success(pcService.getHomeConfig());
    }
 }
--- a/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/GroupConfigConstants.java
+++ b/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/GroupConfigConstants.java
@ -0,0 +1,43 @@
+package com.zbkj.pc.entity;
+
+/**
+ * 组合配置常量类
+ * +----------------------------------------------------------------------
+ * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+ * +----------------------------------------------------------------------
+ * | Author: CRMEB Team <admin@crmeb.com>
+ * +----------------------------------------------------------------------
+ */
+public class GroupConfigConstants {
+
+    /** tag-首页banner */
+    public static final Integer TAG_HOME_BANNER = 1;
+    /** tag-首页推荐 */
+    public static final Integer TAG_HOME_RECOMMEND = 2;
+    /** tag-经营理念 */
+    public static final Integer TAG_PHILOSOPHY = 3;
+    /** tag-友情链接 */
+    public static final Integer TAG_FRIENDLY_LINKS = 4;
+    /** tag-快捷入口 */
+    public static final Integer TAG_QUICK_ENTRY = 5;
+    /** tag-商户PC店铺Banner */
+    public static final Integer TAG_MERCHANT_PC_BANNER = 6;
+    /** tag-商户PC店铺商品推荐 */
+    public static final Integer TAG_MERCHANT_PC_RECOMMEND_PRODUCT = 7;
+    /** tag-首页底部二维码 */
+    public static final Integer TAG_BOTTOM_QR_CODE = 8;
+    /** tag-首页广告 */
+    public static final Integer TAG_HOME_ADVERTISEMENT = 9;
+    /** tag-首页导航 */
+    public static final Integer TAG_HOME_NAVIGATION = 10;
+    /** tag-付费会员权益 */
+    public static final Integer TAG_PAID_MEMBER_BENEFITS = 11;
+    /** tag-积分区间 */
+    public static final Integer TAG_INTEGRAL_INTERVAL = 12;
+    /** tag_开屏广告数据 */
+    public static final Integer TAG_SPLASH_AD_DATA = 13;
+}
--- a/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcBottomQrCodeVo.java
+++ b/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcBottomQrCodeVo.java
@ -0,0 +1,47 @@
+package com.zbkj.pc.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * PC底部二维码Vo对象
+ * +----------------------------------------------------------------------
+ * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+ * +----------------------------------------------------------------------
+ * | Author: CRMEB Team <admin@crmeb.com>
+ * +----------------------------------------------------------------------
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "PcBottomQrCodeVo", description = "PC底部二维码Vo对象")
+public class PcBottomQrCodeVo implements Serializable {
+
+    private static final long serialVersionUID = -3097800453211866415L;
+
+    @ApiModelProperty(value = "ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "二维码名称", required = true)
+    @NotBlank(message = "请填写二维码名称")
+    private String name;
+
+    @ApiModelProperty(value = "二维码地址", required = true)
+    @NotBlank(message = "二维码地址不能为空")
+    private String imageUrl;
+
+    @ApiModelProperty(value = "排序", required = true)
+    @NotNull(message = "排序不能为空")
+    private Integer sort;
+}
--- a/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcFriendlyLinkVo.java
+++ b/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcFriendlyLinkVo.java
@ -0,0 +1,47 @@
+package com.zbkj.pc.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * PC友情链接Vo对象
+ * +----------------------------------------------------------------------
+ * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+ * +----------------------------------------------------------------------
+ * | Author: CRMEB Team <admin@crmeb.com>
+ * +----------------------------------------------------------------------
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "PcFriendlyLinkVo", description = "PC友情链接Vo对象")
+public class PcFriendlyLinkVo implements Serializable {
+
+    private static final long serialVersionUID = -3097800453211866415L;
+
+    @ApiModelProperty(value = "ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "链接名称", required = true)
+    @NotBlank(message = "请填写链接名称")
+    private String name;
+
+    @ApiModelProperty(value = "链接地址", required = true)
+    @NotBlank(message = "链接地址不能为空")
+    private String linkUrl;
+
+    @ApiModelProperty(value = "排序", required = true)
+    @NotNull(message = "排序不能为空")
+    private Integer sort;
+}
--- a/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcPhilosophyVo.java
+++ b/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcPhilosophyVo.java
@ -0,0 +1,47 @@
+package com.zbkj.pc.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * PC经营理念Vo对象
+ * +----------------------------------------------------------------------
+ * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+ * +----------------------------------------------------------------------
+ * | Author: CRMEB Team <admin@crmeb.com>
+ * +----------------------------------------------------------------------
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "PcPhilosophyVo", description = "PC经营理念Vo对象")
+public class PcPhilosophyVo implements Serializable {
+
+    private static final long serialVersionUID = -3097800453211866415L;
+
+    @ApiModelProperty(value = "ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "图片地址", required = true)
+    @NotBlank(message = "请选择图片")
+    private String imageUrl;
+
+    @ApiModelProperty(value = "理念描述", required = true)
+    @NotBlank(message = "请填写理念描述")
+    private String name;
+
+    @ApiModelProperty(value = "排序", required = true)
+    @NotNull(message = "排序不能为空")
+    private Integer sort;
+}
--- a/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcQuickEntryLinksVo.java
+++ b/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcQuickEntryLinksVo.java
@ -0,0 +1,47 @@
+package com.zbkj.pc.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * PC快捷入口链接Vo对象
+ * +----------------------------------------------------------------------
+ * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+ * +----------------------------------------------------------------------
+ * | Author: CRMEB Team <admin@crmeb.com>
+ * +----------------------------------------------------------------------
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "PcQuickEntryLinksVo", description = "PC快捷入口链接Vo对象")
+public class PcQuickEntryLinksVo implements Serializable {
+
+    private static final long serialVersionUID = -3097800453211866415L;
+
+    @ApiModelProperty(value = "ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "链接名称", required = true)
+    @NotBlank(message = "请填写链接名称")
+    private String name;
+
+    @ApiModelProperty(value = "链接地址", required = true)
+    @NotBlank(message = "链接地址不能为空")
+    private String linkUrl;
+
+    @ApiModelProperty(value = "排序", required = true)
+    @NotNull(message = "排序不能为空")
+    private Integer sort;
+}
--- a/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcQuickEntryVo.java
+++ b/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcQuickEntryVo.java
@ -0,0 +1,47 @@
+package com.zbkj.pc.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * PC快捷入口Vo对象
+ * +----------------------------------------------------------------------
+ * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+ * +----------------------------------------------------------------------
+ * | Author: CRMEB Team <admin@crmeb.com>
+ * +----------------------------------------------------------------------
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "PcQuickEntryVo", description = "PC快捷入口Vo对象")
+public class PcQuickEntryVo implements Serializable {
+
+    private static final long serialVersionUID = -3097800453211866415L;
+
+    @ApiModelProperty(value = "ID")
+    private Integer id;
+
+    @ApiModelProperty(value = "入口名称", required = true)
+    @NotBlank(message = "请填写入口名称")
+    private String name;
+
+    @ApiModelProperty(value = "排序", required = true)
+    @NotNull(message = "排序不能为空")
+    private Integer sort;
+
+    @ApiModelProperty(value = "快捷入口链接组")
+    private List<PcQuickEntryLinksVo> linkList;
+}
--- a/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcShoppingConfigResponse.java
+++ b/crmeb/crmeb-front/src/main/java/com/zbkj/pc/entity/PcShoppingConfigResponse.java
@ -0,0 +1,70 @@
+package com.zbkj.pc.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * PC配置信息响应对象
+ * +----------------------------------------------------------------------
+ * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 2016~2025 https://www.crmeb.com All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+ * +----------------------------------------------------------------------
+ * | Author: CRMEB Team <admin@crmeb.com>
+ * +----------------------------------------------------------------------
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "PcShoppingConfigResponse", description = "PC配置信息响应对象")
+public class PcShoppingConfigResponse implements Serializable {
+
+    private static final long serialVersionUID = -4585094537501770138L;
+
+    @ApiModelProperty(value = "PC商城—左上角logo")
+    private String leftTopLogo;
+
+    @ApiModelProperty(value = "PC商城—品牌好店广告图")
+    private String goodStoreImage;
+
+    @ApiModelProperty(value = "PC商城—手机体验购买二维码类型 1:小程序 2:公众号/H5")
+    private String goPhoneQrCodeType;
+
+//    @ApiModelProperty(value = "联系电话")
+//    private String phone;
+//
+//    @ApiModelProperty(value = "地址")
+//    private String address;
+//
+//    @ApiModelProperty(value = "授权信息")
+//    private String authInfo;
+//
+//    @ApiModelProperty(value = "备案号")
+//    private String filingNum;
+
+//    @ApiModelProperty(value = "首页广告")
+//    private PcHomeAdvertisementVo advertisement;
+
+    @ApiModelProperty(value = "经营理念列表")
+    private List<PcPhilosophyVo> philosophyList;
+
+    @ApiModelProperty(value = "友情链接列表")
+    private List<PcFriendlyLinkVo> friendlyLinkList;
+
+    @ApiModelProperty(value = "快捷入口列表")
+    private List<PcQuickEntryVo> quickEntryList;
+
+    @ApiModelProperty(value = "二维码列表")
+    private List<PcBottomQrCodeVo> qrCodeList;
+
+//    @ApiModelProperty(value = "首页导航列表")
+//    private List<PcHomeNavigationVo> homeNavigationList;
+}
--- a/crmeb/crmeb-front/src/main/java/com/zbkj/pc/service/PcService.java
+++ b/crmeb/crmeb-front/src/main/java/com/zbkj/pc/service/PcService.java
@ -1,17 +1,16 @@
 package com.zbkj.pc.service;

 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.json.JSON;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.google.gson.Gson;
-import com.zbkj.common.model.system.SystemFormTemp;
+import com.zbkj.common.constants.Constants;
 import com.zbkj.common.model.system.SystemGroupData;
 import com.zbkj.pc.dao.GroupConfigDao;
-import com.zbkj.pc.entity.GroupConfig;
-import com.zbkj.pc.entity.PcHomeBannerVo;
+import com.zbkj.pc.entity.*;
 import com.zbkj.service.service.SystemGroupDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@ -19,11 +18,15 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
+
@Service
 public class PcService {
    @Autowired
    SystemGroupDataService systemGroupDataService;
    @Autowired
+    GroupConfigDao systemGroupConfigDao;
+    @Autowired
    private GroupConfigDao groupConfigDao;
    public List<PcHomeBannerVo> getHomeBanner() {
        LambdaQueryWrapper<SystemGroupData> wrapper = new LambdaQueryWrapper<>();
@ -58,8 +61,6 @@ public class PcService {
            JSONArray array= (JSONArray) jsonObject.get("fields");
            jsonObject= (JSONObject) array.get(0);
 //            vo.setImageUrl(jsonObject.get(""));
-//            vo.setName(config.getName());
-//            vo.setLinkUrl(config.getLinkUrl());
            vo.setSort(config.getSort());
            vo.setImageUrl(jsonObject.get("value").toString());
            voList.add(vo);
@ -75,4 +76,107 @@ public class PcService {
        JSONObject js= (JSONObject) array.get(0);
        System.out.println(js.get("value"));
    }
+    public PcShoppingConfigResponse getHomeConfig() {
+        List<String> keyList = new ArrayList<>();
+//        keyList.add(SysConfigConstants.PC_SHOPPING_LEFT_TOP_LOGO);
+//        keyList.add(SysConfigConstants.PC_SHOPPING_GOOD_STORE_IMAGE);
+//        keyList.add(SysConfigConstants.PC_SHOPPING_GO_PHONE_QR_CODE_TYPE);
+//
+//        MyRecord myRecord = systemConfigService.getValuesByKeyList(keyList);
+        PcShoppingConfigResponse response = new PcShoppingConfigResponse();
+//        response.setLeftTopLogo(myRecord.getStr(SysConfigConstants.PC_SHOPPING_LEFT_TOP_LOGO));
+//        response.setGoodStoreImage(myRecord.getStr(SysConfigConstants.PC_SHOPPING_GOOD_STORE_IMAGE));
+//        response.setGoPhoneQrCodeType(myRecord.getStr(SysConfigConstants.PC_SHOPPING_GO_PHONE_QR_CODE_TYPE));
+
+        response.setPhilosophyList(getPhilosophyList());
+        response.setFriendlyLinkList(getFriendlyLinkList());
+        response.setQuickEntryList(getQuickEntryList());
+        response.setQrCodeList(getBottomQrCodeList());
+//        response.setAdvertisement(getHomeAdvertisement());
+//        response.setHomeNavigationList(getHomeNavigationList());
+        return response;
+    }
+    private List<PcFriendlyLinkVo>  getFriendlyLinkList() {
+        List<GroupConfig> configList =findByTag(GroupConfigConstants.TAG_FRIENDLY_LINKS, Constants.SORT_ASC, true);
+        if (CollUtil.isEmpty(configList)) {
+            return new ArrayList<>();
+        }
+        Iterator<GroupConfig> iterator = configList.iterator();
+        List<PcFriendlyLinkVo> voList = new ArrayList<>();
+        while (iterator.hasNext()) {
+            GroupConfig config = iterator.next();
+            PcFriendlyLinkVo vo = new PcFriendlyLinkVo();
+            vo.setId(config.getId());
+            vo.setName(config.getName());
+            vo.setLinkUrl(config.getLinkUrl());
+            vo.setSort(config.getSort());
+            voList.add(vo);
+        }
+        return voList;
+    }
+    private List<PcPhilosophyVo> getPhilosophyList() {
+        List<GroupConfig> configList = findByTag(GroupConfigConstants.TAG_PHILOSOPHY, Constants.SORT_ASC, true);
+        if (CollUtil.isEmpty(configList)) {
+            return new ArrayList<>();
+        }
+        Iterator<GroupConfig> iterator = configList.iterator();
+        List<PcPhilosophyVo> voList = new ArrayList<>();
+        while (iterator.hasNext()) {
+            GroupConfig config = iterator.next();
+            PcPhilosophyVo vo = new PcPhilosophyVo();
+            vo.setId(config.getId());
+            vo.setImageUrl(config.getImageUrl());
+            vo.setName(config.getName());
+            vo.setSort(config.getSort());
+            voList.add(vo);
+        }
+        return voList;
+    }
+    public List<GroupConfig> findByTag(Integer tag, String sortRule, Boolean status) {
+        LambdaQueryWrapper<GroupConfig> lqw = Wrappers.lambdaQuery();
+        lqw.eq(GroupConfig::getTag, tag);
+        lqw.eq(GroupConfig::getIsDel, 0);
+        if (ObjectUtil.isNotNull(status)) {
+            lqw.eq(GroupConfig::getStatus, status ? 1 : 0);
+        }
+        if (StrUtil.isBlank(sortRule) || sortRule.equals(Constants.SORT_ASC)) {
+            lqw.orderByAsc(GroupConfig::getSort);
+        } else {
+            lqw.orderByDesc(GroupConfig::getSort);
+        }
+        lqw.orderByDesc(GroupConfig::getId);
+        return systemGroupConfigDao.selectList(lqw);
+    }
+    private List<PcQuickEntryVo> getQuickEntryList() {
+        List<GroupConfig> configList = findByTag(GroupConfigConstants.TAG_QUICK_ENTRY, Constants.SORT_ASC, true);
+        if (CollUtil.isEmpty(configList)) {
+            return new ArrayList<>();
+        }
+        return configList.stream().map(confing -> {
+            PcQuickEntryVo quickEntryVo = new PcQuickEntryVo();
+            quickEntryVo.setId(confing.getId());
+            quickEntryVo.setName(confing.getName());
+            quickEntryVo.setSort(confing.getSort());
+            if (StrUtil.isNotBlank(confing.getExpand())) {
+                List<PcQuickEntryLinksVo> linksVoList = com.alibaba.fastjson.JSONArray.parseArray(confing.getExpand(), PcQuickEntryLinksVo.class);
+                quickEntryVo.setLinkList(linksVoList);
+            }
+            return quickEntryVo;
+        }).collect(Collectors.toList());
+    }
+
+    private List<PcBottomQrCodeVo> getBottomQrCodeList() {
+        List<GroupConfig> codeConfigList = findByTag(GroupConfigConstants.TAG_BOTTOM_QR_CODE, Constants.SORT_ASC, null);
+        if (CollUtil.isEmpty(codeConfigList)) {
+            return CollUtil.newArrayList();
+        }
+        return codeConfigList.stream().map(codeConfig -> {
+            PcBottomQrCodeVo codeVo = new PcBottomQrCodeVo();
+            codeVo.setId(codeConfig.getId());
+            codeVo.setImageUrl(codeConfig.getImageUrl());
+            codeVo.setSort(codeConfig.getSort());
+            codeVo.setName(codeConfig.getName());
+            return codeVo;
+        }).collect(Collectors.toList());
+    }
 }
--- a/pc/components/layoutHeader.vue
+++ b/pc/components/layoutHeader.vue
@ -82,8 +82,36 @@
            <!--logo-->
            <nuxt-link :to="{ path: '/' }"
            >
-              <el-image lazy src="/logo.png" class="w100px h36px"></el-image
+              <el-image lazy src="/logo.png" class="w150px h54px"></el-image
              >
+              <nav class="top-right-nav">
+                <ul>
+                  <li>
+                    <a href="#">首页</a>
+                    <div class="submenu">
+                      <p>子菜单 1</p>
+                      <p>子菜单 2</p>
+                      <p>子菜单 3</p>
+                    </div>
+                  </li>
+                  <li>
+                    <a href="#">关于</a>
+                    <div class="submenu">
+                      <p>公司简介</p>
+                      <p>团队成员</p>
+                      <p>发展历程</p>
+                    </div>
+                  </li>
+                  <li>
+                    <a href="#">联系我们</a>
+                    <div class="submenu">
+                      <p>在线留言</p>
+                      <p>客服电话</p>
+                      <p>邮箱地址</p>
+                    </div>
+                  </li>
+                </ul>
+              </nav>
            </nuxt-link>
            <!--搜索框商品详情页、商户主页-->
 <!--            <div-->
@ -112,34 +140,7 @@
 <!--              </div>-->
 <!--            </div>-->
            <!-- 导航栏 -->
-            <nav class="top-right-nav">
-              <ul>
-                <li>
-                  <a href="#">首页</a>
-                  <div class="submenu">
-                    <p>子菜单 1</p>
-                    <p>子菜单 2</p>
-                    <p>子菜单 3</p>
-                  </div>
-                </li>
-                <li>
-                  <a href="#">关于</a>
-                  <div class="submenu">
-                    <p>公司简介</p>
-                    <p>团队成员</p>
-                    <p>发展历程</p>
-                  </div>
-                </li>
-                <li>
-                  <a href="#">联系我们</a>
-                  <div class="submenu">
-                    <p>在线留言</p>
-                    <p>客服电话</p>
-                    <p>邮箱地址</p>
-                  </div>
-                </li>
-              </ul>
-            </nav>
+
            <!--搜索框-->
            <!--            <div v-else class="w-560px ml-5px" >-->
            <!--              <el-input-->
@ -178,14 +179,14 @@
          <div @mouseenter="handlerMenuEnter" @mouseleave="handleSubmitLeave">
            <!--菜单分类-->
            <div class="menu flex-y-center">
-              <!--              <div-->
-              <!--                @mouseenter="handlerMenuEnter(0)"-->
-              <!--                @click="handleGoPage(item, 0)"-->
-              <!--                class="cursor-pointer menu-item fontColor333 text-16px mr-40px font-500 oppoSans-M classification flex" style="flex: none;"-->
-              <!--              >-->
-              <!--                <span class="iconfont icon-shangpinfenlei mr-8px"></span>商品分类-->
-              <!--              </div>-->
-              <template v-if="pcHomeCon && pcHomeCon.homeNavigationList.length">
+<!--                            <div-->
+<!--                              @mouseenter="handlerMenuEnter(0)"-->
+<!--                              @click="handleGoPage(item, 0)"-->
+<!--                              class="cursor-pointer menu-item fontColor333 text-16px mr-40px font-500 oppoSans-M classification flex" style="flex: none;"-->
+<!--                            >-->
+<!--                              <span class="iconfont icon-shangpinfenlei mr-8px"></span>商品分类-->
+<!--                            </div>-->
+              <template v-if="pcHomeCon && pcHomeCon.homeNavigationList!=null&&pcHomeCon.homeNavigationList.length">
                <div
                    v-for="(item, index) in pcHomeCon.homeNavigationList"
                    :key="item.id"
@ -552,8 +553,9 @@ const handleHeaderLogout = Debounce(async () => {
 /* 导航栏样式 */
 .top-right-nav {
  position: absolute;
-  top: 20px;
+  top: 0px;
  right: 20px;
+  line-height: 59px;
  z-index: 10;
  margin-right: 8%;
 }
--- a/pc/layouts/default.vue
+++ b/pc/layouts/default.vue
@ -28,7 +28,7 @@
    <!-- 共享的底部内容 -->
    <LayoutFooter :pc-home-con="pcHomeCon"></LayoutFooter>
    <!-- 登录弹窗 -->
-    <UserLogin ref="userLoginRef" @onLoginSucceeded="onLoginSucceeded"></UserLogin>
+<!--    <UserLogin ref="userLoginRef" @onLoginSucceeded="onLoginSucceeded"></UserLogin>-->
    <!-- 新人礼 -->
    <newcomer-gift
      :couponModal="couponModal"
--- a/pc/pages/index.vue
+++ b/pc/pages/index.vue
@ -10,6 +10,7 @@
    <RecommendedIndex></RecommendedIndex>
    <!--猜你喜欢-->
    <recommend></recommend>
+    <layout-footer></layout-footer>
  </div>
 </template>

--- a/pc/server/homeApi.ts
+++ b/pc/server/homeApi.ts
@ -33,7 +33,7 @@ export const indexMerchantListApi = (recomdnum: number) => {
 */
 export const pcHomeConfigApi = () => {
    //return httpRequest.get('front/pc/home/get/config');
-  return $request.get({ url: `front/pc/home/get/config` })
+  return $request.get({ url: `pc/home/get/config` })
 }

 /**