Merge branch 'master' of https://git.bjtdba.com/shop/php

app/controller/merchant/Common.php

@@ -80,7 +80,7 @@ class Common extends BaseController
      
         $query = Db::name('order_merchant');
         $count = $query->where('mer_id', $merId)->count();
-        $list = $query->page($pageNum, $pageSize)->order('id desc')->where('mer_id', $merId)->select();
+        $list = $query->page($pageNum, $pageSize)->order('id desc')->where('mer_id', $merId)->where('paid', 1)->select();
         $list = $list->toArray();
         foreach ($list as $k => $v) {
             $list[$k]['pv'] = Db::name('user_sign_gongxian')->where('mer_id', $v['mer_id'])->where('order_id', $v['id'])->value('pv') ?? 0;