Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/shopping/shopHome.vue

@@ -93,7 +93,7 @@
                       </div>
         </a-carousel>
         <div class="more d-flex" style="padding-top: 20px">
-          <a href="#">更多西装</a>
+          <a href="/#/shopping/chengyi">更多推荐</a>
           <img src="./assets/youjiantou.png" alt="" />
         </div>
 <!--        <el-carousel type="card" arrow="always">-->
@@ -138,7 +138,7 @@
               </div>
             </div>
             <div class="more d-flex">
-              <router-link to="/shopping/clothType">更多西装</router-link>
+              <router-link to="/shopping/clothType">更多男装</router-link>
               <img src="./assets/youjiantou.png" alt="" />
             </div>
           </el-tab-pane>
@@ -165,7 +165,7 @@
               </div>
             </div>
             <div class="more d-flex">
-              <router-link to="/shopping/clothType">更多西装</router-link>
+              <router-link to="/shopping/clothType">更多女装</router-link>
               <img src="./assets/youjiantou.png" alt="" />
             </div>
           </el-tab-pane>
@@ -192,7 +192,7 @@
               </div>
             </div>
             <div class="more d-flex">
-              <router-link to="/shopping/clothType">更多西装</router-link>
+              <router-link to="/shopping/clothType">更多童装</router-link>
               <img src="./assets/youjiantou.png" alt="" />
             </div>
           </el-tab-pane>
@@ -205,6 +205,7 @@
 <script>
   import Header from './components/Header/HeaderView'
   import Footer from './components/Footer/FooterView'
+  import { httpAction, getAction } from '@/api/manage'
   export default {
     name: "shopHome",
     components: { Header ,Footer},
@@ -212,6 +213,9 @@
       return {
         vh: 0,
         activeName: "first",
+        url: {
+          zxdz: "/zygoods/zyGoods/zxdz",
+        },
         // 轮播图数据
         imgList: [
           require("./assets/bg.png"),
@@ -624,6 +628,14 @@
     },
     mounted() {
       this.vh = window.screen.availHeight - 100;
+      getAction(this.url.zxdz).then((res) => {
+        if (res.success) {
+          console.log(res.result);
+          this.clothList = res.result;
+        }else{
+          this.$message.error(res.message);
+        }
+      })
     },
   }
 </script>