Browse Source

Merge branch 'deploy_0804' of jianguan-web/jg-ocs-html into master

陈瑞 3 years ago
parent
commit
83d31302f3

+ 2 - 2
.env.preview

@@ -1,7 +1,7 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=http://ocs-admin.360arrow.com.cn/ocs-admin
-VUE_APP_WX_BASE_URL=//ocs-admin.360arrow.com.cn/ocs-admin/websocket/
+VUE_APP_API_BASE_URL=http://p.ocs.360arrow.com/ocs-admin
+VUE_APP_WX_BASE_URL=//p.ocs.360arrow.com/ocs-admin/websocket/
 VUE_APP_VERSION=V1.0.1
 VUE_APP_ENVTIPS=预发布环境
 VUE_APP_PRO_NAME=箭冠运营中心系统

+ 1 - 1
src/views/salesManagement/pushOrderManagement/chooseTypeModal.vue

@@ -51,7 +51,7 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       form: {
-        id: undefined
+        id: 'all'
       },
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }]

+ 1 - 1
vue.config.js

@@ -109,7 +109,7 @@ const vueConfig = {
     proxy: {
       '/api': {
         // target: 'http://192.168.16.194:8602/ocs-admin',
-        target: 'http://ocs-admin.360arrow.com.cn/ocs-admin', //  Ô¤·¢²¼
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         // target: 'http://ocs-admin.360arrow.com/ocs-admin', //  Éú²ú
         ws: false,
         changeOrigin: true,