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

.gitignore

@@ -1,8 +1,8 @@
-HELP.md
-target/
+/target/
+/target/**/
 !.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
+!**/src/main/**
+!**/src/test/**
 
 ### STS ###
 .apt_generated

src/main/java/com/caimei/www/service/generate/impl/GenerateHtmlImpl.java

@@ -48,6 +48,9 @@ public class GenerateHtmlImpl implements GenerateHtml {
     /** 打包时间 */
     @Value("${spring.application.build-time}")
     private String buildTime;
+    /** 环境 */
+    @Value("${spring.profiles.active}")
+    private String profile;
 
     @Resource
     private TemplateEngine templateEngine;
@@ -120,6 +123,10 @@ public class GenerateHtmlImpl implements GenerateHtml {
      */
     @Override
     public String generateStaticFiles() {
+        if ("dev".equals(profile)){
+            log.info("[静态页服务]：本地环境不拷贝静态文件! ^_^");
+            return "[静态页服务]：本地环境不拷贝静态文件! ^_^";
+        }
         // 拷贝静态资源文件
         try {
             copyResourceToFile();

src/main/resources/config/dev/application-dev.yml

@@ -4,7 +4,6 @@ spring:
   #数据源连接--start
   datasource:
     #本地连接数据库
-    driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
     password: 05bZ/OxTB:X+yd%1
@@ -60,7 +59,7 @@ caimei:
   #coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009
-  destPath: D:/_PLAN_WORKSPACE/test/static
+  destPath: classpath:/
 
 
 #DFS配置

src/main/resources/static/js/shopping/confirm.js

@@ -659,7 +659,7 @@ var shoppingConfirm = new Vue({
         },
         submitOrder: function(){// 提交按钮点击
             var _self = this;
-            if( _self.hanldShouldPayFee<1000){
+            if( _self.totalPrice<1000){
                 _self.isModelAlert = true;
                 _self.isModelAlertText = '采购金额过小，将扣除500采美豆。建议您使用微信扫描 以下二维码，进入采美旗下“呵呵商城”小程序购买小额 商品。';
             }else{

src/main/resources/templates/components/footer.html

@@ -3,7 +3,7 @@
         <div class="wrap mf">
             <span class="icon mIcon mfi">国内首家美业共享平台</span>
             <span class="icon mIcon mfi">采美正品联盟货源保证</span>
-            <span class="icon mIcon mfi">5000+美容机构入驻</span>
+            <span class="icon mIcon mfi">6000+美容机构入驻</span>
             <span class="icon mIcon mfi">100+国际国内知名供应商</span>
         </div>
     </div>

src/main/resources/templates/product/instruelist.html

@@ -157,7 +157,9 @@
                         <a class="image" th:href="'/product-'+ *{productId} +'.html'">
                             <img src="/img/base/placeholder.png"  th:attr="data-original=*{image}" th:alt="*{name}">
                             <p class="name">
-                                <span th:if="*{beautyActFlag}==1" class="tag">美博会</span>
+                                <th:block th:if="${product.containsKey('beautyActFlag')}">
+                                    <span th:if="*{beautyActFlag}==1" class="tag">美博会</span>
+                                </th:block>
                                 <th:block th:text="*{name}"></th:block>
                             </p>
                             <div class="price">

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

@@ -109,12 +109,12 @@
                                 </div>
                                  <div class="userinfo" >
                                         <div class="username">
-                                             <p>买家名称：<span class="blcak">{{order.userInfo.name}}</span> </p>
-                                             <p >收货人：<span class="blcak">{{order.userInfo.receiver}}</span> </p>
-                                             <p >联系方式：<span class="blcak">{{order.userInfo.mobile}}</span> </p>
+                                             <p>买家名称：<span class="blcak">{{ order.userInfo ? order.userInfo.name : ''}}</span> </p>
+                                             <p >收货人：<span class="blcak">{{ order.userInfo ? order.userInfo.receiver : ''}}</span> </p>
+                                             <p >联系方式：<span class="blcak">{{ order.userInfo ? order.userInfo.mobile : ''}}</span> </p>
                                         </div>
                                         <div class="address">
-                                            <p >收货地址：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.address}}</span> </p>
+                                            <p >收货地址：&nbsp;&nbsp;<span class="blcak">{{ order.userInfo ? order.userInfo.address : ''}}</span> </p>
                                         </div>
                                  </div>
                             </div>