Merge branch 'v3.0' into company

src/config/env.development.js

@@ -3,10 +3,10 @@ module.exports = {
   title: '采销平台',
   baseUrl: 'http://wx.wxhr.sit.futurelab.tv',
   api: {
-    baseApi: 'http://stocknew.test241.wanyuhengtong.com/'
+    baseApi: 'http://stock.api.caixiao365.com/'
     // baseApi: 'http://stockwm.test241.wanyuhengtong.com/'
   },
-  webUrl: 'http://project.web.caixiao365.com/#/test-good-share?id=',
+  webUrl: 'http://project.web.caixiao365.com/#/good-share?id=',
   fileURL: `https://api2.edu.futurelab.tv`,
   shareWebUrl: 'http://post.web.caixiao365.com/?prod=1&outCode=',
   // 分仓
@@ -21,9 +21,9 @@ module.exports = {
   // 结算平台url
   // settlementPlatformUrl: 'http://127.0.0.1:8848',
   // 结算平台url
-  settlementPlatformUrl: 'http://webcx.test241.wanyuhengtong.com/',
+  settlementPlatformUrl: 'http://fin.caixiao365.com/',
   // 工单管理系统url
-  GDUrl: 'http://localhost:8080/',
+  GDUrl: 'http://bug.caixiao365.com/',
   // token加密key
   secretKey: 'key123',
   loginTitle: '',

src/config/env.v3.js

@@ -22,8 +22,8 @@ module.exports = {
   // settlementPlatformUrl: 'http://127.0.0.1:8848',
   // 结算平台url
   settlementPlatformUrl: 'http://fin.caixiao365.com/',
-   // 工单管理系统url
-  GDUrl: 'http://http://bugweb.test241.wanyuhengtong.com/',
+  // 工单管理系统url
+  GDUrl: 'http://bug.caixiao365.com/',
   // token加密key
   secretKey: 'key123',
   loginTitle: '',

src/layout/components/Navbar.vue

@@ -46,7 +46,7 @@
         <p
           class="username"
           style="font-size:14px;color:#5a5e66;font-weight:500;line-height:54px;margin:0px 5px;cursor:pointer"
-          @click="openAlert"
+          @click="openSettlementSystem(GDurl)"
         >
           工单
         </p>