1/13

src/components/Index/indexHeader.vue

@@ -44,7 +44,7 @@
               </div>
               <div class="index-icons-name">快速报价</div>
             </div>
-            <div class="index-right-button" style="width:130px;" @click="routeTap('/user/shopping')">
+            <div class="index-right-button" @click="routeTap('/user/shopping')">
               <div class="index-icons shopping">
                 <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/index/index-shopping-icon.png"/>
               </div>

src/components/Index/indexHeaders.vue

@@ -44,7 +44,7 @@
           </div>
           <div class="index-icons-name">快速报价</div>
         </div>
-        <div class="index-right-button" style="width:130px;" @click="routeTap('/user/shopping')">
+        <div class="index-right-button" @click="routeTap('/user/shopping')">
           <div class="index-icons shopping">
             <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/index/index-shopping-icon.png"/>
           </div>

src/view/index/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="login-wrapper" >
-    <div class="leftSlider">
+    <div class="leftSlider" v-if="showHeight">
       <a href="javascript:void(0)" :class="anchorIndex === index?'sliderStyle':''" @click="goToAnchor('anchor'+item.id,index)" class="slider" v-for="(item,index) in categoryGoods.arr" :key="index">
       <div v-if="item.goods!=''">
         <div class="sliderName">{{item.name}}</div>
@@ -17,28 +17,27 @@
 
       <div class="index-top-center"  id="div1">
         <div class="index-center-left" @mouseenter="indexSortSlide()" @mouseleave="indexSortOut"  >
-        <div  v-for="(item,index) in categoryGoods.arr" :key="index">
-          <div class="index-sort-list" v-if="item.goods!=''"    :class="sortIndex==index?'colorStyles':''"  @mouseenter="indexSortSlide(item,index)" >
-            <div class="index-sort-name overflow2" >{{item.name}}</div>
-            <div class="right-icon"  :class="sortIndex==index?'bgRight':''">
-            </div>
-          </div>
+            <div  v-for="(item,index) in categoryGoods.arr" :key="index">
+              <div class="index-sort-list" v-if="item.goods!=''"    :class="sortIndex==index?'colorStyles':''"  @mouseenter="indexSortSlide(item,index)" >
+                <div class="index-sort-name overflow2" >{{item.name}}</div>
+                <div class="right-icon"  :class="sortIndex==index?'bgRight':''"></div>
+              </div>
 
-          <div class="index-sort-content" v-if="sortIndex!=null"   @mouseenter="indexSortSlide()" @mouseleave="indexSortOut" >
-            <div class="index-sort-lists"   v-for="(items,indexs) in categoryGoods.arr[sortIndex].goods" :key="indexs" @click="routeTap('/goodsDetail',items.id)">
-              <div class="index-sort-img">
-                <img :src=items.logo[0] alt="">
+              <div class="index-sort-content" v-if="sortIndex!=null"   @mouseenter="indexSortSlide()" @mouseleave="indexSortOut" >
+                <div class="index-sort-lists"   v-for="(items,indexs) in categoryGoods.arr[sortIndex].goods" :key="indexs" @click="routeTap('/goodsDetail',items.id)">
+                  <div class="index-sort-img">
+                    <img :src=items.logo[0] alt="">
+                  </div>
+                  <div class="index-sort-name overflow2" style="color: #333">{{ items.name }}</div>
+
+                </div>
               </div>
-              <div class="index-sort-name overflow2" style="color: #333">{{ items.name }}</div>
 
             </div>
-          </div>
 
-        </div>
-
-        </div>
+          </div>
 
-        <div class="index-swiper-center">
+        <div class="index-swiper-center" :style="swiperZ">
           <swiper
               :modules="modules"
               :pagination="{ clickable: true }"
@@ -317,11 +316,14 @@ const bannerTap=(url)=>{
 }
 onMounted(()=>{
   window.addEventListener("scroll",onscrolls);
+  window.addEventListener("scroll",handleScroll);
   killGoodss()
   
 })
 onUnmounted(()=>{
   window.removeEventListener('scroll',onscrolls)
+  window.removeEventListener('scroll',handleScroll)
+
 
 })
 get_config().then((res)=>{
@@ -357,6 +359,8 @@ const navigation = {
   prevElRef: '.swiper-button-prev'
 }
 const statValue=ref('');
+const swiperZ=ref('z-index: 222;');
+const showHeight=ref(false)
 const endValue=ref('');
 const ChildsDom=ref(null)
 const sortIndex = ref(null)
@@ -380,6 +384,16 @@ const urlTaps=(url)=>{
 category().then((res)=>{
   categoryGoods.arr=res.data
 })
+function handleScroll(){
+  let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
+  if(scrollTop > 876) {
+    showHeight.value = true
+  } else {
+    showHeight.value = false
+  }
+  
+  // console.log('高度',scrollTop);
+}
 async function killGoodss(){
   setTimeout(()=>{
     killGoods().then((res)=>{
@@ -436,10 +450,12 @@ const indexSortSlide = (item,index) =>{
     sortIndex.value=index
   }
   sortFlag.value=true
+  swiperZ.value = ''
 }
 const indexSortOut = () =>{
   sortFlag.value=false
   sortIndex.value=null
+  swiperZ.value = 'z-index: 222;'
 }
 const onSwiper = (swiper) => {
 }
@@ -1100,6 +1116,8 @@ const routesTap=(url,id)=>{
     background-color: #fff;
     padding: 0 20px;
     margin-left: 10px;
+    float: right;
+    height: 652px;
     .index-right-gg{
       .index-notice{
         margin-top: 10px;
@@ -1201,22 +1219,29 @@ const routesTap=(url,id)=>{
     }
   }
   .index-top-center{
-    display: flex;
+    // display: flex;
+    position: relative;
     .index-swiper-center{
-
+      position: absolute;
+      left: 260px;
+      top: 0;
       width: 760px;
       height: 652px;
       //background-color: #333;
       margin-left: 10px;
+
     }
     .index-center-left{
-      background-color: #393939;
-      width: 260px;
+      background-color: #fff;
+      width: 1030px;
+      height: 652px;
+      display: inline-block;
+      overflow-y: scroll;
       padding:0 0 20px 0;
       position: relative;
       z-index: 111;
       .colorStyles{
-        background-color: #fff;
+        background-color: #fff !important;
         will-change: transform;
         transition: all 500ms;
         display: block;
@@ -1230,6 +1255,8 @@ const routesTap=(url,id)=>{
         display: flex;
         height: 60px;
         line-height: 60px;
+        width: 260px;
+        background: #393939;
         //justify-content: center;
         .index-sort-name{
           color: #fff;

src/view/user/order/pay/index.vue

@@ -93,21 +93,21 @@
         <div class="submit">
           <div class="title">订单信息</div>
           <div class="submit-content">
-            <div class="submit-view" v-if="payOrder.arr.address">
+            <div class="submit-view" v-if="payOrder.arr.address" style="line-height: 35px;">
               <div class="submit-name">收货地址：</div>
               <div class="boxs" style="display:flex;">
-                 <span>
-                    {{payOrder.arr.address.name}}
-              </span>
+                <span>
+                  {{payOrder.arr.address.name}}
+                </span>
                 <span style="margin-left: 10px">
-                    {{payOrder.arr.address.address}}
-              </span>
+                  {{payOrder.arr.address.address}}
+                </span>
                 <span style="margin-left: 10px">
-                    {{payOrder.arr.address.mobile}}
-              </span>
+                  {{payOrder.arr.address.mobile}}
+                </span>
               </div>
             </div>
-            <div class="submit-view" style="margin-top: 15px">
+            <div class="submit-view" style="margin-top: 15px;line-height: 35px;">
               <div class="submit-name">发票信息：</div>
               <div class="" v-if="payOrder.arr.tax==null">未开票</div>
               <div v-else>
@@ -120,11 +120,11 @@
                     {{payOrder.arr.tax.id}}
                   </div>
                 </div>
-                <div class="boxs" style="padding-top: 5px;display: flex" v-if="payOrder.arr.tax.u_type==2 && payOrder.arr.tax.self_type==2">
+                <div class="boxs" style="display: flex" v-if="payOrder.arr.tax.u_type==2 && payOrder.arr.tax.self_type==2">
                   <div class="spans">{{payOrder.arr.tax.com_name}}/</div>
                   <div class="spans">{{payOrder.arr.tax.tax_no}}/</div>
                 </div>
-                <div class="boxs" style="padding-top: 5px;display: flex" v-if="payOrder.arr.tax.u_type==2 && payOrder.arr.tax.self_type==1">
+                <div class="boxs" style="display: flex" v-if="payOrder.arr.tax.u_type==2 && payOrder.arr.tax.self_type==1">
                   <div class="spans">{{payOrder.arr.paperType==1?'电子发票':'纸质发票'}}/</div>
                   <div class="spans">{{payOrder.arr.selfType==1?'专票':'普票'}}/</div>
                   <div class="spans">{{payOrder.arr.tax.com_name}}/</div>
@@ -1329,8 +1329,8 @@ isLogin()
           .spans{
             color:#999;
             font-size: 14px;
-            height: 30px;
-            line-height: 24px;
+            // height: 30px;
+            // line-height: 24px;
           }
         }
         .submit-content{

src/view/user/order/submit/index.vue

@@ -455,13 +455,15 @@
         <div class="title">订单信息</div>
         <div class="submit-content">
           <div class="submit-view">
-              <div class="submit-name">收货方式：</div>
-              <div class=" classStyle">物流</div>
-<!--              <div class="address submit-lable" @click="addressFlags=true" style="margin-left: 30px">新增地址</div>-->
-              <div class="color-s" style="margin-left: 50px;position: relative" v-if="user_address_flag">
-                <div v-if="checkText" style="position: absolute;color: #fff;background-color: #dcdfe6;left:0;top:0;margin:-15px 0 0 -20px;border-radius: 12px;width: 45px;text-align: center;height: 20px;line-height: 20px;font-size: 14px;
-" >默认</div>
-                {{mineAddress}}
+              <div style="display:flex;align-items:center;">
+                <div class="submit-name">收货方式：</div>
+                <div class=" classStyle">物流</div>
+  <!--              <div class="address submit-lable" @click="addressFlags=true" style="margin-left: 30px">新增地址</div>-->
+                <div class="color-s" style="margin-left: 50px;position: relative" v-if="user_address_flag">
+                  <div v-if="checkText" style="position: absolute;color: #fff;background-color: #dcdfe6;left:0;top:0;margin:-15px 0 0 -20px;border-radius: 12px;width: 45px;text-align: center;height: 20px;line-height: 20px;font-size: 14px;
+  " >默认</div>
+                  {{mineAddress}}
+                </div>
               </div>
 <!--              <div class="address-add">添加收货地址</div>-->
               <div class="address-right" style="right: 40px" @click="selectAddress">
@@ -469,8 +471,10 @@
               </div>
           </div>
           <div class="submit-view" style="position: relative;margin-top: 30px;height: 20px;padding-bottom: 10px">
-            <div class="submit-name" style="position: absolute;top: 8px">发票开具：</div>
-            <div class="" v-if="invoiceIndex==2" style="margin: 8px 0 0 90px;font-size: 14px;color: #333">不需要</div>
+            <div style="display:flex;align-items:center;">
+              <div class="submit-name" style="position: absolute">发票开具：</div>
+              <div class="" v-if="invoiceIndex==2" style="margin: 8px 0 0 90px;font-size: 14px;color: #333">不需要</div>
+            </div>
             <div class="address-right" style="right: 0;top: 10px" @click="invoiceFlag=true">
               选择/新增
             </div>
@@ -1779,7 +1783,7 @@ isLogin()
   line-height: 40px;
   color: #fff;
   font-size: 16px;
-  position: absolute;
+  // position: absolute;
   right:30px;
 }
 .address-add{
@@ -2382,11 +2386,17 @@ isLogin()
           background: #FFFFFF;
           position: relative;
           padding: 30px 40px 20px;
+          width: 100%;
+          box-sizing: border-box;
 
           .submit-view{
+            width: 100%;
             cursor: pointer;
-            margin-bottom: 20px;
+            padding-bottom: 20px;
             line-height: 30px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
             .texts{
               box-sizing: border-box;
 
@@ -2417,7 +2427,7 @@ isLogin()
               line-height: 40px;
               color: #fff;
               font-size: 16px;
-              position: absolute;
+              // position: absolute;
               right:30px;
             }
             .address-add{