diff --git a/crmeb/app/adminapi/controller/v1/system/SystemDatabackup.php b/crmeb/app/adminapi/controller/v1/system/SystemDatabackup.php index 5b143d484..4e8030eea 100644 --- a/crmeb/app/adminapi/controller/v1/system/SystemDatabackup.php +++ b/crmeb/app/adminapi/controller/v1/system/SystemDatabackup.php @@ -75,7 +75,19 @@ class SystemDatabackup extends AuthController if ($is_field == 0) { $sql = "ALTER TABLE $table COMMENT '$mark'"; } else { - $sql = "ALTER TABLE $table MODIFY COLUMN $field $type COMMENT '$mark'"; + $fieldInfo = Db::query("SHOW FULL COLUMNS FROM `{$table}` WHERE Field = '{$field}'"); + $sql = "ALTER TABLE $table MODIFY COLUMN "; + $sql .= $field . ' ' . $type . ' '; + if ($fieldInfo[0]['Null'] == 'NO') { + $sql .= 'NOT NULL '; + if (!is_null($fieldInfo[0]['Default'])) { + $sql .= "DEFAULT '" . $fieldInfo[0]['Default'] . "' "; + } + } + if ($fieldInfo[0]['Extra']) { + $sql .= $fieldInfo[0]['Extra'] . ' '; + } + $sql .= "COMMENT '$mark'"; } Db::execute($sql); return app('json')->success(100024); diff --git a/crmeb/app/listener/order/OrderShippingListener.php b/crmeb/app/listener/order/OrderShippingListener.php index 430fc87f7..f3d33701c 100644 --- a/crmeb/app/listener/order/OrderShippingListener.php +++ b/crmeb/app/listener/order/OrderShippingListener.php @@ -16,7 +16,7 @@ class OrderShippingListener implements ListenerInterface public function handle($event): void { /** @var StoreOrder $order */ - [$order_type, $order, $delivery_type, $delivery_id, $delivery_code] = $event; + [$order_type, $order, $delivery_type, $delivery_id, $delivery_name] = $event; $order_shipping_open = sys_config('order_shipping_open', 0); // 小程序发货信息管理服务开关 $secs = 0; if ($order && $order_shipping_open) { @@ -80,14 +80,27 @@ class OrderShippingListener implements ListenerInterface if (!isset($order['shipping_type']) || $order['shipping_type'] == 1) { if ($delivery_type == 1) { //仅实现默认的快递公司 - $expressData = ['韵达快递' => 'YD','顺丰速运' => 'SF','圆通速递' => 'YTO','中通快递' => 'ZTO', - '申通快递' => 'STO','百世快递' => 'HTKY','京东物流' => 'JD','极兔速递' => 'JTSD', - '邮政快递包裹' => 'YZPY','EMS' => 'EMS','德邦快递' => 'DBL','宅急送' => 'ZJS', + $expressData = [ + '韵达快递' => 'YD', + '顺丰速运' => 'SF', + '圆通速递' => 'YTO', + '中通快递' => 'ZTO', + '申通快递' => 'STO', + '百世快递' => 'HTKY', + '京东物流' => 'JD', + '极兔速递' => 'JTSD', + '邮政快递包裹' => 'YZPY', + 'EMS' => 'EMS', + '德邦快递' => 'DBL', + '德邦物流' => 'DBLKY', + '宅急送' => 'ZJS', + '优速快递' => 'UC', + '苏宁物流' => 'SNWL', ]; $shipping_list = [ [ 'tracking_no' => $delivery_id ?? '', - 'express_company' => $delivery_code, + 'express_company' => $expressData[$delivery_name] ?? '', 'item_desc' => $item_desc, 'contact' => [ 'receiver_contact' => $order['user_phone'] diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php index 2fd8bf0d2..981905f0e 100644 --- a/crmeb/app/services/order/StoreOrderDeliveryServices.php +++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php @@ -502,7 +502,7 @@ if ($type == 'order') { $data['delivery_id'] = uniqid(); } // 小程序订单管理 - event('OrderShippingListener', ['product', $orderInfo, $type, $data['delivery_id'], $data['delivery_code']]); + event('OrderShippingListener', ['product', $orderInfo, $type, $data['delivery_id'], $data['delivery_name']]); //到期自动收货 event('OrderDeliveryListener', [$orderInfo, $storeName, $data, $type]); diff --git a/crmeb/app/services/user/UserBillServices.php b/crmeb/app/services/user/UserBillServices.php index 13c18d14d..342742d55 100644 --- a/crmeb/app/services/user/UserBillServices.php +++ b/crmeb/app/services/user/UserBillServices.php @@ -1192,8 +1192,8 @@ class UserBillServices extends BaseServices $storeOrderServices = app()->make(StoreOrderServices::class); [$page, $limit] = $this->getPageValue(); $time = []; - $where = ['paid' => 1, 'type' => 6, 'spread_or_uid' => $uid, 'pid' => 0, 'refund_status' => 0]; - $list = $storeOrderServices->getlist($where, ['id,order_id,uid,add_time,spread_uid,status,spread_two_uid,one_brokerage,two_brokerage,pay_price,pid'], $page, $limit, ['split']); + $where = ['paid' => 1, 'type' => 6, 'all_spread' => $uid, 'pid' => 0, 'refund_status' => 0]; + $list = $storeOrderServices->getlist($where, ['id,order_id,uid,add_time,spread_uid,status,spread_two_uid,one_brokerage,two_brokerage,pay_price,pid,staff_id,agent_id,division_id,staff_brokerage,agent_brokerage,division_brokerage'], $page, $limit, ['split']); $result['count'] = $storeOrderServices->count($where); $time_data = []; if ($list) { @@ -1202,7 +1202,15 @@ class UserBillServices extends BaseServices foreach ($list as &$item) { $item['avatar'] = $userInfos[$item['uid']]['avatar'] ?? ''; $item['nickname'] = $userInfos[$item['uid']]['nickname'] ?? ''; - $item['number'] = $item['spread_uid'] == $uid ? $item['one_brokerage'] : $item['two_brokerage']; + if ($item['division_id'] == $uid) { + $item['number'] = $item['division_brokerage']; + } elseif ($item['agent_id'] == $uid) { + $item['number'] = $item['agent_brokerage']; + } elseif ($item['staff_id'] == $uid) { + $item['number'] = $item['staff_brokerage']; + } else { + $item['number'] = $item['spread_uid'] == $uid ? $item['one_brokerage'] : $item['two_brokerage']; + } $item['time'] = $item['add_time'] ? date('Y-m-d H:i', $item['add_time']) : ''; $item['time_key'] = $item['add_time'] ? date('Y-m', $item['add_time']) : ''; $item['type'] = in_array($item['status'], [2, 3]) ? 'brokerage' : 'number'; diff --git a/crmeb/crmeb/services/crud/stubs/view/pages/crud/index.stub b/crmeb/crmeb/services/crud/stubs/view/pages/crud/index.stub index e80bec748..d96a2f92f 100644 --- a/crmeb/crmeb/services/crud/stubs/view/pages/crud/index.stub +++ b/crmeb/crmeb/services/crud/stubs/view/pages/crud/index.stub @@ -82,7 +82,7 @@ export default { this.dialogTableVisible = true; this.info = res.data; }).catch(res => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }) }, //修改状态 @@ -116,7 +116,7 @@ export default { }) .catch((res) => { this.loading = false; - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, //分页 @@ -139,11 +139,11 @@ export default { }; this.$modalSure(delfromData) .then((res) => { - this.$Message.success(res.msg); + this.$message.success(res.msg); this.getList(); }) .catch((res) => { - this.$Message.error(res.msg); + this.$message.error(res.msg); }); }, }, diff --git a/template/admin/src/pages/agent/handle/promotersList.vue b/template/admin/src/pages/agent/handle/promotersList.vue index 7e8aeb43f..218702d08 100644 --- a/template/admin/src/pages/agent/handle/promotersList.vue +++ b/template/admin/src/pages/agent/handle/promotersList.vue @@ -138,6 +138,11 @@ {{ scope.row.agent_brokerage || 0 }} + + +
diff --git a/template/admin/src/pages/marketing/storeBargain/create.vue b/template/admin/src/pages/marketing/storeBargain/create.vue index f0c8b53fe..db17346a3 100644 --- a/template/admin/src/pages/marketing/storeBargain/create.vue +++ b/template/admin/src/pages/marketing/storeBargain/create.vue @@ -710,7 +710,7 @@ export default { is_hot: row.is_hot, status: 0, section_time: [], - description: row.description, // 不取商品中的 + description: '', // 不取商品中的 rule: '', id: 0, product_id: row.id, @@ -830,9 +830,9 @@ export default { } } this.current += 1; - setTimeout((e) => { - this.formValidate.description += ' '; - }, 0); + // setTimeout((e) => { + // this.formValidate.description += ' '; + // }, 0); } else { return this.$message.warning('请完善您的信息'); } diff --git a/template/admin/src/pages/marketing/storeCombination/create.vue b/template/admin/src/pages/marketing/storeCombination/create.vue index 352e67266..43b000152 100644 --- a/template/admin/src/pages/marketing/storeCombination/create.vue +++ b/template/admin/src/pages/marketing/storeCombination/create.vue @@ -763,7 +763,7 @@ export default { is_host: row.is_hot, is_show: 0, section_time: [], - description: row.description, // 不取商品中的 + description: '', // 不取商品中的 id: 0, people: 2, num: 1, diff --git a/template/admin/src/pages/marketing/storeIntegral/create.vue b/template/admin/src/pages/marketing/storeIntegral/create.vue index 05b25057e..2132d97bc 100644 --- a/template/admin/src/pages/marketing/storeIntegral/create.vue +++ b/template/admin/src/pages/marketing/storeIntegral/create.vue @@ -507,7 +507,7 @@ export default { is_postage: row.is_postage, is_host: 0, is_show: 1, - description: row.description, + description: '', id: 0, product_id: row.id, temp_id: row.temp_id, diff --git a/template/admin/src/pages/marketing/storePresell/create.vue b/template/admin/src/pages/marketing/storePresell/create.vue index 3783f25b5..17f4d3acf 100644 --- a/template/admin/src/pages/marketing/storePresell/create.vue +++ b/template/admin/src/pages/marketing/storePresell/create.vue @@ -590,7 +590,7 @@ export default { // type: 1, num: 1, deposit: 1, - description: row.description, // 不取商品中的 + description: '', // 不取商品中的 id: 0, num: 1, status: 1, diff --git a/template/admin/src/pages/marketing/storeSeckill/create.vue b/template/admin/src/pages/marketing/storeSeckill/create.vue index d8720e834..815451df1 100644 --- a/template/admin/src/pages/marketing/storeSeckill/create.vue +++ b/template/admin/src/pages/marketing/storeSeckill/create.vue @@ -685,7 +685,7 @@ export default { is_postage: row.is_postage, is_hot: row.is_hot, status: 0, - description: row.description, + description: '', id: 0, product_id: row.id, temp_id: row.temp_id, diff --git a/template/admin/src/pages/order/orderList/handle/orderDetails.vue b/template/admin/src/pages/order/orderList/handle/orderDetails.vue index 43ab06699..c353ff807 100644 --- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue +++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue @@ -129,6 +129,31 @@
+
+
返佣信息(金额｜用户UID)
+ +
{{ orderDatalist.orderInfo.delivery_type == 'express' ? '物流信息' : '送货人信息' }} diff --git a/template/admin/src/pages/product/productAdd/productAdd.scss b/template/admin/src/pages/product/productAdd/productAdd.scss index 750c2eede..6adba3a58 100644 --- a/template/admin/src/pages/product/productAdd/productAdd.scss +++ b/template/admin/src/pages/product/productAdd/productAdd.scss @@ -342,7 +342,7 @@ .ifam { width: 344px; height: 644px; - background: url('~/assets/images/phonebg.png') no-repeat center top; + background: url('~@/assets/images/phonebg.png') no-repeat center top; background-size: 344px 644px; padding: 40px 20px; padding-top: 50px; diff --git a/template/admin/src/pages/setting/devise/diyIndex.vue b/template/admin/src/pages/setting/devise/diyIndex.vue index 2e8ca7ebc..30779c46f 100644 --- a/template/admin/src/pages/setting/devise/diyIndex.vue +++ b/template/admin/src/pages/setting/devise/diyIndex.vue @@ -447,7 +447,7 @@ export default { confirmButtonClass: 'btn-custom-cancel', }) .then(() => { - this.$router.push('/admin/setting/pages/devise/0'); + this.$router.push(this.$routeProStr + '/setting/pages/devise/0'); }) .catch(() => {}); }, @@ -844,7 +844,7 @@ export default { if (num == 2) { this.relLoading = false; setTimeout(() => { - window.location.replace('/admin/setting/pages/devise/0'); + window.location.replace(this.$routeProStr + '/setting/pages/devise/0'); }, 2000); } else { this.loading = false; diff --git a/template/admin/src/pages/user/grade/type/index.vue b/template/admin/src/pages/user/grade/type/index.vue index daf7d1cf0..0047f028a 100644 --- a/template/admin/src/pages/user/grade/type/index.vue +++ b/template/admin/src/pages/user/grade/type/index.vue @@ -322,15 +322,7 @@ export default { } else { item.props.disabled = false; item.props.min = 1; - item.validate = [ - { - type: 'number', - max: 1000000, - min: 0, - message: '最大只能输入1000000,最小为0', - requred: true, - }, - ]; + } } if (['price'].includes(key)) { diff --git a/template/admin/src/pages/user/list/index.vue b/template/admin/src/pages/user/list/index.vue index ef7faa175..ff4fc29ab 100644 --- a/template/admin/src/pages/user/list/index.vue +++ b/template/admin/src/pages/user/list/index.vue @@ -378,6 +378,11 @@
{{ scope.row.user_type }}
+ + +