Merge branch 'test6.9.1' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into test6.9.1

@@ -495,7 +495,7 @@
                     <td>
                     <td>
                         <div class="form-group">
                         <div class="form-group">
                             <div class="col-sm-10">
                             <div class="col-sm-10">
-                                <label>男or女or其他：</label>
+                                <label>数据来源</label>
                                 <select class="form-control input-form observe" name="goTo" value="[[item.preferChannel]]" data-field="[[index]].preferChannel">
                                 <select class="form-control input-form observe" name="goTo" value="[[item.preferChannel]]" data-field="[[index]].preferChannel">
                                     <option value="3">其他</option>
                                     <option value="3">其他</option>
                                     <option value="1">男</option>
                                     <option value="1">男</option>
@@ -505,12 +505,14 @@
                         </div>
                         </div>
                         <div class="form-group">
                         <div class="form-group">
                             <div class="col-sm-10">
                             <div class="col-sm-10">
+                                <label>tab名称<span class="red">*</span></label>
                                 <input class="form-control observe " value="[[item.tab_name?item.tab_name:'']]" placeholder="tab名称"
                                 <input class="form-control observe " value="[[item.tab_name?item.tab_name:'']]" placeholder="tab名称"
                                        data-field='[[index]].tab_name'/>
                                        data-field='[[index]].tab_name'/>
                             </div>
                             </div>
                         </div>
                         </div>
                         <div class="form-group">
                         <div class="form-group">
                             <div class="col-sm-10">
                             <div class="col-sm-10">
+                                <label>tab参数<span class="red">*</span></label>
                                 <input class="form-control observe queryParam" value="[[item.query?item.query:'']]" placeholder="tab参数(例)key1=value1&key2=value2"
                                 <input class="form-control observe queryParam" value="[[item.query?item.query:'']]" placeholder="tab参数(例)key1=value1&key2=value2"
                                        data-field='[[index]].query'/>
                                        data-field='[[index]].query'/>
                             </div>
                             </div>
@@ -518,6 +520,7 @@
 
 
                         <div class="form-group">
                         <div class="form-group">
                             <div class="col-sm-10">
                             <div class="col-sm-10">
+                                <label>tab图标<span class="red">*(80*40)</span></label>
                                 <input type="file" name="file"  value="[[item.src]]"
                                 <input type="file" name="file"  value="[[item.src]]"
                                        data-field="[[index]].src" data-index="[[index]]" />
                                        data-field="[[index]].src" data-index="[[index]]" />
                             </div>
                             </div>