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

# Conflicts:
#	target/www-0.0.1-SNAPSHOT.jar

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

@@ -160,6 +160,9 @@ var fleaMarketList = new Vue({
      mounted:function () {
           var _this = this;
           _this.gettabList();
+         setTimeout(function(){  // 图片懒加载
+             $("img[data-original]").lazyload();
+         },500);
           if(!isPC){
             $('footer').addClass("noneImportant");
             //移动端上垃加载更多

src/main/resources/static/js/flea-market/secondDetail.js

@@ -63,10 +63,12 @@ var fleaMarket = new Vue({
            }else {
                 _this.isRequest =false;
            }
-             _this.detail = res.data;
-             _this.previewThumb =  res.data.imageList;
-             _this.previewBigimage =res.data.imageList[0];
-
+                _this.detail = res.data;
+                _this.previewThumb =  res.data.imageList;
+                _this.previewBigimage =res.data.imageList[0];
+                setTimeout(function(){  // 图片懒加载
+                      $("img[data-original]").lazyload();
+                },500);
               if(_this.userID!=null){
                 if(res.data.secondHandType ==2){ //临期产品显示
                    _this.HandType =true;

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

@@ -17,13 +17,13 @@
         <div class="preview-header clearfix">
             <div class="preview-banner clearfix" id="imgShown" >
                 <div class="preview-banner-big bigImage" v-if="isPC">
-                    <img class="preview-img" :src="previewBigimage" >
+                    <img class="preview-img" src="/img/base/placeholder.png" :data-original="previewBigimage" >
                     <span class="mask"></span>
                 </div>
                 <div class="preview-banner-small" id="CM____pic_thumb" v-if="isPC">
                     <ul class="preview-thumb-ul">
                         <li class="item" v-for="(item, index) in previewThumb"  :class="current==index?'addImg':''" :key="index" :data-src="item" @click="ImgList(item,index)">
-                            <img :src="item">
+                            <img src="/img/base/placeholder.png" :data-original ="item">
                         </li>
                     </ul>
                 </div>
@@ -80,11 +80,11 @@
                     </div>
                     <div class="info " v-if="HandType">
                        <span class="label" style="width: 84px">产品到期日：</span>
-                        <p>{{detail.maturityYears}}</p>
+                        <p>{{ detail.maturityYears ? detail.maturityYears : '暂无' }}</p>
                     </div>
                     <div class="info bind">
                        <span class="label">分&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;类：</span>
-                        <p>{{detail.typeStr}}</p>
+                        <p>{{ detail.typeStr ? detail.typeStr : '暂无' }}</p>
                     </div>
                     <div class="info ">
                        <span class="label">所&nbsp;&nbsp;在&nbsp;&nbsp;地：</span>
@@ -96,15 +96,15 @@
                     </div>
                      <div class="info " v-if="detail.showContactFlag==2">
                        <span class="label">联&nbsp;&nbsp;系&nbsp;&nbsp;人：</span>
-                        <p>{{detail.contactName}}</p>
+                        <p>{{ detail.contactName ? detail.contactName : '暂无' }}</p>
                     </div>
                     <div class="info unit" v-if="detail.fixedYears!='' && detail.fixedYears!=null">
                         <span class="label">出厂日期：</span>
-                        <p>{{detail.fixedYears}}</p>
+                        <p>{{detail.fixedYears ? detail.fixedYears : '暂无'}}</p>
                     </div>
                     <div class="info unit" v-if="detail.showContactFlag==2">
                         <span class="label">联系方式：</span>
-                        <p>{{detail.contactMobile}}</p>
+                        <p>{{ detail.contactMobile ? detail.contactMobile : '暂无' }}</p>
                     </div>
                     <div class="info price" style="width: 100%" v-if="HandType">
                         <span class="label">库&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;存：</span>

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

@@ -55,7 +55,7 @@
             <div class="shopList">
                 <div class="Listitem" v-if="isShow" v-for="(item, index) in tabchildList">
                     <a class="itemImg onhref" :href="'/flea-market-'+item.productID+'.html'">
-                        <img :src="item.imageList[0]" :class="item.sold==1?'activeImg':''" class="bigImg">
+                        <img src="/img/base/placeholder.png" :class="item.sold==1?'activeImg':''" :data-original="item.imageList[0]" class="bigImg">
                     </a>
                     <div class="ItemInfo">
                         <div class="tag">

src/main/resources/templates/shopping/cart.html

@@ -97,7 +97,7 @@
                                 <del v-text="'¥'+toFloat(cart.originalPrice)"></del>
                             </template>
                             <template v-else>
-                                <em v-text="'¥'+toFloat(cart.price)"></em>
+                                <em> {{ cart.price | NumFormat }} </em>
                             </template>
                             <!-- 促销活动 -->
                             <div v-if="cart.actStatus==1 && cart.promotions" class="priceTag">

src/main/resources/templates/user-center/setting/upgrade.html

@@ -69,8 +69,10 @@
                                 <span class="errTips icon mIcon" tips="" :class="flagshow?'show':''">请输入正确的联系地址</span>
                             </div>
                             <div class="formLine">
-                                <p>营业执照：</p>
+                                <p><em>*</em>营业执照：</p>
                                 <input type="text" v-model.trim="clubUpgradeUser.socialCreditCode" placeholder="请输入统一社会信用代码" maxlength="18">
+                                <i class="checked icon mIcon"></i>
+                                <span class="errTips icon mIcon" tips="请输入统一社会信用代码"></span>
                             </div>
                             <div class="formLine clear">
                                 <div class="form-upload">