支付 bug 修复

71884b25 · devil · 5ec2ee4f · 71884b25 · 71884b25 · 71884b25
7 changed file
--- a/application/service/OrderService.php
+++ b/application/service/OrderService.php
@@ -1658,14 +1658,14 @@ class OrderService
        }

        // 获取订单商品
-        $order_detail = Db::name('OrderDetail')->field('goods_id,buy_number')->where(['order_id'=>$params['order_id']])->select();
+        $order_detail = Db::name('OrderDetail')->field('id,goods_id,title,buy_number')->where(['order_id'=>$params['order_id']])->select();
        if(!empty($order_detail))
        {
            foreach($order_detail as $v)
            {
-                if(!Db::name('Goods')->where(['id'=>$v['goods_id']])->setInc('sales_count', $v['buy_number']))
+                if(Db::name('Goods')->where(['id'=>$v['goods_id']])->setInc('sales_count', $v['buy_number']) === false)
                {
-                    return DataReturn('订单商品销量增加失败['.$params['order_id'].'-'.$v['goods_id'].']', -10);
+                    return DataReturn('订单商品销量增加失败['.$v['title'].']', -10);
                }
            }
            return DataReturn('操作成功', 0);

--- a/application/service/PaymentService.php
+++ b/application/service/PaymentService.php
@@ -214,7 +214,6 @@ class PaymentService
    public static function BuyPaymentList($params = [])
    {
        $data = self::PaymentList($params);
-
        $result = [];
        if(!empty($data))
        {
@@ -223,6 +222,7 @@ class PaymentService
                // 根据终端类型筛选
                if(in_array(APPLICATION_CLIENT_TYPE, $v['apply_terminal']))
                {
+                    unset($v['config'], $v['element'], $v['apply_terminal'], $v['author'], $v['author_url'], $v['is_open_user'], $v['is_enable']);
                    $result[] = $v;
                }
            }

--- a/application/tags.php
+++ b/application/tags.php
@@ -32,6 +32,27 @@ return array (
  'log_write' => 
  array (
  ),
+  'plugins_css' => 
+  array (
+    0 => 'app\\plugins\\freightfee\\Hook',
+    1 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
+    2 => 'app\\plugins\\coupon\\Hook',
+    3 => 'app\\plugins\\distribution\\Hook',
+    4 => 'app\\plugins\\commononlineservice\\Hook',
+    5 => 'app\\plugins\\membershiplevelvip\\Hook',
+    6 => 'app\\plugins\\share\\Hook',
+  ),
+  'plugins_service_buy_handle' => 
+  array (
+    0 => 'app\\plugins\\freightfee\\Hook',
+    1 => 'app\\plugins\\coupon\\Hook',
+    2 => 'app\\plugins\\membershiplevelvip\\Hook',
+  ),
+  'plugins_view_goods_detail_title' => 
+  array (
+    0 => 'app\\plugins\\freightfee\\Hook',
+    1 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
+  ),
  'plugins_view_admin_order_top_operate' => 
  array (
    0 => 'app\\plugins\\orderexportprint\\Hook',
@@ -39,15 +60,7 @@ return array (
  'plugins_view_admin_order_list_operate' => 
  array (
    0 => 'app\\plugins\\orderexportprint\\Hook',
-  ),
-  'plugins_css' => 
-  array (
-    0 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
-    1 => 'app\\plugins\\coupon\\Hook',
-    2 => 'app\\plugins\\distribution\\Hook',
-    3 => 'app\\plugins\\commononlineservice\\Hook',
-    4 => 'app\\plugins\\membershiplevelvip\\Hook',
-    5 => 'app\\plugins\\share\\Hook',
+    1 => 'app\\plugins\\orderpricerevision\\Hook',
  ),
  'plugins_service_users_center_left_menu_handle' => 
  array (
@@ -90,9 +103,19 @@ return array (
    0 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
    1 => 'app\\plugins\\coupon\\Hook',
  ),
-  'plugins_view_goods_detail_title' => 
+  'plugins_admin_css' => 
  array (
-    0 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
+    0 => 'app\\plugins\\orderpricerevision\\Hook',
+  ),
+  'plugins_admin_js' => 
+  array (
+    0 => 'app\\plugins\\orderpricerevision\\Hook',
+    1 => 'app\\plugins\\orderremind\\Hook',
+  ),
+  'plugins_admin_view_common_bottom' => 
+  array (
+    0 => 'app\\plugins\\orderpricerevision\\Hook',
+    1 => 'app\\plugins\\orderremind\\Hook',
  ),
  'plugins_js' => 
  array (
@@ -109,11 +132,6 @@ return array (
  array (
    0 => 'app\\plugins\\coupon\\Hook',
  ),
-  'plugins_service_buy_handle' => 
-  array (
-    0 => 'app\\plugins\\coupon\\Hook',
-    1 => 'app\\plugins\\membershiplevelvip\\Hook',
-  ),
  'plugins_view_buy_form_inside' => 
  array (
    0 => 'app\\plugins\\coupon\\Hook',

--- a/config/shopxo.php
+++ b/config/shopxo.php
@@ -15,7 +15,7 @@

 return [
    // 开发模式
-    'is_develop'                            => false,
+    'is_develop'                            => true,

    // 默认编码
    'default_charset'                       => 'utf-8',

--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -464,15 +464,6 @@ button.colorpicker-submit:active {
    resize: none;
    padding: 10px 15px;
 }
-.am-table-scrollable-horizontal .am-table-td-fixed-first th:nth-child(2),
-.am-table-scrollable-horizontal .am-table-td-fixed-first td:nth-child(2) {
-    padding-left: 110px;
-}
-.am-table-scrollable-horizontal .am-table-td-fixed-last th:nth-last-child(2),
-.am-table-scrollable-horizontal .am-table-td-fixed-last td:nth-last-child(2) {
-    padding-right: 110px;
-}
-
 .am-table-scrollable-horizontal .am-table-td-fixed-first th:first-child,
 .am-table-scrollable-horizontal .am-table-td-fixed-first td:first-child,
 .am-table-scrollable-horizontal .am-table-td-fixed-last th:last-child,

--- a/public/static/common/js/common.js
+++ b/public/static/common/js/common.js
@@ -1567,11 +1567,12 @@ function TableContainerInit()
 	        {
 	        	$(this).find('th:first').css('left', $(this).parents('.am-table').offset().left);

-	        	// 第一列是否自定义宽度,则第二列 left 设置
-	        	var find_width = $(this).find('th').first().data('width') || 0;
-	        	if(find_width > 0)
+	        	// 第一列自定义宽度->默认宽度,设置第二列 padding-left
+	        	var first_width = $(this).find('th').first().data('width') || $(this).find('th').first().innerWidth();
+	        	if(first_width > 0)
 	        	{
-	        		$(this).find('th').eq(1).css('padding-left', (find_width+10)+'px');
+		        	$(this).find('th').eq(1).css('min-width', ($(this).find('th').eq(1).innerWidth()+first_width)+'px');
+	        		$(this).find('th').eq(1).css('padding-left', (first_width+10)+'px');
 	        	}
 	        }

@@ -1584,11 +1585,13 @@ function TableContainerInit()
 				var right = width-$obj.width()-left-1;
 	        	$(this).find('th:last').css('right', right);

-	        	// 最后一列是否自定义宽度,则倒数第二列 right 设置
-	        	var find_width = $(this).find('th').last().data('width') || 0;
-	        	if(find_width > 0)
+	        	// 最后一列自定义宽度->默认宽度,设置倒数第二列 padding-right
+	        	var last_width = $(this).find('th').last().data('width') || $(this).find('th').last().innerWidth();
+	        	if(last_width > 0)
 	        	{
-	        		$(this).find('th').eq(-2).css('padding-right', (find_width+10)+'px');
+	        		console.log($(this).find('th').eq(-2).innerWidth())
+	        		$(this).find('th').eq(-2).css('min-width', ($(this).find('th').eq(-2).innerWidth()+last_width)+'px');
+	        		$(this).find('th').eq(-2).css('padding-right', (last_width+10)+'px');
 	        	}
 	        }
 	        
@@ -1629,11 +1632,11 @@ function TableContainerInit()
 		        {
 		        	$(this).find('td:first').css('left', $(this).parents('.am-table').offset().left);

-		        	// 第一列是否自定义宽度,则第二列 left 设置
-		        	var find_width = $(this).find('td').first().data('width') || 0;
-		        	if(find_width > 0)
+		        	// 第一列自定义宽度->默认宽度,设置第二列 padding-left
+		        	var first_width = $(this).find('td').first().data('width') || $(this).find('td').first().innerWidth();
+		        	if(first_width > 0)
 		        	{
-		        		$(this).find('td').eq(1).css('padding-left', (find_width+10)+'px');
+		        		$(this).find('td').eq(1).css('padding-left', (first_width+10)+'px');
 		        	}
 		        }

@@ -1646,11 +1649,11 @@ function TableContainerInit()
 					var right = width-$obj.width()-left-1;
 		        	$(this).find('td:last').css('right', right);

-		        	// 最后一列是否自定义宽度,则倒数第二列 right 设置
-		        	var find_width = $(this).find('td').last().data('width') || 0;
-		        	if(find_width > 0)
+		        	// 最后一列自定义宽度->默认宽度,设置倒数第二列 padding-right
+		        	var last_width = $(this).find('td').last().data('width') || $(this).find('td').last().innerWidth();
+		        	if(last_width > 0)
 		        	{
-		        		$(this).find('td').eq(-2).css('padding-right', (find_width+10)+'px');
+		        		$(this).find('td').eq(-2).css('padding-right', (last_width+10)+'px');
 		        	}
 		        }


--- a/sourcecode/baidu/pages/user-order/user-order.swan
+++ b/sourcecode/baidu/pages/user-order/user-order.swan
@@ -55,7 +55,7 @@
 </scroll-view>

 <!-- 支付方式 popup -->
-<component-popup prop-show="{{is_show_payment_popup}}" prop-position="bottom" bindonclose="payment_popup_event_close">
+<component-popup status="{{is_show_payment_popup}}" position="bottom" bindonclose="payment_popup_event_close">
  <view s-if="payment_list.length > 0" class="payment-list oh bg-white">
    <view class="item tc fl" s-for="item, index in payment_list" s-key="key">
      <view class="item-content br" data-value="{{item.id}}" bindtap="popup_payment_event">