diff --git a/addons/shopro/controller/Category.php b/addons/shopro/controller/Category.php
index e581b18..677d6e9 100755
--- a/addons/shopro/controller/Category.php
+++ b/addons/shopro/controller/Category.php
@@ -3,6 +3,7 @@
 namespace addons\shopro\controller;
 
 use app\admin\model\shopro\Category as CategoryModel;
+use app\admin\model\shopro\goods\Goods;
 
 class Category extends Common
 {
@@ -28,4 +29,31 @@ class Category extends Common
 
         $this->success('商城分类', $categories);
     }
+
+    /**
+     * 商城列表
+     * @return
+     */
+    public function goodsList() {
+        $category = CategoryModel::where('parent_id', 0)->normal()->order('weigh', 'desc')->order('id', 'desc')->select();
+        $category_ids = [];
+        foreach ($category as $item) {
+            $categories = CategoryModel::where('parent_id', $item['id'])->column('id');
+            $category_ids = array_merge($category_ids, $categories);
+        }
+        $category =  CategoryModel::where('id', 'in', $category_ids)->normal()->order('weigh', 'desc')->order('id', 'desc')->select();
+
+        foreach ($category as &$row) {
+            $row['image'] = formatImage($row['image']);
+            $row['goods_list'] = Goods::where('category_ids', 'in', $row['id'])->show()->select();
+            foreach ($row['goods_list'] as $v) {
+                $v->image = formatImage($v->image);
+                $v->images = array_map('formatImage', $v->images);
+            }
+        }
+        $this->success('商城分类', $category);
+    }
+
+
+
 }
diff --git a/addons/shopro/controller/order/Order.php b/addons/shopro/controller/order/Order.php
index 3ca15ca..f48cfbb 100755
--- a/addons/shopro/controller/order/Order.php
+++ b/addons/shopro/controller/order/Order.php
@@ -37,6 +37,9 @@ class Order extends Common
             case 'nocomment':
                 $orders = $orders->paid()->nocomment();
                 break;
+            case 'completed':
+                $orders = $orders->paid()->completed();
+                break;
         }
 
         $orders = $orders->order('id', 'desc')->paginate(request()->param('list_rows', 10))->toArray();
diff --git a/application/admin/controller/Epay.php b/application/admin/controller/Epay.php
old mode 100755
new mode 100644
diff --git a/application/common.php b/application/common.php
index 0259248..e1c5a84 100755
--- a/application/common.php
+++ b/application/common.php
@@ -560,3 +560,7 @@ EOT;
         return $icon;
     }
 }
+
+ function formatImage($url) {
+    return request()->domain().$url;
+}
diff --git a/public/assets/addons/epay/css/common.css b/public/assets/addons/epay/css/common.css
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/images/alipay.png b/public/assets/addons/epay/images/alipay.png
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/images/expired.png b/public/assets/addons/epay/images/expired.png
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/images/logo-alipay.png b/public/assets/addons/epay/images/logo-alipay.png
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/images/logo-wechat.png b/public/assets/addons/epay/images/logo-wechat.png
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/images/paid.png b/public/assets/addons/epay/images/paid.png
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/images/scan.png b/public/assets/addons/epay/images/scan.png
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/images/screenshot-alipay.png b/public/assets/addons/epay/images/screenshot-alipay.png
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/images/screenshot-wechat.png b/public/assets/addons/epay/images/screenshot-wechat.png
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/images/wechat.png b/public/assets/addons/epay/images/wechat.png
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/js/common.js b/public/assets/addons/epay/js/common.js
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/js/jquery.qrcode.min.js b/public/assets/addons/epay/js/jquery.qrcode.min.js
old mode 100755
new mode 100644
diff --git a/public/assets/addons/epay/less/common.less b/public/assets/addons/epay/less/common.less
old mode 100755
new mode 100644
diff --git a/public/assets/addons/shopro/uniapp/order/all_order.png b/public/assets/addons/shopro/uniapp/order/all_order.png
index d599baa..c8a2eda 100755
Binary files a/public/assets/addons/shopro/uniapp/order/all_order.png and b/public/assets/addons/shopro/uniapp/order/all_order.png differ
diff --git a/public/assets/addons/shopro/uniapp/order/all_order1.png b/public/assets/addons/shopro/uniapp/order/all_order1.png
new file mode 100755
index 0000000..d599baa
Binary files /dev/null and b/public/assets/addons/shopro/uniapp/order/all_order1.png differ
diff --git a/public/assets/addons/shopro/uniapp/order/completed.png b/public/assets/addons/shopro/uniapp/order/completed.png
new file mode 100755
index 0000000..19fa088
Binary files /dev/null and b/public/assets/addons/shopro/uniapp/order/completed.png differ
diff --git a/public/assets/addons/shopro/uniapp/order/no_pay.png b/public/assets/addons/shopro/uniapp/order/no_pay.png
index 0428fb5..732cb65 100755
Binary files a/public/assets/addons/shopro/uniapp/order/no_pay.png and b/public/assets/addons/shopro/uniapp/order/no_pay.png differ
diff --git a/public/assets/addons/shopro/uniapp/order/no_pay1.png b/public/assets/addons/shopro/uniapp/order/no_pay1.png
new file mode 100755
index 0000000..0428fb5
Binary files /dev/null and b/public/assets/addons/shopro/uniapp/order/no_pay1.png differ
diff --git a/public/assets/addons/shopro/uniapp/order/no_sumbit.png b/public/assets/addons/shopro/uniapp/order/no_sumbit.png
new file mode 100755
index 0000000..1b8c6da
Binary files /dev/null and b/public/assets/addons/shopro/uniapp/order/no_sumbit.png differ
diff --git a/public/assets/addons/shopro/uniapp/order/no_take.png b/public/assets/addons/shopro/uniapp/order/no_take.png
index f27edc0..87dad08 100755
Binary files a/public/assets/addons/shopro/uniapp/order/no_take.png and b/public/assets/addons/shopro/uniapp/order/no_take.png differ
diff --git a/public/assets/addons/shopro/uniapp/order/no_take1.png b/public/assets/addons/shopro/uniapp/order/no_take1.png
new file mode 100755
index 0000000..f27edc0
Binary files /dev/null and b/public/assets/addons/shopro/uniapp/order/no_take1.png differ