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/orderMan/RecommendBill.vue

@@ -441,7 +441,7 @@
   }
   .RecommendBill .Re_rightDiv{
     float:left;
-    width:79%;
+    width:76%;
     margin:0 10px;
   }
   .RecommendBill .ReDivList{

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,