Merge branch 'feature/task1.0.0' into msb_test

pages/goods/detail/_id.vue

@@ -605,6 +605,7 @@ export default {
   }
   &__details {
     width: 714px;
+    padding-top: 10px;
     &-title {
       font-size: 16px;
       font-family: Microsoft YaHei-Regular, Microsoft YaHei;

pages/goods/list/index.vue

@@ -11,7 +11,7 @@
     <el-skeleton
       v-for="item in 5"
       :key="item"
-      style="width: 230px;margin-right:20px;"
+      style="width: 230px; margin-right: 20px"
       :loading="true"
       animated
     >
@@ -194,8 +194,8 @@ export default {
       if (vm.levelType == 1) {
         vm.params.categoryId = vm.categoryOneList[vm.levelActive].id;
       }
-      if(vm.params.name){
+      if (vm.params.name) {
-        vm.params.categoryId = ''
+        vm.params.categoryId = "";
       }
       let res = await ApiGetGoodsList(vm.params);
       vm.pageloading = false;
@@ -259,6 +259,9 @@ export default {
       &-btn {
         margin-right: 50px;
         cursor: pointer;
+        &:hover {
+          color: #ff512b;
+        }
       }
       &-active {
         color: #ff512b;

pages/index/module/Banner.vue

@@ -9,6 +9,20 @@
 <template>
   <div class="home-banner">
     <el-carousel height="360px" indicator-position="outside">
+      <el-carousel-item>
+        <el-image
+          @click="onAdvBannerClick(1)"
+          :src="banner1"
+          fit="cover"
+        ></el-image>
+      </el-carousel-item>
+      <el-carousel-item>
+        <el-image
+          @click="onAdvBannerClick(2)"
+          :src="banner2"
+          fit="cover"
+        ></el-image>
+      </el-carousel-item>
       <el-carousel-item v-for="item in bannerList" :key="item.id">
         <el-image
           @click="onBannerClick(item.id)"
@@ -24,6 +38,8 @@ export default {
   name: "HomtBanner",
   data() {
     return {
+      banner1: require("~/assets/img/home/banner1.jpg"),
+      banner2: require("~/assets/img/home/banner2.jpg"),
       bannerList: [
         {
           url: "https://cdn.mashibing.com/shop-pc/goods13.jpg",
@@ -45,6 +61,13 @@ export default {
     };
   },
   methods: {
+    onAdvBannerClick(i) {
+      if (i === 1) {
+        window.open(`https://www.mashibing.com/live/1530`);
+      } else if (i === 2) {
+        window.open(`https://www.mashibing.com/free/1373`);
+      }
+    },
     onBannerClick(goodsId) {
       window.open(`${location.origin}/goods/detail/${goodsId}`);
     },