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

src/views/configManage/walletConfig/xfpz.vue

@@ -35,6 +35,7 @@
             align="center"
             prop="specialAreaVal"
             :label="'所属专区'"
+            width="140"
           />
           <el-table-column
             align="center"
@@ -55,17 +56,20 @@
             align="center"
             prop="effectiveDate"
             :label="'生效日期'"
+            width="180"
           />
           <el-table-column
             align="center"
             prop="creationTime"
             :label="'创建日期'"
+            width="180"
           />
           <el-table-column
             align="center"
             prop="time"
             :label="'操作'"
             fixed="right"
+            width="110"
           >
             <template slot-scope="scope">
               <el-button

src/views/information/member/index.vue

@@ -319,7 +319,13 @@
             :label="'会员姓名'"
             width="180"
           />
-
+          <el-table-column
+            v-if="allTxt.pkAwardsVal"
+            align="center"
+            prop="pkAwardsVal"
+            :label="$t('荣誉奖衔')"
+            width="160"
+          />
           <el-table-column
             v-if="allTxt.phone"
             align="center"
@@ -341,13 +347,7 @@
             :label="'推荐姓名'"
             width="180"
           />
-          <el-table-column
-            v-if="allTxt.pkAwardsVal"
-            align="center"
-            prop="pkAwardsVal"
-            :label="$t('荣誉奖衔')"
-            width="160"
-          />
+
           <el-table-column
             v-if="allTxt.orderSourceVal"
             align="center"