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

src/components/UserMan/fxDistribution.vue

@@ -26,7 +26,7 @@
         </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>
@@ -179,6 +179,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="描述">
+              <el-input v-model="addMsg.Description" style="width:93%" type="textarea" :rows=4></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible = false">取 消</el-button>
@@ -231,7 +238,8 @@
           IsUpgrade: 1, //是否可以升级 1是 2否
           UpgradeNum: 0, //升级所需下级等级数量
           UpgradeId: 1, //升序所需下级等级id
-          DecimalType:1 //小数类型 
+          DecimalType:1, //小数类型 
+          Description:'' //描述
         },
         //分销商选择等级
         numList: [],
@@ -315,7 +323,8 @@
           IsUpgrade: 2, //是否可以升级 1是 2否
           UpgradeNum: 0, //升级所需下级等级数量
           UpgradeId: 1, //升序所需下级等级id
-          DecimalType:1 //小数类型 
+          DecimalType:1, //小数类型 
+          Description:'' //描述
         }
       },
       //修改