Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_order_gift_20210107

public/js/web/orderServiceList.js

@@ -138,7 +138,7 @@ layui.use(['form', 'table', 'laydate'], function(){
                             <td class="origin-goods-number">'+ items[i].goods_number +'</td>\
                             <td class="origin-goods-number">'+ items[i].goods_number +'</td>\
                             <td class="fqty">'+ items[i].removal_number +'</td>\
                             <td class="fqty">'+ items[i].removal_number +'</td>\
                             <td class="single_pre_price">'+ items[i].single_pre_price +'</td>\
                             <td class="single_pre_price">'+ items[i].single_pre_price +'</td>\
-                            <td class="service-goods-number">'+( serviced_num[items[i].goods_id] ?? 0 )+'</td>';
+                            <td class="service-goods-number">'+( serviced_num[items[i].goods_id] ? serviced_num[items[i].goods_id] : 0 )+'</td>';
 
 
                 if (items[i].adjust_number != 0) {
                 if (items[i].adjust_number != 0) {
                     html += '<td><input type="text" class="form-control adjust_number" name="service_item['+items[i].id+'][adjust_number]" value="'+ items[i].adjust_number +'"></td>';
                     html += '<td><input type="text" class="form-control adjust_number" name="service_item['+items[i].id+'][adjust_number]" value="'+ items[i].adjust_number +'"></td>';