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

src/views/information/member/index.vue

@@ -207,18 +207,6 @@
         <el-collapse-transition>
           <div v-show="isActive">
             <el-row>
-              <el-col :span="8">
-                <el-form-item :label="$t('收益地址')" prop="accountStatus">
-                  <el-cascader
-                    v-model="address"
-                    class="area"
-                    :options="areaData"
-                    :placeholder="'请选择省市区'"
-                    :props="regionParams"
-                    @change="flChange"
-                  />
-                </el-form-item>
-              </el-col>
               <el-col :span="8">
                 <el-form-item :label="'创建日期'" prop="code">
                   <el-date-picker
@@ -435,25 +423,6 @@
             :label="'钱包状态'"
             width="180"
           />
-          <el-table-column
-            align="center"
-            prop="giftProvince"
-            :label="$t('收益区省')"
-            width="180"
-          />
-          <el-table-column
-            align="center"
-            prop="giftCity"
-            :label="$t('收益区市')"
-            width="180"
-          />
-          <el-table-column
-            align="center"
-            prop="giftCounty"
-            :label="$t('收益区县（区）')"
-            width="180"
-          />
-
           <el-table-column
             v-if="getColumnVisible('incomeStatusVal') && allTxt.incomeStatusVal"
             align="center"
@@ -858,7 +827,7 @@ export default {
         this.download(
           '/member/manager/member/export',
           { ...this.queryParams },
-          `${'会员信息'}}${new Date().getTime()}.xlsx`
+          `${'会员信息'}${new Date().getTime()}.xlsx`
         )
       })
     },