Merge branch 'feature/7月迭代-会员' into dev

# Conflicts:
#	src/components/axios/url.js

index.html

@@ -42,7 +42,7 @@
       (function() {
         var src = '/component/static/import-component.js?timestrap='+ new Date().getTime();
         var host = window.location.host;
-        host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
+        host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'www.gicdev.com' : host;
         document.write('<script src="//'+ host + src +'"><\/script>')
       })()
     </script>

src/App.vue

@@ -17,7 +17,7 @@ export default {
   },
 
   created() {
-    this.baseUrl = window.location.origin.indexOf('localhost') > -1 ? 'http://gicdev.demogic.com' : window.location.origin;
+    this.baseUrl = window.location.origin.indexOf('localhost') > -1 ? 'http://www.gicdev.com' : window.location.origin;
     this._getUserInfo();
     this.changeTab();
     this.isEditClique();

src/api/request.js

@@ -5,9 +5,9 @@ import router from '../router';
 
 // axios 配置
 // axios.defaults.timeout = 5000;
-// let adminUrl = 'http://gicdev.demogic.com'
+// let adminUrl = 'http://www.gicdev.com'
 // let adminUrl = process.env.NODE_ENV === 'production' ? '':'http://111.231.99.90:8880/app/mock/19'
-let adminUrl = process.env.NODE_ENV === 'production' ? '' : 'http://gicdev.demogic.com';
+let adminUrl = process.env.NODE_ENV === 'production' ? '' : 'http://www.gicdev.com';
 let request;
 request = axios.create({
   baseURL: adminUrl,

src/common/vueGicGroup.vue

@@ -55,7 +55,7 @@ export default {
   created() {
     this.baseURL = window.location.origin.indexOf("host") > -1
       ? window.location.origin
-      : "http:gicdev.demogic.com";
+      : "http:www.gicdev.com";
     this.getStoreId();
   },
   methods: {

src/components/allCustomers/components/customerLog.vue

@@ -14,21 +14,21 @@
       <p class="font14 tip-p" v-if="!memberId">展示近一年的日志</p>
     </div>
     <el-table :data="tableData"  style="width: 100%">
-      <el-table-column prop="createTime" label="时间" min-width="100px">
+      <el-table-column prop="createTime" label="时间" min-width="138px">
         <template slot-scope="scope">
           {{ scope.row.createTime | formatDate('ymd') }} <br /> {{ scope.row.createTime | formatDate('hms') }}
         </template>
       </el-table-column>
-      <el-table-column prop="operType" label="日志类型" min-width="100px" :formatter="(row, col, val) => val || '--'" />
-      <el-table-column prop="operReason" label="事由" min-width="100px" :formatter="(row, col, val) => val || '--'" />
-      <el-table-column prop="operContent" label="日志详情" min-width="230px" show-overflow-tooltip :formatter="(row, col, val) => val || '--'"/>
-      <el-table-column prop="operRemark" label="备注" min-width="230px" show-overflow-tooltip>
+      <el-table-column prop="operType" label="日志类型" min-width="166px" :formatter="(row, col, val) => val || '--'" />
+      <el-table-column prop="operReason" label="事由" min-width="138px" :formatter="(row, col, val) => val || '--'" />
+      <el-table-column prop="operContent" label="日志详情" min-width="301px" show-overflow-tooltip :formatter="(row, col, val) => val || '--'"/>
+      <el-table-column prop="operRemark" label="备注" min-width="290px" show-overflow-tooltip>
         <template slot-scope="{ row }">
           <span v-if="row.operRemark" v-html="row.operRemark" />
           <span v-else>--</span>
         </template>
       </el-table-column>
-      <el-table-column prop="" label="操作" width="80" v-if="memberId">
+      <el-table-column prop="" label="操作" min-width="77px" v-if="memberId">
         <template slot-scope="{ row }">
           <el-button v-if="row.operType == '客户合并' && row.referLogId && (row.referLogId != -1 && row.referLogId != '')" type="text" @click="goLink('/customerLog',row.referLogId)">查看</el-button>
           <p v-else>--</p>
@@ -99,16 +99,15 @@ export default {
   methods: {
     // 级联搜索
     filterMethod(e) {
-      console.log(e.length);
       if(e && e.length > 0) {
-        if(e[0]) {
+        // if(e[0]) {
           this.logPageParam.operType = e[0];
-        }else if (e[1]) {
+        // }else if (e[1]) {
           this.logPageParam.operReason = e[1]
-        }
+        // }
       }else {
         this.logPageParam.operType = null;
-        // this.logPageParam.operReason = null;
+        this.logPageParam.operReason = null;
       }
       this.logPageParam.currentPage = 1;
       this.getLogPage();

src/components/axios/url.js

 const host = window.location.origin;
-const baseUrl = host.indexOf('localhost') > -1 ? 'http://gicdev.demogic.com' : host;
+const baseUrl = host.indexOf('localhost') > -1 ? 'http://www.gicdev.com' : host;
 
 const urlConfig = {
   updateBabyInfo: '/api-member/update-member-baby-info',// 更新宝宝信息
@@ -118,7 +118,13 @@ const urlConfig = {
   frozenMemberExportExcel: '/api-admin/frozen-member-export-excel',// 异常会员搜索结果导出
 
   getMemberLogType: '/api-plug/member-oper-type-list',
-  getMemberLogReason: '/api-plug/member-oper-reason-list'
+  getMemberLogReason: '/api-plug/member-oper-reason-list',
+  getMemberSourceList: '/api-plug/member-source-list',
+  getMemberLogType: '/api-plug/member-oper-type-list',
+  getMemberLogReason: '/api-plug/member-oper-reason-list',
+  getFrozenList: "/api-member/ajax-frozen-members",
+  batchUpdateFrozen: "/api-member/members-batch-update-frozen",
+  getExceptionList: '/api-member/list-exception-member'
 }
 
 const defaultUrl = Object.assign({}, urlConfig);

src/components/wechatmembers/integralDataPage.vue

@@ -72,7 +72,7 @@
         <el-table-column
           prop="callBeginTime"
           label="时间"
-          min-width="110px"
+          min-width="118px"
         >
           <template slot-scope="scope">
             {{ scope.row.createTime | formatDate('ymd') }} <br /> {{ scope.row.createTime | formatDate('hms') }}
@@ -81,7 +81,7 @@
         <el-table-column
           prop="intervalInout"
           label="日志类型"
-          min-width="80px"
+          min-width="120px"
         >
           <template slot-scope="scope">
             <span v-if="scope.row.intervalInout == 1">积分获取</span>
@@ -91,12 +91,12 @@
         <el-table-column
           prop="memberIntegralName"
           label="事由"
-          min-width="90px"
+          min-width="108px"
         ></el-table-column>
         <el-table-column
           prop="intervalHistory"
           label="日志详情"
-          min-width="80px"
+          min-width="132px"
         >
           <template slot-scope="scope">
             <span :style="{color: scope.row.intervalHistory > 0 ? 'green' : 'red'}">{{ scope.row.intervalHistory }}</span>
@@ -111,28 +111,28 @@
             <span>{{  row.frozenStatus==1?'冻结':'可用' }}</span>
           </template>
         </el-table-column> -->
-        <el-table-column prop="sourceType" label="来源渠道" min-width="80px" :formatter="formatSourceType"></el-table-column>
+        <el-table-column prop="sourceType" label="来源渠道" min-width="98px" :formatter="formatSourceType"></el-table-column>
         <el-table-column
           prop="remark"
           label="备注"
-          min-width="160px"
+          min-width="128px"
         ></el-table-column>
         <el-table-column
           prop="mainStoreName"
           label="服务门店"
-          min-width="160px"
+          min-width="146px"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           prop="openStoreName"
           label="开卡门店"
-          min-width="160px"
+          min-width="141px"
           show-overflow-tooltip
         ></el-table-column>
         <el-table-column
           prop="intervalEffect"
           label="积分成本主体"
-          min-width="110px"
+          min-width="132px"
           show-overflow-tooltip
         >
           <template slot-scope="scope">

src/components/wechatmembers/wechatmembers.js

@@ -1019,12 +1019,12 @@ export default {
     },
     // premodefiySubStoreId
     promiseAll() {
-      // http://gicdev.demogic.com/api-member/find-member-fields?requestProject=member
-      // http://gicdev.demogic.com/api-member/enterprise-info?requestProject=member
+      // http://www.gicdev.com/api-member/find-member-fields?requestProject=member
+      // http://www.gicdev.com/api-member/enterprise-info?requestProject=member
 
       let urls = [
-        'http://gicdev.demogic.com/api-member/find-member-fields?requestProject=member',
-        'http://gicdev.demogic.com/api-member/enterprise-info?requestProject=member'
+        'http://www.gicdev.com/api-member/find-member-fields?requestProject=member',
+        'http://www.gicdev.com/api-member/enterprise-info?requestProject=member'
       ];
 
       let requests = urls.map(url => fetch(url));

src/config/index.js

 const host = window.location.origin;
 
-export const baseUrl = host.indexOf('localhost') > -1 ? 'http://gicdev.demogic.com' : host;
+export const baseUrl = host.indexOf('localhost') > -1 ? 'http://www.gicdev.com' : host;
 
 export const ERR_OK = 0;

src/request/http.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import QS from 'qs';
 import { Message } from 'element-ui';
 
-axios.defaults.baseURL = window.location.origin.indexOf('localhost') > -1 ? 'http://gicdev.demogic.com' : window.location.origin;
+axios.defaults.baseURL = window.location.origin.indexOf('localhost') > -1 ? 'http://www.gicdev.com' : window.location.origin;
 axios.defaults.timeout = 10000;
 axios.defaults.headers.post['Content-Type'] = 'appliaction/x-www-form-urlencoded;charset=UTF-8';
 

src/test/card-list.vue

@@ -128,7 +128,7 @@ export default {
 
   created() {
     const host = window.location.origin;
-    this.baseUrl = host.indexOf("localhost") > -1 ? 'http://gicdev.demogic.com' : host;
+    this.baseUrl = host.indexOf("localhost") > -1 ? 'http://www.gicdev.com' : host;
   },
 
   mounted() {

src/test/gift-list.vue

@@ -86,7 +86,7 @@ export default {
 
   created() {
     const host = window.location.origin;
-    this.baseUrl = host.indexOf("localhost") > -1 ? 'http://gicdev.demogic.com' : host; 
+    this.baseUrl = host.indexOf("localhost") > -1 ? 'http://www.gicdev.com' : host; 
   },
 
   methods: {

src/test/goods/config.js

 const host = window.location.origin;
 
-export const baseUrl = host.('localhost') ? 'http://gicdev.demogic.com' : host;
+export const baseUrl = host.('localhost') ? 'http://www.gicdev.com' : host;

src/test/linktools.vue

@@ -591,7 +591,7 @@ export default {
     this.giftFlag = false;
     var that = this
     var host = window.location.origin;
-    this.baseUrl = host.indexOf('localhost') > -1 ? 'http://gicdev.demogic.com' : host;
+    this.baseUrl = host.indexOf('localhost') > -1 ? 'http://www.gicdev.com' : host;
   },
   methods: {
     changeVisible() {

src/view/login/login.vue

@@ -124,7 +124,7 @@ export default {
     searchOption() {
       if (this.form.loginName) {
         this.axios
-          .get("http://gicdev.demogic.com/api-auth/list-login-enterprise", {
+          .get("http://www.gicdev.com/api-auth/list-login-enterprise", {
             params: {
               loginName: this.form.loginName
             }
@@ -157,7 +157,7 @@ export default {
         if (this.eid) {
           this.axios
             .post(
-              "http://gicdev.demogic.com/api-auth/do-login",
+              "http://www.gicdev.com/api-auth/do-login",
               qs.stringify({
                 loginName: this.form.loginName,
                 password: this.form.password,
@@ -189,7 +189,7 @@ export default {
         }
       } else {
         this.axios
-          .get("http://gicdev.demogic.com/api-auth/list-login-enterprise", {
+          .get("http://www.gicdev.com/api-auth/list-login-enterprise", {
             params: {
               loginName: this.form.loginName
             }