add

assets/css/tally/index.scss

@@ -102,7 +102,7 @@
                 border: 1px solid #bbdcfd;
             }
             .pb16 {
-                padding-bottom: 30rpx;
+                padding-bottom: 16rpx;
             }
             .w130 {
                 width: 156rpx;

assets/css/tally/unboxing.scss

@@ -110,7 +110,7 @@
                 border: 1px solid #bbdcfd;
             }
             .pb16 {
-                padding-bottom: 30rpx;
+                padding-bottom: 16rpx;
             }
             .w130 {
                 width: 156rpx;

pages/goods/barCode.vue

@@ -42,9 +42,9 @@
 </template>
 
 <script>
-import { API } from '@/util/api.js';
+    import { API } from '@/util/api.js';
 
-export default {
+    export default {
         data() {
             return {
                 erpOrderSnCodeManage: [],
@@ -113,7 +113,7 @@ export default {
                                             } else if (res.cancel) {
                                                 console.log('用户点击取消');
                                                 uni.navigateTo({
-                                                url: '/pages/tag/print?number=' + erp_order_sn
+                                                    url: '/pages/tag/printNew?number=' + erp_order_sn
                                                 });
                                             }
                                         }
@@ -151,9 +151,9 @@ export default {
                 });
             }
         }
-};
+    };
 </script>
 
 <style scoped lang="scss">
-@import '../../assets/css/goods/barCode.scss';
+    @import '../../assets/css/goods/barCode.scss';
 </style>
\ No newline at end of file

pages/tally/index.vue

@@ -98,10 +98,6 @@
                         <text class="t3 w130">品牌：</text>
                         <text class="t4">{{item.brand}}</text>
                     </view>
-                    <view class="pb16 row">
-                        <text class="t3 w130">金额：</text>
-                        <text class="t4">{{item.total_price}}</text>
-                    </view>
                     <!-- 完全理货 -->
                     <template v-if="item.tally_status == 3">
                         <view class="pb16 row">
@@ -111,14 +107,17 @@
                     </template>
                     <!-- 1未理货2部分理货 -->
                     <template v-else>
-                        <view class="pb16 row">
+                        <view class="pb16 row verCenter">
+                            <view class="row" style="width: 50%;">
                                 <text class="t3 w130">待收数量：</text>
                                 <text class="t4">{{item.wait_tally_num}}</text>
                             </view>
-                        <view class="pb16 row">
+                            <view class="row" style="width: 50%;">
                                 <text class="t3 w130">总数量：</text>
                                 <text class="t4">{{item.order_numbers}}</text>
                             </view>
+
+                        </view>
                     </template>
                     <view class="pb16 row verCenter">
                         <!-- 完全理货 -->
@@ -163,8 +162,7 @@
                             </template>
                         </view>
                     </view>
-                    <view class="pb16 row verCenter">
-                        <text class="t3 w130">理货照片：</text>
+                    <view class="row bothSide verCenter">
                         <view class="upload-list row verCenter">
                             <template v-if="image_list.length > 0">
                                 <view class="pic-box" v-for="(v, i) in image_list[index]" :key="i">
@@ -181,8 +179,6 @@
                                 <view class="default row rowCenter verCenter" @click="chooseImageChange(index)" v-if="image_list[index].length < 4"><text class="iconfont icon-xingzhuangjiehe"></text></view>
                             </template>
                         </view>
-                    </view>
-                    <view class="row" style="justify-content: flex-end;">
                         <!-- 完全理货 -->
                         <template v-if="item.tally_status == 3">
                             <view class="btn row rowCenter verCenter disabled" @click="cancelTallyDetail(index)">取消理货</view>

pages/tallyGoods/confirm.vue

@@ -572,7 +572,7 @@
                                     if (type == 1) {
                                         //点击【确认提交并打印】跳转至【打印标签】页面
                                         uni.navigateTo({
-                                            url: '/pages/tag/print?board_num=' + this.form.board_num + '&box_num=' + this.form.box_num + '&erp_order_sn=' + this.form.erp_order_sn + '&from=tallyGoods'
+                                            url: '/pages/tag/printNew?board_num=' + this.form.board_num + '&box_num=' + this.form.box_num + '&erp_order_sn=' + this.form.erp_order_sn + '&from=tallyGoods'
                                         })
                                     } else {
                                         setTimeout(() => {

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 = '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系统
+// 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系统
 
 
 const API = {