新增俩个产品

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_relation.ftl

@@ -629,7 +629,7 @@
                     </div>
                 </div>
             </div>
-        <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if>
+        <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if>>
                 <div class="row cl" id="informationInformation">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>收费信息</strong>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/add_signclosed.ftl

@@ -289,6 +289,7 @@
 <script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>
 <#--<script type="text/javascript" src="${path}/common/lib/cm.lib/dimensions.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
+<script type="text/javascript" src="${path}/common/js/common/address.js"></script>
 <script type="text/javascript">
 
     /*初始化单选框样式*/
@@ -300,7 +301,9 @@
         });
     });
     /*初始化省市区*/
-    $(".address_info").initAddress();
+    /*$(".address_info").initAddress();*/
+    var ulc = initAddress($(".address_info"));
+    var sc = initSalesChannel($(".sales_channel"));
     function hide() {
         $("#objectsStateId").hide();
     }

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -375,6 +375,10 @@ function initProduceType(){
             /*绑定产品类型选择事件*/
             $("input[name='typeId']").change(function (){
                 var typeId = parseInt($(this).val());
+                var typeCompany = parseInt($("input:radio[name='typeId']:checked").attr("typeCompany"));
+                $("#selectCompany").val(typeCompany);
+                $("#companyId").val(typeCompany);
+                setStore(typeCompany,$("#selectStore"));       //获取店铺
                 var isOrder = 1;
                 switch (typeId){    //1:Soodo电动牙刷   6:WaterO净水机    7：Aiberle净水机    9 ：YULIA净水机
                     case 1: