背景图片、媒体管理修改

CallCenterWeb.UI/src/api/mediaCenter/mediaInformation.js

@@ -13,4 +13,42 @@ export function getOrderLists(params) {
     method: 'get',
     params
   })
+}
+// 获取媒体列表数据
+export function getMedia(params) {
+  return request({
+    url: 'api/MediaManagement/getlist',
+    method: 'get',
+    params
+  })
+}
+// 获取媒体信息详情
+export function getMediaDetail(id) {
+  return request({
+    url: 'api/MediaManagement/getdetails',
+    method: 'get',
+    params:{
+      id
+    }
+  })
+}
+// 获取媒体信息详情
+export function addMediaManagment(id) {
+  return request({
+    url: 'api/MediaManagement/getdetails',
+    method: 'get',
+    params:{
+      id
+    }
+  })
+}
+// 获取媒体信息详情
+export function editMediaManagment(id) {
+  return request({
+    url: 'api/MediaManagement/getdetails',
+    method: 'get',
+    params:{
+      id
+    }
+  })
 }

CallCenterWeb.UI/src/views/login/index.vue

@@ -13,7 +13,10 @@
     </div>
     <div class="signin_right">
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
-        <h2 class="title">呼叫中心管理系统</h2>
+		<div class="logo_setting">
+			<img src="../../assets/imgs/zlj_logo.png" alt="" srcset="">
+        	<h2 class="title">电视购物中心客服系统</h2>
+		</div>
         <!-- <h3 class="subtitle">标准版 在线演示系统</h3> -->
         <el-select v-model="userRole" placeholder="请选择您的角色" @change="toggle">
           <el-option
@@ -43,7 +46,7 @@
           <el-input :type="pwdType" v-model="loginForm.password" name="password" auto-complete="new-password" placeholder="请输入密码" @keyup.enter.native="handleLogin"/>
           <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" /></span>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="btn_login">
           <el-button v-waves :loading="loading" type="primary" size="middle" style="width:100%;" @click.native.prevent="handleLogin">
             立即登录
           </el-button>
@@ -333,7 +336,7 @@ export default {
 				color: #666666;
 				transition: all 1s;
 				-webkit-transition: all 1s;
-				margin-bottom: 50px;
+				margin-bottom: 40px;
 			}
 			.subtitle{
 				font-size: 14px;
@@ -375,6 +378,22 @@ export default {
 			}
 		}
 	}
+	.logo_setting{
+		vertical-align: middle;
+		.title{
+			vertical-align: middle;
+			display: inline-block;
+		}
+	}
+	.el-button--primary{
+		background-color: #e60012 !important;
+		border-color: #e60012 !important;
+		border-radius: 20px;
+	}
+	.btn_login{
+		border-radius: 20px;
+		border: none !important;
+	}
 	@media only screen and (max-width: 984px) {
 		.login-container {
 			.signin_left{

CallCenterWeb.UI/src/views/marketingManagement/fullDecrement/components/addOrEdit.vue

@@ -20,10 +20,10 @@
       />
       </el-form-item>
       <el-form-item label="促销方式">
-        <el-input v-model="ruleForm.promotionMethod" placeholder="请输入促销方式"></el-input>
+        <el-input v-model="ruleForm.promotionMethod" placeholder="请输入促销方式" ></el-input>
       </el-form-item>
       <el-form-item label="满减金额">
-        <el-input v-model="ruleForm.reductionAmount" placeholder="请输入满减金额"></el-input>
+        <el-input v-model="ruleForm.reductionAmount" placeholder="请输入满减金额" onkeyup="value=value.replace(/[^\d.]/g,'')"></el-input>
       </el-form-item>
       <el-form-item label="金额区间">
         <el-input v-model="ruleForm.amountRange" placeholder="请输入金额区间"></el-input>

CallCenterWeb.UI/src/views/marketingManagement/fullDecrement/index.vue

@@ -10,7 +10,7 @@
           <el-table-column prop="F_StartTime" label="开始时间" align="center" fixed width=""></el-table-column>
           <el-table-column prop="F_EndTime" label="结束时间" align="center" fixed width=""></el-table-column>
           <el-table-column prop="F_Describe" label="促销方式" align="center" fixed width=""></el-table-column>
-          <el-table-column prop="F_Process" label="满减金额" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_Money" label="满减金额" align="center" fixed width=""></el-table-column>
           <el-table-column prop="F_AmountRange" label="金额区间" align="center" fixed width=""></el-table-column>
           <el-table-column prop="F_Commodity" label="绑定商品" align="center" fixed width=""></el-table-column>
           <el-table-column prop="F_ActivityMode" label="活动方式" align="center" fixed width=""></el-table-column>

CallCenterWeb.UI/src/views/mediaCenter/launchManagment/mediaManagment/addOrEdit.vue

@@ -0,0 +1,176 @@
+<template>
+  <div v-loading="loading">
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="order_form">
+      <el-form-item label="媒体名称" prop="mediaName">
+        <el-input v-model="ruleForm.mediaName" placeholder="请输入媒体名称"></el-input>
+      </el-form-item>
+      <el-form-item label="媒体地区" >
+          <el-cascader
+        v-model="provinceCity"
+        :options="provinceCityDatas"
+        :props="props"
+        placeholder="请选择地区"
+        class="form_select"
+        clearable
+        filterable
+        change-on-select
+      />
+        <!-- <el-input v-model="ruleForm.mediaName" placeholder="请输入媒体地区"></el-input> -->
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">保存</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { getProviceCity } from '@/api/commonAPI'
+import { getMediaDetail, addMediaManagment, editMediaManagment} from '@/api/mediaCenter/mediaInformation'
+import { validateTel } from '@/utils/validate'
+export default {
+  name: 'AddOrEdit',
+  props: {
+    rowid: {
+      type: String,
+      default: ''
+    },
+    callid: {
+      type: Number,
+      default: 0
+    },
+    layerid: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      provinceCityDatas: [], // 省市下拉数据
+      provinceCity: [], // 省市下拉绑定的值
+      props: {
+        // 自定义省市下拉数据的key值
+        value: "id",
+        label: "text",
+        children:'nest'
+      },
+      ruleForm: {
+        unique_id: '', //		否	string	callid
+        mediaName: '', //媒体名称
+      },
+      rules: {
+        mediaName: [{
+          required: true,
+          trigger: 'blur',
+          message: '请输入媒体名称',
+        }],
+      },
+      loading: false
+    }
+  },
+  created() {
+      this.getProCity();
+    if (this.callid) {
+      this.ruleForm.unique_id = this.callid
+    }
+    Promise.all([])
+      .then(() => {
+        if (this.rowid) {
+          this.ruleForm.ordercode = this.rowid
+          this.getDetail(this.rowid)
+        }
+      })
+  },
+  methods: {
+    submitForm() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          return new Promise(response=>{
+            const params={
+              F_Type:3,
+              F_ID:this.rowid ? this.rowid : '',
+              F_Name:this.ruleForm.activityName,//活动名称
+              F_Describe:this.ruleForm.promotionMethod,//促销方式
+              F_Money:this.ruleForm.reductionAmount,//满减金额
+              F_AmountRange:this.ruleForm.amountRange,//金额区间
+              F_StartTime:this.ruleForm.activityTime && this.ruleForm.activityTime[0],//开始时间
+              F_EndTime:this.ruleForm.activityTime && this.ruleForm.activityTime[1],//结束时间
+              F_Commodity:this.ruleForm.boundGoods,//商品ID
+              F_ActivityMode:this.ruleForm.activityMode,//活动金额
+            }
+             // 添加
+            if (!this.rowid) {
+              addMediaManagment(params).then(response => {
+                this.loading = false
+                if (response.state.toLowerCase() === 'success') {
+                  this.$parent.$layer.close(this.layerid)
+                  if (this.callid) {
+                    this.$parent.getOrderRecord() // 重新加载来电弹屏工单记录
+                  } else {
+                    this.$parent.btn_search() // 重新加载父级数据
+                  }
+                  this.$message.success('恭喜你，添加成功!')
+                }
+              }).catch(() => {
+                this.loading = false
+              })
+              return
+            }
+            // 编辑
+            editMediaManagment(params).then(response => {
+              this.loading = false
+              if (response.state.toLowerCase() === 'success') {
+                this.$parent.$layer.close(this.layerid)
+                this.$parent.getList() // 重新加载父级数据
+                this.$message.success('恭喜你，编辑成功!')
+              }
+            }).catch(() => {
+              this.loading = false
+            })
+          })
+         
+        } else {
+          this.$message.error('请输入有效的必填项信息!')
+          return false
+        }
+      })
+    },
+    resetForm() {
+      this.$refs.ruleForm.resetFields()
+    },
+    // 详情
+    getDetail(rid) {
+        console.log(rid)
+      getMediaDetail(rid).then(response => {
+        if (response.state.toLowerCase() === 'success') {
+          const res = response.data
+          this.mediaName = res.F_Name
+        }
+      })
+    },
+    // 获取省市下拉数据
+    getProCity() {
+      return new Promise(resolve => {
+        getProviceCity().then(response => {
+          if (response.state.toLowerCase() === "success") {
+            this.provinceCityDatas = response.data;
+          }
+        });
+        resolve();
+      });
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.order_form {
+  .form_select {
+  	width: 100%;
+  }
+  .form_date {
+    width: 100%;
+  }
+}
+</style>

CallCenterWeb.UI/src/views/mediaCenter/launchManagment/mediaManagment/index.vue

@@ -0,0 +1,154 @@
+<template>
+  <div class="filter-container">
+    <el-card>
+      <el-input v-model="mediaName" placeholder="请输入媒体名称" class="filter-item"></el-input>
+      <el-cascader
+        v-model="provinceCity"
+        :options="provinceCityDatas"
+        :props="props"
+        placeholder="请选择地区"
+        class="form_select"
+        clearable
+        filterable
+        change-on-select
+      />
+      <el-button type="primary" @click="btn_search">搜索</el-button>
+      <el-button v-permission="'HY_add'" type="primary" @click="btn_add">添加</el-button>
+      <el-table :data="dataLists" border stripe>
+        <el-table-column type="selection" width="40"></el-table-column>
+        <el-table-column prop="F_Name" label="媒体名称" align="center" fixed width></el-table-column>
+        <el-table-column prop="F_RegioName" label="媒体地区" align="center" fixed width></el-table-column>
+        <el-table-column prop="F_CreateTime" label="创建时间" align="center" fixed width></el-table-column>
+        <el-table-column label="操作" width align="center" class-name="oparate_btn" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              v-permission="'HY_detail'"
+              type="text"
+              @click="btn_detail(scope.row.F_ID.toString())"
+            >详情</el-button>
+            <el-button
+              v-permission="'HY_edit'"
+              type="text"
+              @click="btn_edit(scope.row.F_ID.toString())"
+            >编辑</el-button>
+            <el-button
+              v-permission="'HY_delete'"
+              type="text"
+              @click="btn_handle(scope.row.F_ID.toString())"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="pageParams.total > 0"
+        :total="pageParams.total"
+        :pageindex.sync="pageParams.pageindex"
+        :pagesize.sync="pageParams.pagesize"
+        class="pagination"
+        @pagination="getList"
+      ></pagination>
+    </el-card>
+  </div>
+</template>
+<script>
+import { getProviceCity } from "@/api/commonAPI";
+import { getMedia } from "@/api/mediaCenter/mediaInformation";
+import Pagination from "@/components/Pagination"; // 对el-pagination 二次封装
+import detail from "./detail";
+import addOrEdit from "./addOrEdit";
+export default {
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      mediaName:'',//媒体名称
+      provinceCityDatas: [], // 省市下拉数据
+      provinceCity: [], // 省市下拉绑定的值
+      props: {
+        // 自定义省市下拉数据的key值
+        value: "id",
+        label: "text",
+        children:'nest'
+      },
+      pageParams: {
+        pageindex: 1, // 当前第几页
+        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
+        total: 0 // 总共多少数据
+      },
+      dataLists: [] //列表数据
+    };
+  },
+  created() {
+    this.getProCity();
+    this.getList();
+  },
+  methods: {
+    getList() {
+      return new Promise(resolve => {
+        const params = {
+          pageindex: this.pageParams.pageindex, // int 第几页
+          pagesize: this.pageParams.pagesize // int 每页几条信息
+        };
+        getMedia(params).then(response => {
+          if (response.state.toLowerCase() === "success") {
+            this.pageParams.total = response.total;
+            this.dataLists = response.rows;
+          }
+        });
+        resolve();
+      });
+    },
+    btn_search() {
+      this.pageParams.pageindex = 1;
+      this.getList();
+    },
+    btn_detail(editId) {
+      this.$layer.iframe({
+        content: {
+          content: detail, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: editId } // props
+        },
+        area: ["80%", "90%"],
+        title: "详情"
+      });
+    },
+    btn_edit(editId) {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: editId } // props
+        },
+        area: ["80%", "90%"],
+        title: "编辑媒体信息"
+      });
+    },
+    btn_add() {
+      this.$layer.iframe({
+        content: {
+          content: addOrEdit, // 传递的组件对象
+          parent: this, // 当前的vue对象
+          data: { rowid: "" } // props
+        },
+        area: ["50%", "50%"],
+        title: "添加媒体信息"
+      });
+    },
+    // 获取省市下拉数据
+    getProCity() {
+      return new Promise(resolve => {
+        getProviceCity().then(response => {
+          if (response.state.toLowerCase() === "success") {
+            this.provinceCityDatas = response.data;
+          }
+        });
+        resolve();
+      });
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+</style>

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrEdit.vue

@@ -43,33 +43,6 @@
         clearable
         filterable
         change-on-select/>
-        <!-- <el-col :span="4">
-          <el-select v-model="ruleForm.province" placeholder="请选择省">
-            <el-option label="省1" value="1"></el-option>
-            <el-option label="省2" value="2"></el-option>
-          </el-select>
-        </el-col> -->
-        <!-- <el-col :span="2" class="col_select_text">市</el-col>
-        <el-col :span="4">
-          <el-select v-model="ruleForm.city" placeholder="请选择市">
-            <el-option label="城市1" value="1"></el-option>
-            <el-option label="城市2" value="2"></el-option>
-          </el-select>
-        </el-col>
-        <el-col :span="2" class="col_select_text">县/区</el-col>
-        <el-col :span="4">
-          <el-select v-model="ruleForm.county" placeholder="请选择县/区">
-            <el-option label="县" value="1"></el-option>
-            <el-option label="区" value="2"></el-option>
-          </el-select>
-        </el-col>
-        <el-col :span="2" class="col_select_text">乡镇</el-col>
-        <el-col :span="4">
-          <el-select v-model="ruleForm.township" placeholder="请选择乡镇">
-            <el-option label="乡镇1" value="1"></el-option>
-            <el-option label="乡镇2" value="2"></el-option>
-          </el-select>
-        </el-col> -->
       </el-form-item>
       <el-form-item label="详细地址">
         <el-input v-model="ruleForm.F_Address" placeholder="请输入详细地址"></el-input>
@@ -243,6 +216,8 @@ export default {
               postcode: this.ruleForm.F_Postcode, //邮编
               province: this.provinceCity && this.provinceCity[0], //省份
               city: this.provinceCity && this.provinceCity[1], //市
+              area: this.provinceCity && this.provinceCity[2], //县
+              town: this.provinceCity && this.provinceCity[3], //乡
               shoesize: this.ruleForm.F_ShoeSize, //鞋码
               regtime: this.ruleForm.F_RegTime, //会员日期
               birthday: this.ruleForm.F_Birthday, //会员生日
@@ -301,6 +276,12 @@ export default {
           if(response.data.F_City){
             this.provinceCity.push(response.data.F_City)
           }
+          if(response.data.F_Area){
+            this.provinceCity.push(response.data.F_Area)
+          }
+          if(response.data.F_Town){
+            this.provinceCity.push(response.data.F_Town)
+          }
           
         }
       });

CallCenterWeb.UI/src/views/memberManagement/memberList/components/detail.vue

@@ -11,7 +11,7 @@
           <el-col :md="21">
             <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />会员信息</h1>
             <!-- <p class="title_sub"><span class="green">{{ name }}</span> {{ createtime }}</p> -->
-            <p class="title_sub"><span class="green">{{ name }}</span> 	足力健 {{ createtime }}</p>
+            <p class="title_sub"><span class="green">{{ name }}</span> 	足力健 </p>
             <!-- <p class="title_sub">催单次数：<span class="red">10</span>次 | 工单状态： <span class="done">已完成</span></p> -->
           </el-col>
           <el-col :md="24" class="order_detail_content">
@@ -37,16 +37,16 @@
               会员类型：{{ type }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              省份：{{ createuser }}
+              省份：{{ province }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              市：{{ createuser }}
+              市：{{ city }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              县区：{{ createuser }}
+              县区：{{ area }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              乡镇：{{ createuser }}
+              乡镇：{{ town }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
               详细地址：{{ address }}
@@ -142,6 +142,7 @@ export default {
       name: '', // 姓名
       phone: '', // 固定电话
       sex: '', // 性别
+      age: '', // 年龄
       mobile1: '', // 手机号码1
       mobile2: '', // 手机号码2
       type: '', // 会员类型
@@ -153,6 +154,10 @@ export default {
       recommender: '', // 推荐人
       money: '', // 累计消费金额
       totalscore: '', // 累计积分
+      province: '', // 省
+      city: '', // 市
+      area: '', // 县
+      town: '', // 乡
     }
   },
   computed: {
@@ -189,6 +194,10 @@ export default {
           this.recommender = res.F_Recommender // 推荐人
           this.money = res.F_Money // 累计消费金额  
           this.totalscore = res.F_TotalScore // 累计积分
+          this.province = res.F_TotalScore // 省
+          this.city = res.F_City // 市
+          this.area = res.F_Area // 县
+          this.town = res.F_Town // 乡
         }
       })
     }

CallCenterWeb.UI/src/views/memberManagement/memberList/components/searchFilter.vue

@@ -2,34 +2,27 @@
     <div class="filter-container">
       <el-input v-model="searchDatas.customerName" placeholder="客户姓名" class="filter-item"></el-input>
       <el-input v-model="searchDatas.phoneNumber" placeholder="手机号码" class="filter-item"></el-input>
-      <el-select v-model="searchDatas.memberType" placeholder="会员类型" class="filter-item">
-        <el-option label="类型1" value="1"></el-option>
-        <el-option label="类型2" value="2"></el-option>
-      </el-select>
+       <el-select v-model="searchDatas.memberType" placeholder="请选择会员类型" class="form_select">
+          <el-option
+            v-for="item in memberType"
+            :key="item.F_ValueId"
+            :label="item.F_Value"
+            :value="item.F_Value">
+          </el-option>
+        </el-select>
       <el-cascader
-        v-model="provinceCity"
+        v-model="searchDatas.provinceCity"
         :options="provinceCityDatas"
         :props="props"
         placeholder="请选择地区"
-        class="form_select"
+        class="form_select area"
         clearable
         filterable
         change-on-select/>
-      <!-- <el-select v-model="searchDatas.city" placeholder="市" class="filter-item">
-        <el-option label="市1" value="1"></el-option>
-        <el-option label="市2" value="2"></el-option>
-      </el-select>
-      <el-select v-model="searchDatas.county" placeholder="县区" class="filter-item">
-        <el-option label="县" value="1"></el-option>
-        <el-option label="区" value="2"></el-option>
-      </el-select>
-      <el-select v-model="searchDatas.township" placeholder="乡镇" class="filter-item">
-        <el-option label="乡镇1" value="1"></el-option>
-        <el-option label="乡镇2" value="2"></el-option>
-      </el-select> -->
       <el-input v-model="searchDatas.address" placeholder="详细地址" class="filter-item"></el-input>
       <el-date-picker v-model="searchDatas.memberBirthday" type="date" placeholder="会员生日" value-format="yyyy-MM-dd" class="filter-item"></el-date-picker>
       <el-input v-model="searchDatas.referrer" placeholder="推荐人" class="filter-item"></el-input>
+      <el-input v-model="searchDatas.saleperson" placeholder="销售负责人" class="filter-item"></el-input>
       <el-input v-model="searchDatas.contactFrequency" placeholder="联系频次" class="filter-item"></el-input>
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
       <el-button v-permission="'HY_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
@@ -58,7 +51,7 @@ import sendGroupMessage from './sendGroupMessage'
 import memberExtension from './memberExtension'
 import memberLevel from './memberLevel'
 import importFile from './importFile'
-
+import {getMemberType} from "@/api/memberManagement/memberList";
 export default {
   name: 'SearchFilter',
   props: {
@@ -77,11 +70,14 @@ export default {
           address: '', //详细地址
           memberBirthday: '', //会员生日
           referrer: '', //推荐人
+          saleperson: '', //销售负责人
           contactFrequency: '', //联系频次
+          provinceCity: [], // 省市下拉绑定的值
         }
       }
     },
     selectedId: Array,
+    // provinceCity: Array,
   },
   data() {
     return {
@@ -89,16 +85,17 @@ export default {
       provinceCity: [], // 省市下拉绑定的值
       props: {
         // 自定义省市下拉数据的key值
-        value: 'id',
+        value: 'text',
         label: 'text',
         children: 'children'
       },
       deptOptions: [], // 咨询/投诉下拉数据
-      typeOptions: [], // 工单类型下拉数据
+      memberType: [], // 会员类型下拉数据
       pickerOptions // 日期数据
     }
   },
   created() {
+    this.getType();
     this.getProCity()
   },
   methods: {
@@ -213,6 +210,22 @@ export default {
         resolve()
       })
     },
+    // 获取会员类型
+    getType() {
+      return new Promise(resolve=>{
+        const params={
+          pageindex:1,
+          pagesize:10,
+          isleaf:true,
+          code:'HYLX',
+        }
+        getMemberType(params).then(response => {
+          if (response.state.toLowerCase() === 'success') {
+            this.memberType= response.data.Rows
+          }
+        })
+      })
+    },
   }
 }
 </script>
@@ -224,5 +237,8 @@ export default {
 .filter-container .filter-item.el-date-editor{
   margin-right: 10px;
 }
+.area{
+  width: 270px !important;
+}
 </style>
 

CallCenterWeb.UI/src/views/memberManagement/memberList/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <search-filter :search-datas.sync="searchDatas" :selectedId="selectedId" showadd @transfer="btn_transfer" @search="btn_search" @delorders="btn_deletes" @export="btn_export"></search-filter>
+    <search-filter :search-datas.sync="searchDatas"  :selectedId="selectedId" showadd @transfer="btn_transfer" @search="btn_search" @delorders="btn_deletes" @export="btn_export"></search-filter>
     <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
       <el-table-column type="selection" width="40" fixed></el-table-column>
       <!-- <el-table-column prop="F_VIPCode" label="会员卡编号" align="center"  width="100px"></el-table-column> -->
@@ -16,6 +16,8 @@
         <template slot-scope="scoped">
           <span v-show="scoped.row.F_Province==null?false:true">{{scoped.row.F_Province}}</span>
           <span v-show="scoped.row.F_City==null?false:true">{{scoped.row.F_City}}</span>
+          <span v-show="scoped.row.F_Area==null?false:true">{{scoped.row.F_Area}}</span>
+          <span v-show="scoped.row.F_Town==null?false:true">{{scoped.row.F_Town}}</span>
           <span v-show="scoped.row.F_Address==null?false:true">{{scoped.row.F_Address}}</span>
         </template>
       </el-table-column>
@@ -30,7 +32,7 @@
       <el-table-column prop="F_TotalScore" label="累计积分" align="center"  width=""></el-table-column>
       <el-table-column label="操作" width="140" align="center" class-name="oparate_btn" fixed="right">
         <template slot-scope="scope">
-          <el-button  type="text" @click="btn_detail(scope.row.F_ID)">详情</el-button>
+          <el-button  type="text" @click="btn_detail(scope.row.F_ID.toString())">详情</el-button>
           <el-button  type="text" @click="btn_edit(scope.row.F_ID)">编辑</el-button>
           <el-button  type="text" @click="btn_delete(scope.row.F_ID)">删除</el-button>
           <!-- <el-button v-permission="'HY_detail'" type="text" @click="btn_detail(scope.row.ordercode)">详情</el-button>
@@ -82,6 +84,7 @@ export default {
         referrer: '', //推荐人
         saleperson: '', //销售负责人
         contactFrequency: '', //联系频次
+        provinceCity: [], // 省市下拉绑定的值
       },
       loading: false,
       pageParams: {
@@ -118,10 +121,10 @@ export default {
           name: this.searchDatas.customerName, //客户姓名
           phone: this.searchDatas.phoneNumber, //手机号码
           type: this.searchDatas.memberType, //会员类型
-          province: this.searchDatas.province, //省份
-          city: this.searchDatas.city, //市
-          area: this.searchDatas.county, //县区
-          town: this.searchDatas.township, //乡镇
+          province: this.searchDatas.provinceCity&&this.searchDatas.provinceCity[0], //省份
+          city: this.searchDatas.provinceCity[1]&&this.searchDatas.provinceCity[1], //市
+          area: this.searchDatas.provinceCity[2]&&this.searchDatas.provinceCity[2], //县区
+          town: this.searchDatas.provinceCity[3]&&this.searchDatas.provinceCity[3], //乡镇
           address: this.searchDatas.address, //详细地址
           birthday: this.searchDatas.memberBirthday, //会员生日
           recommender: this.searchDatas.referrer, //推荐人