过年回复信息

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/cartMapper.xml

@@ -13,7 +13,7 @@ PUBLIC
 			C.CART_ID cartId, C.CART_PRODUCT_ID cartProductId,C.CART_COLOR_ID cartColorId, C.CART_NUM cartNum,
 			P.PRODUCT_NAME productName, pc.COLOR_DISCOUNT productDiscount, P.PRODUCT_STATUS productStatus, 
 			pc.COLOR_NAME productColor, P.PRODUCT_INTRODUCE_IMG productIntroduceImg, pc.COLOR_69CODE productRemark,
-			P.PRODUCT_TYPE productType 
+			P.PRODUCT_TYPE productType,pc.color_img
 		FROM 
 			TB_IAMBERRY_SHOP_CART C LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P ON C.CART_PRODUCT_ID = P.PRODUCT_ID 
 			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR pc ON c.CART_COLOR_ID = pc.COLOR_ID 

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

@@ -72,15 +72,23 @@
 </header>
 <div class="mui-segmented-control tab-with-chanpin-list">
 	<a class="mui-control-item mui-active">
-		<span class="iconfont icon-machine"></span>
+		<span class="iconfont icon-shuiji"></span>
 		<span class="mui-tab-label">水机</span>
 	</a>
-	<a class="mui-control-item" style="display: none">
+	<!--<a class="mui-control-item" style="display: none">
 		<span class="iconfont icon-dingzhi"></span>
 		<span class="mui-tab-label">定制</span>
+	</a>-->
+	<a class="mui-control-item" style="">
+		<span class="iconfont icon-gehu"></span>
+		<span class="mui-tab-label">个护</span>
+	</a>
+	<a class="mui-control-item" style="">
+		<span class="iconfont icon-jiadian"></span>
+		<span class="mui-tab-label">电器</span>
 	</a>
 	<a class="mui-control-item">
-		<span class="iconfont icon-filter"></span>
+		<span class="iconfont icon-lvxin"></span>
 		<span class="mui-tab-label">配件</span>
 	</a>
 </div>
@@ -99,5 +107,6 @@
 <script src="//s.iamberry.com/watero/js/shop/wechat-utils-1.0.js"></script>
 <script src="//s.iamberry.com/watero/js/shop/validate.js?v=2016111701"></script>
 <script src="//s.iamberry.com/watero/js/shop/chanpin_list.js?v=2017042701"></script>
+<!--<script src="http://test.iamberry.com/watero/common/shop/js/page/chanpin_list.js"></script>-->
 </body>
 </html>

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

@@ -550,7 +550,6 @@
         });
         // 去支付
         mui('body').on('tap', '.btn-weixin-pay', function() {
-            mui.alert('由于春节期间快递停运，本商城于1月30日-2月13日暂停发货，将延迟至2月14日统一发货。给您带来的不便，敬请见谅！','温馨提示',function () {
             //if($("#forward input[yhq_type=3]").prop("checked") && (((t1+all_t)==0 && t2<=2) || ((t2+all_t)==0 && t1<=2) || ((t1<=1 && t2==0) || (t1==0 && t2<=1)))){
              //   if($(".dhq-last-add").is(":visible")){
             //        console.log(exchangeColorId)
@@ -673,7 +672,6 @@
                 mui.alert("请选择收货地址!");
                 return;
             }
-            });
         });
         mui('body').on('tap', '.mui-popover-action li>a', function() {
             var a = this,

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

@@ -88,6 +88,9 @@ function selectCart() {
                     var pro_color = "",img='';
                     for(var i = 0; i < dt.data.cartList.length; i += 1) {
                         if(dt.data.cartList[i].productType==1){
+
+                            img = dt.data.cartList[i].colorImg;
+
                             switch (dt.data.cartList[i].cartColorId){
                                 case 1:
                                     img='//s.iamberry.com/watero/images/shop/cp-blue.png';pro_color='品蓝';