Merge branch 'master' of http://gitlab.91isoft.com:90/yangshuo/longhui_web

src/api/member/member.js

@@ -15,4 +15,10 @@ export function deleteMember(businessId) {
     method: 'delete'
   })
 }
-
+// 根据id查找会员详情
+export function getDetailById(id) {
+  return request({
+    url: '/sysUserManage/memberDetail/' + id,
+    method: 'get'
+  })
+}

src/views/business/businessadd.vue

@@ -56,8 +56,8 @@
           <!--            <el-button size="small" type="primary">点击上传</el-button>-->
           <div v-if="!imgUrl" class="upload-trademark">
             <i class="el-icon-plus" style="width: 20px;height: 20px;margin-top: 10px;" />
-            <div class="upload-trademark-title">上传竖版封面</div></div>
-          <div v-if="!imgUrl" slot="tip" class="el-upload__tip">推荐上传图片大小为165px*220px</div>
+            <div class="upload-trademark-title">上传封面</div></div>
+          <div v-if="!imgUrl" slot="tip" class="el-upload__tip">推荐上传图片比例为165*220</div>
         </el-upload>
       </el-form-item>
       <el-form-item label="横版封面" prop="image">
@@ -78,7 +78,7 @@
             <i class="el-icon-plus" style="width: 20px;height: 20px;margin-top: 10px;" />
             <div class="upload-trademark-title">上传封面</div>
           </div>
-          <div v-if="!imgageUrl" slot="tip" class="el-upload__tip">推荐上传图片大小为314px*192px</div>
+          <div v-if="!imgageUrl" slot="tip" class="el-upload__tip">推荐上传图片比例为314*192</div>
         </el-upload>
       </el-form-item>
     </el-form>
@@ -172,21 +172,25 @@ export default {
   },
   methods: {
     beforeUpload(file) {
-      let is80x56 = true
-      const reader = new FileReader()
-      reader.readAsDataURL(file)
-      reader.onload = (theFile) => {
-        const image = new Image()
-        image.src = theFile.target.result
-        image.onload = () => {
-          const { width, height } = image
-          if (width !== 165 || height !== 220) {
-            this.$message.error('请上传 165px*220px的图片')
-            is80x56 = false
+      return new Promise((resolve, reject) => {
+        const img = new Image()
+        const URL = window.URL || window.webkitURL
+        img.src = URL.createObjectURL(file.raw)
+
+        img.onload = function() {
+          const width = this.width
+          const height = this.height
+          console.log('width',width)
+          // 检查图片比例是否为314x192
+          if (width / height === 165/192) {
+            resolve(file)
+          } else {
+            console.log('请上传比例为165x192的图片')
+            this.$message.error('请上传比例为165x192的图片')
+            reject(new Error('请上传比例为165x192的图片'))
           }
         }
-      }
-      return is80x56
+      })
     },
     beforeUploads(file) {
       return new Promise((resolve, reject) => {
@@ -247,6 +251,10 @@ export default {
     },
     handlePreview(file) {
       console.log(file)
+      this.$dialog.image({
+        src: file.url,
+        alt: file.name
+      });
     },
     // 提交按钮
     submitForm() {

src/views/business/index.vue

@@ -70,9 +70,13 @@
       <el-table v-loading="loading" border :data="businessList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center" />-->
         <el-table-column label="序号" type="index" align="center" width="55" />
-        <el-table-column label="竖版封面" :show-overflow-tooltip="true">
+        <el-table-column label="横版封面" width="95">
           <template slot-scope="scope">
-            <img :src="replacesrc(scope.row)" style="width: 44px;height: 44px">
+            <el-image
+              style="width: 100%; height: 100%"
+              :src="replacesrc(scope.row)"
+              :preview-src-list="scope.row.srcList"
+            />
           </template>
         </el-table-column>
         <el-table-column label="商家名称" prop="name" :show-overflow-tooltip="true">
@@ -207,9 +211,9 @@
       <el-table ref="table" style="margin-top: 16px" :header-cell-class-name="cellClass" border :data="memberList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" align="center" width="55" />
-        <el-table-column label="会员头像" prop="avatar" :show-overflow-tooltip="true">
+        <el-table-column label="会员头像" prop="avatar" :show-overflow-tooltip="true" width="80">
           <template slot-scope="scope">
-            <img :src="replaceImg(scope.row.avatar)" style="width: 44px;height: 44px">
+            <img :src="replaceImg(scope.row.avatar)" style="width: 100%;height: 100%">
           </template>
         </el-table-column>
         <el-table-column label="会员账号" prop="phone" :show-overflow-tooltip="true">
@@ -259,13 +263,16 @@ export default {
   // components: { Template },
   data() {
     return {
+      srcList: [
+        'http://192.144.239.97:20043/file/static/images/login/denglu_icon_logo.png'
+      ],
       query: {
         phone: '',
         nickName: '',
         integral: '',
         level: '',
         page: 1,
-         rows: 10
+        rows: 10
       },
       // 会员分页需要参数
       queryList: {
@@ -306,10 +313,11 @@ export default {
       statusOptions: [],
       // 日期范围
       dateRange: [],
+      baseURL: 'http://192.144.239.97:20043/file/',
       // 查询参数
       queryParams: {
         page: 1,
-         rows: 10,
+        rows: 10,
         name: undefined,
         head: undefined,
         phone: undefined,
@@ -357,11 +365,26 @@ export default {
     })
   },
   methods: {
+    vbs(val) {
+      console.log('val信息', val)
+      const baseURL = 'http://192.144.239.97:20043/file/'
+      let url = baseURL + val
+      console.log('url', url)
+      if (val === null) {
+        url = 'http://192.144.239.97:20043/file/static/images/login/denglu_icon_logo.png'
+      }
+      this.$nextTick().then(() => {
+        this.srcList = []
+        this.srcList.push(url)
+        this.$forceUpdate()
+        console.log('srcList', this.srcList)
+      })
+    },
     replacesrc(row) {
       const baseURL = 'http://192.144.239.97:20043/file/'
       console.log('baseURL', baseURL)
-      if (row.imgUrl !== null) {
-        const url = baseURL + row.imgUrl
+      if (row.imageUrl !== null) {
+        const url = baseURL + row.imageUrl
         console.log('url', url)
         return url
       } else {
@@ -374,11 +397,21 @@ export default {
         businessId: row.businessId,
         status: row.status
       }
-      updataBussinessInfo(obj).then(res => {
-        if (res.code === 200) {
-          this.$message.success('操作成功')
-        }
+      this.$confirm('是否确认操作?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        updataBussinessInfo(obj).then(res => {
+          if (res.code === 200) {
+            this.$message.success('操作成功')
+          }
+        })
+      }).catch(function() {
+        // row.status = row.status === '0' ? '1' : '0'
+        console.log('取消')
       })
+
       console.log('obj', obj)
     },
     replaceImg(value) {
@@ -439,7 +472,18 @@ export default {
     getList() {
       queryBussinessAll(this.queryParams).then(res => {
         console.log('查询商家列表', res)
+        const that = this
+        res.rows.forEach(item => {
+          if (item.imageUrl) {
+            item.srcList = []
+            item.srcList.push(that.baseURL + item.imageUrl)
+          } else {
+            item.srcList = []
+            item.srcList.push('http://192.144.239.97:20043/file/static/images/login/denglu_icon_logo.png')
+          }
+        })
         this.businessList = res.rows
+        console.log('this.businessList', this.businessList)
         this.total = res.total
         this.loading = false
       })
@@ -559,7 +603,7 @@ export default {
         integral: '',
         level: '',
         page: 1,
-         rows: 10
+        rows: 10
       }
       this.handleQuerys()
     },
@@ -583,9 +627,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      // this.form = row
-      // this.open = true
-      // this.title = '编辑商家'
       this.$router.push({
         path: '/business/businessadd',
         query: {

src/views/member/memberinfo/index.vue

@@ -66,9 +66,13 @@
       <el-table v-loading="loading" border :data="memberList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center" />-->
         <el-table-column label="序号" type="index" align="center" width="55" />
-        <el-table-column label="会员头像" prop="avatar" :show-overflow-tooltip="true">
+        <el-table-column label="会员头像" prop="avatar"  width="85">
           <template slot-scope="scope">
-            <img :src="replaceImg(scope.row.avatar)" style="width: 44px;height: 44px">
+            <el-image
+              style="width: 100%; height: 90%"
+              :src="replaceImg(scope.row.avatar)"
+              :preview-src-list="scope.row.srcList"
+            />
           </template>
         </el-table-column>
         <el-table-column label="会员账号" prop="phone" :show-overflow-tooltip="true">
@@ -88,7 +92,7 @@
       </el-table-column>
         <el-table-column label="用户邮箱" prop="email" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.email || '-' }}
+            {{ replaceEmil(scope.row.email) || '-' }}
           </template>
         </el-table-column>
         <el-table-column prop="level" label="会员等级" :show-overflow-tooltip="true">
@@ -134,22 +138,28 @@
     <!-- 会员详情对话框 -->
     <el-dialog title="会员信息" :visible.sync="open" width="500px" append-to-body @close="reset">
       <el-form ref="form" :model="form" label-width="100px">
-        <el-form-item label="头像" prop="dictName">
+        <el-form-item label="头像" >
           <img  :src="replaceImg(form.avatar)" style="width: 80px;height: 80px">
         </el-form-item>
-        <el-form-item label="会员账号" prop="dictName">
+        <el-form-item label="会员账号">
           <span>{{ form.phone || '-' }}</span>
         </el-form-item>
-        <el-form-item label="会员昵称" prop="dictType">
+        <el-form-item label="会员昵称" >
           <span>{{ form.nickName || '-' }}</span>
         </el-form-item>
-        <el-form-item label="会员等级" prop="dictType">
+        <el-form-item label="会员性别" >
+          {{ replaceSex(form.sex) || '-' }}
+        </el-form-item>
+        <el-form-item label="会员邮箱" >
+          {{ form.email  || '-' }}
+        </el-form-item>
+        <el-form-item label="会员等级" >
           <span>{{ form.level || '-' }}</span>
         </el-form-item>
-        <el-form-item label="会员积分" prop="dictType">
+        <el-form-item label="会员积分">
           <span>{{ form.integral || '-' }}</span>
         </el-form-item>
-        <el-form-item label="报名活动数" prop="dictType">
+        <el-form-item label="报名活动数">
           <span>{{ form.count || '-' }}</span>
         </el-form-item>
       </el-form>
@@ -158,7 +168,7 @@
 </template>
 
 <script>
-import { queryMemberList, deleteMember } from '@/api/member/member'
+import { queryMemberList, deleteMember, getDetailById } from '@/api/member/member'
 import {
   addType,
   updateType,
@@ -170,6 +180,7 @@ export default {
   name: 'Dict',
   data() {
     return {
+      baseUrl: 'http://192.144.239.97:20043/file/static/images/login/denglu_icon_logo.png',
       value: true,
       test: '',
       options: [],
@@ -266,6 +277,13 @@ export default {
     // })
   },
   methods: {
+    replaceEmil(value){
+      if (value === '***'){
+        return '-'
+      } else {
+        return value
+      }
+    },
     replaceSex(value) {
       if (value === '0') {
         return '女'
@@ -297,6 +315,14 @@ export default {
     getList() {
       queryMemberList(this.queryParams).then(res => {
         console.log('会员列表', res)
+        res.rows.forEach(item => {
+          item.srcList = []
+          if (item.avatar === '') {
+            item.srcList.push(this.baseUrl)
+          } else {
+            item.srcList.push(item.avatar)
+          }
+        })
         this.memberList = res.rows
         this.total = res.total
         this.loading = false
@@ -389,8 +415,11 @@ export default {
     },
     /** 详情按钮操作 */
     handleDetail(row) {
-      this.form = row
-      this.open = true
+      getDetailById(row.businessId).then(res => {
+        console.log('详情',res)
+        this.form = res.data
+        this.open = true
+      })
     },
     /** 提交按钮 */
     submitForm() {