04/25

src/components/Index/CountDate.vue

@@ -29,7 +29,7 @@
       <div>{{minuteString }}</div>
       <p>:</p>
       <div>{{ secondString }}</div>
-      <div class="rights">
+      <div class="rights" @click="toMore">
         <span >更多抢购</span>
         <span class="right-icon">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/goods/goods-icon5.png">
@@ -138,6 +138,10 @@ export default {
     },
     formatNum(num) {
       return num < 10 ? '0' + num : '' + num
+    },
+    toMore() {
+      console.log('seckillRank');
+      this.$router.push('/seckillRank')
     }
   }
 }

src/components/Index/RightSliderBar.vue

@@ -78,6 +78,7 @@ const props = defineProps({
     .wx-service{
       //width: 100px;
       //height: 119px;
+      cursor: pointer;
       padding: 8px 0;
       background: #fff;
       border-radius: 12px 0px 0px 12px;

src/components/Index/indexHeader.vue

@@ -1,463 +0,0 @@
-<template>
-    <div class="index-header">
-      <div>
-        <FeedBack ref="ChildsDom"/>
-      </div>
-        <div class="index-tops">
-            <div class="index-tips" @click="indexTaps()">
-              {{$router.currentRoute.value.path=='/hotSellRank'||$router.currentRoute.value.path=='/seckillRank'
-            ?'返回首页':'欢迎光临屏酷网站！'}}</div>
-            <div class="index-rights">
-              <div class="phones">服务热线：400-0000000</div>
-              <div class="logins" v-if="!userInfos">请[<span @click="routeTap('/login')">登录</span>]</div>
-              <div class="logins" @click.stop="routeTap('/userCentre')" v-else>你好!<span style="margin-left: 5px">{{userInfos.nickname}}</span>
-                <span style="color: #999990;margin-left: 20px" @click="logout">[退出]</span>
-              </div>
-              <div class="logins" @click="routeTap('/evaluates')">快速报价</div>
-              <div class="logins" @click="navTaps">意见反馈</div>
-              <div class="logins" @click="routeTap('/userCentre')">个人中心</div>
-            </div>
-        </div>
-        <div class="index-header-search" v-if="topFlag">
-          <div class="index-logo"  @click="routeTap('/index')">
-            <img :src="logo"/>
-          </div>
-          <div class="search">
-            <div class="search-s">
-              <div class="input-search">
-                <el-input style="font-size: 14px" @keydown.enter="getUserKeyUp('/goodsList')" placeholder="请输入您要检索的关键词" v-model="goodsName"></el-input>
-              </div>
-              <div class="search-icon" @click="goodsSearch('/goodsList',goodsName)">
-                <img src="@/assets/img/search-icon.png"/>
-              </div>
-            </div>
-<!--            <div class="search-tips">-->
-<!--                <div class="search-list" v-for="(item,index) in searchList">-->
-<!--                  {{item.name}}-->
-<!--                </div>-->
-<!--            </div>-->
-          </div>
-          <div class="index-top-right">
-            <div class="index-right-button" @click="routeTap('/evaluates')">
-              <div class="index-icons">
-                <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/index/index-icon-bj.png"/>
-              </div>
-              <div class="index-icons-name">快速报价</div>
-            </div>
-            <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>
-              <div class="index-icons-name"  style="margin-left: 5px">我的购物车</div>
-<!--              <div class="shopping-num" :class="shoppingNum>10?'paddings':''">{{ shoppingNum>99?99:shoppingNum }}</div>-->
-            </div>
-            <div class="mobiles">
-<!--              <div class="mobile-icon">-->
-<!--                <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/index/mobile-icon.png"/>-->
-<!--              </div>-->
-              <div class="mobile-img">
-                <img :src="config.mobile_kp" alt="">
-              </div>
-            </div>
-          </div>
-        </div>
-      <div class="index-top-sort" v-if="topFlag">
-        <div class="index-all-sort">
-          全部分类
-        </div>
-        <div class="index-sort-content">
-          <div class="index-sort-list" @mouseenter="indexSortSlide(indexs)" @mouseleave="indexSortOut" :class="item.class" v-for="(item,indexs) in sortList" @click="routeTap(item.url,indexs)" :key="indexs">
-              <div class="sortName">
-<!--                <div v-if="indexs==1" class="mobile-text">-->
-<!--                  <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/index/index-ms-text.png"/>-->
-<!--                </div>-->
-                <div :class="indexs==0?'colorStyle':''">
-                  {{item.name}}
-                </div>
-              </div>
-          </div>
-          <div v-show="flags" class="boxs"  @mouseenter="indexSortSlide(4)" @mouseleave="indexSortOut">
-            <div v-for="(item,index) in sjList" :key="index">
-            <button @click.stop="routeClick(index)">
-              {{item.name}}
-            </button>
-          </div>
-          </div>
-        </div>
-      </div>
-    </div>
-</template>
-
-<script setup="props,context">
-import FeedBack from '@/components/User/FeedBack.vue'
-import { provide, reactive, ref,onMounted ,onBeforeMount} from 'vue'
-import { useRouter } from 'vue-router';
-import {useUserStore} from "@/store/modules/user";
-import {removeStore} from "@/utils/storage";
-import {removeAuthed, removeToken} from "@/utils/auth";
-import {defineEmits, defineExpose, defineProps} from "@vue/runtime-core";
-import {get_config, getContentPage, goods_coupon} from "@/api/menu1";
-import {closeService} from "@/utils";
-
-let logo=ref('')
-getContentPage({"page":"shouye"}).then((res)=>{
-  logo.value=res.data.content.logo
-})
-let flags=ref(false)
-const getUserKeyUp=(url)=>{
-  $router.push({path:url,query:{userName:goodsName.value}})
-
-}
-const indexSortSlide = (index) =>{
-  //滑入
-  if(index==4){
-    flags.value=true
-  }
-}
-const indexSortOut = () =>{
-  //划出
-  flags.value=false
-}
-const coupon=reactive({
-  arr:[]
-})
-const config=ref('')
-if(localStorage.getItem('config')){
-  let data=JSON.parse(localStorage.getItem('config'))
-  config.value=data
-}else{
-  get_config().then((res)=>{
-    config.value=res.data
-  })
-}
-const props = defineProps({
-  navIndexs:{
-    type: Number,
-    default: 0
-  }
-})
-let flag=ref(false)
-
-
-const userStore = useUserStore()
-const topFlag=ref(true)
-const userInfos = userStore.getUserInfo
-const goodsName = ref('')
-const shoppingNum = 0
-const emits = defineEmits(["eventIsNum"]);
-const ChildsDom=ref(null)
-const searchList = [
-  { name: '内容' },
-  { name: '广告' },
-  { name: '屏幕' }
-]
-const sjList = [
-  { name: '智慧医疗' ,url:'/medical'},
-  { name: '智慧餐饮',url:'/repast' },
-  { name: '智慧金融',url:'/financial' },
-  { name: '智慧安防',url:'/security' },
-  { name: '智慧展厅',url:'/gallery' },
-  { name: '智慧零售',url:'/resale' },
-]
-const sortList = [
-  { name: '首页' ,url:'/index'},
-  { name: '限时秒杀',url:'/seckillRank' },
-  { name: '热销爆款',url:'/hotSellRank' },
-  { name: '产品定制',url:'/product' },
-  { name: '方案设计',class:'class1' },
-  { name: '云平台',url:'/cloundPlatform'}
-]
-const router = useRouter()
-const navTaps=()=>{
-  ChildsDom.value.feedTip()
-}
-defineExpose({
-  navTaps
-})
-const $router=useRouter()
-$router.currentRoute.value.path==='/hotSellRank'||$router.currentRoute.value.path=='/seckillRank'?topFlag.value=false:''
-const routeTap=(url,index)=>{
-  console.error(index)
-  console.log(url);
-  console.log(index);
-  if(url){
-    $router.push({path:url})
-
-  }
-}
-const routeClick=(index) => {
-  console.log(index);
-  router.push(sjList[index].url)
-}
-const indexTaps=()=>{
-  let url=$router.currentRoute.value.path;
-  if(url=='/seckillRank' || url=='/hotSellRank'){
-    $router.push({path:'/index'})
-
-  }
-}
-const goodsSearch=(url,name)=>{
-  $router.push({path:url,query:{userName:name}})
-  goodsName.value=''
-  emits('eventIsNum',name)
-}
-const logout=()=>{
-  location.reload()
-  removeAuthed()
-  localStorage.removeItem("USER__INFO__")
-  closeService()
-  // removeToken()
-  // sessionStorage.clear()
-  // localStorage.clear()
-}
-</script>
-
-<style lang="less" scoped>
-.search-icon:hover{
-  background-color: #20538B!important;
-}
-.colorStyle{
-  color: #4B71AE;
-}
-.boxs{
-  display: block;
-  position: absolute;
-  left: 460px;
-  top:60px;
-  color: #fff;
-  z-index: 10000;
-  background-color: #393939;
-  padding: 0 20px;
-  div:hover{
-    color: #4B71AE;
-    cursor: pointer;
-  }
-  button {
-    background: none;
-    border: none;
-    color: #fff;
-    cursor: pointer;
-  }
-}
-/deep/ .el-textarea__inner{
-  background-color: #F5F5F5;
-}
-/deep/ .el-dialog{
-  width: 700px;
-  text-align: center;
-}
-/deep/ .el-radio__label{
-  color: #999;
-}
-/deep/ .el-dialog .el-dialog__header::before{
-  display: none;
-}
-  /deep/ .el-input .el-input__inner{
-    //height: 40px;
-    line-height: 40px;
-    border: none;
-    font-size: 18px;
-    width: 472px;
-  }
-  .index-header{
-    .index-top-sort{
-      .index-sort-content{
-        display: flex;
-        position: relative;
-        .index-sort-list:nth-child(0){
-          margin-left: 10px;
-        }
-        .index-sort-list{
-          margin-left: 45px;
-          .sortName{
-            font-size: 18px;
-            cursor: pointer;
-            .mobile-text{
-              margin-top:1px;
-              img{
-                width: 75px;
-                height: 17px;
-              }
-            }
-          }
-        }
-      }
-      height: 60px;
-      background-color: #fff;
-      margin-top: 20px;
-      padding: 0 260px;
-      line-height: 60px;
-      display: flex;
-      .index-all-sort{
-        padding-left: 60px;
-        //text-align: center;
-        width: 200px;
-        height: 60px;
-        background: #4B71AE;
-        color: #fff;
-        font-size: 18px;
-      }
-    }
-    .index-top-right{
-      margin: 12px 0 0 60px;
-      display: flex;
-      .mobiles{
-        margin: -30px 0 0 50px;
-        text-align:center ;
-        .mobile-icon{
-          img{
-            width: 56px;
-            height: 14px;
-          }
-        }
-        .mobile-img{
-          width: 60px;
-          height: 60px;
-          //background: #D8D8D8;
-          //border: 1px solid #f4f4f4;
-          margin-top: 5px;
-          img{
-            border-radius: 50%;
-            width: 100px;
-            height: 100px;
-          }
-        }
-      }
-      .index-right-button{
-        //width: max-content;
-        width: 120px;
-        cursor: pointer;
-        position: relative;
-        display: flex;
-        height: 27px;
-        padding: 10px 20px;
-        background: #FFFFFF;
-        border: 1px solid #4171B3;
-        line-height: 27px;
-        margin-right: 10px;
-        .paddings{
-          padding:5px!important;
-          margin: -17px 0 0 22px!important;
-        }
-        .shopping-num{
-          padding:3px 7px;
-          height: 16px;
-          background: #E1251B;
-          color: #fff;
-          text-align: center;
-          line-height: 16px;
-          position: absolute;
-          font-size: 10px;
-          border-radius: 50%;
-          margin: -10px 0 0 20px;
-        }
-        .shopping {
-          img{
-            width: 30px!important;
-            height: 26px;
-            margin:0 5px 0 0px!important;
-          }
-        }
-        .index-icons{
-          img{
-            width: 26px;
-            height: 26px;
-            margin: 3px 5px 0 0;
-          }
-        }
-      }
-      .index-icons-name{
-        color: #4171B3;
-        font-size: 15px;
-      }
-    }
-    .index-header-search{
-      padding: 30px 260px 0 260px;
-      display: flex;
-      .index-logo{
-        cursor: pointer;
-        img{
-          width: 100%;
-          image-rendering: -moz-crisp-edges; /* Firefox */
-          image-rendering: -o-crisp-edges; /* Opera */
-          image-rendering: -webkit-optimize-contrast; /*Webkit (non-standard naming) */
-          image-rendering: crisp-edges;
-          -ms-interpolation-mode: nearest-neighbor; /* IE (non-standard property) */
-        }
-      }
-      .search{
-        margin-left: 20px;
-        .search-tips{
-          margin: 10px 0 0 60px;
-          display: flex;
-          .search-list{
-            font-size: 14px;
-            color: #333;
-            cursor: pointer;
-            margin-right: 20px;
-          }
-        }
-        .search-s{
-          width: 565px;
-          height: 44px;
-          position: relative;
-          background: #FFFFFF;
-          border-top: 2px solid #4171B3;
-          //border-right: 2px solid #4171B3;
-          border-left: 2px solid #4171B3;
-          border-bottom: 2px solid #4171B3;
-          line-height: 44px;
-          margin:13px 0 0 60px;
-          display: flex;
-          .search-icon{
-            box-sizing: border-box;
-            position: absolute;
-            right: 0;
-            top: 0;
-            width: 93px;
-            height: 45px;
-            background-color: #4171B3;
-            cursor: pointer;
-            margin-top: -1px;
-            img{
-              width: 30px;
-              height: 30px;
-              margin: 5px 0 0 30px;
-            }
-          }
-        }
-
-      }
-    }
-    .index-tops{
-      height: 34px;
-      background-color: #333;
-      display: flex;
-      padding: 0 260px;
-      justify-content: space-between;
-      line-height: 34px;
-      .index-tips{
-        color: #fff;
-        font-size: 14px;
-        cursor: pointer;
-      }
-      .index-rights{
-        display: flex;
-        cursor: pointer;
-        .phones{
-          color: #fff;
-          font-size: 14px;
-        }
-        .logins{
-          color: #fff;
-          font-size: 14px;
-          margin-left: 20px;
-          span{
-            color: #4171B3;
-            font-size: 14px;
-          }
-        }
-      }
-    }
-  }
-</style>

src/components/Index/indexHeaders.vue

@@ -98,6 +98,7 @@
           <div class="index-sort-lists"   v-for="(items,indexs) in categoryGoods.arr[sortIndex].goods" @click="routeTaps('/goodsDetail',items.id)" :key="indexs">
             <div class="index-sort-img">
               <img :src=items.logo[0] alt="">
+              <a :href="'/goodsDetail?id=' + items.id" class="img_top"></a>
             </div>
             <div class="index-sort-name overflow2" style="color: #333">{{ items.name }}</div>
 
@@ -277,7 +278,7 @@ const logout=()=>{
   background-color: #20538B!important;
 }
 .index-sort-contents{
-  width: 840px;
+  width: 760px;
   // display: flex;
   position: absolute;
   //justify-content: left;
@@ -296,6 +297,9 @@ const logout=()=>{
   .index-sort-lists{
     cursor: pointer;
     float: left;
+    width: 30%;
+    margin-right: 20px;
+
     // flex-grow:0
     .index-sort-name{
       font-size: 14px;
@@ -309,10 +313,20 @@ const logout=()=>{
     background-color: #fff;
     text-align: center;
     .index-sort-img{
+      position: relative;
       img{
         width: 145px;
         height: 145px;
       }
+      .img_top {
+          position: absolute;
+          width: 145px;
+        height: 145px;
+          left: 0;
+          top: 0;
+          z-index: 10;
+          background: rgba(0, 0, 0, 0);
+        }
     }
   }
 }

src/components/Tool/Footer.vue

@@ -26,7 +26,7 @@
           账号管理
         </div>
       </div>
-      <div class="footer_intro_list lefts">
+      <div class="footer_intro_list">
         <div class="footer_title">
           购物指南
         </div>
@@ -40,7 +40,7 @@
           配送/签收常见问题
         </div>
       </div>
-      <div class="footer_intro_list lefts" >
+      <div class="footer_intro_list" >
         <div class="footer_title">
           交易保障
         </div>
@@ -51,8 +51,8 @@
           售后保障
         </div>
       </div>
-      <div class="footer_intro_list leftWidth">
-        <div class="footer_title">
+      <div class="footer_intro_list" style="align-items: flex-start">
+        <div class="footer_title" style="width: 100%;text-align: center">
          联系我们
         </div>
         <div class="footer_text">
@@ -89,7 +89,7 @@
           在线客服
         </div>
       </div>
-      <div class="footer_intro_list lefts">
+      <div class="footer_intro_list">
         <div class="footer_title" >
           手机屏酷
         </div>
@@ -164,8 +164,9 @@ const routeTap=(url,id)=>{
   }
   .footer_intro_center{
     flex: 1;
-    margin-left: 40px;
+    margin-right: 100px;
     display: flex;
+    justify-content: space-around;
     .lefts{
       margin-left: 100px;
     }
@@ -173,7 +174,10 @@ const routeTap=(url,id)=>{
       margin-left: 150px;
     }
     .footer_intro_list{
-
+      text-align: center;
+      display: flex;
+      flex-direction: column;
+    
       .footer_title{
         margin-top: 10px;
         font-size: 20px;
@@ -196,6 +200,7 @@ const routeTap=(url,id)=>{
         }
       }
       .footer_text{
+        text-align: center;
         font-size: 14px;
         color: #333;
         margin-top: 18px;

src/components/User/ShoppingCart.vue

@@ -494,6 +494,8 @@ const pay=(index,item)=>{
         border: 1px solid #D7DBE0;
         line-height: 20px;
         text-align: center;
+        cursor: pointer;
+
       }
       .sum{
         width: 50px;
@@ -512,6 +514,7 @@ const pay=(index,item)=>{
         border: 1px solid #D7DBE0;
         line-height: 20px;
         text-align: center;
+        cursor: pointer;
       }
     }
     .goods-money{

src/view/evaluateDetail/index.vue

@@ -423,6 +423,8 @@ const shareUpdateData = (data) => {
     border: 1px solid #D7DBE0;
     line-height: 22px;
     text-align: center;
+    cursor: pointer;
+
   }
   .sum{
     width: 66px;
@@ -441,6 +443,8 @@ const shareUpdateData = (data) => {
     border: 1px solid #D7DBE0;
     line-height: 22px;
     text-align: center;
+    cursor: pointer;
+
   }
 }
 .money{

src/view/goods/goodsDetail/index.vue

@@ -74,7 +74,7 @@ v-if="goodsDetails.arr.logo"
             <div class="goods-brand-text">配送</div>
             <div class="freight-text">现在下单，预计{{goodsDetails.arr.send_day}}发货</div>
             <div class="kf-icons" style="margin-left: 30px" @click="serviceTap">
-              <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/goods/goods-kf-cion.png">
+              <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/goods/goods-kf-cion.png">咨询客服
             </div>
           </div>
           <div class="goods-brand">
@@ -323,15 +323,15 @@ v-if="goodsDetails.arr.logo"
                 <img :src="item.logo[0]">
               </div>
               <div class="goods-rights">
-                <div class="goods-name overflow2">{{ item.name }}</div>
-                <div class="goods-money">¥{{ item.amount }}</div>
+                <div class="goods-name overflow2 point">{{ item.name }}</div>
+                <div class="goods-money point">¥{{ item.amount }}</div>
               </div>
             </div>
           </div>
           <div class="seckill-group" v-if="recommends.arr!=''"  style="margin-top: 20px">
             <div class="seckill-title" @click="reloadRecommend">
               <div class="title">推荐商品</div>
-              <div class="change">
+              <div class="change point">
                 <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/goods/change-text.png">
               </div>
             </div>
@@ -340,8 +340,8 @@ v-if="goodsDetails.arr.logo"
                   <img :src="item.logo[0]">
                 </div>
                 <div class="goods-rights">
-                  <div class="goods-name overflow2">{{ item.name }}</div>
-                  <div class="goods-money">¥{{ item.amount }}</div>
+                  <div class="goods-name point overflow2">{{ item.name }}</div>
+                  <div class="goods-money point">¥{{ item.amount }}</div>
                 </div>
             </div>
           </div>
@@ -1079,6 +1079,9 @@ const ruleChange = (index, item, items) => {
   color: #666;
 
 }
+.point {
+  cursor: pointer;
+}
 .border-right{
   border-right: 1px solid #f1f1f1;
   //padding-right: 20px;
@@ -1265,6 +1268,7 @@ const ruleChange = (index, item, items) => {
         padding: 0 18px;
         .change{
           margin-top: 5px;
+          cursor: pointer;
         }
       }
       .seckill-colors{
@@ -1573,8 +1577,12 @@ const ruleChange = (index, item, items) => {
         .kf-icons{
           cursor: pointer;
           margin-top: 10px;
+          display: flex;
+          align-items: center;
+          color: #4171B3;
+          font-size: 14px;
           img{
-            width: 92px;
+            // width: 92px;
             height: 30px;
           }
         }
@@ -1611,6 +1619,9 @@ const ruleChange = (index, item, items) => {
             cursor: pointer;
             display: flex;
             margin-top: 10px;
+            img{
+              width: 30px;
+            }
             .collect-text{
               color: #999;
               font-size: 16px;
@@ -1658,6 +1669,8 @@ const ruleChange = (index, item, items) => {
             border: 1px solid #D7DBE0;
             text-align: center;
             line-height: 36px;
+            cursor: pointer;
+
             img{
               width: 20px;
               height: 20px;
@@ -1677,6 +1690,8 @@ const ruleChange = (index, item, items) => {
             border-radius: 2px;
             border: 1px solid #D7DBE0;
             text-align: center;
+        cursor: pointer;
+
             img{
               width: 20px;
               height: 20px;
@@ -1730,11 +1745,11 @@ const ruleChange = (index, item, items) => {
           margin: 0 0 0 20px;
           .rob-text{
             color: #999;
-            font-size: 20px;
+            font-size: 18px;
           }
           .rob-money{
             color: #EE351A;
-            font-size: 20px;
+            font-size: 18px;
             margin-left: 37px;
           }
         }

src/view/goods/seckillGoods/index.vue

@@ -666,6 +666,8 @@ const ruleChange = (index) =>{
                     border-radius: 2px;
                     border: 1px solid #EFEFEF;
                     line-height: 22px;
+                  cursor: pointer;
+
                     img{
                       width: 11px;
                       height: 11px;
@@ -679,6 +681,8 @@ const ruleChange = (index) =>{
                     border-radius: 2px;
                     border: 1px solid #EFEFEF;
                     line-height: 22px;
+        cursor: pointer;
+
                     img{
                       width: 11px;
                       height: 11px;
@@ -755,6 +759,8 @@ const ruleChange = (index) =>{
             border-radius: 2px;
             border: 1px solid #EFEFEF;
             line-height: 22px;
+            cursor: pointer;
+
             img{
               width: 11px;
               height: 11px;
@@ -768,6 +774,8 @@ const ruleChange = (index) =>{
             border-radius: 2px;
             border: 1px solid #EFEFEF;
             line-height: 22px;
+        cursor: pointer;
+
             img{
               width: 11px;
               height: 11px;
@@ -909,6 +917,7 @@ const ruleChange = (index) =>{
             border-radius: 2px;
             border: 1px solid #D7DBE0;
             text-align: center;
+                  cursor: pointer;
             line-height: 36px;
             img{
               width: 20px;
@@ -929,6 +938,8 @@ const ruleChange = (index) =>{
             border-radius: 2px;
             border: 1px solid #D7DBE0;
             text-align: center;
+        cursor: pointer;
+
             img{
               width: 20px;
               height: 20px;

src/view/index/index.vue

@@ -59,9 +59,9 @@
           <div class="index-right-user" style="padding: 20px 0;" v-if="userInfos">
             <div class="index-userInfo">
               <div class="user-avatar">
-                <img :src="userInfos.avatar" style="width: 80px;height: 80px;border-radius: 50%">
+                <img :src="userInfos.avatar" style="border-radius: 50%">
               </div>
-              <div style="color: #999999;font-size: 22px;margin: 15px 0 0 20px" class="overflow1">
+              <div style="color: #999999;margin: 0 0 0 20px" class="overflow1">
                 Hi！{{userInfos.nickname}}
                 <div>
                   <div class="index-user-text" style="margin:10px 0 0 0">欢迎来到屏酷！</div>
@@ -229,8 +229,10 @@
             </div>
           </div>
         </div>
-        <div class="buttons">
-          {{indexPage.a.title_btn}}
+        <div style="width: 50%">
+          <div class="buttons">
+            {{indexPage.a.title_btn}}
+          </div>
         </div>
         <div class="right-slider">
           <div class="index-page-a">
@@ -630,7 +632,7 @@ const routesTap=(url,id)=>{
       color: #fff;
       font-size: 30px;
       text-align: center;
-      margin-top: 45px;
+      margin: 45px auto 0;
     }
     .buttons:hover{
       background: #FF6F46;
@@ -666,6 +668,7 @@ const routesTap=(url,id)=>{
     .index-top{
       width: 120px;
       padding-top: 70px;
+      padding-left: 10px;
 
       .title{
         font-size: 30px;
@@ -768,9 +771,10 @@ const routesTap=(url,id)=>{
 }
 .dev-cloud{
   cursor: pointer;
+  padding: 0 260px;
   img{
     width: 100%;
-    height:300px;
+    // height:300px;
   }
 }
 /deep/ .swiper-button-next:after, .swiper-rtl .swiper-button-prev:after{
@@ -1217,7 +1221,7 @@ const routesTap=(url,id)=>{
           margin: 0 0 0 15px;
         }
         .user-avatar{
-          image{
+          img{
             width: 40px;
             height: 40px;
           }

src/view/publicity/financial/index.vue

@@ -369,6 +369,9 @@ const indexSortOut = () =>{
 .repeat-bg5{
   height: 1000px;
   margin-top: -10px;
+  .repeat_img {
+    height: 1000px;
+  }
   .final-center{
     position: relative;
     padding: 0 220px 200px 220px;
@@ -718,16 +721,17 @@ const indexSortOut = () =>{
       background-color: #F7F8FA;
       flex-wrap: wrap;
       .product-img{
-        img{
-          width: 320px;
-          height: 260px;
-        }
+        // img{
+        //   width: 320px;
+        //   height: 260px;
+        // }
+        width: 20%;
         .product-imgs{
           margin-left: 15px;
           margin-bottom: 20px;
           img{
-            width: 220px;
-            height: 100px;
+            width: 100%;
+            // height: 100px;
           }
         }
       }
@@ -789,7 +793,7 @@ const indexSortOut = () =>{
     .product-title{
       color: #333;
       font-size: 44px;
-      margin: 20px 0;
+      padding: 20px 0;
     }
     .product-desc{
       color: #999999;

src/view/publicity/gallery/index.vue

@@ -719,16 +719,17 @@ const indexSortOut = () =>{
       background-color: #F7F8FA;
       flex-wrap: wrap;
       .product-img{
-        img{
-          width: 320px;
-          height: 260px;
-        }
+        width: 20%;
+        // img{
+        //   width: 320px;
+        //   height: 260px;
+        // }
         .product-imgs{
           margin-left: 15px;
           margin-bottom: 20px;
           img{
-            width: 220px;
-            height: 100px;
+            width: 100%;
+            // height: 100px;
           }
         }
       }
@@ -790,7 +791,7 @@ const indexSortOut = () =>{
     .product-title{
       color: #333;
       font-size: 44px;
-      margin: 20px 0;
+      padding: 20px 0;
     }
     .product-desc{
       color: #999999;

src/view/publicity/medical/index.vue

@@ -112,8 +112,8 @@
         </div>
 
       </div>
-      <div class="repeat-bg5" style="height: 1000px">
-        <img :src="indexPage.g.bg" style="height: 1000px;">
+      <div class="repeat-bg5">
+        <img :src="indexPage.g.bg" class="repeat_img">
         <div style="text-align: center;font-size: 40px;padding-top: 90px">{{indexPage.g.title}}</div>
         <div class="repeat-bg3-cen">
           <!-- <div class="repeat-bg3-view" v-for="(item,index) in indexPage.g.list" @mouseenter="indexSortSlide(index)" @mouseleave="indexSortOut()"  > -->
@@ -477,6 +477,9 @@ const indexSortOut = () =>{
 }
 .repeat-bg5{
   height:1000px;
+  .repeat_img {
+    height: 1000px;
+  }
   img{
     height: 700px;
     width: 100%;
@@ -745,16 +748,17 @@ const indexSortOut = () =>{
       background-color: #F7F8FA;
       flex-wrap: wrap;
       .product-img{
-        img{
-          width: 320px;
-          height: 260px;
-        }
+        width: 20%;
+        // img{
+        //   width: 320px;
+        //   height: 260px;
+        // }
         .product-imgs{
           margin-left: 15px;
           margin-bottom: 20px;
           img{
-            width: 220px;
-            height: 100px;
+            width: 100%;
+            // height: 100px;
           }
         }
       }
@@ -816,7 +820,7 @@ const indexSortOut = () =>{
     .product-title{
       color: #333;
       font-size: 44px;
-      margin: 20px 0;
+      padding: 20px 0;
     }
     .product-desc{
       color: #999999;

src/view/publicity/product/index.vue

@@ -416,16 +416,17 @@ const pauseAll=(index)=>{
       background-color: #F7F8FA;
       flex-wrap: wrap;
       .product-img{
-        img{
-          width: 320px;
-          height: 260px;
-        }
+        // img{
+        //   width: 320px;
+        //   height: 260px;
+        // }
+        width: 20%;
         .product-imgs{
           margin-left: 15px;
           margin-bottom: 20px;
           img{
-            width: 220px;
-            height: 100px;
+            width: 100%;
+            // height: 100px;
           }
         }
       }

src/view/publicity/repast/index.vue

@@ -610,16 +610,17 @@ const indexSortOut = () =>{
       background-color: #F7F8FA;
       flex-wrap: wrap;
       .product-img{
-        img{
-          width: 320px;
-          height: 260px;
-        }
+        // img{
+        //   width: 320px;
+        //   height: 260px;
+        // }
+        width: 20%;
         .product-imgs{
           margin-left: 15px;
           margin-bottom: 20px;
           img{
-            width: 220px;
-            height: 100px;
+            width: 100%;
+            // height: 100px;
           }
         }
       }
@@ -681,7 +682,7 @@ const indexSortOut = () =>{
     .product-title{
       color: #333;
       font-size: 44px;
-      margin: 20px 0;
+      padding: 20px 0;
     }
     .product-desc{
       color: #999999;

src/view/publicity/resale/index.vue

@@ -608,16 +608,17 @@ const indexSortOut = () =>{
       background-color: #F7F8FA;
       flex-wrap: wrap;
       .product-img{
-        img{
-          width: 320px;
-          height: 260px;
-        }
+        width: 20%;
+        // img{
+        //   width: 320px;
+        //   height: 260px;
+        // }
         .product-imgs{
           margin-left: 15px;
           margin-bottom: 20px;
           img{
-            width: 220px;
-            height: 100px;
+            width: 100%;
+            // height: 100px;
           }
         }
       }
@@ -679,7 +680,7 @@ const indexSortOut = () =>{
     .product-title{
       color: #333;
       font-size: 44px;
-      margin: 20px 0;
+      padding: 20px 0;
     }
     .product-desc{
       color: #999999;

src/view/publicity/security/index.vue

@@ -610,16 +610,17 @@ const indexSortOut = () =>{
       background-color: #F7F8FA;
       flex-wrap: wrap;
       .product-img{
-        img{
-          width: 320px;
-          height: 260px;
-        }
+        // img{
+        //   width: 320px;
+        //   height: 260px;
+        // }
+        width: 20%;
         .product-imgs{
           margin-left: 15px;
           margin-bottom: 20px;
           img{
-            width: 220px;
-            height: 100px;
+            width: 100%;
+            // height: 100px;
           }
         }
       }
@@ -681,7 +682,7 @@ const indexSortOut = () =>{
     .product-title{
       color: #333;
       font-size: 44px;
-      margin: 20px 0;
+      padding: 20px 0;
     }
     .product-desc{
       color: #999999;

src/view/user/invoiceManage/index.vue

@@ -18,7 +18,7 @@
         </el-radio-group>
       </div>
       <div>
-        <text style="margin-right: 10px">发票抬头：</text>
+        <text style="margin-right: 10px">抬头类型：</text>
         <el-radio-group @change="clearFrom()" v-model="u_type" class="ml-4">
           <el-radio label='2'  disabled size="large">企业</el-radio>
           <el-radio label='1' disabled size="large" v-if="self_type!=1">个人</el-radio>
@@ -140,14 +140,14 @@
         </el-radio-group>
       </div>
       <div v-if="self_type==2">
-        <text style="margin-right: 10px">发票抬头：</text>
+        <text style="margin-right: 10px">抬头类型：</text>
         <el-radio-group @change="clearFrom()" v-model="u_type" class="ml-4">
           <el-radio   v-model="readio1" label="2" size="large">企业</el-radio>
           <el-radio  v-model="readio1" label="1" size="large">个人</el-radio>
         </el-radio-group>
       </div>
       <div v-else>
-        <text style="margin-right: 10px">发票抬头：</text>
+        <text style="margin-right: 10px">抬头类型：</text>
         <el-radio-group @change="clearFrom()" v-model="u_type" class="ml-4">
           <el-radio  v-model="readio1" label="2" size="large">企业</el-radio>
         </el-radio-group>
@@ -268,7 +268,7 @@
         </div>
         <div class="tops">
           <div class="tops-order-text">发票类型</div>
-          <div class="tops-order-text">发票抬头</div>
+          <div class="tops-order-text">抬头类型</div>
           <div class="tops-order-text">税号人识别号</div>
           <div class="tops-order-text" >操作</div>
         </div>

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

@@ -96,7 +96,7 @@
     <el-dialog width="340px" style="width: 200px" v-model="expressFlag" :show-close="true" title="我已寄回" >
       <div style="display: flex;line-height: 30px;padding: 0px 0 20px 0">
         <div style="margin-right: 10px">快递公司</div>
-        <el-dropdown style="width: 180px" trigger="click" @command="handleCommand3" @click="handleClick">
+        <el-dropdown  max-height="200px" style="width: 180px" trigger="click" @command="handleCommand3" @click="handleClick">
           <el-button type="primary">
             {{returnText3}}<el-icon class="el-icon--right"><arrow-down /></el-icon>
           </el-button>
@@ -177,7 +177,7 @@
                 </el-form-item>
               </div>
             </div>
-            <div class="goods-views">
+            <div class="goods-views" v-if="!changeFlag">
               <div><span>*</span>预估退款金额：</div>
               <div class="goods-right" style="margin-left: 50px">
                 <div style="height: 20px;font-size: 18px;color: #333">¥{{ returnMoney }}</div>
@@ -185,8 +185,11 @@
               </div>
             </div>
             <div v-if="checkFlag_s">
-              <div class="color-s" style="padding: 10px" v-if="user_address_flag">
-                取件信息：{{mineAddress}}
+              <div style="display:flex; align-items:center">
+                <div><span style="color: red">*</span>取件信息：</div>
+                <div class="color-s lefts" style="padding: 10px;" v-if="user_address_flag">
+                  {{mineAddress}}
+                </div>
               </div>
               <div style="display: flex;margin: 30px 0 30px 160px;cursor: pointer">
                 <div @click="addressFlags=true" style="color: #999;font-size: 16px;margin-top: 15px">新增地址</div>
@@ -294,87 +297,127 @@
           <div class="order-status" :class="'class'+order.refund.refund_status">{{status[order.refund.refund_status]}}</div>
         </div>
         <!--退货退款 -->
-        <div class="index-top-right" v-if="order.refund.refund_type==3 || order.refund.refund_type==5"  style="position: absolute;right: 40px">
+        <div class="index-top-right" v-if="order.refund.refund_type==3 || order.refund.refund_type==5" >
           <div class="index-top-status" >
             <div class="index-status-view" style="margin-left: 20px">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon5.png">
+              <div class="text" style="text-align: center">
+                <div>提交申请</div>
+                <div style="margin-top: 10px">{{ order.refund.timeline[0].time }}</div>
+              </div>
             </div>
-            <div class="line" style="width: 155px"></div>
+            <div class="line"></div>
             <div class="index-status-view">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon1.png" v-if="order.refund.timeline[1].time">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon2.png" v-else>
+              <div class="text" style="text-align: center;" >
+                <div>申请审核</div>
+                <div style="margin-top: 10px">{{order.refund.timeline[1].time}}</div>
+              </div>
             </div>
-            <div class="line" style="width: 160px" :class="order.refund.timeline[2].time?'':'color-ss'"></div>
+            <div class="line" :class="order.refund.timeline[2].time?'':'color-ss'"></div>
             <div class="index-status-view">
               <img src="@/assets/img/index-icon12.png" v-if="order.refund.timeline[2].time">
               <img src="@/assets/img/index-icon11.png" v-else>
+              <div class="text" style="text-align: center;" >
+                <div>用户寄回</div>
+                <div style="margin-top: 10px">{{order.refund.timeline[2].time}}</div>
+              </div>
             </div>
-            <div class="line" style="width: 170px" :class="order.refund.timeline[3].time?'':'color-ss'"></div>
+            <div class="line" :class="order.refund.timeline[3].time?'':'color-ss'"></div>
             <div class="index-status-view">
               <img src="@/assets/img/index-icon14.png"  v-if="order.refund.timeline[3].time">
               <img src="@/assets/img/index-icon10.png" v-else>
+              <div class="text" style="text-align: center;" >
+                <div>售后中</div>
+                <div style="margin-top: 10px">{{order.refund.timeline[3].time}}</div>
+              </div>
             </div>
-            <div class="line" style="width: 160px" :class="order.refund.timeline[4].time?'':'color-ss'"></div>
+            <div class="line" :class="order.refund.timeline[4].time?'':'color-ss'"></div>
             <div class="index-status-view">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon4.png" v-if="order.refund.timeline[4].time">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon3.png" v-else>
+              <div class="text" style="text-align: center;" >
+                <div>处理完成</div>
+                <div style="margin-top: 10px">{{order.refund.timeline[4].time}}</div>
+              </div>
             </div>
           </div>
-          <div class="index-top-texts">
+          <!-- <div class="index-top-texts">
             <div style="text-align: center">
               <div>提交申请</div>
               <div style="margin-top: 10px">{{ order.refund.timeline[0].time }}</div>
             </div>
-            <div class="lines" style="width:40px"></div>
-            <div style="text-align: center;width: 170px" >
+            <div class="lines"></div>
+            <div style="text-align: center;" >
               <div>申请审核</div>
               <div style="margin-top: 10px">{{order.refund.timeline[1].time}}</div>
             </div>
-            <div class="lines" style="width: 45px"></div>
-            <div style="text-align: center;width: 176px" >
+            <div class="lines"></div>
+            <div style="text-align: center;" >
               <div>用户寄回</div>
               <div style="margin-top: 10px">{{order.refund.timeline[2].time}}</div>
             </div>
-            <div class="lines" style="width: 40px"></div>
-            <div style="text-align: center;width: 176px" >
+            <div class="lines"></div>
+            <div style="text-align: center;" >
               <div>售后中</div>
               <div style="margin-top: 10px">{{order.refund.timeline[3].time}}</div>
             </div>
-            <div class="lines" style="width: 30px"></div>
-            <div style="text-align: center;width: 176px" >
+            <div class="lines"></div>
+            <div style="text-align: center;" >
               <div>处理完成</div>
               <div style="margin-top: 10px">{{order.refund.timeline[4].time}}</div>
             </div>
 
-          </div>
+          </div> -->
         </div>
-        <div class="index-top-right" v-if="order.refund.refund_type==2 || order.refund.refund_type==4"  style="position: absolute;right: 40px">
+        <div class="index-top-right" v-if="order.refund.refund_type==2 || order.refund.refund_type==4">
           <div class="index-top-status" >
             <div class="index-status-view" style="margin-left: 20px">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon5.png">
+              <div class="text" style="text-align: center">
+                <div>提交申请</div>
+                <div style="margin-top: 10px">{{ order.refund.timeline[0].time }}</div>
+              </div>
             </div>
-            <div class="line" style="width: 150px"></div>
+            <div class="line"></div>
             <div class="index-status-view">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon1.png" v-if="order.refund.timeline[1].time">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon2.png" v-else>
+              <div class="text" style="text-align: center;" >
+                <div>申请审核</div>
+                <div style="margin-top: 10px">{{order.refund.timeline[1].time}}</div>
+              </div>
             </div>
-            <div class="line" style="width: 160px" :class="order.refund.timeline[2].time?'':'color-ss'"></div>
+            <div class="line" :class="order.refund.timeline[2].time?'':'color-ss'"></div>
             <div class="index-status-view">
               <img src="@/assets/img/index-icon12.png" v-if="order.refund.timeline[2].time">
               <img src="@/assets/img/index-icon11.png" v-else>
+              <div class="text" style="text-align: center;" >
+                <div>用户寄回</div>
+                <div style="margin-top: 10px">{{order.refund.timeline[2].time}}</div>
+              </div>
             </div>
-            <div class="line" style="width: 160px" :class="order.refund.timeline[3].time?'':'color-ss'"></div>
+            <div class="line" :class="order.refund.timeline[3].time?'':'color-ss'"></div>
             <div class="index-status-view">
               <img src="@/assets/img/index-icon14.png"  v-if="order.refund.timeline[3].time">
               <img src="@/assets/img/index-icon10.png" v-else>
+              <div class="text" style="text-align: center;" >
+                <div>退款中</div>
+                <div style="margin-top: 10px">{{order.refund.timeline[3].time}}</div>
+              </div>
             </div>
-            <div class="line" style="width: 150px" :class="order.refund.timeline[4].time?'':'color-ss'"></div>
+            <div class="line" :class="order.refund.timeline[4].time?'':'color-ss'"></div>
             <div class="index-status-view">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon4.png" v-if="order.refund.timeline[4].time">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon3.png" v-else>
+              <div class="text" style="text-align: center;" >
+                <div>处理完成</div>
+                <div style="margin-top: 10px">{{order.refund.timeline[4].time}}</div>
+              </div>
             </div>
           </div>
-          <div class="index-top-texts">
+          <!-- <div class="index-top-texts">
             <div style="text-align: center">
               <div>提交申请</div>
               <div style="margin-top: 10px">{{ order.refund.timeline[0].time }}</div>
@@ -400,53 +443,69 @@
               <div style="margin-top: 10px">{{order.refund.timeline[4].time}}</div>
             </div>
 
-          </div>
+          </div> -->
         </div>
-        <div class="index-top-right" v-if="order.refund.refund_type==1"  style="position: absolute;right: 40px">
+        <div class="index-top-right" v-if="order.refund.refund_type==1">
           <div class="index-top-status" >
             <div class="index-status-view" style="margin-left: 20px">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon5.png">
+              <div class="text" style="text-align: center">
+                <div>提交申请</div>
+                <div style="margin-top: 10px">{{ order.refund.timeline[0].time }}</div>
+              </div>
             </div>
-            <div class="line" style="width: 150px"></div>
+            <div class="line"></div>
             <div class="index-status-view">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon1.png" v-if="order.refund.timeline[1].time">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon2.png" v-else>
+              <div class="text" style="text-align: center" >
+                <div>申请审核</div>
+                <div style="margin-top: 10px">{{order.refund.timeline[1].time}}</div>
+              </div>
             </div>
-            <div class="line" style="width: 160px" :class="order.refund.timeline[2].time?'':'color-ss'"></div>
+            <div class="line" :class="order.refund.timeline[2].time?'':'color-ss'"></div>
             <div class="index-status-view">
               <img src="@/assets/img/index-icon14.png" v-if="order.refund.timeline[2].time">
               <img src="@/assets/img/index-icon10.png" v-else>
+              <div class="text" style="text-align: center" >
+                <div>退款中</div>
+                <div style="margin-top: 10px">{{order.refund.timeline[2].time}}</div>
+              </div>
             </div>
-            <div class="line" style="width: 160px" :class="order.refund.timeline[3].time?'':'color-ss'"></div>
+            <div class="line" :class="order.refund.timeline[3].time?'':'color-ss'"></div>
             <div class="index-status-view">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon4.png" v-if="order.refund.timeline[3].time">
               <img src="http://screen-test.zhousi.hdlkeji.com/aksdbn/img/order-status-icon3.png" v-else>
+              <div class="text" style="text-align: center" >
+                <div>处理完成</div>
+                <div style="margin-top: 10px">{{order.refund.timeline[3].time}}</div>
+              </div>
             </div>
           </div>
-          <div class="index-top-texts">
+          <!-- <div class="index-top-texts">
             <div style="text-align: center">
               <div>提交申请</div>
               <div style="margin-top: 10px">{{ order.refund.timeline[0].time }}</div>
             </div>
             <div class="lines" style="width:40px"></div>
-            <div style="text-align: center;width: 170px" >
+            <div style="text-align: center" >
               <div>申请审核</div>
               <div style="margin-top: 10px">{{order.refund.timeline[1].time}}</div>
             </div>
             <div class="lines" style="width: 45px"></div>
-            <div style="text-align: center;width: 160px" >
+            <div style="text-align: center" >
               <div>退款中</div>
               <div style="margin-top: 10px">{{order.refund.timeline[2].time}}</div>
             </div>
             <div class="lines" style="width: 40px"></div>
-            <div style="text-align: center;width: 176px" >
+            <div style="text-align: center" >
               <div>处理完成</div>
               <div style="margin-top: 10px">{{order.refund.timeline[3].time}}</div>
             </div>
             <div class="lines" style="width: 30px"></div>
 
 
-          </div>
+          </div> -->
         </div>
 
       </div>
@@ -1630,14 +1689,16 @@ order_refund_s({order_info_id	:url.id}).then((res)=>{
     }
   }
   .index-top{
-    height: 130px;
+    // height: 130px;
     background: #FFFFFF;
     //margin: 20px 0;
-    padding: 20px 70px;
+    padding: 20px 50px;
     position: relative;
     display: flex;
+    box-sizing: border-box;
     .index-top-right{
       margin-left: 20px;
+      width: 80%;
       .index-top-texts{
         display: flex;
         margin-top: 20px;
@@ -1661,6 +1722,14 @@ order_refund_s({order_info_id	:url.id}).then((res)=>{
           margin-top:24px;
         }
         .index-status-view{
+          display: flex;
+          flex-direction: column;
+          // justify-content: center;
+          align-items: center;
+          width: 20%;
+          .text {
+            padding-top: 20px;
+          }
           img{
             width: 50px;
             height: 50px;
@@ -1669,11 +1738,15 @@ order_refund_s({order_info_id	:url.id}).then((res)=>{
       }
     }
     .index-top-left{
-      width: 300px;
+      // width: 300px;
       text-align: center;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
       .order-no{
         color: #333;
         font-size: 14px;
+        text-align: left;
       }
       .order-status{
         color: #2CBB00;

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

@@ -102,8 +102,8 @@
     </el-dialog>
 
     <el-dialog v-model="txFlag" :show-close="true" >
-		<img @click="downs(index)" style="width: 100%;" :src="txImg" />
-	</el-dialog>
+      <img @click="downs(index)" style="width: 100%;" :src="txImg" />
+    </el-dialog>
     <el-dialog v-model="returnFlag" @close="Clears" :show-close="true" title="申请售后">
       <div class="order-bottom">
         <div class="goods-content">
@@ -142,7 +142,7 @@
                 </el-form-item>
               </div>
             </div>
-          <div class="goods-views">
+          <div class="goods-views" v-if="!changeFlag">
             <div><span>*</span>预估退款金额：</div>
             <div class="goods-right">
               <div style="height: 20px;font-size: 18px;color: #333">¥{{ returnMoney }}</div>
@@ -150,8 +150,11 @@
             </div>
           </div>
             <div v-if="checkFlag_s">
-              <div class="color-s" style="padding: 10px" v-if="user_address_flag">
-                取件信息：{{mineAddress}}
+              <div style="display:flex; align-items:center">
+                <div><span style="color: red">*</span>取件信息：</div>
+                <div class="color-s lefts" style="padding: 10px;" v-if="user_address_flag">
+                  {{mineAddress}}
+                </div>
               </div>
               <div style="display: flex;margin: 30px 0 30px 160px;cursor: pointer">
                 <div @click="addressFlags=true" style="color: #999;font-size: 16px;margin-top: 15px">新增地址</div>
@@ -287,10 +290,10 @@
             </div>
           </div>
           <div class="index-top-texts">
-            <div>提交申请</div>
-            <div class="lines" style="width:290px"></div>
+            <div class="left">提交申请</div>
+            <div class="lines"></div>
             <div class="left">审核中</div>
-            <div class="lines" style="width: 295px;"></div>
+            <div class="lines"></div>
             <div class="left">已完成</div>
           </div>
         </div>
@@ -404,7 +407,7 @@
         <div class="goods-view widths " style="flex: 0 0 400px;">
           <div>配送信息</div>
           <div>配送方式：{{order.logistics?order.logistics.com.name:''}}</div>
-          <div>备注：{{order.logistics?order.logistics.remark:''}}</div>
+          <div>备注：{{order.logistics?order.logistics.remark:order.remark}}</div>
           <div>期望发货时间:<text style="margin-left: 10px">{{dates(order.customer_send_time)}}</text></div>
 <!--		  <div class="logistts" v-if="logistics.arr!=''">-->
 <!--			  <div>物流信息:</div>-->
@@ -1091,7 +1094,7 @@ let indexs=ref(0)
 orderDetail({id:url.id}).then((res)=>{
   if(res.code==1){
     order.value=res.data
-
+    console.log('订单消息',order.value);
   }
 })
 </script>
@@ -1124,6 +1127,7 @@ orderDetail({id:url.id}).then((res)=>{
   border-radius: 2px;
   border: 1px solid #CECECE;
   padding: 0 20px;
+  margin-left: 50px;
 }
 .address-content{
   padding: 0 70px;

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

@@ -806,6 +806,7 @@ isLogin()
   //background: #D8D8D8;
   padding: 10px;
   margin-left:30px;
+  text-align: left;
   //opacity: 0.18;
   .name{
     color:#333;
@@ -1127,10 +1128,11 @@ isLogin()
           margin: 30px auto;
           cursor: pointer;
         }
-        width: 339px;
+        width: 300px;
         //height: 1px;
         float: right;
-        text-align: center;
+        // margin-left: 30px;
+        // text-align: center;
         color: #333333;
         font-size: 18px;
         div{
@@ -1210,6 +1212,8 @@ isLogin()
                   background: #F0F2F5;
                   //border-radius: 2px;
                   line-height: 36px;
+                  cursor: pointer;
+
                 }
 
               }

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

@@ -15,14 +15,14 @@
       </el-radio-group>
     </div>
     <div v-if="self_type1==2">
-      <text style="margin-right: 10px">发票抬头：</text>
+      <text style="margin-right: 10px">抬头类型：</text>
       <el-radio-group @change="clearFrom()" v-model="u_type1" class="ml-4">
         <el-radio   v-model="readio1" label="2" size="large">企业</el-radio>
         <el-radio  v-model="readio1" label="1" size="large">个人</el-radio>
       </el-radio-group>
     </div>
     <div v-else>
-      <text style="margin-right: 10px">发票抬头：</text>
+      <text style="margin-right: 10px">抬头类型：</text>
       <el-radio-group @change="clearFrom()" v-model="u_type1" class="ml-4">
         <el-radio  v-model="readio1" label="2" size="large">企业</el-radio>
       </el-radio-group>
@@ -472,7 +472,7 @@
           <div class="submit-view" style="position: relative;margin-top: 30px;height: 20px;padding-bottom: 10px">
             <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 class="" v-if="invoiceIndex==2" style="margin: 0 0 0 90px;color: #333">不开票</div>
             </div>
             <div class="address-right" style="right: 0;top: 10px" @click="invoiceFlag=true">
               选择/新增
@@ -555,7 +555,7 @@
 <!--              </div>-->
 <!--            </div>-->
 <!--            <div class="invoiceSource">-->
-<!--              <div class="name">发票抬头：</div>-->
+<!--              <div class="name">抬头类型：</div>-->
 <!--              <div class="source" v-if="sourceIndex==1" v-for="(item,index) in invoiceType" @click="typeIndex=index;clearIndex()" :class="typeIndex==index?'colorStyle':''">-->
 <!--                {{item}}-->
 <!--              </div>-->
@@ -783,11 +783,13 @@
           <el-input v-model="message" placeholder="买家留言：选填，可填写对某一件产品的要求"></el-input>
         </div>
         <div class="shopping-total" v-if="priceOrder.arr.goods!=''">
-          <div v-if="priceOrder.arr.amount_coupon>0">优惠券：-{{priceOrder.arr.amount_coupon}}</div>
-          <div>商品件数： {{ priceOrder.arr.num||0 }}</div>
-          <div>安装件数： {{ priceOrder.arr.num_install||0 }}</div>
-          <div style="border-bottom: 1px solid #F1F1F1;padding-bottom: 20px">合计金额： {{ priceOrder.arr.amount_total||0 }}</div>
-          <div style="color: #EA2813">总计：{{ priceOrder.arr.amount_pay ||0}}</div>
+          <div class="total_top">
+            <div v-if="priceOrder.arr.amount_coupon>0">优惠券：-{{priceOrder.arr.amount_coupon}}</div>
+            <div>商品件数： {{ priceOrder.arr.num||0 }}</div>
+            <div>安装件数： {{ priceOrder.arr.num_install||0 }}</div>
+            <div style="border-bottom: 1px solid #F1F1F1;padding-bottom: 20px">合计金额： {{ priceOrder.arr.amount_total||0 }}</div>
+            <div style="color: #EA2813">总计：{{ priceOrder.arr.amount_pay ||0}}</div>
+          </div>
           <div class="buttons">
             <div class="button" @click="returnSub" style="background:none;border: 1px solid #4171B3;color:#4171B3 ">
               上一步
@@ -1728,6 +1730,10 @@ isLogin()
 }
 /deep/ .date-picker .el-input__inner::placeholder{
   color: #333;
+  cursor: pointer;
+  .el-input .el-input__inner {
+    cursor: pointer;
+  }
 }
   .tips{
     color:#999;
@@ -2130,6 +2136,9 @@ isLogin()
       }
       .shopping-total{
         padding: 15px 0 0;
+        .total_top {
+          padding-left: 50px;
+        }
         .buttons{
           display: flex;
           .button{
@@ -2148,7 +2157,7 @@ isLogin()
         width: 339px;
         //height: 1px;
         float: right;
-        text-align: center;
+        // text-align: center;
         color: #333333;
         font-size: 18px;
         div{
@@ -2230,6 +2239,7 @@ isLogin()
                   //border-radius: 2px;
                   // margin-top:4px;
                   line-height: 20px;
+                  cursor: pointer;
                 }
 
               }

src/view/user/userInfo/index.vue

@@ -40,7 +40,7 @@
             <div class="name">用户名：</div>
             <div>
               <el-form-item prop="name">
-                  <el-input v-model.trim="userFormState.name" :disabled="rules.name[0].disabled" v-model="userName"></el-input>
+                  <el-input v-model.trim="userFormState.name" :disabled="rules.name[0].disabled"></el-input>
               </el-form-item>
             </div>
             <div class="update" >
@@ -166,7 +166,7 @@ const files=ref({
 user_infos().then((res)=>{
   if(res.code==1){
     userInfos.arr=res.data
-	userFormState.name=res.data.nickname
+	userFormState.name=res.data.username
 	imageUrl.value=res.data.avatar
 	userFormState.address=res.data.live_addr
 	userFormState.firmName=res.data.com_name