Skip to content

P
pica-cooperation-cme
提交 88416ac0 编写于 作者: xiaoping.di's avatar xiaoping.di
浏览文件
操作

Merge branch 'feature/dxp' into 'release' 

埋点

See merge request !18
上级 b4abeb98 b0f8e587
流水线 #37181 已失败 于阶段
      隐藏空白字符变更
      内嵌 并排
      正在显示 包含 290 行增加 和 78 行删除
      node_main.js 0 → 100644
      浏览文件 @ 88416ac0
      const path = require('path');
      const axios = require('axios')
      const fs = require('fs');
      const projectName=require('./package.json').name
      const filePath = path.join(__dirname, 'src');
      // 先删除文件
      function deleOldJson(){
      const json_path = path.join(__dirname, 'src/menu_code.json');
      try{
      fs.unlinkSync(json_path);
      }catch(err){
      console.log("没有json 文件")
      }
      };
      deleOldJson()
      // 文件夹是不是存在
      function isFileExisted(filePath) {
      return new Promise((resolve, reject) => {
      fs.access(filePath, (err) => {
      if (err) {
      return reject(false);
      } else {
      return resolve(true);
      }
      });
      });
      }
      // 请求接口获取menucode
      function getMenuCode() {
      let url="https://sc.yunqueyi.com/basic-data/menuCode/fetch";
      //let url="https://dev-sc.yunqueyi.com/basic-data/menuCode/fetch";
      axios.get(url, {params:{"projectName":projectName}})
      .then(res => {
      let resData=res.data;
      if(resData.code=="000000"){
      if(!resData.data){
      console.log("接口data 数据为空");
      return
      }
      return writerJsonFile(JSON.stringify(resData.data.menuCodeDtoList));
      }else{
      console.log("获取接口失败");
      }
      }).catch(error => {
      console.error('请求menu接口失败error',error);
      });
      }
      // 写入json 文件
      function writerJsonFile(data) {
      const wpath = filePath + '/menu_code.json';
      fs.writeFileSync(wpath, data);
      console.log("写入文件成功");
      }
      // 创建目录
      function createFiles(filePath) {
      return new Promise((resolve, reject) => {
      fs.mkdir(filePath, function(err) {
      if(!err) {
      getMenuCode();
      }else{
      console.log('创建目录失败');
      }
      });
      });
      }
      isFileExisted(filePath).then(res => {
      return getMenuCode();
      }).catch(err => {
      // 没有文件创建文件
      createFiles(filePath);
      });
      package-lock.json
      浏览文件 @ 88416ac0
      ...@@ -1900,6 +1900,39 @@ ...@@ -1900,6 +1900,39 @@
      } }
      } }
      }, },
      "@pica-core/web-buried-point": {
      "version": "1.0.9",
      "resolved": "http://192.168.110.93:4873/@pica-core%2fweb-buried-point/-/web-buried-point-1.0.9.tgz",
      "integrity": "sha512-c2hHjLqKTXWXpgN3o7BngGvWTF3g9s7pZb8UiNiC8foEbkwcwWkK7Uo3YuIn1pzR48fYReQkYRRHFm3PHdwoQw==",
      "requires": {
      "axios": "^0.18.0",
      "vue": "^2.5.17"
      },
      "dependencies": {
      "axios": {
      "version": "0.18.1",
      "resolved": "http://192.168.110.93:4873/axios/-/axios-0.18.1.tgz",
      "integrity": "sha1-/z8N4ue10YDnV62YAA8Qgbh7zqM=",
      "requires": {
      "follow-redirects": "1.5.10",
      "is-buffer": "^2.0.2"
      }
      },
      "follow-redirects": {
      "version": "1.5.10",
      "resolved": "http://192.168.110.93:4873/follow-redirects/-/follow-redirects-1.5.10.tgz",
      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
      "requires": {
      "debug": "=3.1.0"
      }
      },
      "is-buffer": {
      "version": "2.0.5",
      "resolved": "http://192.168.110.93:4873/is-buffer/-/is-buffer-2.0.5.tgz",
      "integrity": "sha1-68JS5ADSL/jXf6CYiIIaJKZYwZE="
      }
      }
      },
      "@types/node": { "@types/node": {
      "version": "10.12.0", "version": "10.12.0",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.0.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.0.tgz",
      ...@@ -2614,7 +2647,8 @@ ...@@ -2614,7 +2647,8 @@
      "ansi-regex": { "ansi-regex": {
      "version": "2.1.1", "version": "2.1.1",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "aproba": { "aproba": {
      "version": "1.2.0", "version": "1.2.0",
      ...@@ -2635,12 +2669,14 @@ ...@@ -2635,12 +2669,14 @@
      "balanced-match": { "balanced-match": {
      "version": "1.0.0", "version": "1.0.0",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "brace-expansion": { "brace-expansion": {
      "version": "1.1.11", "version": "1.1.11",
      "bundled": true, "bundled": true,
      "dev": true, "dev": true,
      "optional": true,
      "requires": { "requires": {
      "balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
      "concat-map": "0.0.1" "concat-map": "0.0.1"
      ...@@ -2655,17 +2691,20 @@ ...@@ -2655,17 +2691,20 @@
      "code-point-at": { "code-point-at": {
      "version": "1.1.0", "version": "1.1.0",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "concat-map": { "concat-map": {
      "version": "0.0.1", "version": "0.0.1",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "console-control-strings": { "console-control-strings": {
      "version": "1.1.0", "version": "1.1.0",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "core-util-is": { "core-util-is": {
      "version": "1.0.2", "version": "1.0.2",
      ...@@ -2782,7 +2821,8 @@ ...@@ -2782,7 +2821,8 @@
      "inherits": { "inherits": {
      "version": "2.0.3", "version": "2.0.3",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "ini": { "ini": {
      "version": "1.3.5", "version": "1.3.5",
      ...@@ -2794,6 +2834,7 @@ ...@@ -2794,6 +2834,7 @@
      "version": "1.0.0", "version": "1.0.0",
      "bundled": true, "bundled": true,
      "dev": true, "dev": true,
      "optional": true,
      "requires": { "requires": {
      "number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
      } }
      ...@@ -2808,6 +2849,7 @@ ...@@ -2808,6 +2849,7 @@
      "version": "3.0.4", "version": "3.0.4",
      "bundled": true, "bundled": true,
      "dev": true, "dev": true,
      "optional": true,
      "requires": { "requires": {
      "brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
      } }
      ...@@ -2815,12 +2857,14 @@ ...@@ -2815,12 +2857,14 @@
      "minimist": { "minimist": {
      "version": "0.0.8", "version": "0.0.8",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "minipass": { "minipass": {
      "version": "2.3.5", "version": "2.3.5",
      "bundled": true, "bundled": true,
      "dev": true, "dev": true,
      "optional": true,
      "requires": { "requires": {
      "safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
      "yallist": "^3.0.0" "yallist": "^3.0.0"
      ...@@ -2839,6 +2883,7 @@ ...@@ -2839,6 +2883,7 @@
      "version": "0.5.1", "version": "0.5.1",
      "bundled": true, "bundled": true,
      "dev": true, "dev": true,
      "optional": true,
      "requires": { "requires": {
      "minimist": "0.0.8" "minimist": "0.0.8"
      } }
      ...@@ -2919,7 +2964,8 @@ ...@@ -2919,7 +2964,8 @@
      "number-is-nan": { "number-is-nan": {
      "version": "1.0.1", "version": "1.0.1",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "object-assign": { "object-assign": {
      "version": "4.1.1", "version": "4.1.1",
      ...@@ -2931,6 +2977,7 @@ ...@@ -2931,6 +2977,7 @@
      "version": "1.4.0", "version": "1.4.0",
      "bundled": true, "bundled": true,
      "dev": true, "dev": true,
      "optional": true,
      "requires": { "requires": {
      "wrappy": "1" "wrappy": "1"
      } }
      ...@@ -3016,7 +3063,8 @@ ...@@ -3016,7 +3063,8 @@
      "safe-buffer": { "safe-buffer": {
      "version": "5.1.2", "version": "5.1.2",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "safer-buffer": { "safer-buffer": {
      "version": "2.1.2", "version": "2.1.2",
      ...@@ -3052,6 +3100,7 @@ ...@@ -3052,6 +3100,7 @@
      "version": "1.0.2", "version": "1.0.2",
      "bundled": true, "bundled": true,
      "dev": true, "dev": true,
      "optional": true,
      "requires": { "requires": {
      "code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
      "is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
      ...@@ -3071,6 +3120,7 @@ ...@@ -3071,6 +3120,7 @@
      "version": "3.0.1", "version": "3.0.1",
      "bundled": true, "bundled": true,
      "dev": true, "dev": true,
      "optional": true,
      "requires": { "requires": {
      "ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
      } }
      ...@@ -3114,12 +3164,14 @@ ...@@ -3114,12 +3164,14 @@
      "wrappy": { "wrappy": {
      "version": "1.0.2", "version": "1.0.2",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "yallist": { "yallist": {
      "version": "3.0.3", "version": "3.0.3",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      } }
      } }
      }, },
      ...@@ -4951,12 +5003,14 @@ ...@@ -4951,12 +5003,14 @@
      "balanced-match": { "balanced-match": {
      "version": "1.0.0", "version": "1.0.0",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "brace-expansion": { "brace-expansion": {
      "version": "1.1.11", "version": "1.1.11",
      "bundled": true, "bundled": true,
      "dev": true, "dev": true,
      "optional": true,
      "requires": { "requires": {
      "balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
      "concat-map": "0.0.1" "concat-map": "0.0.1"
      ...@@ -4976,7 +5030,8 @@ ...@@ -4976,7 +5030,8 @@
      "concat-map": { "concat-map": {
      "version": "0.0.1", "version": "0.0.1",
      "bundled": true, "bundled": true,
      "dev": true "dev": true,
      "optional": true
      }, },
      "console-control-strings": { "console-control-strings": {
      "version": "1.1.0", "version": "1.1.0",
      ...@@ -5124,6 +5179,7 @@ ...@@ -5124,6 +5179,7 @@
      "version": "3.0.4", "version": "3.0.4",
      "bundled": true, "bundled": true,
      "dev": true, "dev": true,
      "optional": true,
      "requires": { "requires": {
      "brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
      } }
      ......
      package.json
      浏览文件 @ 88416ac0
      ...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
      }, },
      "dependencies": { "dependencies": {
      "@babel/polyfill": "^7.10.4", "@babel/polyfill": "^7.10.4",
      "@pica-core/web-buried-point": "^1.0.9",
      "axios": "0.16.2", "axios": "0.16.2",
      "clipboard": "^2.0.6", "clipboard": "^2.0.6",
      "pdfjs-dist": "^2.4.456", "pdfjs-dist": "^2.4.456",
      ......
      src/main.js
      浏览文件 @ 88416ac0
      ...@@ -2,13 +2,14 @@ import "@babel/polyfill"; ...@@ -2,13 +2,14 @@ import "@babel/polyfill";
      import Vue from 'vue' import Vue from 'vue'
      import VueRouter from 'vue-router' import VueRouter from 'vue-router'
      import routes from './router/router' import routes from './router/router'
      import handleAllRouter from './public_uat';
      import store from './store/' import store from './store/'
      const mixins = require('@/utils/mixins'); const mixins = require('@/utils/mixins');
      import '@/utils/rem' // 引入自适应 import '@/utils/rem' // 引入自适应
      import '@/utils/yqy-bridge' // 移动端服务 import '@/utils/yqy-bridge' // 移动端服务
      import vueFilters from '@/utils/filter' import vueFilters from '@/utils/filter'
      import VConsole from 'vconsole/dist/vconsole.min.js' import VConsole from 'vconsole/dist/vconsole.min.js'
      import BuriedPoint,{ sendBuriedData} from 'web-buried-point'; import BuriedPoint,{ sendBuriedData} from '@pica-core/web-buried-point';
      import Vant from 'vant'; import Vant from 'vant';
      import 'vant/lib/index.css'; import 'vant/lib/index.css';
      import clipboard from 'clipboard'; import clipboard from 'clipboard';
      ...@@ -87,7 +88,15 @@ Vue.use(BuriedPoint, { ...@@ -87,7 +88,15 @@ Vue.use(BuriedPoint, {
      Vue.prototype.$sendBuriedData = sendBuriedData; Vue.prototype.$sendBuriedData = sendBuriedData;
      Vue.use(Vant); Vue.use(Vant);
      if(process.env.NODE_ENV!="production" || process.env.NODE_ENV!="prod"){
      let objParms={
      projectName:"yqy",
      mode:"hash",
      baseUrl:'/cme/',
      routerConfig:routes
      }
      handleAllRouter(objParms);
      }
      new Vue({ new Vue({
      router, router,
      store, store,
      ......
      src/menu_code.json 0 → 100644
      浏览文件 @ 88416ac0
      [{"id":11,"url":"/","fullPath":"https://phome.yunqueyi.com/cme/#/","host":"https://phome.yunqueyi.com/cme","menuCode":"7800014"},{"id":14,"url":"/index","fullPath":"https://phome.yunqueyi.com/cme/#/index","host":"https://phome.yunqueyi.com/cme","menuCode":"7800017"},{"id":26,"url":"/home","fullPath":"https://phome.yunqueyi.com/cme/#/home","host":"https://phome.yunqueyi.com/cme","menuCode":"7800026"},{"id":39,"url":"/comp2","fullPath":"https://phome.yunqueyi.com/cme/#/comp2","host":"https://phome.yunqueyi.com/cme","menuCode":"7800040"},{"id":50,"url":"/parent","fullPath":"https://phome.yunqueyi.com/cme/#/parent","host":"https://phome.yunqueyi.com/cme","menuCode":"7800048"},{"id":61,"url":"/coop","fullPath":"https://phome.yunqueyi.com/cme/#/coop","host":"https://phome.yunqueyi.com/cme","menuCode":"211"},{"id":69,"url":"/sharecoop","fullPath":"https://phome.yunqueyi.com/cme/#/sharecoop","host":"https://phome.yunqueyi.com/cme","menuCode":"7800065"},{"id":74,"url":"/test","fullPath":"https://phome.yunqueyi.com/cme/#/test","host":"https://phome.yunqueyi.com/cme","menuCode":"7800071"},{"id":82,"url":"/credit-edit","fullPath":"https://phome.yunqueyi.com/cme/#/credit-edit","host":"https://phome.yunqueyi.com/cme","menuCode":"7800077"},{"id":87,"url":"/credit-detail","fullPath":"https://phome.yunqueyi.com/cme/#/credit-detail","host":"https://phome.yunqueyi.com/cme","menuCode":"7800084"},{"id":93,"url":"/excg-tips","fullPath":"https://phome.yunqueyi.com/cme/#/excg-tips","host":"https://phome.yunqueyi.com/cme","menuCode":"7800088"},{"id":98,"url":"/icredit-detail","fullPath":"https://phome.yunqueyi.com/cme/#/icredit-detail","host":"https://phome.yunqueyi.com/cme","menuCode":"7800093"},{"id":100,"url":"/not-found","fullPath":"https://phome.yunqueyi.com/cme/#/not-found","host":"https://phome.yunqueyi.com/cme","menuCode":"7800096"},{"id":106,"url":"/goods-detail","fullPath":"https://phome.yunqueyi.com/cme/#/goods-detail","host":"https://phome.yunqueyi.com/cme","menuCode":"7800101"}]
      \ No newline at end of file
      src/public_uat.js 0 → 100644
      浏览文件 @ 88416ac0
      import axios from 'axios';
      // 整理路由
      const routerObj={};
      let baseUrl=process.env.VUE_APP_BASE_ROUTE_URL || process.env.BASE_URL || "";
      let fullHost=location.host;
      let rMode="history";
      let projectName="";
      // 处理路由children
      function allRouter(ele,spath){
      for(var i=0;i< ele.length;i++){
      if(ele[i].path){
      let key="";
      if(spath && spath!='/'){
      key=spath + "/"+ele[i].path;
      }else{
      key=ele[i].path
      };
      routerObj[key]= key;
      if(ele[i].children){
      allRouter(ele[i].children,ele[i].path);
      }
      }
      }
      };
      // 处理路由
      function handleAllRouter(parmsObj){
      parmsObj.mode=parmsObj.mode || rMode;
      projectName=parmsObj.projectName;
      baseUrl=baseUrl || parmsObj.baseUrl || '';
      let fhost=parmsObj.fullHost || fullHost;
      if(baseUrl.substr(baseUrl.length-1,1)=="/"){
      baseUrl=baseUrl.substr(0,baseUrl.length-1)
      }
      if(parmsObj.mode=='hash'){
      baseUrl=baseUrl+"/#"
      };
      allRouter(parmsObj.routerConfig,'');
      let arr=[];
      for(var key in routerObj){
      let optionObj={};
      optionObj.url=routerObj[key];
      optionObj.fullPath=fhost+baseUrl+routerObj[key]
      optionObj.host=fhost;
      arr.push(optionObj)
      }
      sendAllRouterInfo(arr)
      }
      // 发送请求
      function sendAllRouterInfo(data){
      let url="https://dev-sc.yunqueyi.com/basic-data/menuCode/upload";
      if(process.env.NODE_ENV!="development"){
      url="https://sc.yunqueyi.com/basic-data/menuCode/upload";
      }
      let obj={
      projectName:projectName,
      menuCodeDtoList:data
      }
      axios({
      method: 'post',
      url:url,
      data: obj
      }).then(res=>{
      console.log("请求接口成功了",res.data)
      return
      }).catch(err=>{
      console.log("errerrerr")
      return
      });
      }
      export default handleAllRouter
      src/router/router.js
      浏览文件 @ 88416ac0
      ...@@ -13,70 +13,70 @@ const excgtips = r => require.ensure([], () => r(require('../views/exchange-tips ...@@ -13,70 +13,70 @@ const excgtips = r => require.ensure([], () => r(require('../views/exchange-tips
      const icreditdetail = r => require.ensure([], () => r(require('../views/I-credit-detail')), 'I-credit-detail') const icreditdetail = r => require.ensure([], () => r(require('../views/I-credit-detail')), 'I-credit-detail')
      const notFound = r => require.ensure([], () => r(require('../views/not-found')), 'not-found') const notFound = r => require.ensure([], () => r(require('../views/not-found')), 'not-found')
      const goodsDetail = r => require.ensure([], () => r(require('../views/goods-detail')), 'goods-detail') const goodsDetail = r => require.ensure([], () => r(require('../views/goods-detail')), 'goods-detail')
      const routerConfig=[
      {
      path: '',
      redirect: '/index'
      },
      {
      path: '/index',
      component: index
      },
      {
      path: '/home',
      component: index
      },
      // {
      // path: '/coop',
      // component: cooplist
      // },
      {
      path: '/comp2',
      component: complist
      },
      {
      path: '/parent',
      component: parent
      },
      {
      path: '/coop',
      component: merge
      },
      {
      path: '/sharecoop',
      component: shareMerge
      },
      {
      path: '/test',
      component: test
      },
      {
      path: '/credit-edit',
      component: creditedit
      },
      {
      path: '/credit-detail',
      component: creditdetail
      },
      {
      path: '/excg-tips',
      component: excgtips
      },
      {
      path: '/icredit-detail',
      component: icreditdetail
      },
      {
      path: '/not-found',
      component: notFound
      },
      {
      path: '/goods-detail',
      component: goodsDetail
      },
      ]
      export default [{ export default [{
      path: '/', path: '/',
      component: App, component: App,
      children: [ children: routerConfig
      {
      path: '',
      redirect: '/index'
      },
      {
      path: '/index',
      component: index
      },
      {
      path: '/home',
      component: index
      },
      // {
      // path: '/coop',
      // component: cooplist
      // },
      {
      path: '/comp2',
      component: complist
      },
      {
      path: '/parent',
      component: parent
      },
      {
      path: '/coop',
      component: merge
      },
      {
      path: '/sharecoop',
      component: shareMerge
      },
      {
      path: '/test',
      component: test
      },
      {
      path: '/credit-edit',
      component: creditedit
      },
      {
      path: '/credit-detail',
      component: creditdetail
      },
      {
      path: '/excg-tips',
      component: excgtips
      },
      {
      path: '/icredit-detail',
      component: icreditdetail
      },
      {
      path: '/not-found',
      component: notFound
      },
      {
      path: '/goods-detail',
      component: goodsDetail
      },
      ]
      }] }]
      Markdown 格式
      0% or
      您添加了 0 人 到此讨论。请谨慎行事。
      先完成此消息的编辑！
      想要评论请 注册 或