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

src/main/java/com/caimei/www/utils/ImageUtil.java

@@ -60,17 +60,17 @@ public class ImageUtil {
 			String tmp = src;
 			src = tmp.substring(0, tmp.indexOf(","));
 		}
-		String image = "/public/3.0/img/default/none.jpg";
+		String image = "/img/default/none.jpg";
 		if (dirName.equals("user")) {
-			image = "/public/3.0/img/default/HeaderImg.png";
+			image = "/img/default/HeaderImg.png";
 		} else if (dirName.equals("club")) {
-			image = "/public/3.0/img/default/default_club.jpg";
+			image = "/img/default/default_club.jpg";
 		} else if (dirName.equals("shopLogo")) {
-			image = "/public/3.0/img/default/suppliver.jpg";
+			image = "/img/default/suppliver.jpg";
 		}else if (dirName.equals("caiMeiImage")) {
-			image = "/public/3.0/img/default/caiMeiImage.jpg";
+			image = "/img/default/caiMeiImage.jpg";
 		}else {
-			image = "/public/3.0/img/default/none.jpg";
+			image = "/img/default/none.jpg";
 		}
 		if (src != null && !src.equals("")) {
 			if (type != 0 || dirName.equals("product")) {
@@ -100,7 +100,7 @@ public class ImageUtil {
 			}
 		}else {
 			if(StringUtils.isEmpty(image)) {
-				image = "/public/3.0/img/default/none.jpg";
+				image = "/img/default/none.jpg";
 			}
 		}
 		return domain + image;

src/main/resources/templates/index.html

@@ -187,7 +187,7 @@
     <div id="advertising">
         <div class="item" v-for="ad in advertising">
             <a :href="ad.link" target="_blank">
-                <img src="/img/base/placeholder.png" :data-original="ad.image" :alt="ad.title">
+                <img :src="ad.image" :alt="ad.title">
             </a>
             <span class="close"></span>
         </div>