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

src/assets/css/zkcss.css

@@ -15,16 +15,16 @@ input, textarea, select{
     box-shadow: none;
 }
 .w120{
-    width:120px;
+    width:120px!important;
 }
 .w160{
-    width:160px;
+    width:160px!important;
 }
 .w400{
-    width:400px;
+    width:400px!important;
 }
 .w200{
-    width:200px;
+    width:200px!important;
 }
 .CommonHeader{
     padding: 18px 20px;

src/components/UserMan/customSet.vue

@@ -676,7 +676,7 @@
           </div>
           <div style="width:100%">
             <div class="title">图片</div>
-            <el-form style="padding:20px 0;background:#fff" ref="addMsg" label-width="100px">
+            <el-form style="padding:20px 0;background:#fff" :model="vipMsg" ref="vipMsg" :rules="viprule" label-width="100px">
               <el-form-item label="背景图片">
                 <el-button @click="openChangeDig(8)" size="mini">选择文件</el-button>
                 <el-button @click="vipMsg.BackImage=vipbackground" size="mini" type="primary">恢复默认</el-button>
@@ -708,7 +708,7 @@
               <el-form-item label="背景颜色">
                   <el-color-picker v-model="vipMsg.BackColor"></el-color-picker>
               </el-form-item>
-              <el-form-item label="活动规则">
+              <el-form-item label="活动规则" prop="BottomRule">
                   <el-input type="textarea" :rows="4" style="width:60%" v-model="vipMsg.BottomRule"></el-input>
               </el-form-item>
             </el-form>
@@ -716,7 +716,7 @@
         </div>
       </el-tab-pane>
       <div style="padding-left:410px;padding-top:20px">
-        <el-button @click="saveVip" size="small" type="primary" v-if="activeName == 'sixth' ">保存</el-button>
+        <el-button @click="saveVipMsg('vipMsg')" size="small" type="primary" v-if="activeName == 'sixth' ">保存</el-button>
         <el-button @click="save" size="small" type="primary" v-if="activeName != 'sixth' ">保存</el-button>
       </div>
     </el-tabs>
@@ -789,7 +789,14 @@
           VipICO:'', //vip图标
           BackColor:'', //背景颜色
           BottomRule:'' //活动规则
-        }
+        },
+        viprule: {
+          BottomRule: [{
+            required: true,
+            message: '请输入活动规则',
+            trigger: 'blur'
+          }]
+        },
       }
     },
     created() {
@@ -801,16 +808,26 @@
       getVipInfo(){
         this.apipost("/api/UserVip/GetFXGradeCustom", {}, res => {
           if (res.data.resultCode == 1) {
-            console.log(res,'vip');
             this.vipMsg=res.data.data;
           }
         })
       },
+      saveVipMsg(formName){
+         this.$refs[formName].validate((valid) => {
+          if (valid) {
+            this.saveVip();
+          } else {
+            return false;
+          }
+        });
+      },
       //保存vip购买
       saveVip(){
         this.apipost("/api/UserVip/SetFXGradeCustom", this.vipMsg, res => {
           if (res.data.resultCode == 1) {
             this.Success(res.data.message);
+          }else{
+            this.Error(res.data.message);
           }
         })
       },

src/components/UserMan/distributors.vue

@@ -173,15 +173,15 @@
                   <img @click="Delete(3,scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/del.png"
                     alt="">
                 </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="修改可提现佣金" placement="top-start">
+                        <img @click="openYongjin(scope.row)" style="width:32px;height:32px"
+                          src="../../assets/img/userman/edit.png" alt="">
+                </el-tooltip>
                 <!-- <img @click="OpenczjfDig(scope.row,1)" style="width:32px;height:32px;"
                   src="../../assets/img/userman/integral.png" alt="">
                 <img @click="OpenczjfDig(scope.row,2)" style="width:32px;height:32px"
                   src="../../assets/img/userman/balance.png" alt=""> -->
             </template>
-            <el-tooltip class="item" effect="dark" content="修改可提现佣金" placement="top-start">
-                    <img @click="openYongjin(scope.row)" style="width:32px;height:32px"
-                      src="../../assets/img/userman/edit.png" alt="">
-            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>

src/components/UserMan/fxCommission.vue

@@ -48,7 +48,7 @@
       </el-button>
     </div>
     <div class="content">
-      <table class="fxCommTable" v-loading="loading">
+      <table class="fxCommTable" v-loading="loading" v-if="dataList.length>0">
         <tr>
           <th>级别标准</th>
           <th v-for="(item,index) in titleList" :key="index">{{item.GradeName}}</th>
@@ -60,6 +60,11 @@
           </td>
         </tr>
       </table>
+      <table class="fxCommTable" v-else>
+        <tr>
+          <th>暂无数据</th>
+        </tr>
+      </table>
     </div>
   </div>
 </template>

src/components/UserMan/vipbuySales.vue

@@ -38,6 +38,9 @@
         <el-table-column prop="OrderNo" label="订单号">
         </el-table-column>
         <el-table-column prop="UserName" label="购买用户">
+          <template slot-scope="scope">
+            {{scope.row.UserName}} id:{{scope.row.UserId}}
+          </template>
         </el-table-column>
         <el-table-column prop="Money" label="购买金额">
         </el-table-column>