add

assets/css/tally/abnormalTally.scss

@@ -36,7 +36,7 @@
             height: 48rpx;
             background: #ffffff;
             border-radius: 4rpx;
-            border: 1rpx solid #197adb;
+            border: 1px solid #197adb;
             font-size: 24rpx;
             color: #197adb;
         }
@@ -80,7 +80,7 @@
                 width: 40rpx;
                 height: 28rpx;
                 border-radius: 4rpx;
-                border: 1rpx solid #197adb;
+                border: 1px solid #197adb;
                 font-size: 22rpx;
                 color: #197adb;
             }

assets/css/tally/index.scss

@@ -25,7 +25,7 @@
                 height: 48rpx;
                 background: #ffffff;
                 border-radius: 4rpx;
-                border: 1rpx solid #197adb;
+                border: 1px solid #197adb;
                 font-size: 24rpx;
                 color: #197adb;
             }
@@ -93,7 +93,7 @@
                 padding-bottom: 16rpx;
             }
             .w130 {
-                width: 130rpx;
+                width: 156rpx;
             }
             .t1 {
                 font-size: 28rpx;
@@ -104,7 +104,7 @@
                 width: 48rpx;
                 height: 36rpx;
                 border-radius: 4rpx;
-                border: 1rpx solid #197adb;
+                border: 1px solid #197adb;
                 font-size: 24rpx;
                 color: #197adb;
                 margin-left: 16rpx;
@@ -119,7 +119,7 @@
             }
             .input-text {
                 .uni-input {
-                    width: 190rpx;
+                    width: 173rpx;
                     height: 48rpx;
                     background: #e6edf0;
                     border-radius: 4rpx;
@@ -134,7 +134,7 @@
                     width: 88rpx;
                     height: 88rpx;
                     background-color: #f1f4f6;
-                    border: 1rpx solid #e6edf0;
+                    border: 1px solid #e6edf0;
                     .iconfont {
                         font-size: 48rpx;
                         color: #d8d8d8;
@@ -212,7 +212,7 @@
             height: 44rpx;
             background: #ffffff;
             border-radius: 4rpx;
-            border: 1rpx solid #197adb;
+            border: 1px solid #197adb;
             margin-right: 16rpx;
             margin-bottom: 16rpx;
             .text {

pages/tally/abnormalTally.vue

@@ -152,8 +152,8 @@
             confirm() {
                 if (!this.abnormal_batch) {
                     uni.showToast({
-                        title: '请输入异常批次号',
-                        icon: 'none'
+                        title: '请输入异常批次',
+                        icon: 'error'
                     });
                     return false;
                 }
@@ -257,7 +257,7 @@
                 if (!val) {
                     uni.showToast({
                         title: '请输入毛重',
-                        icon: 'none'
+                        icon: 'error'
                     });
                     return false;
                 }

pages/tally/fixBox.vue

@@ -77,11 +77,13 @@
              */
             add() {
                 if (!this.keyword) {
-                    uni.showToast({
-                        title: '请输入箱号',
-                        icon: 'none'
+                    uni.showModal({
+                        title: '',
+                        content: '请先扫描箱号',
+                        showCancel: false
                     });
                     return false;
+                    return false;
                 }
 
                 // 检查输入的箱号是否已经存在于列表中

util/api.js

 // const API_BASE = 'https://api.ichunt.com';
 // const API_BASE_OSS = 'https://image.ichunt.net'; //oss系统
+// const API_BASE_OSS_HK = 'http://hk.image.semour.com'; //oss系统 HK
 // 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_OSS_HK = 'http://image.liexindev.net'; //oss系统 HK
 const API_BASE_WMS = 'http://wms.liexindev.net'; //WMS系统
 
 
@@ -37,6 +39,10 @@ const API = {
      * */
     uploadImage: API_BASE_OSS + '/uploadImage',
     /**
+     *  上传文件
+     * */
+    uploadImageHk: API_BASE_OSS_HK + '/uploadImage',
+    /**
      *  生成打印标签数据
      * */
     printLabel: API_BASE + '/supplywechatwms/printLabel',