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

src/components/UserMan/fxDistribution.vue

@@ -26,10 +26,10 @@
         </el-table-column>
         <el-table-column prop="GradeName" label="等级名称">
         </el-table-column>
-        <el-table-column prop="IsGuest" label="是否普通会员">
+        <el-table-column prop="IsGuest" label="会员类型"">
           <template slot-scope="scope">
-            <span v-if="scope.row.IsGuest==1">普通会员</span>
-            <span v-if="scope.row.IsGuest==2">其他会员</span>
+            <span v-if="scope.row.IsGuest==1">普通</span>
+            <span v-if="scope.row.IsGuest==2">其他</span>
             <span v-if="scope.row.IsGuest==3">Vip</span>
           </template>
         </el-table-column>
@@ -50,14 +50,14 @@
             <span>{{scope.row.IsCanBuy==1?'是':'否'}}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="BuyMoney" label="购买金额">
+        </el-table-column>
         <el-table-column prop="DecimalType" label="小数类型">
           <template slot-scope="scope">
             <span v-if="scope.row.DecimalType==1">取整</span>
             <span v-if="scope.row.DecimalType==2">保留两位小数</span>
           </template>
         </el-table-column>
-        <el-table-column prop="BuyMoney" label="购买金额">
-        </el-table-column>
         <el-table-column prop="UpdateDate" label="操作时间">
         </el-table-column>
         <el-table-column prop="address" width="120" label="操作">
@@ -83,7 +83,7 @@
         <el-row>
           <el-col :span="12">
             <p style="padding-left:34px;margin-bottom:15px" class="cred">注：等级需连续，从等级1开始</p>
-            <el-form-item label="分销商等级选择" prop="Grade">
+            <el-form-item label="分销商等级" prop="Grade">
               <el-select v-model="addMsg.Grade" placeholder="请选择">
                 <el-option v-for="(item,index) in numList" :key="index" :label="`等级${index+1}`" :value="item.Id"
                   :disabled="item.dis">
@@ -93,17 +93,17 @@
           </el-col>
           <el-col :span="12">
             <p style="padding-left:34px;margin-bottom:15px;visibility:hidden;" class="cred">.</p>
-            <el-form-item label="分销商等级名称" prop="GradeName">
+            <el-form-item label="等级名称" prop="GradeName">
               <el-input v-model="addMsg.GradeName" style="width:218px;"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="是否普通会员" prop="IsGuest">
+            <el-form-item label="会员类型" prop="IsGuest">
               <el-select v-model="addMsg.IsGuest" placeholder="请选择">
-                <el-option label="普通会员" :value="1"></el-option>
-                <el-option label="其他会员" :value="2"></el-option>
+                <el-option label="普通" :value="1"></el-option>
+                <el-option label="其他" :value="2"></el-option>
                 <el-option label="Vip" :value="3"></el-option>
               </el-select>
             </el-form-item>
@@ -222,7 +222,7 @@
           Id: 0, //等级id
           Grade: 1, //等级
           GradeName: '', //等级名称
-          IsGuest: 1, //是否普通会员 1普通会员 2其他会员 3Vip
+          IsGuest: 2, //是否普通会员 1普通会员 2其他会员 3Vip
           CommissionRatio: 0, //返佣比例
           SiblingRatio: 0, //同级返佣比例
           SiblingRebatesNum: 0, //可拿同级返佣的数量
@@ -306,13 +306,13 @@
           Id: 0,
           Grade: 1,
           GradeName: '',
-          IsGuest: 1,
+          IsGuest: 2,
           CommissionRatio: 0, //返佣比例
           SiblingRatio: 0, //同级返佣比例
           SiblingRebatesNum: 0, //可拿同级返佣的数量
-          IsCanBuy: 1, //是否可以购买 1是 2否
+          IsCanBuy: 2, //是否可以购买 1是 2否
           BuyMoney: 0, //购买金额
-          IsUpgrade: 1, //是否可以升级 1是 2否
+          IsUpgrade: 2, //是否可以升级 1是 2否
           UpgradeNum: 0, //升级所需下级等级数量
           UpgradeId: 1, //升序所需下级等级id
           DecimalType:1 //小数类型