updated

src/main/resources/static/css/index/index_new.h5.css

@@ -31,7 +31,7 @@
   height: 20vw;
   display: flex;
   align-items: center;
-  border: 1px solid;
+  background: linear-gradient(180deg, #FFF1EB 0%, #FFFFFF 100%);
  }
  .quickOperation .van-swipe__indicator {
   width: 1.867vw;
@@ -58,6 +58,7 @@
   height: 100%;
   border-radius: 50%;
   border: 1px solid;
+  overflow: hidden;
  }
  .quickOperation .list .list-content .list-title {
   margin-left: 2.4vw;
@@ -66,9 +67,8 @@
   justify-content: space-between;
  }
  .quickOperation .list .list-content .list-title .title-1 {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+  width: 26vw;
+  line-height: 5vw;
  }
  .quickOperation .list .list-content .list-title .title-1 .title-1-item {
   font-size: 3.6vw;

src/main/resources/static/css/index/index_new.pc.css

@@ -31,7 +31,7 @@ li{list-style:none;}
     align-items: center;
 }
 .quickOperation .el-carousel {
-    width: 1300px;
+    width: 1336px;
 }
 .quickOperation .el-carousel .el-carousel__button {
     width: 14px;
@@ -52,17 +52,11 @@ li{list-style:none;}
     opacity: 0.2;
     font-size: 24px;
 }
-.quickOperation .el-carousel__arrow--left {
-    left: 0;
-}
-.quickOperation .el-carousel__arrow--right {
-    right: 0;
-}
 .quickOperation .el-carousel__container {
     height: 150px !important;
 }
 .quickOperation .carousel-list {
-    width: 1180px;
+    width: 1184px;
     height: 100%;
     display: grid !important;
     grid-template-columns: repeat(4, 1fr);
@@ -78,15 +72,16 @@ li{list-style:none;}
     transition: .3s;
 }
 .quickOperation .carousel-list .list .card {
-    border: 1px solid;
     height: 120px;
     width: 100%;
     display: flex;
     justify-content: center;
     align-items: center;
+    background: linear-gradient(180deg, #FFF1EB 0%, #FFFFFF 100%);
+    box-sizing: border-box;
 }
 .quickOperation .carousel-list .list:hover {
-    padding: 0;
+    padding-top: 10px;
 }
 .quickOperation .carousel-list .list:hover .card {
     border: 1px solid #FF5B00;
@@ -102,6 +97,7 @@ li{list-style:none;}
     height: 64px;
     border-radius: 50%;
     border: 1px solid;
+    overflow: hidden;
 }
 .carousel-list .card-content .card-title{
     margin-left: 16px;
@@ -111,14 +107,16 @@ li{list-style:none;}
     height: 64px;
 }
 .carousel-list .card-content .card-title .title-1 {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+    line-height: 30px;
+    width: 140px;
+    box-sizing: border-box;
 }
 .carousel-list .card-content .card-title .title-1 .title-1-item {
     font-size: 18px;
     font-weight: bold;
     color: #4A4F58;
+    display: inline-block;
+    box-sizing: border-box;
 }
 .carousel-list .card-content .card-title .title-1 .title-2-item {
     width: 38px;
@@ -129,6 +127,8 @@ li{list-style:none;}
     color: #B2B2B2;
     text-align: center;
     line-height: 18px;
+    display: inline-block;
+    box-sizing: border-box;
 }
 .carousel-list .card-content .card-title .title-2 {
     font-size: 14px;

src/main/resources/static/css/supplier-login/login.css

@@ -352,7 +352,7 @@ body{
     padding-top: 7vh;
 }
 #zeroPage .el-carousel__container {
-    height: 26.562vw;
+    height: 510px;
 }
 .el-carousel__item:nth-child(1) {
     display: flex;

src/main/resources/static/js/index.js

@@ -14,33 +14,32 @@ var homeData = new Vue({
         couponEntry:2,// 活动优惠券弹窗显示控制
         hotListPageFloor:[],// 新皮橱窗
         homePageFloor:[],//楼层
-        quickoperaList: [1,2,4,53,3,5,677,2], // 快捷运营入口列表
+        quickoperaList: [], // 快捷运营入口列表
     },
     filters: {
         NumFormat: function(value) {//处理金额
             return Number(value).toFixed(2);
         },
     },
-    computed: {
+    methods: {
         // 快捷运营列表
-        footList() {
+        footList(arr) {
+            if (!Array.isArray(arr)) return []
             let newArr = [],
                 a = []
-            this.quickoperaList.map((item, index) => {
+            arr.map((item, index) => {
                 if (index !== 0 && index % 4 === 0) {
                     newArr.push(a)
                     a = []
                     a.push(item)
                 }
                 else a.push(item)
-                if (this.quickoperaList.length === (index + 1)) {
+                if (arr.length === (index + 1)) {
                     newArr.push(a)
                 }
             })
             return newArr
         },
-    },
-    methods: {
         // 是否显示vip标签价格
         showVipPriceTag: function(pros){
             //非会员
@@ -113,6 +112,8 @@ var homeData = new Vue({
             PublicApi.GetHomeInit({ source: 1 },function(response){
                 if(response.code == 0){
                     _self.couponEntry = response.data.couponEntry
+                    _self.quickoperaList = _self.footList(response.data.shortcutList)
+                    console.log(_self.quickoperaList)
                     if(isPC){
                         _self.newsList = response.data.annlist.slice(0,2)
                     }else{
@@ -372,11 +373,11 @@ var homeData = new Vue({
                 }
             });
         },
-        getQuickOpreationList() {
-        },
         // 快捷运营跳转
         goQuickOpera($event) {
-            window.location.href = '/quickOperation/operation-324.html'
+            // 链接跳转
+            if (localStorage.getItem('userInfo')) return window.location.href = $event.link
+            else return window.location.href = '/login.html'
         },
     },
     created: function() {
@@ -401,7 +402,6 @@ var homeData = new Vue({
             this.swiperFloor();
             this.GetHomeInit();
         }
-        this.getQuickOpreationList() // 获取快捷运营列表
         // Dom加载后
         this.$nextTick(function(){
             // 图片懒加载

src/main/resources/templates/index.html

@@ -40,6 +40,28 @@
             <p th:text="${menu.name}"></p>
         </a>
     </div>
+    <div class="quickOperation" v-if="quickoperaList.length > 0 && !isPC" v-cloak>
+        <van-swipe class="my-swipe" :autoplay="false">
+            <van-swipe-item v-for="(item, index) in quickoperaList" :key="item">
+                <div class="carousel-list">
+                    <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(i)">
+                        <div class="list-content">
+                            <div class="list-icon">
+                                <van-image style="width: 100%; height: 100%;" :src="i.icon" />
+                            </div>
+                            <div class="list-title">
+                                <div class="title-1">
+                                    <div class="title-1-item">{{i.name}}</div>
+                                    <div class="title-2-item">GO></div>
+                                </div>
+<!--                                <div class="title-2">量大优惠 豪礼相送</div>-->
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </van-swipe-item>
+        </van-swipe>
+    </div>
     <div id="new-container" class="section_container" v-if="newsList.length>0">
         <div class="inner">
             <div class="new-label">公告：</div>
@@ -53,20 +75,22 @@
         </div>
     </div>
     <!--  快捷运营  -->
-    <div class="quickOperation" v-if="footList" v-cloak>
-        <el-carousel v-if="isPC" :autoplay="false" indicator-position="outside">
-            <el-carousel-item v-for="(item, index) in footList" :key="item">
+    <div class="quickOperation" v-if="quickoperaList.length > 0 && isPC" v-cloak>
+        <el-carousel :autoplay="false" indicator-position="outside">
+            <el-carousel-item v-for="(item, index) in quickoperaList" :key="item">
                 <div class="carousel-list">
-                    <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(item)">
+                    <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(i)">
                         <div class="card">
                             <div class="card-content">
-                                <div class="card-icon"></div>
+                                <div class="card-icon">
+                                    <el-image style="width: 100%; height: 100%;" :src="i.icon"></el-image>
+                                </div>
                                 <div class="card-title">
                                     <div class="title-1">
-                                        <div class="title-1-item">豪礼专区</div>
+                                        <div class="title-1-item">{{i.name}}</div>
                                         <div class="title-2-item">GO></div>
                                     </div>
-                                    <div class="title-2">量大优惠 豪礼相送</div>
+<!--                                    <div class="title-2">量大优惠 豪礼相送</div>-->
                                 </div>
                             </div>
                         </div>
@@ -74,24 +98,6 @@
                 </div>
             </el-carousel-item>
         </el-carousel>
-        <van-swipe v-else class="my-swipe" :autoplay="false">
-            <van-swipe-item v-for="(item, index) in footList" :key="item">
-                <div class="carousel-list">
-                    <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(item)">
-                        <div class="list-content">
-                            <div class="list-icon"></div>
-                            <div class="list-title">
-                                <div class="title-1">
-                                    <div class="title-1-item">豪礼专区</div>
-                                    <div class="title-2-item">GO></div>
-                                </div>
-                                <div class="title-2">量大优惠 豪礼相送</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </van-swipe-item>
-        </van-swipe>
     </div>
     <!--首页楼层主体数据-->
     <div class="section_container">

src/main/resources/templates/supplier_login/index.html

@@ -19,7 +19,7 @@
     <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" />
-    <link rel="stylesheet" href="https://unpkg.com/vant@2.12/lib/index.css" />coed
+    <link rel="stylesheet" href="https://unpkg.com/vant@2.12/lib/index.css" />
     <!--    <template th:replace="components/analysis"></template>-->
 </head>
 
@@ -82,7 +82,7 @@
             <div class="slide_icon_item slide_icon_qrcode">
                 <img src="" /> 微信客服
                 <div class="tooltip tooltip_2" :style="{bottom: activeLinkId!==0 ? '50px':'0'}">
-                    <img src="/img/supplier-login/kefu_qr.jpg" alt="采美客服">
+                    <img src="https://static.caimei365.com/app/img/supplier-login/kefu_qr.jpg" alt="采美客服">
                 </div>
             </div>
             <div class="slide_icon_item goTop" @click="H5link({href: '#zeroPage', id: 0})" v-if="activeLinkId!==0"></div>
@@ -514,7 +514,7 @@
                         <div class="showIphone_time">周一至周五 9:00~1800</div>
                         <div class="showIphone_phone" @click="confirm">153-3889-7365</div>
                     </div>
-                    <img style="width: 48vw; height: 48vw;" src="/img/supplier-login/kefu_qr.jpg" alt="采美客服" v-else/>
+                    <img style="width: 48vw; height: 48vw;" src="https://static.caimei365.com/app/img/supplier-login/kefu_qr.jpg" alt="采美客服" v-else/>
                 </van-popup>
                 <van-popup v-model="showPopup" round>
                     <div id="H5showPopup">