Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

package-accounts-manage/pages/payment-order/payment-order.js

@@ -67,18 +67,20 @@ Page({
         name: 'cusReturnCollection',
         title: mixins.$t('refund'),
       },
-       {
-        name: 'ticketPirnt',
-        title: mixins.$t('ticketPirnt'),
-      },
+      // {
+      //   name: 'editOrder',
+      //   title: mixins.$t('edit'),
+      // },
       {
         name: 'invaidOrder',
         title: mixins.$t('invaidOrder'),
       },
-      // {
-      //   name: 'editOrder',
-      //   title: mixins.$t('edit'),
-      // }
+       {
+        name: 'ticketPirnt',
+        title: mixins.$t('ticketPirnt'),
+      },
+      
+      
     ],
     // 底部保存按钮
     buttonFootList: [{

package-accounts-manage/pages/receipt/receipt.js

@@ -68,18 +68,19 @@ Page({
         name: 'cusReturnCollection',
         title: mixins.$t('cusReturnCollection'),
       },
+      //  {
+      //   name: 'editOrder',
+      //   title: mixins.$t('edit'),
+      // },
+      {
+        name: 'invaidOrder',
+        title: mixins.$t('invaidOrder'),
+      },
       {
         name: 'ticketPirnt',
         title: mixins.$t('ticketPirnt'),
       },
-      {
-        name: 'invaidOrder',
-        title: mixins.$t('invaidOrder'),
-      }, 
-      // , {
-      //   name: 'editOrder',
-      //   title: mixins.$t('edit'),
-      // }
+
     ],
 
     // 底部保存按钮

package-base-select/pages/select-goods/select-goods.wxml

@@ -33,7 +33,7 @@
     </view>
 
     <view class="scan-class" style="width: 15%;display: flex;align-items: center;">
-      <image class="scan-image" fit="fill" src="{{imageUrl+'/scan_image.png'}}"></image>
+      <image class="scan-image" fit="fill" src="{{imageUrl+'scan_image.png'}}"></image>
     </view>
   </view>
 

package-inventory/pages/outbound-processing/outbound-processing.js

@@ -14,7 +14,7 @@ Page({
   /**
    * 页面的初始数据 
    */
-  data: {
+  data: { 
     isfirst:true,
     tagList: [{
         title: mixins.$t('outboundProcessing')
@@ -35,7 +35,7 @@ Page({
       searchType: Constants.searchType.pick
     }],
 
-    // 查询条件-筛选
+    // 查询条件-筛选 
     pullMenuList: [{
         code: 'outType',
         pullType: 'mSelect',
@@ -154,17 +154,12 @@ Page({
     },
 
     // 弹出按钮
-    buttonList: [{
-      name: 'invaidOrder',
-      title: mixins.$t('invaidOrder'),
-
-    }, {
-      name: 'ticketPirnt',
-      title: mixins.$t('ticketPirnt'),
-    }, {
-      name: 'editOrder',
-      title: mixins.$t('edit'),
-    }],
+		{
+        name: 'editOrder',
+        title: mixins.$t('edit'),
+      },
+        title: mixins.$t('invaidOrder'),
+      
 
     // 底部保存按钮
     buttonFootList: [{
@@ -255,7 +250,6 @@ Page({
     }
     this.open(e);
   },
-  /**
    * @desc : 设置查询参数
    * @date : 2024年3月8日
    * @author : 姜永辉

package-inventory/pages/warehousing-processing/warehousing-processing.js

@@ -148,6 +148,10 @@ Page({
     // 弹出按钮
     buttonList: [
       {
+        name: 'editOrder',
+        title: mixins.$t('edit'),
+      },
+      {
         name: 'invaidOrder',
         title: mixins.$t('invaidOrder'),
 
@@ -155,10 +159,7 @@ Page({
         name: 'ticketPirnt',
         title: mixins.$t('ticketPirnt'),
       }
-      , {
-        name: 'editOrder',
-        title: mixins.$t('edit'),
-      }
+      , 
     ],
     // 底部保存按钮
     buttonFootList: [{