Merge pull request 'dev' (#6) from dev into master

Reviewed-on: #6

app/controller/api/community/Community.php

@@ -641,7 +641,8 @@ class Community extends BaseController
         if (!$communityInfo) {
             return app('json')->fail('委托商品不存在');
         } 
-        $entrustInfo = Db::name('entrust')->where('community_id', $id)->where('entrust_mer_id', $this->request->uid())->where('is_del', 0)->where('status', 0)->fetchSql(false)->find();
+        $merchantId = Db::name('merchant')->where('uid', $this->request->uid())->value('mer_id');
+        $entrustInfo = Db::name('entrust')->where('community_id', $id)->where('entrust_mer_id', $merchantId)->where('is_del', 0)->where('status', 0)->fetchSql(false)->find();
         if (!$entrustInfo) {
             return app('json')->fail('用户无审核此委托商品权限');
         }

app/controller/api/store/merchant/Merchant.php

@@ -246,7 +246,7 @@ class Merchant extends BaseController
         $delivery = $repository->get($id) + systemConfig(['tx_map_key']);
         $data = array_merge($data,$delivery);
         $data['sys_bases_status'] = systemConfig('sys_bases_status') === '0' ? 0 : 1;
-
+        $data['type_code'] = Db::name('MerchantType')->where('mer_type_id', $data['type_id'])->value('type_code');
         return app('json')->success($data);
     }
 

public/static.dev/images/cancellation-header.png:Zone.Identifier

@@ -0,0 +1,3 @@
+[ZoneTransfer]
+ZoneId=3
+HostUrl=https://mer.crmeb.net/static/images/cancellation-header.png

public/static/images/cancellation-header.png:Zone.Identifier

@@ -0,0 +1,3 @@
+[ZoneTransfer]
+ZoneId=3
+HostUrl=https://mer.crmeb.net/static/images/cancellation-header.png