Merge branch 'feature/099_customer_filter' into 'dev'

Feature/099 customer filter

See merge request !10

src/utils/request.js

-import axios from 'axios'
-import { Notification, MessageBox, Message } from 'element-ui'
-import store from '@/store'
-import { getToken } from '@/utils/auth'
-import errorCode from '@/utils/errorCode'
+import axios from "axios";
+import { Notification, MessageBox, Message } from "element-ui";
+import store from "@/store";
+import { getToken } from "@/utils/auth";
+import errorCode from "@/utils/errorCode";
 import Cookies from "js-cookie";
-import {getTenantEnable} from "@/utils/ruoyi";
-import { getLocale } from '@/utils/db';
+import { getTenantEnable } from "@/utils/ruoyi";
+import { getLocale } from "@/utils/db";
 import i18n from "@/i18n";
 
 // 是否显示重新登录
 export let isRelogin = { show: false };
 
-axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: (localStorage.VUE_APP_BASE_API || process.env.VUE_APP_BASE_API) + '/admin-api/', // 此处的 /admin-api/ 地址，原因是后端的基础路径为 /admin-api/
+  baseURL:
+    (localStorage.VUE_APP_BASE_API || process.env.VUE_APP_BASE_API) +
+    "/admin-api/", // 此处的 /admin-api/ 地址，原因是后端的基础路径为 /admin-api/
   // 超时
-  timeout: 1000 * 30
-})
+  timeout: 1000 * 30,
+});
 
 // 如果是生产环境则打印提示
-if (process.env.NODE_ENV === 'development' && service.defaults.baseURL === 'https://api2.groupage.cn/admin-api/') {
-  console.log('%c请注意，当前为生产环境请谨慎操作!!', 'background-color: red; font-size: 3em; color:yellow');
-  console.log('%c接口地址：' + service.defaults.baseURL, 'background-color: black; font-size: 1.5em; color:yellow !important');
+if (
+  process.env.NODE_ENV === "development" &&
+  service.defaults.baseURL === "https://api2.groupage.cn/admin-api/"
+) {
+  console.log(
+    "%c请注意，当前为生产环境请谨慎操作!!",
+    "background-color: red; font-size: 3em; color:yellow"
+  );
+  console.log(
+    "%c接口地址：" + service.defaults.baseURL,
+    "background-color: black; font-size: 1.5em; color:yellow !important"
+  );
 }
 
 // request拦截器
-service.interceptors.request.use(config => {
-  config.headers['locale'] = getLocale()
-  // 是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  if (getToken() && !isToken) {
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  // 设置租户
-  if (getTenantEnable()) {
-    const tenantId = Cookies.get('tenantId');
-    if (tenantId) {
-      config.headers['tenant-id'] = tenantId;
+service.interceptors.request.use(
+  (config) => {
+    config.headers["locale"] = getLocale();
+    // 是否需要设置 token
+    const isToken = (config.headers || {}).isToken === false;
+    if (getToken() && !isToken) {
+      config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
     }
-  }
-  // get请求映射params参数
-  if (config.method === 'get' && config.params) {
-    let url = config.url + '?';
-    for (const propName of Object.keys(config.params)) {
-      const value = config.params[propName];
-      var part = encodeURIComponent(propName) + "=";
-      if (value !== null && typeof(value) !== "undefined") {
-        if (typeof value === 'object') {
-          for (const key of Object.keys(value)) {
-            let params = propName + '[' + key + ']';
-            var subPart = encodeURIComponent(params) + "=";
-            url += subPart + encodeURIComponent(value[key]) + "&";
+    // 设置租户
+    if (getTenantEnable()) {
+      const tenantId = Cookies.get("tenantId");
+      if (tenantId) {
+        config.headers["tenant-id"] = tenantId;
+      }
+    }
+    // get请求映射params参数
+    if (config.method === "get" && config.params) {
+      let url = config.url + "?";
+      for (const propName of Object.keys(config.params)) {
+        const value = config.params[propName];
+        var part = encodeURIComponent(propName) + "=";
+        if (value !== null && typeof value !== "undefined") {
+          if (typeof value === "object") {
+            for (const key of Object.keys(value)) {
+              let params = propName + "[" + key + "]";
+              var subPart = encodeURIComponent(params) + "=";
+              url += subPart + encodeURIComponent(value[key]) + "&";
+            }
+          } else {
+            url += part + encodeURIComponent(value) + "&";
           }
-        } else {
-          url += part + encodeURIComponent(value) + "&";
         }
       }
+      url = url.slice(0, -1);
+      config.params = {};
+      config.url = url;
     }
-    url = url.slice(0, -1);
-    config.params = {};
-    config.url = url;
+    return config;
+  },
+  (error) => {
+    console.log(error);
+    Promise.reject(error);
   }
-  return config
-}, error => {
-    console.log(error)
-    Promise.reject(error)
-})
+);
 
 // 响应拦截器
-service.interceptors.response.use(res => {
+service.interceptors.response.use(
+  (res) => {
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息
-    const msg = errorCode[code] || res.data.msg || errorCode['default']
+    const msg = errorCode[code] || res.data.msg || errorCode["default"];
     if (code === 401) {
       if (!isRelogin.show) {
         isRelogin.show = true;
-        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消',
-            type: 'warning'
+        MessageBox.confirm(
+          "登录状态已过期，您可以继续留在该页面，或者重新登录",
+          "系统提示",
+          {
+            confirmButtonText: "重新登录",
+            cancelButtonText: "取消",
+            type: "warning",
           }
-        ).then(() => {
-          isRelogin.show = false;
-          store.dispatch('LogOut').then(() => {
-            location.href = '/';
+        )
+          .then(() => {
+            isRelogin.show = false;
+            store.dispatch("LogOut").then(() => {
+              location.href = "/";
+            });
           })
-        }).catch(() => {
-          isRelogin.show = false;
-        });
+          .catch(() => {
+            isRelogin.show = false;
+          });
       }
-      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+      return Promise.reject("无效的会话，或者会话已过期，请重新登录。");
     } else if (code === 500) {
       Message({
         dangerouslyUseHTMLString: true,
         message: msg,
-        type: 'error'
-      })
-      return Promise.reject(new Error(msg))
+        type: "error",
+      });
+      return Promise.reject(new Error(msg));
     } else if (code === 901) {
       Message({
-        type: 'error',
+        type: "error",
         duration: 0,
         dangerouslyUseHTMLString: true,
-        message: '<div>演示模式，无法进行写操作</div>'
-          + '<div> &nbsp; </div>'
-          + '<div>参考 https://doc.iocoder.cn/ 教程</div>'
-          + '<div> &nbsp; </div>'
-          + '<div>5 分钟搭建本地环境</div>',
-      })
-      return Promise.reject(new Error(msg))
+        message:
+          "<div>演示模式，无法进行写操作</div>" +
+          "<div> &nbsp; </div>" +
+          "<div>参考 https://doc.iocoder.cn/ 教程</div>" +
+          "<div> &nbsp; </div>" +
+          "<div>5 分钟搭建本地环境</div>",
+      });
+      return Promise.reject(new Error(msg));
     } else if (code === 555) {
       // 额外情况
-      return Promise.reject(res.data)
+      return Promise.reject(res.data);
     } else if (code === 566) {
       // 额外情况
-      return Promise.reject(res.data)
+      return Promise.reject(res.data);
     } else if (code === 666) {
       // 额外情况
-      return Promise.reject(res.data)
+      return Promise.reject(res.data);
     } else if (code !== 200) {
       // 如果内容很长则用alert提示，不然可能显示不全，自动隐藏也会导致看不完整就消失了
-      if(msg.length > 300){
-        MessageBox.alert(msg, i18n.t('错误提示'), i18n.t('确定'))
-      }else{
+      if (msg.length > 300) {
+        MessageBox.alert(msg, i18n.t("错误提示"), i18n.t("确定"));
+      } else {
         Notification.error({
-          title: msg
-        })
+          title: msg,
+        });
       }
 
-      return Promise.reject(msg || 'error')
+      return Promise.reject(msg || "error");
     } else {
-      return res.data
+      return res.data;
     }
   },
-  error => {
-    console.log('err' + error)
+  (error) => {
+    console.log("err" + error);
     let { message } = error;
     if (message === "Network Error") {
       message = "后端接口连接异常";
-    }
-    else if (message.includes("timeout")) {
+    } else if (message.includes("timeout")) {
       message = "系统接口请求超时";
-    }
-    else if (message.includes("Request failed with status code")) {
+    } else if (message.includes("Request failed with status code")) {
       message = "系统接口" + message.substr(message.length - 3) + "异常";
     }
     Message({
       message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
+      type: "error",
+      duration: 5 * 1000,
+    });
+    return Promise.reject(error);
   }
-)
+);
 
 export function getBaseHeader() {
   return {
-    'Authorization': "Bearer " + getToken(),
-    'tenant-id': Cookies.get('tenantId'),
-  }
+    Authorization: "Bearer " + getToken(),
+    "tenant-id": Cookies.get("tenantId"),
+  };
 }
 
-export default service
+export default service;

src/views/ecw/memberManagement/addIntegrationRuleOperation/index.vue

@@ -917,7 +917,7 @@ export default {
     "queryParams.dateRangeCreateTime": {
       handler: function (newVal, oldVal) {
         this.$nextTick(() => {
-          if (newVal.length > 0) {
+          if (newVal.length) {
             this.queryParams.startTime = newVal[0];
             this.queryParams.endTime = newVal[1];
           } else {

src/views/ecw/memberManagement/exchangeRecord/index.vue

@@ -676,7 +676,7 @@ export default {
     //导出
     handleBatchExport() {
       let params = { ...this.queryParams };
-      if (this.dateRangeCreateTime.length > 0) {
+      if (this.dateRangeCreateTime) {
         params.startTime = this.dateRangeCreateTime[0];
         params.endTime = this.dateRangeCreateTime[1];
         params.pageNo = null;
@@ -795,7 +795,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNo = 1;
       let params = { ...this.queryParams };
-      if (this.dateRangeCreateTime.length > 0) {
+      if (this.dateRangeCreateTime) {
         params.startTime = this.dateRangeCreateTime[0];
         params.endTime = this.dateRangeCreateTime[1];
       }
@@ -807,7 +807,7 @@ export default {
     },
     handleQueryPagination() {
       let params = { ...this.queryParams };
-      if (this.dateRangeCreateTime.length > 0) {
+      if (this.dateRangeCreateTime) {
         params.startTime = this.dateRangeCreateTime[0];
         params.endTime = this.dateRangeCreateTime[1];
       }

src/views/ecw/memberManagement/exchangeRecordOperation/index.vue

@@ -746,6 +746,7 @@ export default {
               if (res.code == "0") {
                 this.queryParamsList = this.resetForm();
                 this.$message.success(this.$t("兑换成功"));
+                this.$router.go(-1);
               }
             });
           }

src/views/ecw/memberManagement/integralRecord/index.vue

@@ -167,7 +167,7 @@
           {{ parseTime(row.createTime) || "/" }}</template
         >
       </el-table-column>
-      <el-table-column :label="$t('详细信息')" align="center">
+      <el-table-column width="300" :label="$t('详细信息')" align="center">
         <template v-slot="{ row }">
           <!--  人工操作-->
           <span v-if="row.sourceType == '1'">{{
@@ -296,7 +296,7 @@ export default {
       this.queryParams.pageNo = 1;
       let params = { ...this.queryParams };
 
-      if (this.dateRangeCreateTime.length > 0) {
+      if (this.dateRangeCreateTime) {
         params.startTime = this.dateRangeCreateTime[0];
         params.endTime = this.dateRangeCreateTime[1];
       }
@@ -308,7 +308,7 @@ export default {
     },
     handleQueryPagination() {
       let params = { ...this.queryParams };
-      if (this.dateRangeCreateTime.length > 0) {
+      if (this.dateRangeCreateTime) {
         params.startTime = this.dateRangeCreateTime[0];
         params.endTime = this.dateRangeCreateTime[1];
       }

src/views/ecw/memberManagement/memberPointsSummary/index.vue

@@ -344,8 +344,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNo = 1;
       let params = { ...this.queryParams };
-
-      if (this.dateRangeCreateTime.length > 0) {
+      if (this.dateRangeCreateTime) {
         params.startTime = this.dateRangeCreateTime[0];
         params.endTime = this.dateRangeCreateTime[1];
       }
@@ -357,7 +356,7 @@ export default {
     },
     handleQueryPagination() {
       let params = { ...this.queryParams };
-      if (this.dateRangeCreateTime.length > 0) {
+      if (this.dateRangeCreateTime) {
         params.startTime = this.dateRangeCreateTime[0];
         params.endTime = this.dateRangeCreateTime[1];
       }

src/views/member/user/memberDetails.vue

@@ -1051,7 +1051,7 @@ export default {
     handleQueryRecord() {
       this.queryParamsRecord.pageNo = 1;
       let params = { ...this.queryParamsRecord };
-      if (this.dateRangeCreateTimeRecord.length > 0) {
+      if (this.dateRangeCreateTimeRecord > 0) {
         params.startTime = this.dateRangeCreateTimeRecord[0];
         params.endTime = this.dateRangeCreateTimeRecord[1];
       }
@@ -1083,7 +1083,7 @@ export default {
 
     handleQueryPaginationRecord() {
       let params = { ...this.queryParamsRecord };
-      if (this.dateRangeCreateTimeRecord.length > 0) {
+      if (this.dateRangeCreateTimeRecord) {
         params.startTime = this.dateRangeCreateTimeRecord[0];
         params.endTime = this.dateRangeCreateTimeRecord[1];
       }
@@ -1108,7 +1108,7 @@ export default {
       this.queryParams.pageNo = 1;
       let params = { ...this.queryParams };
 
-      if (this.dateRangeCreateTime.length > 0) {
+      if (this.dateRangeCreateTime) {
         params.startTime = this.dateRangeCreateTime[0];
         params.endTime = this.dateRangeCreateTime[1];
       }
@@ -1120,7 +1120,7 @@ export default {
     },
     handleQueryPagination() {
       let params = { ...this.queryParams };
-      if (this.dateRangeCreateTime.length > 0) {
+      if (this.dateRangeCreateTime) {
         params.startTime = this.dateRangeCreateTime[0];
         params.endTime = this.dateRangeCreateTime[1];
       }