fix(店铺)：一件代发

@@ -9,6 +9,12 @@ module.exports = function (app){
     });
     
     app.get("/supplier/store/info3/:shopsId", "shop.Info", "shopAudit_getLastCheckShopInfoById", function (rs,req,res){
+        if(rs && rs.data) {
+            const {shopNature,province ='',city='',county='',street='',detailAdd=''} = rs.data
+            if(shopNature == 6) {
+                rs.data.shopAddress = `${province} ${city} ${county} ${street} ${detailAdd}`
+            }
+        }
         this.$extend={
             moduleName:"店铺管理",
             pageName:"店铺详情",

@@ -29,6 +29,36 @@
 					<input id="appType" type="hidden" value="<%data.appType%>">
 				</div>
 			</div>
+			<%if !!data.shopAddress%>
+				<div class="row show-grid">
+					<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺地址：</div>
+					<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.shopAddress%></div>
+				</div>
+			<%/if%>
+			<%if !!data.customerTel%>
+			<div class="row show-grid">
+				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">客服电话：</div>
+				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.customerTel%></div>
+			</div>
+			<%/if%>
+			<%if !!data.zfbAccount%>
+			<div class="row show-grid">
+				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">支付宝账号：</div>
+				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.zfbAccount%></div>
+			</div>
+			<%/if%>
+			<%if !!data.zfbAccountName%>
+			<div class="row show-grid">
+				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">支付宝账号名称：</div>
+				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.zfbAccountName%></div>
+			</div>
+			<%/if%>
+			<%if !!data.checkTel%>
+			<div class="row show-grid">
+				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">联系方式：</div>
+				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.checkTel%></div>
+			</div>
+			<%/if%>
 			<div class="row show-grid" id="showUrl">
 				<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">官网地址：</div>
 				<div id='otherUrlValue' class="col-xs-8 col-sm-8 col-md-8 col-lg-8">

@@ -14,6 +14,7 @@ window.UMBusinessLicense = UM.getEditor('edit-business-license');
 
 // 一件代发 选项展示
 function underTakeElm(isShow) {
+    const shopRelations = $("#shopRelationList").val()
     if(isShow) {
         $("#customerTelFormGroup").show();
         $("#shopsAddressInfo").show();
@@ -36,10 +37,10 @@ function underTakeElm(isShow) {
         }else{
             $("#modalId").prop("disabled",true);
         }
-        if(g2.grid){
-            g2.__rows.length=0;
-            g2.reload();
-        }
+        // if(g2.grid){
+        //     g2.__rows.length=0;
+        //     g2.reload();
+        // }
 
     }else{
         $("#customerTelFormGroup").hide();
@@ -62,10 +63,10 @@ function underTakeElm(isShow) {
         }else{
             $("#modalId").prop("disabled",true);
         }
-        if(g2.grid){
-            g2.__rows.length=0;
-            g2.reload();
-        }
+        // if(g2.grid){
+        //     g2.__rows.length=0;
+        //     g2.reload();
+        // }
     }
 }
 $(function () {
@@ -203,7 +204,6 @@ e.on("bind",function(){
     });
 
     $("#shopsType").change(function(){
-        
         if(!!~$("#shopsType").val()){
             $("#modalId").prop("disabled",false);
         }else{