Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online

public/index.html

@@ -11,7 +11,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-  <link rel="icon" href="<%= BASE_URL %>fave.png">
+  <link rel="icon" href="<%= BASE_URL %>logo.png">
   <title>
     <%= webpackConfig.name %>
   </title>

src/views/information/member/index.vue

@@ -64,7 +64,7 @@
           <el-col :span="4">
             <el-form-item :label="'结算等级'" prop="pkMaxAwards">
               <el-select
-                v-model="queryParams.pkMaxAwards"
+                v-model="queryParams.pkgettleGrade"
                 clearable
                 :placeholder="'请选择'"
               >
@@ -466,9 +466,9 @@
             width="180"
           />
           <el-table-column
-            v-if="menuList[4].checked == true && allTxt.pkMaxAwardsVal"
+            v-if="menuList[4].checked == true && allTxt.pkgettleGradeval"
             align="center"
-            prop="pkMaxAwardsVal"
+            prop="pkgettleGradeval"
             :label="'结算等级'"
             width="180"
           />
@@ -775,7 +775,7 @@ export default {
           id: 4,
           text: '结算等级',
           checked: true,
-          prop: 'pkMaxAwardsVal'
+          prop: 'pkgettleGradeval'
         },
         {
           id: 5,
@@ -869,7 +869,7 @@ export default {
         phone: '', // 联系方式
         changeNumber: '', // 变更次数
         pkRegisterGrade: '', // 注册等级
-        pkMaxAwards: '', // 结算等级
+        pkgettleGrade: '', // 结算等级
         pkAwards: '', // 真实奖衔
         vertexId: '', // 隶属体系
         teamId: '', // 隶属团队