商家楼层装修

buyer/public/config.js

@@ -3,8 +3,8 @@ var BASE = {
      * @description api请求基础路径
      */
     API_DEV: {
-      common: "https://common-api.pickmall.cn",
-      buyer: "https://buyer-api.pickmall.cn",
+      common: "http://192.168.102:8890",
+      buyer: "http://192.168.102:8888",
       seller: "https://store-api.pickmall.cn",
       manager: "https://admin-api.pickmall.cn"
     },

buyer/src/api/index.js

@@ -1,13 +1,24 @@
-import request, {Method} from '@/plugins/request.js'
+import request, { Method } from "@/plugins/request.js";
 
 // 获取首页楼层装修数据
-export function indexData (params) {
+export function indexData(params) {
   return request({
-    url: '/buyer/other/pageData/getIndex',
+    url: "/buyer/other/pageData/getIndex",
     method: Method.GET,
     needToken: false,
-    params
-  })
+    params,
+  });
+}
+
+/**
+ * 获取店铺楼层数据
+ */
+export function getFloorStoreData(params) {
+  return request({
+    url: `/buyer/other/pageData?pageClientType=PC`,
+    method: "get",
+    params,
+  });
 }
 
 /**
@@ -15,21 +26,22 @@ export function indexData (params) {
  * @param pageClientType 客户端类型,可用值:PC,H5,WECHAT_MP,APP
  * @param pageType 页面类型,可用值:INDEX,STORE,SPECIAL
  */
-export function pageData (params) {
+export function pageData(params) {
   return request({
     url: `/buyer/other/pageData`,
     method: Method.GET,
     needToken: false,
-    params
-  })
+    params,
+  });
 }
+
 /**
  * 刷新token
  */
-export function handleRefreshToken (token) {
+export function handleRefreshToken(token) {
   return request({
     url: `/buyer/passport/member/refresh/${token}`,
     method: Method.GET,
-    needToken: false
-  })
+    needToken: false,
+  });
 }

buyer/src/pages/Merchant.vue

@@ -1,189 +1,335 @@
 <template>
   <div class="merchant">
-    <BaseHeader />
-    <!-- 搜索栏 -->
-    <Search :store="true" @search="search"></Search>
-    <!-- 店铺logo -->
-    <div class="shop-logo">
-      <div>
-        <img :src="storeMsg.storeLogo" height="80" alt="">
+    <!-- 普通店铺装修 -->
+    <div v-if="basePageData">
+      <BaseHeader />
+      <!-- 搜索栏 -->
+      <Search :store="true" @search="search"></Search>
+      <!-- 店铺logo -->
+      <div class="shop-logo">
         <div>
-          <p>{{storeMsg.storeName || 'xx店铺'}}</p>
-          <p class="ellipsis" :alt="storeMsg.storeDesc" v-html="storeMsg.storeDesc"></p>
-        </div>
-        <div>
-          <span class="hover-pointer" @click="collect"><Icon type="ios-heart" :color="storeCollected ? '#ed3f14' : '#fff'" />{{storeCollected?'已收藏店铺':'收藏店铺'}}</span>
-          <span style="width:80px" class="hover-pointer ml_10" @click="connectCs(storeMsg.yzfSign)"><Icon custom="icomoon icon-customer-service"  />联系客服</span>
+          <img :src="storeMsg.storeLogo" height="80" alt="" />
+          <div>
+            <p>{{ storeMsg.storeName || "xx店铺" }}</p>
+            <p
+              class="ellipsis"
+              :alt="storeMsg.storeDesc"
+              v-html="storeMsg.storeDesc"
+            ></p>
+          </div>
+          <div>
+            <span class="hover-pointer" @click="collect"
+              ><Icon
+                type="ios-heart"
+                :color="storeCollected ? '#ed3f14' : '#fff'"
+              />{{ storeCollected ? "已收藏店铺" : "收藏店铺" }}</span
+            >
+            <span
+              style="width: 80px"
+              class="hover-pointer ml_10"
+              @click="connectCs(storeMsg.yzfSign)"
+              ><Icon custom="icomoon icon-customer-service" />联系客服</span
+            >
+          </div>
         </div>
       </div>
-    </div>
-    <div  class="store-category">
-      <ul class="cate-list">
-        <li class="cate-item" @click="searchByCate({id:'', labelName: '店铺推荐'})">首页</li>
-        <li class="cate-item" v-for="(cate, index) in cateList" :key="index">
-          <Dropdown v-if="cate.children.length">
-            <div @click.self="searchByCate(cate)">{{cate.labelName}} <Icon type="ios-arrow-down"></Icon></div>
-            <DropdownMenu slot="list">
-                <DropdownItem @click.native="searchByCate(sec)" :name="sec.id" v-for="sec in cate.children" :key="sec.id">{{sec.labelName}}</DropdownItem>
-            </DropdownMenu>
-          </Dropdown>
-          <span v-else @click.self="searchByCate(cate)">{{cate.labelName}}</span>
-        </li>
-      </ul>
-    </div>
-
-    <div class="promotion-decorate">{{cateName}}</div>
-
-    <div class="goods-list">
-      <empty v-if="goodsList.length === 0" />
-      <div
-        v-else
-        class="goods-show-info"
-        v-for="(item, index) in goodsList"
-        :key="index"
-        @click="goGoodsDetail(item.content.id, item.content.goodsId)"
-      >
-        <div class="goods-show-img">
-          <img width="220" height="220" :src="item.content.thumbnail" />
-        </div>
-        <div class="goods-show-price">
-          <span>
-            <span class="seckill-price text-danger">{{
-              item.content.price | unitPrice("￥")
+      <div class="store-category">
+        <ul class="cate-list">
+          <li
+            class="cate-item"
+            @click="searchByCate({ id: '', labelName: '店铺推荐' })"
+          >
+            首页
+          </li>
+          <li class="cate-item" v-for="(cate, index) in cateList" :key="index">
+            <Dropdown v-if="cate.children.length">
+              <div @click.self="searchByCate(cate)">
+                {{ cate.labelName }} <Icon type="ios-arrow-down"></Icon>
+              </div>
+              <DropdownMenu slot="list">
+                <DropdownItem
+                  @click.native="searchByCate(sec)"
+                  :name="sec.id"
+                  v-for="sec in cate.children"
+                  :key="sec.id"
+                  >{{ sec.labelName }}</DropdownItem
+                >
+              </DropdownMenu>
+            </Dropdown>
+            <span v-else @click.self="searchByCate(cate)">{{
+              cate.labelName
             }}</span>
-          </span>
-        </div>
-        <div class="goods-show-detail">
-          <span>{{ item.content.goodsName }}</span>
-        </div>
-        <div class="goods-show-num">
-          已有<span>{{ item.content.commentNum || 0 }}</span>人评价
+          </li>
+        </ul>
+      </div>
+
+      <div class="promotion-decorate">{{ cateName }}</div>
+
+      <div class="goods-list">
+        <empty v-if="goodsList.length === 0" />
+        <div
+          v-else
+          class="goods-show-info"
+          v-for="(item, index) in goodsList"
+          :key="index"
+          @click="goGoodsDetail(item.content.id, item.content.goodsId)"
+        >
+          <div class="goods-show-img">
+            <img width="220" height="220" :src="item.content.thumbnail" />
+          </div>
+          <div class="goods-show-price">
+            <span>
+              <span class="seckill-price text-danger">{{
+                item.content.price | unitPrice("￥")
+              }}</span>
+            </span>
+          </div>
+          <div class="goods-show-detail">
+            <span>{{ item.content.goodsName }}</span>
+          </div>
+          <div class="goods-show-num">
+            已有<span>{{ item.content.commentNum || 0 }}</span
+            >人评价
+          </div>
         </div>
       </div>
+      <div class="goods-page">
+        <Page
+          show-sizer
+          @on-change="changePageNum"
+          @on-page-size-change="changePageSize"
+          :total="total"
+          :page-size="params.pageSize"
+        ></Page>
+      </div>
+      <BaseFooter />
     </div>
-    <div class="goods-page">
-      <Page
-        show-sizer
-        @on-change="changePageNum"
-        @on-page-size-change="changePageSize"
-        :total="total"
-        :page-size="params.pageSize"
-      ></Page>
+
+    <div v-if="enablePageData">
+      <drawer></drawer>
+      <!-- 固定头部 -->
+      <hover-search
+        class="hover-search"
+        :class="{ show: topSearchShow }"
+      ></hover-search>
+      <!-- 顶部广告 -->
+      <FixedTopPage :data="topAdvert"></FixedTopPage>
+      <!-- 头部 包括登录，我的订单等 -->
+      <BaseHeader></BaseHeader>
+      <!-- 搜索框、logo -->
+      <Search :store="true" @search="search"></Search>
+      <!-- 商品分类 -->
+      <cateNav
+        :showAlways="true"
+        v-if="showNav"
+        :large="carouselLarge"
+        :opacity="carouselOpacity"
+      ></cateNav>
+      <!-- 楼层装修部分 -->
+      <model-form ref="modelForm" :data="modelForm"></model-form>
+      <!-- 底部栏 -->
+      <BaseFooter></BaseFooter>
     </div>
-    <BaseFooter />
   </div>
 </template>
 
 <script>
-import {getDetailById, getCateById} from '@/api/shopentry'
-import { cancelCollect, collectGoods, isCollection } from '@/api/member';
-import {goodsList} from '@/api/goods';
+import { getDetailById, getCateById } from "@/api/shopentry";
+import { cancelCollect, collectGoods, isCollection } from "@/api/member";
+import { goodsList } from "@/api/goods";
+import Search from "@/components/Search";
+import ModelForm from "@/components/indexDecorate/ModelForm";
+import HoverSearch from "@/components/header/hoverSearch";
+import storage from "@/plugins/storage";
+import { getFloorStoreData } from "@/api/index.js";
+import { seckillByDay } from "@/api/promotion";
 export default {
-  name: 'Merchant',
-  data () {
+  name: "Merchant",
+  components: {
+    Search,
+    ModelForm,
+    HoverSearch,
+  },
+  data() {
     return {
+      // 店铺装修的内容
+      modelForm: { list: [] }, // 楼层装修数据
+      topAdvert: {}, // 顶部广告
+      showNav: false, // 是否展示分类栏
+      topSearchShow: false, // 滚动后顶部搜索栏展示
+      carouselLarge: false, // 不同轮播分类尺寸
+      carouselOpacity: false, // 不同轮播分类样式,
+
+      enablePageData: false, //是否显示楼层装修内容
+      basePageData: false, //基础店铺信息
       storeMsg: {}, // 店铺信息
       cateList: [], // 店铺分裂
       goodsList: [], // 商品列表
       total: 0, // 商品数量
-      params: { // 请求参数
+      params: {
+        // 请求参数
         pageNumber: 1,
         pageSize: 20,
-        keyword: '',
+        keyword: "",
         storeId: this.$route.query.id,
-        storeCatId: ''
+        storeCatId: "",
       },
-      cateName: '店铺推荐', // 分类名称
-      storeCollected: false // 是否收藏
-    }
+      cateName: "店铺推荐", // 分类名称
+      storeCollected: false, // 是否收藏
+    };
   },
-  created () {
-    this.getStoreMsg()
-    this.getCateList()
-    this.getGoodsList()
+  created() {
+    this.getStoreMsg();
   },
   methods: {
-    getStoreMsg () { // 店铺信息
-      getDetailById(this.$route.query.id).then(res => {
-        if (res.success) {
-          this.storeMsg = res.result
-          document.title = this.storeMsg.storeName
-          if (this.Cookies.getItem('userInfo')) {
-            isCollection('STORE', this.storeMsg.storeId).then(res => {
-              if (res.success && res.result) {
-                this.storeCollected = true;
+    getIndexData() {
+      // 获取首页装修数据
+      getFloorStoreData({ clientType: "PC", num: this.$route.query.id ,pageType:'STORE'}).then(
+        (res) => {
+          if (res.success) {
+            let dataJson = JSON.parse(res.result.pageData);
+            // 秒杀活动不是装修的数据，需要调用接口判断是否有秒杀商品
+            // 轮播图根据不同轮播，样式不同
+            for (let i = 0; i < dataJson.list.length; i++) {
+              let type = dataJson.list[i].type;
+              if (type === "carousel2") {
+                this.carouselLarge = true;
+              } else if (type === "carousel1") {
+                this.carouselLarge = true;
+                this.carouselOpacity = true;
               }
-            })
+
+              // else if (type === "seckill") {
+              //   let seckill = this.getListByDay();
+              //   dataJson.list[i].options.list = seckill;
+              // }
+            }
+            this.modelForm = dataJson;
+            storage.setItem("navList", dataJson.list[1]);
+            this.showNav = true;
+            this.topAdvert = dataJson.list[0];
           }
         }
-      })
+      );
     },
-    getCateList () { // 店铺分类
-      getCateById(this.$route.query.id).then(res => {
+    // async getListByDay() {
+    //   // 当天秒杀活动
+    //   const res = await seckillByDay();
+    //   if (res.success && res.result.length) {
+    //     return res.result;
+    //   } else {
+    //     return [];
+    //   }
+    // },
+
+    getStoreMsg() {
+      // 店铺信息
+      getDetailById(this.$route.query.id).then((res) => {
         if (res.success) {
-          this.cateList = res.result
+          if (res.result.pageShow == "1") {
+            this.getIndexData();
+            let that = this;
+            window.onscroll = function () {
+              let top =
+                document.documentElement.scrollTop || document.body.scrollTop;
+              if (top > 300) {
+                that.topSearchShow = true;
+              } else {
+                that.topSearchShow = false;
+              }
+            };
+            // 楼层装修
+            this.enablePageData = true;
+          } else {
+            this.storeMsg = res.result;
+            document.title = this.storeMsg.storeName;
+            if (this.Cookies.getItem("userInfo")) {
+              isCollection("STORE", this.storeMsg.storeId).then((res) => {
+                if (res.success && res.result) {
+                  this.storeCollected = true;
+                }
+              });
+            }
+            this.basePageData = true;
+
+            this.getCateList();
+            this.getGoodsList();
+          }
         }
-      })
-    },
-    getGoodsList () { // 商品信息
-      goodsList(this.params).then((res) => {
-        if (res.success) {
-          this.goodsList = res.result.content;
-          this.total = res.result.totalElements;
-        }
-      }).catch(() => {
       });
     },
-    goGoodsDetail (skuId, goodsId) {
+    getCateList() {
+      // 店铺分类
+      getCateById(this.$route.query.id).then((res) => {
+        if (res.success) {
+          this.cateList = res.result;
+        }
+      });
+    },
+    getGoodsList() {
+      // 商品信息
+      goodsList(this.params)
+        .then((res) => {
+          if (res.success) {
+            this.goodsList = res.result.content;
+            this.total = res.result.totalElements;
+          }
+        })
+        .catch(() => {});
+    },
+    goGoodsDetail(skuId, goodsId) {
       // 跳转商品详情
       let routeUrl = this.$router.resolve({
-        path: '/goodsDetail',
-        query: { skuId, goodsId }
+        path: "/goodsDetail",
+        query: { skuId, goodsId },
       });
-      window.open(routeUrl.href, '_blank');
+      window.open(routeUrl.href, "_blank");
     },
-    search (val) { // 搜索本店商品
+    search(val) {
+      // 搜索本店商品
       console.log(val);
-      this.params.keyword = val
-      this.getGoodsList()
+      this.params.keyword = val;
+      this.getGoodsList();
     },
-    searchByCate (cate) { // 搜索同分类下商品
-      this.params.storeCatId = cate.id
-      this.cateName = cate.labelName
-      this.getGoodsList()
+    searchByCate(cate) {
+      // 搜索同分类下商品
+      this.params.storeCatId = cate.id;
+      this.cateName = cate.labelName;
+      this.getGoodsList();
     },
     // 分页 修改页码
-    changePageNum (val) {
+    changePageNum(val) {
       this.params.pageNumber = val;
       this.getGoodsList();
     },
     // 分页 修改页数
-    changePageSize (val) {
+    changePageSize(val) {
       this.params.pageNumber = 1;
       this.params.pageSize = val;
       this.getGoodsList();
     },
-    async collect () { // 收藏店铺
+    async collect() {
+      // 收藏店铺
       if (this.storeCollected) {
-        let cancel = await cancelCollect('STORE', this.storeMsg.storeId)
+        let cancel = await cancelCollect("STORE", this.storeMsg.storeId);
         if (cancel.success) {
-          this.$Message.success('已取消收藏')
+          this.$Message.success("已取消收藏");
           this.storeCollected = false;
         }
       } else {
-        let collect = await collectGoods('STORE', this.storeMsg.storeId);
+        let collect = await collectGoods("STORE", this.storeMsg.storeId);
         if (collect.code === 200) {
           this.storeCollected = true;
-          this.$Message.success('收藏店铺成功,可以前往个人中心我的收藏查看');
+          this.$Message.success("收藏店铺成功,可以前往个人中心我的收藏查看");
         }
       }
-    }
-  }
+    },
+  },
 };
 </script>
 
 <style scoped lang="scss">
-@import '../assets/styles/goodsList.scss';
+@import "../assets/styles/goodsList.scss";
 .merchant {
   margin: 0 auto;
 }
@@ -193,25 +339,25 @@ export default {
   background-color: #666;
   padding: 4px;
   color: #fff;
-  >div{
+  > div {
     display: flex;
     width: 1200px;
     margin: 0 auto;
     align-items: center;
 
-    >div:nth-child(2){
+    > div:nth-child(2) {
       margin-left: 10px;
       flex: 1;
     }
 
-    >div:nth-child(3){
+    > div:nth-child(3) {
       width: 200px;
     }
   }
   p:nth-child(1) {
     font-size: 20px;
   }
-  p:nth-child(2){
+  p:nth-child(2) {
     font-size: 14px;
     max-height: 40px;
     max-width: 400px;
@@ -221,9 +367,9 @@ export default {
 .store-category {
   background-color: #005aa0;
   color: #fff;
-  .cate-list{
+  .cate-list {
     width: 1200px;
-    margin: 0 auto ;
+    margin: 0 auto;
     clear: left;
     height: 30px;
     line-height: 30px;
@@ -231,12 +377,13 @@ export default {
       margin-right: 25px;
       float: left;
     }
-    .cate-item:hover{
+    .cate-item:hover {
       cursor: pointer;
     }
   }
 }
-.promotion-decorate::before,.promotion-decorate::after{
-  background-image: url('/src/assets/images/sprite@2x.png');
+.promotion-decorate::before,
+.promotion-decorate::after {
+  background-image: url("/src/assets/images/sprite@2x.png");
 }
 </style>