fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by shuaiguo
Commit ae994a81e33a5465a219243b1dd9715fc7f5bbd8 1 parent 989ba29a

fix(店铺)：一件代发

Inline Side-by-side
Showing 3 changed files with 45 additions and 9 deletions
@@ -9,6 +9,12 @@ module.exports = function (app){ @@ -9,6 +9,12 @@ module.exports = function (app){
9 }); 9 });
10 10
11 app.get("/supplier/store/info3/:shopsId", "shop.Info", "shopAudit_getLastCheckShopInfoById", function (rs,req,res){ 11 app.get("/supplier/store/info3/:shopsId", "shop.Info", "shopAudit_getLastCheckShopInfoById", function (rs,req,res){
  12 + if(rs && rs.data) {
  13 + const {shopNature,province ='',city='',county='',street='',detailAdd=''} = rs.data
  14 + if(shopNature == 6) {
  15 + rs.data.shopAddress = `${province} ${city} ${county} ${street} ${detailAdd}`
  16 + }
  17 + }
12 this.$extend={ 18 this.$extend={
13 moduleName:"店铺管理", 19 moduleName:"店铺管理",
14 pageName:"店铺详情", 20 pageName:"店铺详情",
@@ -29,6 +29,36 @@ @@ -29,6 +29,36 @@
29 <input id="appType" type="hidden" value="<%data.appType%>"> 29 <input id="appType" type="hidden" value="<%data.appType%>">
30 </div> 30 </div>
31 </div> 31 </div>
  32 + <%if !!data.shopAddress%>
  33 + <div class="row show-grid">
  34 + <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">店铺地址：</div>
  35 + <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.shopAddress%></div>
  36 + </div>
  37 + <%/if%>
  38 + <%if !!data.customerTel%>
  39 + <div class="row show-grid">
  40 + <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">客服电话：</div>
  41 + <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.customerTel%></div>
  42 + </div>
  43 + <%/if%>
  44 + <%if !!data.zfbAccount%>
  45 + <div class="row show-grid">
  46 + <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">支付宝账号：</div>
  47 + <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.zfbAccount%></div>
  48 + </div>
  49 + <%/if%>
  50 + <%if !!data.zfbAccountName%>
  51 + <div class="row show-grid">
  52 + <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">支付宝账号名称：</div>
  53 + <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.zfbAccountName%></div>
  54 + </div>
  55 + <%/if%>
  56 + <%if !!data.checkTel%>
  57 + <div class="row show-grid">
  58 + <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">联系方式：</div>
  59 + <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8"><%data.checkTel%></div>
  60 + </div>
  61 + <%/if%>
32 <div class="row show-grid" id="showUrl"> 62 <div class="row show-grid" id="showUrl">
33 <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">官网地址：</div> 63 <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">官网地址：</div>
34 <div id='otherUrlValue' class="col-xs-8 col-sm-8 col-md-8 col-lg-8"> 64 <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'); @@ -14,6 +14,7 @@ window.UMBusinessLicense = UM.getEditor('edit-business-license');
14 14
15 // 一件代发 选项展示 15 // 一件代发 选项展示
16 function underTakeElm(isShow) { 16 function underTakeElm(isShow) {
  17 + const shopRelations = $("#shopRelationList").val()
17 if(isShow) { 18 if(isShow) {
18 $("#customerTelFormGroup").show(); 19 $("#customerTelFormGroup").show();
19 $("#shopsAddressInfo").show(); 20 $("#shopsAddressInfo").show();
@@ -36,10 +37,10 @@ function underTakeElm(isShow) { @@ -36,10 +37,10 @@ function underTakeElm(isShow) {
36 }else{ 37 }else{
37 $("#modalId").prop("disabled",true); 38 $("#modalId").prop("disabled",true);
38 } 39 }
39 - if(g2.grid){  
40 - g2.__rows.length=0;  
41 - g2.reload();  
42 - } 40 + // if(g2.grid){
  41 + // g2.__rows.length=0;
  42 + // g2.reload();
  43 + // }
43 44
44 }else{ 45 }else{
45 $("#customerTelFormGroup").hide(); 46 $("#customerTelFormGroup").hide();
@@ -62,10 +63,10 @@ function underTakeElm(isShow) { @@ -62,10 +63,10 @@ function underTakeElm(isShow) {
62 }else{ 63 }else{
63 $("#modalId").prop("disabled",true); 64 $("#modalId").prop("disabled",true);
64 } 65 }
65 - if(g2.grid){  
66 - g2.__rows.length=0;  
67 - g2.reload();  
68 - } 66 + // if(g2.grid){
  67 + // g2.__rows.length=0;
  68 + // g2.reload();
  69 + // }
69 } 70 }
70 } 71 }
71 $(function () { 72 $(function () {
@@ -203,7 +204,6 @@ e.on("bind",function(){ @@ -203,7 +204,6 @@ e.on("bind",function(){
203 }); 204 });
204 205
205 $("#shopsType").change(function(){ 206 $("#shopsType").change(function(){
206 -  
207 if(!!~$("#shopsType").val()){ 207 if(!!~$("#shopsType").val()){
208 $("#modalId").prop("disabled",false); 208 $("#modalId").prop("disabled",false);
209 }else{ 209 }else{