Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/PersonalInfoSet.vue

@@ -37,6 +37,7 @@
         margin:39px auto;
         border:1px solid #F4F4F4;
         padding:3px;
+        border-radius: 50%;
     }
     .Person_Header img{
         width:100%;
@@ -588,7 +589,7 @@
     position: relative;
     cursor: pointer;
     color: #888;
-    background: #fafafa;
+    background: #fff;
     overflow: hidden;
     display: inline-block;
     *display: inline;
@@ -604,6 +605,11 @@
     filter: alpha(opacity=0);
     cursor: pointer
 }
+.cancel_Btnn{
+    background-color: #fff!important;
+    border:1px solid #e95252!important;
+    color:#e95252!important;
+}
 </style>
 
 <template>
@@ -838,9 +844,10 @@
         </div>
         <div id="demo">
             <div class="container" v-show="panel">
-                <div style="width:400px;height:400px;margin:5% 0 0 36%;position:relative;">
+                <div style="width:400px;height:400px;margin:5% 0 0 36%;position:relative;background-color:#fff;">
                     <img id="image" :src="url" alt="Picture">
-                    <button type="button" id="button" style="bottom:0;" @click="crop">确定</button>
+                    <button type="button" class="cancel_Btnn" id="button" style="bottom:-50px;right:105px;" @click="CancelUpImg">取消</button>
+                    <button type="button" id="button" style="bottom:-50px;" @click="crop">确定</button>
                 </div>	
             </div>
             <div style="padding:20px;">
@@ -1381,9 +1388,12 @@
                 }
             },err=>{})
 
+        },
+        //取消上传
+        CancelUpImg(){
+            this.panel=false;
         }
 
-
     },
     mounted() {
       this.getList();

src/components/sale/sale.vue

@@ -11,6 +11,14 @@
     font-size:12px;
     margin-left:10px;
   }
+  .ShareDisClick{
+    color:gray;
+  }
+  .Sale_UnlessWords{
+    display:inline-block;
+    margin:25px 0 0 80px;
+    color:#E95252;
+  }
 </style>
 
 <template>
@@ -48,7 +56,7 @@
                         <span>本月提成</span>
                         <template v-if="data.comissionGeneralId>0">
                           <span v-if="data.share==1" class="Sale_Share" style="color:#333;cursor:default;">已确认</span>
-                          <span v-if="data.share==0" @click="tichengDialog=true" class="Sale_Share">分享并确认</span>
+                          <span v-if="data.share==0" @click="tichengDialog=true" class="Sale_Share" :class="{'ShareDisClick':!isSubmit}">分享并确认</span>
                         </template>
                       </div>
                     </div>
@@ -502,10 +510,13 @@
      <!-- 分享业绩 -->
     <el-dialog custom-class='w500' title="分享提成" :visible.sync="tichengDialog" center :before-close="resetCommission">
             <el-form :model="shareMsg" :rules="rules" ref="shareMsg" label-width="80px">
-                <el-form-item  label="个人宣言" style="margin-bottom:0;">
+                <el-form-item  label="个人宣言" style="margin-bottom:0;" prop="ShareContent">
                     <el-input type="textarea" rows="6" resize="none" maxlength="100" v-model="shareMsg.ShareContent" placeholder=""></el-input>
                 </el-form-item>
 			    	</el-form>	
+            <span class="Sale_UnlessWords">
+                不能少于4个字
+            </span>
 			    	<div slot="footer" class="dialog-footer">
 			    		<button class="hollowFixedBtn" @click="tichengDialog=false">取消</button>
 			    		<button class="normalBtn" @click="shareCommission">确定</button>
@@ -546,6 +557,8 @@
             trigger: 'blur'
           }]
         },
+        //验证重复提交
+        isSubmit: true,
       }
     },
     components:{
@@ -775,25 +788,45 @@
           path: path
         })
       },
+      //锅炉除开标点符号的字数
+      getFilteredNum(val){
+        //var pattern=new RegExp("[`~%!@#$^=''?~！@#￥……&——‘”“'？*()（），,。.、<>《》\\[\\]【】\\“\\”{}=+-|\/:;；：]"); 
+        var pattern=new RegExp("[`~%!@#$^=''?~！@#￥……&——‘”“'？*()（），,。.、<>《》:;； +-=]"); 
+        //[]内输入你要过滤的字符，这里基本包含全部的标点符号，\\是转义字符
+        var rs="";
+        for(var i=0;i<val.length;i++){
+          rs+=val.substr(i,1).replace(pattern,'');
+        }
+        return rs
+      },
       //确定分享业绩
       shareCommission(){
         if(this.shareMsg.ShareContent==''){
           this.Error('请填写个人宣言');
           return;
         }
-        this.shareMsg.PeriodsId=this.data.comissionGeneralId;
-        this.shareMsg.totalCommission=this.data.totalCommission;
-        this.apipost('customerIndex_post_SetSellComissionGeneralSure', this.shareMsg ,res=>{
-          if(res.data.resultCode==1){
-            this.Success(res.data.message);
-            this.iWorkbench();
-            this.resetCommission();
-            this.MsgBus.$emit('reSetMSG');
-
-          }else{
-            this.Error(res.data.message);
+        let FilterNum=this.getFilteredNum(this.shareMsg.ShareContent); 
+        if(FilterNum.length<4){
+          this.Error('字数太少了，再多说点吧！');
+          return;
+        }else{
+          this.shareMsg.PeriodsId=this.data.comissionGeneralId;
+          this.shareMsg.totalCommission=this.data.totalCommission;
+          if (this.isSubmit) {
+            this.isSubmit = false;
+            this.apipost('customerIndex_post_SetSellComissionGeneralSure', this.shareMsg ,res=>{
+              this.isSubmit=true;
+              if(res.data.resultCode==1){
+                this.Success(res.data.message);
+                this.iWorkbench();
+                this.resetCommission();
+                this.MsgBus.$emit('reSetMSG');
+              }else{
+                this.Error(res.data.message);
+              }
+            },err=>{})
           }
-        },err=>{})
+        }
       },
       //关闭重置输入框
       resetCommission(){