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

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

@@ -4,6 +4,7 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
+    .pageWrap{width: 968px;margin: auto;padding: 32px 0}
     .content .empty{background-color:#FFF;}
     .content{width: 100%;min-height: 370px;background-color: #FFFFFF;box-sizing: border-box;padding:0 20px 20px 20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);margin:0 0 10px 0;}
     .content .title{width: 100%;height: 56px;border-bottom: solid 1px #e2e7ef;line-height: 56px;color: #22272e;font-size: 16px;}

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

@@ -1,5 +1,6 @@
 @media screen and (min-width:768px) {
-.pageWrap{width: 986px}  .crumbs{font-size: 16px;color: #22272e}
+.pageWrap{width: 968px;margin: auto;padding: 32px 0}
+.crumbs{font-size: 16px;color: #22272e}
 .new-s-item>form{overflow: hidden;background: #fff;padding: 10px 10px 17px 10px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
 .new-s-item>form>div{float: left;height: 40px;margin: 10px 20px 0 20px;font-size: 12px;color: #627386;line-height: 40px;position: relative;}
 .new-s-item>form>label{float: left;margin: 10px 20px 0 20px;font-size: 12px;color: #627386;}

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

@@ -1,5 +1,6 @@
 
 @media screen and (min-width:768px) {
+    .pageWrap{width: 968px;margin: auto;padding: 32px 0}
     .crumbs {font-size: 16px;color: #22272e }
     .userinfo { padding: 5px 20px; background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .info {height: 56px;line-height: 56px; border-bottom: solid 1px #e2e7ef;font-size: 16px; color: #22272e; overflow: hidden }

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

@@ -1,4 +1,5 @@
  @media screen and (min-width:768px) {
+   .pageWrap{width: 968px;margin: auto;padding: 32px 0}
    .crumbs{color: #22272e;font-size: 16px;}
    .head-top>form{overflow: hidden;background: #fff;padding:20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
    form>div {float: left; height: 40px;font-size: 12px;color: #627386;line-height: 40px;margin-right: 15px}

src/main/resources/static/css/supplier-center/setting/password.css

@@ -36,4 +36,5 @@ li{list-style:none}
     .right-header{    width: 100%;box-sizing: border-box;padding: 0 3.3vw;}
     .right-header .header-tabs{width: 46.7vw;height: 9.6vw;background-color: #f0f3f7;border-radius: .53vw 0px 0px .53vw;;line-height: 9.6vw;font-size: 14px;text-align: center;color: #627386;float: left;cursor: pointer;}
     .right-header .header-tabs.current{background-color: #e15616;color: #FFFFFF;}
+    .mIcon.showPwd:before{width: 5.3vw;height: 5.3vw;background-position: -42vw -8vw;right: 8px;top: 12.5vw;position: absolute}
 }

src/main/resources/static/css/supplier-center/shop/brand.css

@@ -1,4 +1,5 @@
  @media screen and (min-width:768px) {
+  .pageWrap{width: 968px;margin: auto;padding: 32px 0}
   .crumbs{color: #22272e;font-size: 16px;}
   .head-top>form{overflow: hidden;background: #fff;padding:20px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
   form>div {float: left; height: 40px;font-size: 12px;color: #627386;line-height: 40px;margin-right: 15px}

src/main/resources/static/css/supplier-center/shop/goods.css

@@ -48,6 +48,7 @@ li{list-style: none}
   .bg-gouxuan{background-color: #f0f3f7;}
   .good-price p {display: inline-block}
   .priceTag{position: absolute;    top: 60px; right: 45px}
+  .pageWrap{width: 968px;margin: auto;padding: 32px 0}
   }
 
 /*移动*/

src/main/resources/templates/supplier-center/setting/password.html

@@ -48,14 +48,14 @@
                                 <input type="password" v-model.trim="phonePwd.passWord" autocomplete="new-password" placeholder="请输入新密码,为8-16位数字和字母组合" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
-                                <i class="icon showPwd" @click="showPassword($event)"></i>
+                                <i class="icon mIcon showPwd" @click="showPassword($event)"></i>
                             </div>
                             <div class="formLine">
                                 <p><em>*</em>确认密码：</p>
                                 <input type="password" v-model.trim="phonePwd.confirmPwd" autocomplete="new-password" placeholder="请再次确认新密码" :rule="rule.password" maxlength="32" @blur="blurHandle($event)" needverify>
                                 <i class="checked icon mIcon"></i>
                                 <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
-                                <i class="icon showPwd" @click="showPassword($event)"></i>
+                                <i class="icon mIcon showPwd" @click="showPassword($event)"></i>
                             </div>
                             <div class="subLine">
                                 <button class="btn" type="button" :class="loginLoading ? 'disabled':''"  @click="findPhonePwd()">提交</button>

src/main/resources/templates/supplier-center/shop/brand.html

@@ -55,7 +55,7 @@
                     </ul>
                     <div class="tbody">
                         <ul v-for="item in brandlist">
-                            <li class="brand-name"><h3>{{item.name}}</h3></li>
+                            <li class="brand-name">{{item.name}}</li>
                             <li class="brand-logo">
                                 <img :src="item.logo" v-if="item.logo!=''&&item.logo!=null">
                                 <span v-else>暂无</span>