fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by wangwei
Commit 246fad9615fc4a21061ece5aff3412fe36851d71 2 parents 5c9e572d f4e43ce4

Merge branch 'hotfix_0119_resource' into test6.5

Inline Side-by-side
Showing 2 changed files with 10 additions and 0 deletions
@@ -22,6 +22,8 @@ @@ -22,6 +22,8 @@
22 <option value="6">YOHO</option> 22 <option value="6">YOHO</option>
23 <option value="7">SHOW</option> 23 <option value="7">SHOW</option>
24 <option value="8">分期</option> 24 <option value="8">分期</option>
  25 + <option value="9">订单详情</option>
  26 + <option value="10">物流详情</option>
25 </select> 27 </select>
26 </div> 28 </div>
27 <div class="panel-col"> 29 <div class="panel-col">
@@ -63,6 +65,8 @@ @@ -63,6 +65,8 @@
63 <option value="6">爱享潮物</option> 65 <option value="6">爱享潮物</option>
64 <option value="7">潮人自曝</option> 66 <option value="7">潮人自曝</option>
65 <option value="8">分期</option> 67 <option value="8">分期</option>
  68 + <option value="9">订单详情</option>
  69 + <option value="10">物流详情</option>
66 </select> 70 </select>
67 </div> 71 </div>
68 <div id="showchannel" class="col-sm-5"> 72 <div id="showchannel" class="col-sm-5">
@@ -537,7 +537,13 @@ $(document).on("change", ".observe", function () { @@ -537,7 +537,13 @@ $(document).on("change", ".observe", function () {
537 common.util.__tip("url必须以https开头！", "warning"); 537 common.util.__tip("url必须以https开头！", "warning");
538 $this.val(''); 538 $this.val('');
539 } 539 }
  540 + //规定填写url数据格式，不符合则清空
  541 + if(urlVal.indexOf('yohobuy.com') == -1 && urlVal.indexOf('yoho.cn') == -1 && urlVal.indexOf('yhbimg.com') == -1){
  542 + common.util.__tip('url一级域名必须是"yohobuy.com"或者"yoho.cn"或者"yhbimg.com"的内网地址，请确认!',"warning");
  543 + $this.val('');
  544 + }
540 } 545 }
  546 +
541 } 547 }
542 } 548 }
543 //showDivide check事件 549 //showDivide check事件