Authored by 马力

Merge branch 'dev5.2' into test5.2

@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 <div class="form-group search_type2" [[if !searchType]]style="display: none;"[[/if]]> 73 <div class="form-group search_type2" [[if !searchType]]style="display: none;"[[/if]]>
74 <label class="col-sm-2 control-label" for="matchPcUrl"><i class="red">*</i> PC 链接</label> 74 <label class="col-sm-2 control-label" for="matchPcUrl"><i class="red">*</i> PC 链接</label>
75 <div class="col-sm-10"> 75 <div class="col-sm-10">
76 - <input type="text" value="[[matchAppUrl]]" placeholder="PC 链接" class="form-control observe" data-field="matchPcUrl" id="matchPcUrl" [[if searchType]]required="required"[[/if]]/> 76 + <input type="text" value="[[matchPcUrl]]" placeholder="PC 链接" class="form-control observe" data-field="matchPcUrl" id="matchPcUrl" [[if searchType]]required="required"[[/if]]/>
77 </div> 77 </div>
78 </div> 78 </div>
79 <div class="form-group search_type2" [[if !searchType]]style="display: none;"[[/if]]> 79 <div class="form-group search_type2" [[if !searchType]]style="display: none;"[[/if]]>