Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/static/css/flea-market/list.css

@@ -263,7 +263,7 @@
         color: #666;
         text-decoration: none;
     }
-    .ItemInfo tag{height: 22px}
+    .ItemInfo .tag{height: 22px}
 }
 
 /* 移动端*/

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

@@ -26,7 +26,7 @@
      .msg_num {width: 20px;height: 20px;line-height: 20px;display: block;background: red;border-radius: 50%;color: #fff;font-size: 10px;text-align: center;position: relative;top: 10px;right: -15px;}
      .icon.msg:before {width: 25px;height: 25px;background-position: -240px -371px}
      .product {margin: 20px 0;}
-     .product p {font-size: 16px;font-weight: normal;font-stretch: normal;line-height: 21px;letter-spacing: 0px;color: #22272e;padding: 10px;}
+     .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 -415px;position: absolute;right: 53px;}
@@ -38,7 +38,7 @@
      .sales-ranke ul li:nth-child(2) {width: 79%;}
      .sales-ranke {background: #fff;color: #627386;padding: 10px 22px}
      .sales-ranke ul {padding: 10px 0;border-bottom: 1px solid #e2e7ef}
-     .rank_top {padding: 10px;}
+     .rank_top {padding: 10px 22px;}
      .file_img {width: 118px;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: #e15616;line-height: 70px}
@@ -58,6 +58,7 @@
      .Stati_top p {font-size: 16px;color: #333333;display: inline-block;}
      .Stati_top span {font-size: 12px;color: #999999;}
      #StatisticsEacths {width: 968px;height: 440px;box-sizing: border-box;background: #FFF;padding:20px 0;margin-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+     .Statistics .Stati_top{padding: 0 22px}
  }
 
 /*移动端*/

src/main/resources/static/css/supplier-center/operation/list.css

@@ -31,7 +31,7 @@ li{list-style:none}
     .order-header .header-bt .header-button .btn-serch{width: 90px;height: 36px;display: block;background-color: #e15616;border-radius: 2px;border: solid 1px #e15616;font-size: 14px;color: #FFFFFF;line-height: 36px;text-align: center;float: left;margin: 0 5px;}
     .order-header .header-bt .header-button .btn-add{width: 128px;height: 36px;display: block;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;font-size: 14px;color: #e15616;line-height: 36px;text-align: center;float: left;margin: 0 5px;}
 
-    .container{width: 100%;height:auto;box-sizing: border-box;margin-top: 16px;}
+    .container{width: 100%;height:auto;box-sizing: border-box;margin-top: 10px;}
     .container .empty{background-color:#FFF;}
     .container .section{width: 100%;height:auto;padding-bottom: 16px;box-sizing: border-box;padding:0 16px 16px 16px;background-color: #FFFFFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .container .section .title{width: 100%;height: 54px;border-bottom: 1px solid #e2e7ef;}

src/main/resources/templates/flea-market/form.html

@@ -141,7 +141,7 @@
                        <span class="release-tips errTips icon mIcon" v-show="vShow_Address">{{fromMessage}}</span>
                     </div>
                     <div class="release-main-container">
-                        <div class="release-from unlogin-label">
+                        <div class="release-from">
                             <div class="release-label"><span class="red-color" >*</span>营业执照图片:</div>
                             <div class="release-input upload image"  id="uploadGoodsImages">
                                 <div class="upload-file"  v-for="(item, index) in GoodsImagesList" :key="index">

src/main/resources/templates/index.html

@@ -75,7 +75,7 @@
                                             </div>
                                         </template>
                                         <template v-else>
-                                            <template v-if="p.priceFlag==0 && p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
                                                 <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                                 <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                             </template>