Accept Merge Request #136: (feature/hant -> develop)

Merge Request: 订单优化

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/136?initial=true

addons/address/view/index/amap.html

@@ -262,7 +262,7 @@
         //点击搜索按钮
         $(document).on('click', '.confirm', function () {
             var zoom = map.getZoom();
-            console.log(map)
+            // console.log(map)
             var data = {lat: lat, lng: lng, zoom: zoom, address: address,city_code:city_code};
             if (fromtype !== totype) {
                 var result = gcoord.transform([data.lng, data.lat], gcoord[fromtype], gcoord[totype]);

application/admin/controller/Order.php

@@ -146,6 +146,8 @@ class Order extends Backend
                 'receive_type',
                 'plan_time',
                 'coupon_id',
+                'total',
+                'online_amount',
                 'aftersale_id'
             ])
             ->where($where);
@@ -258,6 +260,7 @@ class Order extends Backend
                 $params['admin_id'] = $this->auth->id;
             }
             $params['status'] = 10;
+            $params['total'] = $params['online_amount'] ?? 0;
             $params['order_no'] = $this->generateOrderNumber();
             $params['create_time'] = date('Y-m-d H:i:s');
             $params['update_time'] = date('Y-m-d H:i:s');
@@ -377,15 +380,15 @@ class Order extends Backend
         return $this->fetch();
     }
 
-    function generateOrderNumber($prefix = 'ORD')
+    function generateOrderNumber($prefix = '')
     {
         // 获取当前时间戳（精确到毫秒）
         $timestamp = microtime(true);
         $date = date('YmdHis', (int)$timestamp);  // 格式：YYYYMMDDHHMMSS
-        $randomNum = strtoupper(substr(md5($timestamp), 0, 4)); // 从时间戳生成一个随机字符串，取前四个字符
+//        $randomNum = strtoupper(substr(md5($timestamp), 0, 4)); // 从时间戳生成一个随机字符串，取前四个字符
-
+        $code = str_pad(mt_rand(0, 999999), 6, '0', STR_PAD_LEFT);
         // 组合生成的订单编号
-        $orderNumber = $prefix . $date . $randomNum;
+        $orderNumber = $prefix . $date . $code;
 
         return $orderNumber;
     }

public/assets/js/backend/order.js

@@ -32,12 +32,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
 服务名称: ${data.item_title}
 客户姓名: ${data.customer}
 客户电话: ${data.tel}
-上门时间: ${data.plan_time || '无'}
+客户地址: ${data.address}
-优惠码: ${data.coupon?.description || '无'}
+收款金额: ${data.receive_type === 1 ? '已收定金 ' + data.online_amount : '已收全款 ' + data.online_amount}
-详细地址: ${data.address}
+优惠活动: ${data.coupon?.description || '无'}
 订单详情: ${data.detail || '无'}
 订单备注: ${data.remark}
-收款方式: ${data.receive_type === 1 ? '已收定金' : '已收全款'}`;
+预约时间: ${data.plan_time || '无'}
+`;
 
         return message;
     }

public/assets/js/cascader.js

@@ -311,7 +311,8 @@
             this.reload(null, true)
             return
         };
-        var keywords = keyword.replace(' ','').replace('/','').split('')
+        var keywords = [keyword];
+        // console.log(keywords);
         var data = this.labelList.filter(function(item) {
             item.num = 0
             keywords.forEach(function(key) {
@@ -321,7 +322,7 @@
             return item.num>(keywords.length==1?0:1)
         }).sort(function(a, b) {
             return b.num - a.num
-        }).slice(0, 10)
+        }).slice(0, 15)
         this.reload(data, true)
     }
     //关键词筛选数据（暂不用）