Merge remote-tracking branch 'origin/master'

xinkeaboard-admin/config/router.config.js

@@ -578,9 +578,9 @@ export default [
       },
       // 订单管理
       {
-        path: '/manage_order/order_manage_list',
+        path: '/manage_neworder/order_manage_list',
         icon: 'form',
-        name: 'manage_order_list',
+        name: 'neworder',
         component: './manage/order_manage/order_list',
         // routes: []
       },

xinkeaboard-admin/src/locales/zh-CN/menu.js

@@ -62,7 +62,7 @@ export default {
   'menu.agreement': '协议管理',
   'menu.agreement.lists': '协议管理',
   'menu.order': '询盘管理',
-  'menu.manage_order_list': '订单管理',
+  'menu.neworder': '订单管理',
   'menu.order.order_lists': '全部订单',
   'menu.order.service': '售后管理',
   'menu.order.evaluation': '评价管理',

xinkeaboard-admin/src/models/login.js

@@ -22,9 +22,14 @@ export default {
           localStorage.setItem('sld_menu_data', JSON.stringify(response.data.resourceList));
           let sld_all_routes = [];//所有页面的路由
           response.data.resourceList.map(item=>{
-            item.children.map(child=>{
-              sld_all_routes.push(child.frontPath)
-            })
+            if (item.children.length) {
+              item.children.map(child=>{
+                sld_all_routes.push(child.frontPath)
+              })
+            } else {
+              sld_all_routes.push(item.frontPath)
+            }
+
           })
           localStorage.setItem('sld_all_routes', JSON.stringify(sld_all_routes));
           let tmp_data = response.data.resourceList;

xinkeaboard-admin/src/models/menu.js

@@ -42,12 +42,12 @@ const memoizeOneFormatter = memoizeOne(formatter, isEqual);
 /**
  * get SubMenu or Item
  */
-const getSubMenu = item => {
+const getSubMenu = (item, blackList = []) => {
   // doc: add hideChildrenInMenu
   if (item.children && !item.hideChildrenInMenu && item.children.some(child => child.name)) {
     return {
       ...item,
-      children: filterMenuData(item.children), // eslint-disable-line
+      children: filterMenuData(item.children, blackList), // eslint-disable-line
     };
   }
   return item;
@@ -56,14 +56,14 @@ const getSubMenu = item => {
 /**
  * filter menuData
  */
-const filterMenuData = menuData => {
+const filterMenuData = (menuData, blackList = []) => {
   if (!menuData) {
     return [];
   }
   return menuData
     .filter(item => item.name && !item.hideInMenu)
-    .map(item => check(item.authority, getSubMenu(item)))
-    .filter(item => item);
+    .map(item => check(item.authority, getSubMenu(item, blackList)))
+    .filter(item => !blackList.includes(item.path));
 };
 /**
  * 获取面包屑映射
@@ -96,7 +96,7 @@ export default {
   },
 
   effects: {
-    * getMenuData({ payload }, { put }) {
+    * getMenuData({ payload }, { put, select }) {
       let { routes, authority } = payload;
       let routes_copy = JSON.parse(JSON.stringify(routes));
       //根据接口返回数据组装菜单
@@ -119,8 +119,9 @@ export default {
           }
         }
       }
-      const menuData = filterMenuData(memoizeOneFormatter(routes_copy, authority));
-
+      const currentSite = yield select(state => state.global.currentSite);
+      const blackList = currentSite === '1' ? ['/manage_order/ai_business_intelligence'] : ['/manage_neworder/order_manage_list']
+      const menuData = filterMenuData(memoizeOneFormatter(routes_copy, authority), blackList);
       const breadcrumbNameMap = memoizeOneGetBreadcrumbNameMap(menuData);
       yield put({
         type: 'save',

xinkeaboard-admin/src/pages/manage/models/order.js

@@ -208,7 +208,7 @@ export default {
       },
       // ai商情报告列表
       *get_ai_business_list({ payload, callback }, { call }) {
-        const response = yield call(sldCommonService, payload, 'get', 'analysis/aiList');
+        const response = yield call(sldCommonService, payload, 'get', 'v3/ai/history/aiList');
         if (callback) callback(response);
       }
     },

xinkeaboard-admin/src/pages/manage/order/enquiry/ai_business_intelligence.js

@@ -1,4 +1,5 @@
 import { connect } from "dva/index";
+import router from "umi/router";
 import React, { Component, Fragment } from "react";
 import { Form, Spin, Switch } from "antd";
 import {
@@ -44,6 +45,7 @@ export default class EnquiryLists extends Component {
       show_foot: false,
       data: {}, //列表数据
       title: "",
+      currentSite: props.global.currentSite,
       params: { pageSize: pageSize }, //搜索条件
       operateData: [], //操作的数据
       formValues: {}, //搜索条件、
@@ -70,7 +72,7 @@ export default class EnquiryLists extends Component {
         },
         {
           title: `${sldComLanguage("月份")}`,
-          dataIndex: "email",
+          dataIndex: "queryMonth",
           align: "center",
           width: 80,
         },
@@ -124,11 +126,18 @@ export default class EnquiryLists extends Component {
   }
 
   componentDidMount() {
+    const { currentSite } = this.state;
+    if (currentSite !== "2") {
+      router.push("/manage_order/enquiry");
+      return;
+    }
     this.get_list({ pageSize: pageSize });
   }
 
-  detailRecord = () => {
-    
+  detailRecord = (record) => {
+    if (record.pdfUrl) {
+      window.open(record.pdfUrl, '_blank')
+    }
   }
 
   //获取数据列表

xinkeaboard-admin/src/pages/manage/order_manage/order_list.js

@@ -1,18 +1,31 @@
 import { Component } from "react";
+import { connect } from "dva";
 import router from "umi/router";
 
+@connect(({ global }) => ({
+  global,
+}))
 export default class BasicIframe extends Component {
   constructor(props) {
     super(props);
+    this.state = {
+      currentSite: props.global.currentSite,
+    }
+    this.src = 'https://xinke.sutextech.com/admin/order/orderby9710/?token=7d591e1b1bd66c936f9b3b5bb153ca7a7f786626'
+  }
+
+  componentDidMount() {
+    const { currentSite } = this.state;
+    if (currentSite !== "1") {
+      router.push("/manage_order/enquiry");
+    }
   }
 
   render() {
     return (
       <div style={{ width: "100%", height: "100%" }}>
         <iframe
-          src={
-            "https://xinke.sutextech.com/admin/order/orderby9710/?token=7d591e1b1bd66c936f9b3b5bb153ca7a7f786626"
-          }
+          src={this.src}
           width="100%"
           height="100%"
           frameBorder="0"