Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

crmeb/app/services/system/SystemCrudServices.php

@@ -560,6 +560,7 @@ class SystemCrudServices extends BaseServices
             'menu_path' => '/' . $routeName,
             'auth_type' => 1,
             'is_show' => 1,
+            'is_show_path' => 1,
             'is_del' => 0,
             'unique_auth' => $uniqueAuth,
             'is_header' => $data['pid'] ? 0 : 1,

crmeb/public/install/crmeb.sql

@@ -47274,7 +47274,6 @@ INSERT INTO `eb_system_menus` (`id`, `pid`, `icon`, `menu_name`, `module`, `cont
 (1069, 1067, '', '语言详情', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/setting/lang/info', '12/1067', 1, '', 0, 'admin-lang-info', 0),
 (1070, 1067, '', '地区列表', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/setting/lang/country', '25/1067', 1, '', 0, 'admin-lang-country', 0),
 (1071, 1695, '', '文件管理', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/system/maintain/system_file/opendir', '25/1695', 1, '', 0, 'system-maintain-system-file', 0),
-(1072, 1064, '', '接口文档', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/setting/system_out_interface/index', '56/1064', 1, '', 0, 'setting-system-out-interface-index', 0),
 (1073, 25, '', '数据维护', 'admin', '', '', '', '', '[]', 7, 1, 1, 1, 'system/database/index', '25', 1, '', 0, 'system-database-index', 0),
 (1075, 731, '', '会员配置', 'admin', '', '', '', '', '[]', 6, 1, 1, 1, '/marketing/member/system_config/3/67', '27/731', 1, '', 0, 'marketing-member-system_config', 0),
 (1076, 56, '', '定时任务', 'admin', '', '', '', '', '[]', 0, 1, 1, 1, '/system/crontab', '25/56', 1, '', 0, 'system-crontab-index', 0),

template/admin/package-lock.json

@@ -19377,6 +19377,11 @@
         }
       }
     },
+    "print-js": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/print-js/-/print-js-1.6.0.tgz",
+      "integrity": "sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg=="
+    },
     "printj": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz",

template/admin/package.json

@@ -43,6 +43,7 @@
     "monaco-editor": "^0.28.1",
     "monaco-editor-webpack-plugin": "^4.2.0",
     "oss": "0.0.1",
+    "print-js": "^1.6.0",
     "qiniu-js": "^2.5.5",
     "qrcodejs2": "0.0.2",
     "qs": "^6.6.0",

template/admin/src/pages/order/orderList/components/tableList.vue

@@ -147,6 +147,7 @@
               <!--                            <DropdownItem name="7"  v-show='row._status === 3'>不退款</DropdownItem>-->
               <DropdownItem name="8" v-show="row._status === 4">已收货</DropdownItem>
               <DropdownItem name="9">删除订单</DropdownItem>
+              <DropdownItem name="12" v-show="row.kuaidi_label">快递面单打印</DropdownItem>
             </DropdownMenu>
           </Dropdown>
         </template>
@@ -190,6 +191,7 @@
 
 <script>
 import expandRow from './tableExpand.vue';
+import printJS from 'print-js';
 import {
   orderList,
   getOrdeDatas,
@@ -417,6 +419,9 @@ export default {
               this.$Message.error(res.msg);
             });
           break;
+        case '12':
+          this.printImg(row.kuaidi_label);
+          break;
         default:
           this.delfromData = {
             title: '删除订单',
@@ -428,6 +433,17 @@ export default {
           this.delOrder(row, this.delfromData);
       }
     },
+    printImg(url) {
+      printJS({
+        printable: url,
+        type: 'image',
+        documentTitle: '快递信息',
+        style: `img{
+          width: 100%;
+          height: 476px;
+        }`,
+      });
+    },
     // 立即支付 /确认收货//删除单条订单
     submitModel() {
       this.getList();

template/admin/src/pages/order/orderList/handle/orderSend.vue

@@ -154,6 +154,7 @@ import {
   orderSheetInfo,
   splitCartInfo,
 } from '@/api/order';
+import printJS from 'print-js';
 export default {
   name: 'orderSend',
   props: {
@@ -352,6 +353,18 @@ export default {
           this.$Message.error(res.msg);
         });
     },
+    printImg(url) {
+      printJS({
+        printable: url,
+        type: 'image',
+        documentTitle: '快递信息',
+        style: `img{
+          width: 100%;
+          height: 476px;
+        }`,
+      });
+    },
+
     // 提交
     putSend(name) {
       let data = {
@@ -385,7 +398,6 @@ export default {
           return this.$Message.error('送货人不能为空');
         }
       }
-
       if (this.splitSwitch) {
         data.datas.cart_ids = [];
         this.selectData.forEach((v) => {
@@ -401,6 +413,7 @@ export default {
             this.$emit('submitFail');
             this.reset();
             this.splitSwitch = false;
+            if (res.data.label) this.printImg(res.data.label);
           })
           .catch((res) => {
             this.$Message.error(res.msg);
@@ -413,6 +426,7 @@ export default {
             this.splitSwitch = false;
             this.$emit('submitFail');
             this.reset();
+            if (res.data.label) this.printImg(res.data.label);
           })
           .catch((res) => {
             this.$Message.error(res.msg);

template/admin/src/pages/statistic/product/components/productInfo.vue

@@ -16,21 +16,13 @@
             <div>在选定条件下，添加商品进入购物车的商品件数</div>
             <br />
             <div>下单件数</div>
-            <div>
-              在选定条件下，成功下单的商品件数之和（拼团商品在成团之后计入，线下支付订单在后台确认支付后计入，不剔除退款订单）
-            </div>
+            <div>在选定条件下，成功下单的商品件数之和（拼团商品在成团之后计入，线下支付订单在后台确认支付后计入，不剔除退款订单）</div>
             <br />
             <div>支付件数</div>
-            <div>
-              在选定条件下，
-              成功付款订单的商品件数之和（拼团商品在成团之后计入，线下支付订单在后台确认支付后计入，不剔除退款订单）
-            </div>
+            <div>在选定条件下，成功付款订单的商品件数之和（拼团商品在成团之后计入，线下支付订单在后台确认支付后计入，不剔除退款订单）</div>
             <br />
             <div>支付金额</div>
-            <div>
-              在选定条件下，
-              成功付款订单的商品金额之和（拼团商品在成团之后计入，线下支付订单在后台确认支付后计入，不剔除退款订单）
-            </div>
+            <div>在选定条件下，成功付款订单的商品金额之和（拼团商品在成团之后计入，线下支付订单在后台确认支付后计入，不剔除退款订单）</div>
             <br />
             <div>成本金额</div>
             <div>在选定条件下，成功付款订单的商品成本金额之和</div>

template/admin/src/pages/statistic/transaction/components/transaction.vue

@@ -13,10 +13,7 @@
             <div>交易毛利金额 = 营业额 - 支出金额</div>
             <br />
             <div>商品支付金额</div>
-            <div>
-              选定条件下，用户购买商品的实际支付金额，包括微信支付、余额支付、支付宝支付、线下支付金额
-              （拼团商品在成团之后计入，线下支付订单在后台确认支付后计入）
-            </div>
+            <div>选定条件下，用户购买商品的实际支付金额，包括微信支付、余额支付、支付宝支付、线下支付金额（拼团商品在成团之后计入，线下支付订单在后台确认支付后计入）</div>
             <br />
             <div>购买会员金额</div>
             <div>选定条件下，用户成功购买付费会员的金额</div>

template/uni-app/pages/goods/order_confirm/index.vue

@@ -616,8 +616,8 @@
 			 * 获取门店列表数据
 			 */
 			getList: function() {
-				let longitude = uni.getStorageSync("user_longitude"); //经度
-				let latitude = uni.getStorageSync("user_latitude"); //纬度
+				let longitude = uni.getStorageSync("user_longitude") || ''; //经度
+				let latitude = uni.getStorageSync("user_latitude") || ''; //纬度
 				let data = {
 					latitude: latitude, //纬度
 					longitude: longitude, //经度
@@ -692,12 +692,11 @@
 							success: (res) => {
 								uni.setStorageSync('user_latitude', res.latitude);
 								uni.setStorageSync('user_longitude', res.longitude);
-								this.getList()
 							},
 							complete: () => {
 								this.getList()
 							}
-						});
+						})
 						// #ifdef H5	
 					}
 					// #endif