供应商

src/main/resources/static/css/supplier-center/dashboard.css

@@ -384,7 +384,7 @@
     overflow: hidden;
     box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);
     width: 100%;
-    height: 33.9vw;
+    /*height: 33.9vw;*/
 }
 
 .head {
@@ -415,19 +415,20 @@
 }
 
 .username {
- color: #627386;
- font-size: 12px;
- margin: 10px 0;
+ color: #9aa5b5;
+ font-size: 3.2vw;
+ margin: 2.7vw 0;
 }
-
+.mainContent>p{    color: #22272e;
+    font-size: 3.7vw;}
 .perfect {
- width: 64px;
- height: 22px;
+ width: 13.6vw;
+ height: 4.7vw;
  background-color: #627386;
- border-radius: 2px;
+ border-radius:.53vw;
  color: #ffffff;
- font-size: 12px;
- line-height: 22px;
+ font-size: 3.2vw;
+ line-height: 4.7vw;
  text-align: center;
  display: inline-block;
  float: right;
@@ -479,7 +480,9 @@
 }
 
 .product {
- margin: 5.3vw 0;
+    margin: 1.3vw 0;
+    background: #fff;
+    height: 29.8vw;
 }
 
 .product p {
@@ -493,16 +496,15 @@
 }
 
 .product ul {
-     height: 50px;
-     line-height: 80px;
+     height:10.6vw;
+     line-height:17vw;
      background-color: #ffffff;
-     box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-     padding: 15px;
+     padding: 4vw;
 }
 
 .product li {
      display: inline-block;
-     width: 24vw;
+     width: 32%;
      text-align: center;
      color: #333333;
      position: relative;
@@ -513,16 +515,16 @@
     width: 9vw;
     height: 9vw;
     background-position: -66.7vw -60vw;
-    right: 37px;
-    top: -2px;
+    right: 13.9vw;
+    top: -2.53vw;
     position: absolute
 }
 
 .mIcon.other:before {
- background-position: -76vw -60vw;
+ background-position: -74vw -60vw;
 }
 .mIcon.down:before {
- background-position: -84vw -60vw;
+ background-position: -83vw -60vw;
 }
 .rank_top p {
  font-size: 3.4vw;
@@ -552,7 +554,7 @@
 }
 
 .sales-ranke ul {
- padding: 10px 0;
+ padding: 2.7vw 0;
  border-bottom: .27vw solid #e2e7ef
 }
 
@@ -562,9 +564,8 @@
 }
 
 .file_img {
- width: 26.7vw;
- height: 19.4vw;
- font-size: 999px;
+    width: 29.9vw;
+    height: 21.3vw;
  opacity: 0;
  top: 0px;
  left: 0px;
@@ -573,7 +574,7 @@
 
 .shop-ranke {
  background: #fff;
- padding-bottom: 20px;
+ padding-bottom: 5.3vw;
  box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);
 }
 
@@ -584,6 +585,7 @@
  color: #e15616;
  line-height: 12vw;
  position: relative;
+ font-size: 3.1vw;
 }
 
 .shop-ranke ul {
@@ -620,7 +622,7 @@
 }
 
 .mIcon.rank0:before {
- background-position: -25.3vw -226px;
+ background-position: -25.3vw -60.3vw;
 }
 
 .mIcon.rank1:before {
@@ -648,12 +650,28 @@
 }
 
 .confirm span {
- color: #e15616;
- padding: 1.3vw
+ padding: 1.3vw;
+    width: 3vw;
+    height: 3vw;
+    line-height: 3vw;
+    display: inline-block;
+    background: #f55c5c;
+    border-radius: 50%;
+    color: #fff;
+    font-size: 3vw;
+    text-align: center;
+    position: relative;
+    top: -8.8vw;
+    right: 6.7vw
+}
+.confirm.other span {
+ right: 3.5vw
+}
+.confirm.down span {
+ right: 4vw
 }
-
 .Statistics {
- margin-top: 4vw;
+ margin-top: 1.3vw;
  background: #fff;
  padding: 2.7vw;
 }

src/main/resources/static/css/supplier-center/order/logistics.css

@@ -68,39 +68,39 @@
     .product-info {box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);background: #fff;margin-top: 2.7vw}
     .price {overflow: hidden;}
     .protitle {color: #22272e;font-size: 3.4vw;padding: 2.7vw 5.3vw;}
-    .product {background: #fff;padding: 2.7vw 5.3vw;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);height: 50vw}
+    .product {background: #fff;padding: 2.7vw 5.3vw;box-shadow: 0px .8vw 1.3vw 0px rgba(0, 0, 0, 0.07);height: 50vw}
     .product-title {height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
     .product-title li {display: inline-block;list-style: none;color: #9aa5b5;position: relative;top: 26vw;width: 21vw}
     .product-title li:nth-child(1) {width: 100%;text-align: left;top: 0;}
     .pro-information li {list-style: none;}
-    .pro-information li {width: 100%;padding: 10px 0;}
+    .pro-information li {width: 100%;padding: 2.7vw 0;}
     .pro-information li div {display: inline-block;color: #22272e;top: 11.6vw;width: 21vw;position: relative}
     .pro-information li div.product-img {width: 100%;text-align: left;top: 0}
-    .product-img img {width: 18.7vw;height: 18.7vw;border: solid 1px #e2e7ef;}
-    .product-img h3 {display: inline-block;width: 40vw;margin-left: 10px;font-size: 3.4VW;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .product-img img {width: 18.7vw;height: 18.7vw;border: solid .27vw #e2e7ef;}
+    .product-img h3 {display: inline-block;width: 40vw;margin-left: 2.7vw;font-size: 3.4VW;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
     .add-logistics{height: auto;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin-top: 2.7vw;padding: 20px;color: #627386;}
     .company-number{width: 100%;}
-    .logist-right>div{margin-top: 5px;}
+    .logist-right>div{margin-top: 1.3vw;}
     .company-number>div{margin: 4vw 0;}
     .logistics-order-number.company{width: 72vw}
-    .company{width: 75vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;color: #9aa5b5;padding-left: 2.7vw;margin-top: 2.7vw}
-    input::placeholder,textarea::placeholder {color: #9aa5b5;font-size: 12px;}
+    .company{width: 75vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;color: #9aa5b5;padding-left: 2.7vw;margin-top: 2.7vw}
+    input::placeholder,textarea::placeholder {color: #9aa5b5;font-size:3.2vw;}
     textarea::placeholder {color: #9aa5b5;}
     .red{color: #f94b4b;}
-    .companyBtn{width: 11.8vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;margin-left: .53vw;cursor: pointer;font-size: 4.8vw;color: #b8bfca;}
+    .companyBtn{width: 11.8vw;height: 11.8vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;margin-left: .53vw;cursor: pointer;font-size: 4.8vw;color: #b8bfca;}
     .mIcon.add{background: url(/img/account/add.png) no-repeat;height: 23vw;display: block;    background-size: 23vw;}
     .upload-file{position: relative;float: left;margin: 0 2.7vw 2.7vw 0px;cursor: pointer;width: 23vw;height: 23vw;border-radius: .53vw;}
     .input-file{width: 23vw;height:23vw;opacity: 0;cursor: pointer;position: absolute;top: 0;}
-    #uploadGoodsImages{overflow: hidden;float: left;width: 90%;margin-top: 2.7vw}
+    #uploadGoodsImages{overflow: hidden;float: left;width: 100%;margin-top: 2.7vw}
     .release-from{overflow: hidden;}
     .upload-file img{width: 100%;height: 100%;}
     .mIcon.del:before {width: 5.3vw;height: 5.3vw;background-position: -90vw -7.5vw;position: absolute;top: -.8vw;right: -.8vw}
-    .form-upload-tips .icon-wen:before {width: 20px;height: 20px;background-position: -84px -144px;cursor: pointer;}
-    .wen-tips {width: 300px;height: 47px;background-color: #1890f9;box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);color: #fff;position: absolute;left: inherit;font-size: 12px;text-align: center;line-height: 47px;top: 33px;display: none;}
+    .form-upload-tips .icon-wen:before {width: 5.3vw;height: 5.3vw;background-position: -76.4vw 0vw;cursor: pointer;}
+    .wen-tips {width: 67.2vw;height:9vw;background-color: #1890f9;box-shadow: 0px .8vw 1.3vw 0px rgba(24, 144, 249, 0.17);color: #fff;position: absolute;left: inherit;font-size: 2.6vw;text-align: center;line-height: 9vw;top:8.8vw;display: none;}
     .form-upload-tips{float: left;position: relative;}
-    .form-upload-tips .wen-tips:before {content: '';width: 0px;height: 0px;border-width: 8px;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -15px;left:5px;}
+    .form-upload-tips .wen-tips:before {content: '';width: 0px;height: 0px;border-width: 8px;border-style: solid;border-color: transparent transparent #1890f9 transparent;position: absolute;top: -3.5vw;left:1.3vw;}
     .form-upload-tips:hover .wen-tips {display: block;}
-    .remarks textarea{width: 83.4vw;height: 42.4vw;background-color: #ffffff;border-radius: .53vw;border: solid 1px #b8bfca;resize: none;padding: 2.7vw;color: #9aa5b5;}
+    .remarks textarea{width: 83.4vw;height: 42.4vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;resize: none;padding: 2.7vw;color: #9aa5b5;}
     .remarks{position: relative}
     .remarks .rema{line-height:10.7vw ;}
     .size-num {position: absolute;right: 2.7vw;top: 52vw;color: #9aa5b5}

src/main/resources/static/js/supplier-center/dashboard.js

@@ -3,6 +3,7 @@ var isPC = ($(window).width()>768);
 var dashboard = new Vue({
     el:'#dashboard',
     data:{
+        isRequset:true,
         userId:'',
         homeData:'',
         formData:new FormData(),
@@ -21,6 +22,7 @@ var dashboard = new Vue({
              var _this = this;
              SupplierApi.homePageData({userId:_this.userId},function (res) {
                  if(res.code==0){
+                     _this.isRequset = false;
                      _this.homeData = res.data;
                      _this.goodImage = _this.homeData.user.image;
                      _this.shopinfo = res.data.shop;
@@ -39,6 +41,8 @@ var dashboard = new Vue({
                          _this.paytotalfeeData.push(item.orderAmount);
                      });
                      _this.EchartsCreated2d();
+                 }else {
+                     _this.isRequset = false;
                  }
              })
          },
@@ -182,6 +186,7 @@ var dashboard = new Vue({
              };
              // 使用刚指定的配置项和数据显示图表。
              myChart.setOption(option);
+             window.onresize = myChart.resize;//移动适配
          }
     },
     mounted:function () {

src/main/resources/templates/supplier-center/dashboard.html

@@ -21,6 +21,8 @@
         <div class="wrap clear">
             <!--左侧导航-->
             <template th:replace="supplier-center/components/tableft"></template>
+
+
             <div class="right">
                 <div class="information">
                     <div class="head">
@@ -30,7 +32,7 @@
                     </div>
                     <div class="info_main">
                         <div class="mainContent">
-                            <h3>{{shopinfo.sname}}</h3>
+                            <p>{{shopinfo.sname}}</p>
                               <span v-if="promotions!=null" class="priceTag">
                               <i class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="promotions?promotions.name:''"></i>
                               <div class="promotion mFixed">