htc 3 hours ago
parent
commit
3827ed8e8f

BIN
src/assets/img/default_avatar.png


+ 1 - 2
src/views/modules/member/add.vue

@@ -139,8 +139,7 @@ export default {
       channelOptions: [],
       genderOptions: [
         { id: 0, name: '男' },
-        { id: 1, name: '女' },
-        { id: 2, name: '保密' }
+        { id: 1, name: '女' }
       ],
       // uploadUrl: `${window.SITE_CONFIG['apiURL']}/sys/oss/upload`,
       uploadUrl: `${window.SITE_CONFIG['apiURL']}/core/app/user/import`,

+ 3 - 1
src/views/modules/member/detail.vue

@@ -13,7 +13,7 @@
                 <div class="title">基础资料</div>
                 <div class="info adfacjb">
                     <div class="info-left adffcac">
-                        <img src="@/assets/img/member_avatar.png">
+                        <img :src="avatar||require('@/assets/img/default_avatar.png')">
                         <el-button type="primary" @click="handleEdit" v-if="$hasPermission('core:appuser:update')">编辑资料</el-button>
                     </div>
                     <div class="info-right adf" v-if="userInfo">
@@ -163,6 +163,7 @@ export default {
       show: false,
       buttonLoading: false,
       userId: this.$route.query.id,
+      avatar: '',
       userInfo: null,
       assetInfo: null,
       form: {
@@ -222,6 +223,7 @@ export default {
     this.getSupplierOptions()
   },
   mounted () {
+    this.avatar = this.$route.query.avatar
     this.getDetail()
     this.getUserAsset()
   },

+ 9 - 6
src/views/modules/member/query.vue

@@ -51,10 +51,13 @@
             </div>
           </div>
           <el-table :data="dataList" border cell-class-name="vertical-top-cell" v-loading="loading" empty-text="暂无会员" style="margin-top: 22px;">
+            <el-table-column prop="xxx" label="序号" width="70">
+              <template #default="{ $index }">{{ ($index + 1) + (queryParams.page - 1) * queryParams.limit }}</template>
+            </el-table-column>
             <el-table-column prop="xxx" label="会员信息" width="180">
               <template #default="{ row }">
                 <div class="userinfo adfac">
-                  <img :src="row.avatarPath" v-if="row.avatarPath">
+                  <img :src="row.avatarPath||require('@/assets/img/default_avatar.png')">
                   <div class="userinfo-text">
                     <div class="userinfo-text-name">{{ row.nickName||'' }}</div>
                     <div class="userinfo-text-phone">{{ row.phoneCopy||'' }}</div>
@@ -64,8 +67,8 @@
             </el-table-column>
             <el-table-column prop="uniqueNo" label="善行少年编号" width="220"></el-table-column>
             <el-table-column prop="channelName" label="渠道方" width="150"></el-table-column>
-            <el-table-column prop="realName" label="用户名" width="100"></el-table-column>
-            <el-table-column prop="phoneCopy" label="手机号" width="120"></el-table-column>
+            <el-table-column prop="realName" label="用户名"></el-table-column>
+            <el-table-column prop="phoneCopy" label="手机号"></el-table-column>
             <!-- <el-table-column prop="welfareName" label="家庭公益名称" width="130"></el-table-column>
             <el-table-column prop="welfareSlogan" label="家庭公益口号" width="130"></el-table-column> -->
             <el-table-column prop="totalConsumeLove" label="累计捐献爱心值" width="140">
@@ -75,10 +78,10 @@
             <el-table-column prop="welfareCount" label="参与公益次数" width="130">
               <template #default="{ row }">{{ row.welfareCount||0 }}次</template>
             </el-table-column>
-            <el-table-column prop="userLevel" label="会员等级" width="100">
+            <el-table-column prop="userLevel" label="会员等级">
               <template #default="{ row }">Lv.{{ row.userLevel||1 }}</template>
             </el-table-column>
-            <el-table-column label="操作" width="300" fixed="right">
+            <el-table-column label="操作" width="180" fixed="right">
               <template #default="scope">
                   <el-button link type="text" @click="handleDetail(scope.row)" v-if="$hasPermission('core:appuser:detail')">会员详情</el-button>
                   <!-- <el-button link type="text" @click="handleCreateCode(scope.row)" v-if="$hasPermission('core:appuser:code')">生成邀请码</el-button> -->
@@ -199,7 +202,7 @@ export default {
       window.location.href = `${window.SITE_CONFIG['apiURL']}/core/app/user/export?${params}`
     },
     handleDetail (row) {
-      this.$router.push({ name: 'memberDetail', query: { id: row.id } })
+      this.$router.push({ name: 'memberDetail', query: { id: row.id, avatar: row.avatarPath } })
     },
     handleCreateCode (row) {