add

pages/goods/addReceiving.vue

@@ -89,7 +89,7 @@
         data() {
         data() {
             return {
             return {
                 noexebshowFalg: true, //控制是否会触发生命周期
                 noexebshowFalg: true, //控制是否会触发生命周期
-                array: ['FedEx', 'DHL', 'UPS', '顺丰', 'Air'],
+                array: ['FedEx', 'DHL', 'UPS', '顺丰', 'Air', '京东', '其他'],
                 textArr: ['物流', '送货', '上门取货'],
                 textArr: ['物流', '送货', '上门取货'],
                 unitArr: ['件', '箱'],
                 unitArr: ['件', '箱'],
                 index: -1,
                 index: -1,

pages/home/index.vue

@@ -190,16 +190,19 @@
                 if (item.name == '快递回单上传') {
                 if (item.name == '快递回单上传') {
                     this.scanChange();
                     this.scanChange();
                 } else if (item.name == '打印标签') {
                 } else if (item.name == '打印标签') {
-                    //是否启用蓝牙wifi打印
-                    if (this.userInfo.is_new_print == 1) {
-                        uni.navigateTo({
-                            url: '/pages/tag/printNew'
-                        });
-                    } else {
                     uni.navigateTo({
                     uni.navigateTo({
                         url: '/pages/tag/print'
                         url: '/pages/tag/print'
                     });
                     });
-                    }
+                    //是否启用蓝牙wifi打印
+                    // if (this.userInfo.is_new_print == 1) {
+                    //     uni.navigateTo({
+                    //         url: '/pages/tag/printNew'
+                    //     });
+                    // } else {
+                    //     uni.navigateTo({
+                    //         url: '/pages/tag/print'
+                    //     });
+                    // }
                 } else if (item.name == '追加标签') {
                 } else if (item.name == '追加标签') {
                     uni.navigateTo({
                     uni.navigateTo({
                         url: '/pages/tag/repairPrint'
                         url: '/pages/tag/repairPrint'

util/api.js

-// const API_BASE = 'https://api.ichunt.com';
-// const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
-// const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统
+const API_BASE = 'https://api.ichunt.com';
+const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
+const API_BASE_WMS = 'https://wms.ichunt.net'; //WMS系统
 
 
-const API_BASE = 'http://api.liexin.com';
-const API_BASE_OSS = 'http://image.liexindev.net';
-const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统
+// const API_BASE = 'http://api.liexin.com';
+// const API_BASE_OSS = 'http://image.liexindev.net';
+// const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统
 
 
 const API = {
 const API = {
     /**
     /**