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

src/api/equitySeting/equitySeting.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取金额和积分的列表
 export function queryIntegralList(params) {
   return request({
-    url: '/system/integral//queryintergras',
+    url: '/system/integral/queryintergras',
     method: 'get',
     params
   })
@@ -30,7 +30,7 @@ export function queryInfoById(id) {
 // 编辑金额和积分的数据
 export function updataInfo(data) {
   return request({
-    url: '/system/integral//update',
+    url: '/system/integral/update',
     method: 'put',
     data,
     headers: {
@@ -61,7 +61,7 @@ export function queryMemberLevel() {
   })
 }
 // 新增会员等级
-export function addMemberBenefits(data){
+export function addMemberBenefits(data) {
   return request({
     url: '/system/memberfits/add',
     method: 'put',

src/views/business/businessadd.vue

@@ -47,14 +47,15 @@
           :limit="1"
           list-type="picture"
         >
+          <img v-if="imgUrl" :src="imgUrl" class="avatar">
           <!--            <el-button size="small" type="primary">点击上传</el-button>-->
-          <div class="upload-trademark">
+          <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 slot="tip" class="el-upload__tip">支持文件格式：.jpg .gpeg .png.单个文件不能超过4M</div>
+          <div v-if="!imgUrl" slot="tip" class="el-upload__tip">支持文件格式：.jpg .gpeg .png.单个文件不能超过4M</div>
         </el-upload>
       </el-form-item>
-      <el-form-item label="封面" prop="image">
+      <el-form-item label="横版封面" prop="image">
         <el-upload
           class="upload-image"
           action="#"
@@ -135,7 +136,7 @@ export default {
     }
   },
   created() {
-    // const baseURL = 'http://192.144.239.97:20043/file/'
+    const baseURL = 'http://192.144.239.97:20043/file/'
     if (this.type === 0) {
       this.form = {}
     } else if (this.type === 1) {
@@ -144,6 +145,8 @@ export default {
       queryDetailById(id).then(res => {
         if (res.code === 200) {
           this.form = res.data
+          this.imgUrl = baseURL + this.form.imgUrl
+          this.imgageUrl = baseURL + this.form.imageUrl
           console.log('form', this.form)
         }
       })

src/views/complaint/index.vue

@@ -107,7 +107,7 @@
             {{ scope.row.dealTime || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="240">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="120">
           <template slot-scope="scope">
             <el-button
               v-hasPermi="['sys:dict:edit']"
@@ -549,6 +549,9 @@ export default {
 .el-switch .el-switch__label {
   width: 57px!important;
 }
+::v-deep .el-table td .cell{
+  height: 48px;
+}
 </style>
 <style lang="scss">
 .app-container-dict {

src/views/member/equitysetting/index.vue

 <template>
   <div class="equityseting">
-    <div class="equityseting-title">会员权益设定</div>
     <div class="form1">
       <div style="margin-bottom: 20px;display: flex;justify-content: space-between">
-        <div>会员等级</div>
+        <h5
+          style="margin: 0 0 12px 0;font-size: 14px;font-weight: bold;
+        color: #333333;"
+        >会员等级</h5>
         <el-button type="primary" icon="el-icon-plus" @click="addDomain">新增</el-button>
       </div>
       <el-table border :data="membershiplevel">
@@ -19,17 +21,17 @@
             {{ scope.row.level || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="积分条件" prop="integral" :show-overflow-tooltip="true">
+        <el-table-column label="所需积分" prop="integral" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.integral || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="折扣" prop="discount" :show-overflow-tooltip="true">
+        <el-table-column label="享受折扣" prop="discount" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.discount || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="240">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="120">
           <template slot-scope="scope">
             <el-button
               v-hasPermi="['sys:dict:remove']"
@@ -50,7 +52,10 @@
       </el-table>
       <el-divider style="margin-top: 53px" />
       <div style="margin-bottom: 20px;display: flex;justify-content: space-between">
-        <div>积分兑换</div>
+        <h5
+          style="margin: 0 0 12px 0;font-size: 14px;font-weight: bold;
+        color: #333333;"
+        >获取积分</h5>
         <el-button type="primary" icon="el-icon-plus" @click="addDynamic">新增</el-button>
       </div>
       <el-table border :data="dynamicValidate">
@@ -61,12 +66,12 @@
             <span>{{ scope.row.amount || '' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="兑换积分" prop="level" :show-overflow-tooltip="true">
+        <el-table-column label="获取积分" prop="level" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.integral || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="240">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="120">
           <template slot-scope="scope">
             <el-button
               v-hasPermi="['sys:dict:remove']"
@@ -100,12 +105,12 @@
         <el-form-item prop="level" label="会员等级">
           <el-input v-model="form.level" disabled placeholder="请输入会员等级" :maxlength="10" />
         </el-form-item>
-        <el-form-item prop="integral" label="积分条件">
-          <el-input v-model="form.integral" placeholder="请输入积分条件" :maxlength="10" />
+        <el-form-item prop="integral" label="所需积分">
+          <el-input v-model="form.integral" placeholder="请输入所需积分" :maxlength="10" />
         </el-form-item>
-        <el-form-item prop="discount" label="折扣">
+        <el-form-item prop="discount" label="享受折扣">
           <div style="display:flex;">
-            <el-input v-model="form.discount" placeholder="请输入折扣" :maxlength="10" />
+            <el-input v-model="form.discount" placeholder="请输入享受折扣" :maxlength="10" />
             <span style="margin-left: 12px">{{ '%' }}</span>
           </div>
         </el-form-item>
@@ -125,8 +130,8 @@
             :maxlength="10"
           />
         </el-form-item>
-        <el-form-item prop="integral" label="兑换积分">
-          <el-input v-model="dynamicFrom.integral" placeholder="请输入兑换积分" :maxlength="10" />
+        <el-form-item prop="integral" label="获取积分">
+          <el-input v-model="dynamicFrom.integral" placeholder="请输入获取积分" :maxlength="10" />
         </el-form-item>
         <div style="text-align: center">
           <el-button type="primary" @click="dynamicsubmitForm">提交</el-button>
@@ -226,7 +231,7 @@ export default {
       this.opens = false
     },
     addDynamic() {
-      this.dynamicTitle = '新增积分兑换'
+      this.dynamicTitle = '新增获取积分'
       this.dynamicFrom = {
         amount: '',
         integral: ''
@@ -401,7 +406,7 @@ export default {
     },
     // 兑换积分编辑
     dynamicUpdate(row) {
-      this.dynamicTitle = '编辑兑换积分'
+      this.dynamicTitle = '编辑获取积分'
       const id = row.businessId
       queryInfoById(id).then(res => {
         console.log('查询信息', res)

src/views/member/memberinfo/index.vue

@@ -81,9 +81,14 @@
             {{ scope.row.nickName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="积分" prop="integral" :show-overflow-tooltip="true">
+        <el-table-column label="用户性别" prop="sex" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          {{ replaceSex(scope.row.sex) || '-' }}
+        </template>
+      </el-table-column>
+        <el-table-column label="用户邮箱" prop="email" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.integral || '-' }}
+            {{ scope.row.email || '-' }}
           </template>
         </el-table-column>
         <el-table-column prop="level" label="会员等级" :show-overflow-tooltip="true">
@@ -91,12 +96,17 @@
             {{ scope.row.level || '-' }}
           </template>
         </el-table-column>
+        <el-table-column label="积分" prop="integral" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.integral || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="报名活动数" prop="count" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.count || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="240">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="100">
           <template slot-scope="scope">
             <el-button
               v-hasPermi="['sys:dict:edit']"
@@ -256,10 +266,17 @@ export default {
     // })
   },
   methods: {
+    replaceSex(value) {
+      if (value === '0') {
+        return '女'
+      } else {
+        return '男'
+      }
+    },
     replaceImg(value) {
       console.log('img', value)
       if (value === '') {
-        return 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
+        return 'http://192.144.239.97:20043/file/static/images/login/denglu_icon_logo.png'
       } else {
         return value
       }