bug修复

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -81,6 +81,8 @@
                             <option value="16">伊姐团购</option>
                             <option value="17">物道团购</option>
                             <option value="18">年糕妈妈</option>
+                            <option value="19">快抱团</option>
+                            <option value="20">北京北斗</option>
                         </select>
                     </label>
                 </td>

watero-rst-web/src/main/webapp/WEB-INF/views/wap/pts/machine_delivery.ftl

@@ -91,8 +91,10 @@
 <script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${path}/common/js/order/order_common.js"></script>
 
-<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
-<script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script>
+<#--<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>-->
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+<script src="https://s.iamberry.com/wateroPF/js/rst/wechat-utils-1.0.0.js"></script>
+
 <script>
     var validate_flag=false;
 
@@ -213,7 +215,8 @@
                         }
                         $(".my-pull-list").html(html);
                     }else{
-                        mui.alert(dt.resultMsg);
+                        $(".my-pull-list").html(dt.resultMsg);
+                       // mui.alert(dt.resultMsg);
                     }
                 }
             },