Merge branch 'master' of http://git.iamberry.com/wangxiaoming/iamberry-watero

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/clearing.html

@@ -379,10 +379,10 @@
                             liNote = liNote +
                                 "<li class='mui-table-view-cell mui-media'>" +
                                 "<a>" +
-                                "<span class='mui-media-object mui-pull-left wh-100'> <img src='" + dt.data.cartItems[i].productIntroduceImg + "'></span>" +
+                                "<span class='mui-media-object mui-pull-left wh-100'> <img src='" + dt.data.cartItems[i].colorImg + "'></span>" +
                                 "<div class='mui-media-body'  style='padding: 5% 0;'>" +
                                 "<div class='wt-space gwc_tit'>" + dt.data.cartItems[i].productName + "</div>" +
-                                "<div><small class='mui-h6 mui-pull-right'>" + pro_color + "x"+dt.data.cartItems[i].cartNum+"</small></div>"+
+                                "<div><small class='mui-h6 mui-pull-right'>" + dt.data.cartItems[i].productColor + "x"+dt.data.cartItems[i].cartNum+"</small></div>"+
                                 "</div>" +
                                 "<div class='price_sp cl-gwc' id='product-" + productId + "' price='" + price + "'>¥" + total + "</div>"+
                                 "</a>" +
@@ -393,10 +393,10 @@
                             liNote = liNote +
                                 "<li class='mui-table-view-cell mui-media'>" +
                                 "<a>" +
-                                "<span class='mui-media-object mui-pull-left wh-100'> <img src='" + dt.data.cartItems[i].productIntroduceImg + "'></span>" +
+                                "<span class='mui-media-object mui-pull-left wh-100'> <img src='" + dt.data.cartItems[i].colorImg + "'></span>" +
                                 "<div class='mui-media-body'  style='padding: 5% 0;'>" +
                                 "<div class='wt-space gwc_tit'>" + dt.data.cartItems[i].productName + "</div>" +
-                                "<div><small class='mui-h6 mui-pull-right'>" + pro_color + "x"+dt.data.cartItems[i].cartNum+"</small></div>"+
+                                "<div><small class='mui-h6 mui-pull-right'>" + dt.data.cartItems[i].productColor + "x"+dt.data.cartItems[i].cartNum+"</small></div>"+
                                 "</div>" +
                                 "<div class='price_sp cl-gwc' id='product-" + productId + "' price='" + price + "'>¥" + total + "</div>"+
                                 "</a>" +

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/order_details.html

@@ -100,6 +100,7 @@
 <script src="//s.iamberry.com/watero/js/shop/wap-alert/layer.js"></script>
 <script src="//s.iamberry.com/watero/js/shop/validate.js?v=2016101701"></script>
 <script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
-<script src="//s.iamberry.com/watero/js/shop/order_details.js?v=2017062201"></script>
+<!--<script src="//s.iamberry.com/watero/js/shop/order_details.js?v=2017062201"></script>-->
+<script src="http://test.iamberry.com/watero/common/shop/js/page/order_details.js"></script>
 </body>
 </html>

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/order_list.html

@@ -95,7 +95,8 @@
 <script src="//s.iamberry.com/watero/js/shop/layer.js"></script>
 <script src="//s.iamberry.com/watero/js/validate.js?v=2016111701"></script>
 <script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
-<script src="//s.iamberry.com/watero/js/shop/order_list.js?v=2017062201"></script>
+<!--<script src="//s.iamberry.com/watero/js/shop/order_list.js?v=2017062201"></script>-->
+<script src="http://test.iamberry.com/watero/common/shop/js/page/order_list.js"></script>
 </body>
 
 </html>

watero-wechat-web/src/main/webapp/common/shop/js/page/order_details.js

@@ -204,13 +204,13 @@ mui
                                             li.innerHTML = '<a proid="'
                                                 + this.itemProductId
                                                 + '" colorid="' + this.itemColorId + '" class="go_chanpin_details"><table class="my-table-order"><tr><td rowspan="3"><div class="wh-80"><img src="'
-                                                + colorImg
+                                                + this.itemProductPic
                                                 + '"></div></td><td style="white-space: pre-line;">'
                                                 + this.itemProductName
                                                 + '</td><td><span><h5 class="mui-text-center">x'
                                                 + this.itemNum
                                                 + '</h5></span></td></tr><tr><td><span><h5>颜色:'
-                                                + pro_color
+                                                + this.productColor
                                                 + '</h5></span></td></tr><tr><td><span>单价：<span>¥'
                                                 + accDiv(
                                                     this.itemProductDiscount,
@@ -220,17 +220,16 @@ mui
                                                     this.itemTotal,
                                                     100)
                                                 + '</span></span></td></tr><table></a>';
-                                            if (this.productStatus != 1) {
-                                                li.innerHTML = '<a proid="'
-                                                    + this.itemProductId
-                                                    + '" class=""><table class="my-table-order" width="100%"><tr><td rowspan="3"><div class="wh-80"><img src="'
-                                                    + this.itemProductPic
-                                                    + '"></div></td><td rowspan="3"><span>赠送'
-                                                    + (this.itemNum / 3)
-                                                    + '套三年滤芯</span></td><td></td></tr><tr><td><p class="mui-ellipsis delete-cart-style cl-red"></p></td></tr><table></a>'
-                                            }
-                                            table
-                                                .appendChild(li)
+                                            // if (this.productStatus != 1) {
+                                            //     li.innerHTML = '<a proid="'
+                                            //         + this.itemProductId
+                                            //         + '" class=""><table class="my-table-order" width="100%"><tr><td rowspan="3"><div class="wh-80"><img src="'
+                                            //         + this.itemProductPic
+                                            //         + '"></div></td><td rowspan="3"><span>赠送'
+                                            //         + (this.itemNum / 3)
+                                            //         + '套三年滤芯</span></td><td></td></tr><tr><td><p class="mui-ellipsis delete-cart-style cl-red"></p></td></tr><table></a>'
+                                            // }
+                                            table.appendChild(li)
                                         })
                             }
                             document.querySelector('.loading-bg').style.display = 'none'