Merge branch 'developer' of http://git.caimei365.com/caimei365/caimei365-www into developer

src/main/resources/static/css/shopping/shopping.css

@@ -30,7 +30,7 @@ li{list-style:none}
     .pageTitle .step span.prev:after{border-color:#FF5B00;}
     .listWrap .cartTit,.listWrap .supplierItem,.addressWrap,.balanceWrap,.invoiceWrap,.totalPriceWrap{box-sizing:border-box;padding:0 14px;text-align:center;width:100%;background:#FFF;margin-bottom:8px;box-shadow:0px 3px 6px rgba(0,0,0,0.07)}
     /* 商品清单 */
-    .listWrap{width:1184px}
+    .listWrap{width:100%}
     .listWrap .supplierItem.disable{background:#f1f0f5}
     .listWrap .supplierItem em{font-style:normal}
     .listWrap .supplierTit{border-bottom:1px solid #F7F7F7;height:60px;line-height:60px;text-align:left}

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

@@ -5,7 +5,7 @@
      /**/
      #dashboard li {list-style: none;}
      .information {background: #fff;padding: 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
-     .head {width: 112px;height: 80px;border-radius: 2px;border: solid 1px #f5f5f5;margin-right: 10px;position: relative;cursor: pointer;display: inline-block;vertical-align: top;}
+     .head {width: 80px;height: 80px;border-radius: 2px;margin-right: 10px;position: relative;cursor: pointer;display: inline-block;vertical-align: top;}
      .zhuti {font-size: 16px;color: #22272e;padding: 25px 236px 10px}
      .info_main h3{display: inline-block;}
      .icon.Promotion:before{width: 20px;height: 20px;background-position: -90px 3px;position: absolute;}
@@ -29,9 +29,9 @@
      .product p {font-size: 16px;font-weight: normal;font-stretch: normal;line-height: 21px;letter-spacing: 0px;color: #22272e;padding: 10px 22px;}
      .product ul {height: 50px;line-height: 80px;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding: 15px;}
      .product li {display: inline-block;margin-right: 20px;width: 110px;text-align: center;color: #333333;position: relative;cursor: pointer;}
-     .icon.confirm:before {width: 34px;height: 35px;background-position:-159px -414px;position: absolute;right: 53px;}
-     .icon.other:before {background-position: -197px -414px;}
-    .icon.down:before{background-position: -234px -414px;}
+     .icon.confirm:before {width: 34px;height: 35px;background-position:-159px -405px;position: absolute;right: 53px;}
+     .icon.other:before {background-position: -197px -405px;}
+    .icon.down:before{background-position: -234px -405px;}
      .rank_top p {font-size: 16px;color: #22272e;display: inline-block;}
      .rank_top span {color: #627386;font-size: 16px;}
      .sales-ranke ul li {display: inline-block;width: 10%;}
@@ -39,7 +39,7 @@
      .sales-ranke {background: #fff;color: #627386;padding: 10px 22px}
      .sales-ranke ul {padding: 10px 0;border-bottom: 1px solid #e2e7ef}
      .rank_top {padding: 10px 22px;}
-     .file_img {width: 118px;height: 80px;font-size: 999px;opacity: 0;top: 0px;left: 0px;position: absolute}
+     .file_img {width: 80px;height: 80px;font-size: 999px;opacity: 0;top: 0px;left: 0px;position: absolute}
      .shop-ranke {background: #fff;padding-bottom: 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
      .shop-ranke ul li {float: left;height: 70px;width: 10%;color: #FF5B00;line-height: 70px}
      .shop-ranke ul {padding: 5px 15px;overflow: hidden;}
@@ -47,11 +47,11 @@
      .shop-ranke ul li .shop-img {display: inline-block;vertical-align: top;margin-left: 10px;}
      .shop-ranke ul li .shop-img img {width: 70px;height: 70px;display: inline-block;}
      .shop-ranke ul li p {width: 350px;font-size: 14px;height: 60px;line-height: 60px;color: #333;padding-left: 16px;display: inline-block;overflow: hidden;text-overflow: ellipsis;}
-     .icon.rank0:before {background-position: 0px -453px}
-     .icon.rank1:before {background-position: -62px -453px}
-     .icon.rank2:before {background-position: -124px -453px}
-     .icon.rank3:before {background-position: -186px -453px}
-     .icon.rank4:before {background-position: -248px -453px}
+     .icon.rank0:before {background-position: 6px -445px}
+     .icon.rank1:before {background-position: -52px -445px}
+     .icon.rank2:before {background-position: -108px -445px}
+     .icon.rank3:before {background-position: -166px -445px}
+     .icon.rank4:before {background-position: -228px -445px}
      .icon.rank:before {position: absolute;width: 60px;height: 60px;}
      .confirm span {color: #FF5B00;padding: 5px}
      .Statistics {margin-top: 20px;}

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

@@ -24,7 +24,7 @@
                  if(res.code==0){
                      _this.isRequset = false;
                      _this.homeData = res.data;
-                     _this.goodImage = _this.homeData.user.image;
+                     _this.goodImage = _this.homeData.user.image ? _this.homeData.user.image : '/img/supplier/icon_default_opea@2x.png';
                      _this.shopinfo = res.data.shop;
                      _this.userInfo = res.data.user;
                      _this.promotions = res.data.promotions;

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

@@ -27,8 +27,7 @@
             <div class="right">
                 <div class="information">
                     <div class="head">
-                         <i class="icon Image" v-if="goodImage==null"></i>
-                         <img :src="goodImage" v-else>
+                         <img :src="goodImage" />
                          <input type="file" ref="goodImage" name="file" class="file_img" @change="uploadGoodsImagesFn" accept="image/png,image/jpeg,image/gif,image/jpg">
                     </div>
                     <div class="info_main">