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

src/main/resources/static/css/index/index.pc.css

@@ -8,7 +8,7 @@ li{list-style:none;}
 #swiper-container .swiper-wrapper{position:relative;height:100%;z-index:0}
 #swiper-container .tempWrap{margin:0 auto;}
 #swiper-container .swiper-wrapper li{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden}
-#swiper-container .swiper-wrapper img{width:auto;height:510px;display:block;margin-left:50%;-o-transform:translateX(-50%);-ms-transform:translateX(-50%);-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%)}
+#swiper-container .swiper-wrapper img{width:auto;height:510px;max-width:none;display:block;margin-left:50%;-o-transform:translateX(-50%);-ms-transform:translateX(-50%);-moz-transform:translateX(-50%);-webkit-transform:translateX(-50%);transform:translateX(-50%)}
 #swiper-container .swiper-button-prev,#swiper-container .swiper-button-next{position:absolute;top:50%;margin-top:-34px;display:block;width:44px;height:68px;line-height:68px;background:rgba(255,230,220,.2);color:#FFF;font-size:40px;text-align:center;border-radius:2px}
 #swiper-container .swiper-button-prev{left:5px;right:auto}
 #swiper-container .swiper-button-next{left:auto;right:5px}

src/main/resources/templates/supplier-center/order/logistics-add.html

@@ -75,16 +75,18 @@
                                 <option value="0">请选择</option>
                                     <option :key="kdIndex" :name='kd.label' :value="kd.value" v-for="(kd,kdIndex) in kdlist">{{kd.label}}</option>
                                 </select>
-                                <button @click="addBtn()" class="add-company companyBtn"v-if="index==0"></button>
-                                <button @click="subBtn(item)" class="sub-company companyBtn icon" v-else>-</button>
+                                <button class="add-company companyBtn icon mIcon" @click="addBtn()" v-if="index==0"></button>
+                                <button class="sub-company companyBtn icon mIcon" @click="subBtn(item)" v-else></button>
                             </div>
                             <div class="logist-right">
                                 <div :key="numIndex" v-for="(num,numIndex) in item.numList">
                                     <i class="red">*</i>
                                     物流编号：
                                     <input class="logistics-order-number company" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号" type="text" v-model="num.number">
-                                    <button @click="addNum(item,numIndex)" class="add-number companyBtn" v-if="numIndex==0"></button>
-                                    <button @click="reduceBtn(item)" class="add-number companyBtn" v-else>-</button>
+                                    <button class="add-company companyBtn icon mIcon" @click="addNum(item,numIndex)"
+                                            v-if="numIndex==0">
+                                    </button>
+                                    <button class="sub-company companyBtn icon mIcon" v-else @click="reduceBtn(item)"></button>
                                 </div>
                             </div>
                         </div>

src/main/resources/templates/supplier-center/order/logistics.html

@@ -86,7 +86,7 @@
                                     物流编号：
                                     <input type="text" v-model="num.number" class="logistics-order-number company"
                                            oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号">
-                                    <button class="add-company companyBtn icon mIcon" @click="addNum(item,numIndex)"
+                                    <button class="add-company companyBtn icon mIcon"  @click="addNum(item,numIndex)"
                                             v-if="numIndex==0">
                                     </button>
                                     <button class="sub-company companyBtn icon mIcon" v-else @click="reduceBtn(item)"></button>