Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/UserMan/RecommendRebate.vue

@@ -179,7 +179,7 @@
                                         <div flex="dir:left cross:center" class=" share-price"  style="margin-bottom: 10px;" v-if="list.OrderIntroduction.Commission!=null && list.OrderIntroduction.Commission!='' && list.OrderIntroduction.Commission!=0 " >
                                             <span style='color: #999999;margin-right: 10px;'>佣金:</span>
                                             <div>￥{{list.OrderIntroduction.Commission}}</div>
-                                            <img v-if='list.OrderIntroduction.CommissionState==1'  @click="EditCommission(list)"
+                                            <img v-if='list.OrderIntroduction.CommissionState==1'  @click="EditCommission(list)" style="margin-left:8px"
                                                   src="../../assets/img/userman/edit1.png" alt="">
                                         </div>
                                        

src/components/common/chooseMenu.vue

@@ -21,7 +21,7 @@
           <el-input placeholder="输入关键字进行过滤" style="width:99%;margin-bottom:10px;" v-model="filterText">
           </el-input>
           <el-tree :data="item.SubMenuList" node-key="PageId" ref="tree" :props="defaultProps" filter
-            :filter-node-method="filterNode" @check="handleCheck" :check-strictly="true" show-checkbox>
+            :filter-node-method="filterNode" @check="handleCheck" :check-strictly="true" show-checkbox :check-on-click-node="true"> 
             <span class="custom-tree-node" slot-scope="{ node, data }">
               <span :class="{'other_Style':data.SubMenuList&&data.SubMenuList.length>0}">{{ data.PageName }}</span>
             </span>

src/components/setup/mailRulesSet.vue

@@ -32,7 +32,7 @@
              <template slot="append">元</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="跳转链接" prop="FreeShippingUrl" class="is-required">
+        <el-form-item label="跳转链接">
           <el-input  v-model="addMsg.FreeShippingUrl" placeholder="请输入链接"  >
              
           </el-input>
@@ -152,11 +152,7 @@
             message: '请选择是否启用',
             trigger: 'change'
           }],
-           FreeShippingUrl: [{
-            required: true,
-            message: '请选择跳转链接',
-            trigger: 'blur'
-          }],
+         
           
         },
         loading: false,