Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/pc-admin

src/config/api.js

@@ -275,6 +275,10 @@ const apis = {
     change: {
       method: 'put',
       url: `${commPrefix}/taPointsExchange/change`
+    },
+    update: {
+      method: 'put',
+      url: `${commPrefix}/taPointsExchange/:id`
     }
   },
   carouselFigure:{ // 轮播图列表查询

src/store/modules/activity.js

@@ -43,8 +43,6 @@ export default {
           ...apis.activity.updateActivity,
           data: payload,
         }).then((data) => {
-          window.console.log(data)
-          commit('updateList', { ...data, list: data.records})
           resolve(data)
         }).catch(({ message }) => {
           if (typeof message === 'string') {

src/store/modules/exchange.js

@@ -112,19 +112,15 @@ export default {
         })
       })
     },
-    cancelDynamic (_, payload) {
+    verifyById (_, payload) {
       return new Promise((resolve, reject) => {
         request({
-          ...apis.dynamic.cancel,
+          ...apis.exchange.update,
           urlData: payload,
         }).then((data) => {
           resolve(data)
         }).catch((err) => {
-          const message = err.message || err.msg
-
-          if (typeof message === 'string') {
-            reject(message)
-          }
+          reject(err)
         })
       })
     }

src/views/activity/add.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-form ref="form" :model="dynamic" label-width="160px">
-    <el-form-item label="所属项目">
+  <el-form ref="activityQuery" :model="activityQuery" :rules="rules"  label-width="160px">
+    <el-form-item label="所属项目" prop="buildingId">
       <el-select v-model="activityQuery.buildingId" placeholder="请选择">
         <el-option v-for="(build,i) in buildings.list || []" :key="i" :label="build.buildingName" :value="build.buildingId"></el-option>
       </el-select>
@@ -22,24 +22,19 @@
             <img width="100%" :src="dialogImageUrl" alt="">
           </el-dialog>
     </el-form-item>
-    <el-form-item label="活动标题">
+    <el-form-item label="活动标题" prop="title">
       <el-input v-model="activityQuery.title"></el-input>
     </el-form-item>
-    <el-form-item label="活动时间">
-       <el-date-picker v-model="activityQuery.startDate"  type="datetime" placeholder="选择日期"/>
-       <!-- <el-date-picker
-                  v-model="detail.reportDate"
-                  type="datetime"
-                  placeholder="选择日期时间">
-          </el-date-picker> -->
+    <el-form-item label="活动时间" prop="startDate">
+       <el-date-picker v-model="activityQuery.startDate" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.endDate"  type="datetime" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.endDate" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
-    <el-form-item label="活动地点">
+    <el-form-item label="活动地点" prop="address">
       <el-input  v-model="activityQuery.address"></el-input>
     </el-form-item>
-    <el-form-item  label="活动人数">
-      <el-input v-model="activityQuery.personNum" ></el-input>
+    <el-form-item  label="活动人数" prop="personNum">
+      <el-input v-model="activityQuery.personNum" type="number"></el-input>
     </el-form-item>
     <!-- <el-form-item label="链接地址">
       <el-input v-model="dynamic.url"></el-input>
@@ -51,13 +46,13 @@
        <el-radio v-model="activityQuery.isEnlist" label="1">是</el-radio>
        <el-radio v-model="activityQuery.isEnlist" label="0">否</el-radio>
     </el-form-item>
-    <el-form-item label="活动时间" v-if="activityQuery.isEnlist == '1'">
-       <el-date-picker v-model="activityQuery.enlistStart" type="date" placeholder="选择日期"/>
+    <el-form-item label="报名时间" v-if="activityQuery.isEnlist == '1'" prop="enlistStart">
+       <el-date-picker v-model="activityQuery.enlistStart" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.enlistEnd" type="date" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.enlistEnd" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" @click="onSubmit">保存</el-button>
+      <el-button type="primary" @click="onSubmit('activityQuery')">保存</el-button>
 
     </el-form-item>
   </el-form>
@@ -77,7 +72,6 @@ export default {
   data () {
     return {
       url:'',
-      buildingId:'',
       upFileUrl: apis.file.upload.url,
       radio:'1',
       imgList: [],
@@ -90,12 +84,40 @@ export default {
        buildingId:'',
        title:'',
        isEnlist:'1',
-       text:'',
+       desc:'',
        enlistStart:'',
        enlistEnd:'',
        personNum:'',
-      }
-      
+      },
+      rules: {
+          buildingId: [
+            { required: true, message: '请选择所属项目', trigger: 'change' }
+          ],
+          url: [
+            { required: true, message: ' ', trigger: 'change' }
+          ],
+          title: [
+            { required: true, message: '请输入标题', trigger: 'blur' },
+          ],
+          startDate: [
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ],
+          endDate: [
+            { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+          ],
+          address: [
+            {  required: true, message: '请至少输入活动地点', trigger: 'change' }
+          ],
+          personNum: [
+            { required: true, message: '请输入活动人数', trigger: 'change' }
+          ],
+          desc: [
+            { required: true, message: ' ', trigger: 'blur' }
+          ],
+          enlistStart:[
+            { type: 'date', required: true, message: '请选报名日期', trigger: 'change' }
+          ]
+        }
     }
   },
   computed: {
@@ -164,11 +186,32 @@ export default {
       this.updateDetail({...this.dynamic, imgUrl: res.data})
       this.loading.close()
     },
-    onSubmit () {
-      // if (!this.detail.dynamicId) {
-        // 新增
-        console.log('this.imgList[0]',this.imgList[0])
-        // this.activityQuery.url = this.imgList[0]
+    onSubmit (formName) {
+      this.$refs[formName].validate((valid) => {
+      if (valid) {
+        // 主图不可为空
+        if(this.activityQuery.url ===''){
+          this.$message({ showClose: true, message: '请选择主图!',type: 'error'});
+        return false
+        }
+      console.log('this.activityQuery.desc',this.activityQuery.desc)
+      const endDate=this.activityQuery.endDate
+      const startDate=this.activityQuery.startDate
+      if( endDate <= startDate){
+        this.$message({ showClose: true, message: '活动结束时间不能小于活动开始时间',type: 'error'});
+        return false
+      }
+      if( this.activityQuery.desc === '' || this.activityQuery.desc === null){
+        this.$message({ showClose: true, message: '活动详情不能为空',type: 'error'});
+        return false
+      }
+
+      const enlistStart= this.activityQuery.enlistStart
+      const enlistEnd= this.activityQuery.enlistEnd
+      if(this.activityQuery.isEnlist ==='1' && enlistEnd<= enlistStart ){
+        this.$message({ showClose: true, message: '报名结束时间不能小于报名开始时间',type: 'error'});
+        return false
+      }
         this.addActivity(
           JSON.stringify(this.activityQuery)
         ).then(() => {
@@ -176,26 +219,23 @@ export default {
           
         })
         this.$router.push({ name: "activity-list" });
-      // } else {
-      //   // 修改
-      //   this.editDynamics({
-      //     detail: JSON.stringify(this.detail)
-      //   }).then(() => {
-      //     this.onCancel()
-      //   })
-      // }
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        })
     },
     onCancel () {
       this.$router.push({name: 'dynamiclist'})
-    }
+    },
   },
   mounted () {
     const _that = this
     const phoneEditor = new E('#websiteEditorElem')
     phoneEditor.customConfig.zIndex = 1
     phoneEditor.customConfig.onchange = function (html) {
-      _that.dynamic = {..._that.dynamic, url: html}
-        _that.activityQuery.text =_that.dynamic.url
+      _that.activityQuery = {..._that.activityQuery, desc: html}
+       console.log('that.dynamic.url',_that.activityQuery.desc)
     }
     // phoneEditor.customConfig.uploadImgServer = this.upFileUrl
     // phoneEditor.customConfig.uploadFileName = 'uploadFiles'

src/views/activity/edit.vue

@@ -1,11 +1,11 @@
 <template>
-  <el-form ref="form" label-width="160px">
-    <el-form-item label="所属项目">
-      <el-select v-model="activityQuery.buildingId" placeholder="请选择">
+  <el-form ref="activityQuery" label-width="160px" :rules="rules" :model="activityQuery">
+    <el-form-item label="所属项目" prop="buildingId">
+      <el-select v-model="activityQuery.buildingId"  placeholder="请选择">
         <el-option v-for="(build,i) in buildings.list || []" :key="i" :label="build.buildingName" :value="build.buildingId"></el-option>
       </el-select>
     </el-form-item>
-    <el-form-item label="主图：">
+    <el-form-item label="主图：" prop="buildingId">
           <el-upload
                 :headers="uploadHeaders"
                 :action="upFileUrl"
@@ -15,37 +15,39 @@
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
     </el-form-item>
-    <el-form-item label="活动标题">
+    <el-form-item label="活动标题" prop="title">
       <el-input v-model="activityQuery.title"></el-input>
     </el-form-item>
-    <el-form-item label="活动时间">
-       <el-date-picker v-model="activityQuery.startDate" type="date" placeholder="选择日期"/>
+    <el-form-item label="活动时间" prop="startDate">
+       <el-date-picker v-model="activityQuery.startDate" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.endDate" type="date" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.endDate" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
-    <el-form-item label="活动地点">
+    <el-form-item label="活动地点"  prop="address">
       <el-input  v-model="activityQuery.address"></el-input>
     </el-form-item>
-    <el-form-item label="活动人数">
-      <el-input v-model="activityQuery.personNum"></el-input>
+    <el-form-item label="活动人数" prop="personNum">
+      <el-input v-model="activityQuery.personNum" type="number"></el-input>
     </el-form-item>
     <!-- <el-form-item label="链接地址">
       <el-input v-model="dynamic.url"></el-input>
     </el-form-item> -->
     <el-form-item label="活动详情">
-      <div id="websiteEditorElem" style="height: 400px"></div>
+      <div id="desc">
+        <rich-editor v-model="activityQuery.desc" style="height: 400px"/>
+      </div>   
     </el-form-item>
     <el-form-item label="是否需要报名">
        <el-radio v-model="activityQuery.isEnlist" label="1">是</el-radio>
        <el-radio v-model="activityQuery.isEnlist" label="0">否</el-radio>
     </el-form-item>
-    <el-form-item label="活动时间" v-if="activityQuery.isEnlist == '1'">
-       <el-date-picker v-model="activityQuery.enlistStart" type="date" placeholder="选择日期"/>
+    <el-form-item label="报名时间" v-if="activityQuery.isEnlist == '1'"  prop="enlistStart">
+       <el-date-picker v-model="activityQuery.enlistStart" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.enlistEnd" type="date" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.enlistEnd" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" @click="onSubmit">保存</el-button>
+      <el-button type="primary" @click="onSubmit('activityQuery')">保存</el-button>
       <el-button @click="onCancel">取消</el-button>
     </el-form-item>
   </el-form>
@@ -55,7 +57,7 @@
 import { createNamespacedHelpers } from 'vuex'
 import apis from '../../config/api'
 import E from 'wangeditor'
-
+import dayjs from 'dayjs'
 const { mapState: mapDynamicState, mapActions: mapDynamicActions, mapMutations: mapDynamicMutations } = createNamespacedHelpers('building')
 const { mapState: mapActivityState, mapActions: mapActivityActions } = createNamespacedHelpers('activity')
 const { mapState: mapBuildingState, mapActions: mapBuildingActions } = createNamespacedHelpers('building')
@@ -74,19 +76,50 @@ export default {
       dialogImageUrl: "",
       activityQuery: {
        dynamicId:'',
-       buildingId:'',
        url:'',
        startDate:'',
        endDate:'',
        buildingId:'',
        title:'',
        isEnlist:'',
-       text:'',
+       desc:'',
        enlistStart:'',
        enlistEnd:'',
        address:'',
        personNum:''
-      }
+      },
+      rules: {
+          buildingId: [
+            { required: true, message: '请选择活动区域', trigger: 'change' }
+          ],
+          url: [
+            { required: true, message: ' ', trigger: 'change' }
+          ],
+          title: [
+            { required: true, message: '请输入活动标题', trigger: 'blur' },
+          ],
+          startDate: [
+            { required: true, message: '请选择日期', trigger: 'change' }
+          ],
+          endDate: [
+            { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+          ],
+          address: [
+            {  required: true, message: '请输入活动地点', trigger: 'change' }
+          ],
+          personNum: [
+            { required: true, message: '请输入活动人数', trigger: 'change' }
+          ],
+          desc: [
+            { required: true, message: ' ', trigger: 'blur' }
+          ],
+          // img: [
+          //   { required: true, message: ' '}
+          // ],
+          enlistStart:[
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ]
+        }
       
     }
   },
@@ -154,83 +187,72 @@ export default {
     },
 
     handleAvatarSuccess (res) {
-      this.activityQuery.url = res.data
-      this.updateDetail({...this.dynamic, imgUrl: res.data})
-      this.loading.close()
+      this.imageUrl = res.data
     },
-    onSubmit () {
-        // 新增
-        console.log('this.imgList[0]',this.imgList[0])
-        // this.activityQuery.url = this.imgList[0]
-        this.updateActivity(
+    onSubmit (formName) {
+      this.$refs[formName].validate((valid) => {
+      if (valid) {
+        // 活动时间校验
+      const endDate = this.formateDate(this.activityQuery.endDate); 
+      const startDate = this.formateDate(this.activityQuery.startDate);           
+      if( endDate <= startDate){
+        this.$message({ showClose: true, message: '活动结束时间不能小于活动开始时间',type: 'error'});
+        return 
+      }
+      // 富文本校验
+      if( this.activityQuery.desc === '' || this.activityQuery.desc === null|| this.activityQuery.desc ==='<p><br></p>'){
+        this.$message({ showClose: true, message: '活动详情不能为空',type: 'error'});
+        return 
+      }
+      // 报名时间校验
+      const enlistStart = this.formateDate(this.activityQuery.enlistStart); 
+      const enlistEnd = this.formateDate(this.activityQuery.enlistEnd);           
+      if(this.activityQuery.isEnlist ==='1' && enlistEnd<= enlistStart ){
+        this.$message({ showClose: true, message: '报名结束时间不能小于报名开始时间',type: 'error'});
+        return 
+      }
+      this.activityQuery.url = this.imageUrl 
+        this.updateActivity(    
            JSON.stringify(this.activityQuery)
-        ).then(() => {
-          this.onCancel()
-          
+        ).then((res) => {
+      this.$router.push({ name: "activity-list" });
+        })
+     
+        } else {
+            console.log('error submit!!');
+            return false;
+          }
         })
-        this.$router.push({ name: "activity-list" });
     },
     onCancel () {
-      this.$router.push({name: 'dynamiclist'})
+      this.$router.push({name: 'activity-list'})
     },
     getDetails(){
       this.activityQuery.dynamicId = this.$route.query.row
         this.activityDetails(this.activityQuery).then((data) => {
-          console.log('55',data)
         this.activityQuery.buildingId = data.buildingId
         this.activityQuery.title = data.title
-        this.activityQuery.startDate = data.startDate
+        this.activityQuery.startDate = data.startDate 
         this.activityQuery.endDate = data.endDate
         this.activityQuery.address = data.address
         this.activityQuery.personNum = data.personNum
         this.imageUrl = data.url
         this.activityQuery.isEnlist = data.isEnlist
+        this.activityQuery.desc = data.desc
         
        
         })
-    }
+    },
+    formateDate(dt) {
+      return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+    },
   },
   mounted () {
-    const _that = this
-    const phoneEditor = new E('#websiteEditorElem')
-    phoneEditor.customConfig.zIndex = 1
-    phoneEditor.customConfig.onchange = function (html) {
-      _that.dynamic = {..._that.dynamic, url: html}
-        _that.activityQuery.text =_that.dynamic.url
-    }
-    // phoneEditor.customConfig.uploadImgServer = this.upFileUrl
-    // phoneEditor.customConfig.uploadFileName = 'uploadFiles'
-
-    phoneEditor.customConfig.customUploadImg = function (files, insert) {
-      _that.uploadImg(files[0]).then(data => {
-        insert(data)
-      })
-    }
-    phoneEditor.customConfig.menus = [
-      'head',  // 标题
-      'bold',  // 粗体
-      'fontSize',  // 字号
-      'fontName',  // 字体
-      'italic',  // 斜体
-      'underline',  // 下划线
-      'strikeThrough',  // 删除线
-      'foreColor',  // 文字颜色
-      'backColor',  // 背景颜色
-      'justify',  // 对齐方式
-      'image',  // 插入图片
-    ]
-    phoneEditor.create()
+    // const editor = new E('#desc')
+    // editor.customConfig.zIndex = 1
+    // editor.create()
     this.getDetails()
-    this.getBuildings({
-      pageNum: 1,
-      pageSize: 100,
-    }).then(() => {
-      if ((this.$route.query.id || '') !== '') {
-        this.getDetail({id: this.$route.query.id}).then((data) => {
-          phoneEditor.txt.html(data.url)
-        })
-      }
-    })
+    
   }
 }
 </script>

src/views/activity/list.vue

@@ -28,9 +28,10 @@
     </el-table-column>
     <el-table-column
       prop="tel"
-      label="活动时间">
+      label="活动时间"
+      width="340">
      <template slot-scope="scope">
-        <span>{{ formateDate(scope.row.startDate)}} ~ {{ formateDate(scope.row.startDate)}}</span>
+        <span>{{ formateDate(scope.row.startDate)}}——{{ formateDate(scope.row.endDate)}}</span>
       </template>
     </el-table-column>
     <el-table-column
@@ -142,14 +143,24 @@ export default {
     },
     // 结束活动
     finish(id){
-      this.filterData.dynamicId = id
+        this.$confirm('结束以后将无法编辑, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+           this.filterData.dynamicId = id
           this.finishActivity(
           JSON.stringify(this.filterData)
         ).then((res) => {
            this.getList();
           this.getBuildList()   
-        })
-       
+        })    
+          this.$message({
+            type: 'success',
+            message: '成功!'
+          });
+        }).catch(() => {       
+        });
     },
     top(id){
           this.filterData.dynamicId = id

src/views/customer/customerDetails.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="detail-box">
+    <el-row :gutter="24">
+      <el-col :span="9">
+        <div class="grid-content">
+          <p class="title">置业顾问信息</p>
+          <img class="touxiang" src="http://img1.imgtn.bdimg.com/it/u=1022041283,4133755956&fm=26&gp=0.jpg" alt="">
+          <p class="name">曹玉文</p>
+          <p class="phone">13706842514</p>
+          <div class="info">
+            <p>部门：营销部</p>
+            <p>岗位：置业经理</p>
+            <p>公司：南京知与行网络科技有限公司</p>
+          </div>
+          <p class="project">所属项目：香颂.蔚澜半岛</p>
+        </div>
+      </el-col>
+      <el-col :span="15">
+        <div class="grid-content">
+          <p class="title">客户信息</p>
+          <div style="display:flex">
+            <img class="touxiang" src="http://img1.imgtn.bdimg.com/it/u=1022041283,4133755956&fm=26&gp=0.jpg" alt="">
+            <div style="width:100%">
+              <p class="info-box">用户名称：<span>曹建芳</span></p>
+              <p class="info-box">国家：<span>中国</span></p>
+              <p class="info-box">手机号：<span>184521462130</span></p>
+              <p class="info-box">省份：<span>江苏</span></p>
+            </div>       
+          </div>
+          <div class="other-info">
+              <p class="info-box">访问时长：<span>20分30秒 在线</span></p>
+              <p class="info-box">城市：<span>苏州</span></p>
+              <p class="info-box">访问次数：<span>20次</span></p>
+              <p class="info-box">来访渠道：<span>活动分享</span></p>
+              <p class="info-box">首次访问时间：<span>2019-07-23 12:23:49</span></p>
+          </div>
+          <p style="line-height:1.8">详细信息：</p>
+          <div class="flex-box" style="display:flex;justify-content: space-between;">
+            <p>意向项目：<span>香颂.蔚澜半岛、碧桂园</span></p>
+            <p>需求类型：<span>高层</span></p>
+            <p>物业类型：<span>物业</span></p>
+          </div>
+          <div class="flex-box" style="display:flex;justify-content: space-between;">
+            <p>价格区间：<span>100-200万</span></p>
+            <p>预约到访时间：<span>2019-07-23 12:59:14</span></p>
+            <p>预约人数：<span>2</span></p>
+          </div>
+          <p class="flex-box">客户说明：<span>客户说明展示处</span></p>
+          <p class="flex-box">客户描述：<span>客户描述展示处</span></p>
+          
+        </div>
+      </el-col>
+    </el-row>
+    <div class="access-records">
+      <p class="title">访问记录</p>
+      <el-table
+      :data="tableData"
+      class="table-box"
+      style="width: 100%;">
+      <el-table-column
+        prop="name"
+        label="访问事件">
+      </el-table-column>
+      <el-table-column
+        prop="date"
+        label="访问时间">
+      </el-table-column>
+      <el-table-column
+        prop="time"
+        label="停留时间">
+      </el-table-column>
+    </el-table>
+    </div>
+  
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from "vuex";
+
+export default {
+  data() {
+    return {
+      tableData: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          time: "10分30秒"
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          time: "17分43秒"
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          time: "05分26秒"
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          time: "1时24分27秒"
+        }
+      ]
+    };
+  },
+  computed: {},
+  created() {}
+};
+</script>
+<style lang="scss">
+.detail-box {
+  .el-table th.is-leaf,
+  .el-table td {
+    border-bottom: 0px !important;
+    text-align: center;
+  }
+  .el-table::before {
+    background-color: #fff;
+  }
+}
+</style>
+
+
+<style lang="scss" scoped>
+.detail-box {
+  .access-records{
+    border: 1px solid #dcdcdc;
+    border-radius: 5px;
+    padding: 12px 15px;
+    margin-bottom: 26px;
+  }
+  .grid-content {
+    border: 1px solid #dcdcdc;
+    border-radius: 5px;
+    height: 400px;
+    overflow: hidden;
+    padding: 12px 15px;
+    position: relative;
+    margin-bottom: 26px;
+    p {
+      margin: 0;
+      font-size: 15px;
+    }
+    .title {
+      font-size: 18px;
+      font-weight: 600;
+      margin-bottom: 30px;
+    }
+    .touxiang {
+      width: 90px;
+      height: 80px;
+      display: inline-block;
+      margin-right: 26px;
+    }
+    .name {
+      position: absolute;
+      top: 80px;
+      left: 130px;
+      font-weight: 600;
+    }
+    .phone {
+      position: absolute;
+      top: 116px;
+      left: 130px;
+    }
+    .info {
+      margin: 20px 0;
+      p {
+        color: #666;
+        line-height: 1.8;
+      }
+    }
+    .info-box {
+      display: inline-block;
+      width: 50%;
+      line-height: 2.4;
+      span {
+        color: #555;
+      }
+    }
+    .other-info {
+      margin-left: 96px;
+      width: 100%;
+      span {
+        color: #555;
+      }
+    }
+    .flex-box {
+      line-height: 2.2;
+      span {
+        color: #555;
+      }
+    }
+  }
+}
+</style>

src/views/customer/list.vue

@@ -19,12 +19,6 @@
             <span>推荐人电话</span>
             <el-input v-model="form.consultTel" ></el-input>
           </li>
-          <!--          <li>-->
-          <!--            <span>状态</span>-->
-          <!--            <el-select v-model="form.status" placeholder="请选择">-->
-          <!--              <el-option v-for="(item,i) in gridData || []" :key="i" :label="item.name" :value="item.value"></el-option>-->
-          <!--            </el-select>-->
-          <!--          </li>-->
         </ul>
         <el-button
                 size="mini"
@@ -75,7 +69,7 @@
           &nbsp;
           <a href="javascript: void(0);" @click="showRecommendCustomerList(scope.row)" v-if="scope.row.phone !== '' && scope.row.phone !== undefined && scope.row.phone !== null">推荐客户</a>
           &nbsp;
-          <router-link :to="{ name:'editCustomer', query: { id: scope.row.customerId } }">查看详情</router-link>
+          <router-link :to="{ name:'customerDetails', query: { id: scope.row.customerId } }">查看详情</router-link>
         </template>
       </el-table-column>
     </el-table>

src/views/exchange/verify.vue

@@ -27,8 +27,14 @@
         </div>
       </el-col>
     </el-row>
-    <el-button type="danger" style="margin:20px auto 0 auto;display:block" round>立即核销</el-button>
-    
+    <el-button type="danger" @click="showVerifyDialog = true" style="margin:20px auto 0 auto;display:block" round>立即核销</el-button>
+    <el-dialog title="核销数据" :visible.sync="showVerifyDialog">
+      <el-form>
+        <el-form-item label="扫描二维码数据">
+          <el-input v-model="verifyId" @keyup.enter.native="verifyEnter" placeholder="请用扫码枪扫描二维码"></el-input>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </el-tab-pane>
   <el-tab-pane label="手机号核销">
     <el-row>
@@ -81,6 +87,8 @@ export default {
         status: ""
       },
       verifyPhone: "",
+      verifyId: "",
+      showVerifyDialog: false,
       list: [],
       pageNavi: {
         current: 1,
@@ -91,7 +99,7 @@ export default {
   },
   computed: {},
   methods: {
-    ...mapExchangeActions(["getExchanges"]),
+    ...mapExchangeActions(["getExchanges", "verifyById"]),
     getList() {
       const pageNumber = this.pageNavi.current || 1;
       const pageSize = this.pageNavi.size;
@@ -114,7 +122,23 @@ export default {
     addGoods() {
       this.$router.push({ name: "goods.edit" });
     },
+    verifyEnter() {
+      this.verifyById({
+        id: this.verifyId
+      })
+        .then(res => {
+         this.$notify.info("核销成功");
+         this.showVerifyDialog = false;
+        })
+        .catch(err => {
+          this.$notify.error(err.msg || err.message);
+        });
+    },
     verifyTel() {
+      if(this.verifyPhone === ""){
+        this.$notify.error("请输入手机号");
+        return;
+      }
       this.$router.push({
         name: "verify.list",
         params: { tel: this.verifyPhone }

src/views/index.js

@@ -197,6 +197,15 @@ const pages = [
           title: '审核',
         },
       },
+      {
+        path: 'customerDetails',
+        name: 'customerDetails',
+        component: () => import('./customer/customerDetails.vue'),
+        meta: {
+          menuShow: false,
+          title: '客户详情',
+        },
+      },
       {
         path: 'integralRecord',
         name: 'integralRecord',